|
70 | 70 | # copy GPBMetadata file to metadata |
71 | 71 | s.move(admin_library / f'proto/src/GPBMetadata/Google/Spanner', f'metadata/', merge=php._merge) |
72 | 72 |
|
73 | | - |
74 | | -# Fix test namespaces |
75 | | -s.replace( |
76 | | - 'tests/Unit/Admin/Database/*/*.php', |
77 | | - r'namespace Google\\Cloud\\Spanner\\Admin\\Database\\Tests\\Unit', |
78 | | - r'namespace Google\\Cloud\\Spanner\\Tests\\Unit\\Admin\\Database') |
| 73 | +# remove class_alias code |
79 | 74 | s.replace( |
80 | | - 'tests/Unit/Admin/Instance/*/*.php', |
81 | | - r'namespace Google\\Cloud\\Spanner\\Admin\\Instance\\Tests\\Unit', |
82 | | - r'namespace Google\\Cloud\\Spanner\\Tests\\Unit\\Admin\\Instance') |
83 | | - |
84 | | -# fix test group |
85 | | -s.replace( |
86 | | - 'tests/**/Admin/Database/V1/*Test.php', |
87 | | - '@group database', |
88 | | - '@group spanner-admin-database') |
89 | | - |
90 | | -s.replace( |
91 | | - 'tests/**/Admin/Instance/V1/*Test.php', |
92 | | - '@group instance', |
93 | | - '@group spanner-admin-instance') |
94 | | - |
95 | | -# remove ReadOnly class_alias code |
96 | | -s.replace( |
97 | | - "src/V*/**/PBReadOnly.php", |
98 | | - r"^// Adding a class alias for backwards compatibility with the \"readonly\" keyword.$" |
| 75 | + "src/V*/**/*.php", |
| 76 | + r"^// Adding a class alias for backwards compatibility with the previous class name.$" |
99 | 77 | + "\n" |
100 | | - + r"^class_alias\(PBReadOnly::class, __NAMESPACE__ . '\\ReadOnly'\);$" |
| 78 | + + r"^class_alias\(.*\);$" |
101 | 79 | + "\n", |
102 | 80 | '') |
103 | 81 |
|
104 | | -### [START] protoc backwards compatibility fixes |
105 | | - |
106 | | -# roll back to private properties. |
107 | | -s.replace( |
108 | | - "src/**/V*/**/*.php", |
109 | | - r"Generated from protobuf field ([^\n]{0,})\n\s{5}\*/\n\s{4}protected \$", |
110 | | - r"""Generated from protobuf field \1 |
111 | | - */ |
112 | | - private $""") |
113 | | - |
114 | | -# Replace "Unwrapped" with "Value" for method names. |
115 | | -s.replace( |
116 | | - "src/**/V*/**/*.php", |
117 | | - r"public function ([s|g]\w{3,})Unwrapped", |
118 | | - r"public function \1Value" |
119 | | -) |
120 | | - |
121 | | -### [END] protoc backwards compatibility fixes |
122 | | - |
123 | 82 | # fix relative cloud.google.com links |
124 | 83 | s.replace( |
125 | 84 | "src/**/V*/**/*.php", |
|
0 commit comments