Revert "fix: don't change PHP functions which are reserved words (#3317…

…)" (#3322) This reverts commit 3ff8ca9.
googleapis · Dec 29, 2020 · 9c22369 · 9c22369
1 parent 6bc6fa8
commit 9c22369
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 5 deletions.
diff --git a/showcase/php/tests/ShowcaseIntegrationTest.php b/showcase/php/tests/ShowcaseIntegrationTest.php
@@ -48,7 +48,7 @@ class ShowcaseIntegrationTest extends TestCase
      */
     public function testUnary($client)
     {
-        $response = $client->echo([
+        $response = $client->echo_([
             'content' => '"Wales snail hail fails!" wails Gail'
         ]);
         $this->assertEquals(
@@ -65,7 +65,7 @@ public function testUnary($client)
     public function testFailUnary($client)
     {
         try {
-            $client->echo([
+            $client->echo_([
                 'error' => (new Status())
                     ->setCode(Code::INVALID_ARGUMENT)
                     ->setMessage("Unary error message"),

diff --git a/src/main/java/com/google/api/codegen/util/php/PhpNameFormatter.java b/src/main/java/com/google/api/codegen/util/php/PhpNameFormatter.java
@@ -63,17 +63,17 @@ public String localVarReference(Name name) {
 
   @Override
   public String publicMethodName(Name name) {
-    return name.toLowerCamel();
+    return wrapIfKeywordOrBuiltIn(name.toLowerCamel());
   }
 
   @Override
   public String privateMethodName(Name name) {
-    return name.toLowerCamel();
+    return wrapIfKeywordOrBuiltIn(name.toLowerCamel());
   }
 
   @Override
   public String staticFunctionName(Name name) {
-    return name.toLowerCamel();
+    return wrapIfKeywordOrBuiltIn(name.toLowerCamel());
   }
 
   @Override