commit a6189acd18b00611c1dc7042299ad75486f08a1a
author Paul Yang <TeBoring@users.noreply.github.com> Wed Apr 26 16:32:21 2017 -0700
committer GitHub <noreply@github.com> Wed Apr 26 16:32:21 2017 -0700
tree 6371eddb9a4192e9fa3117af6bf534baef9d737d
parent 3c0855e94ac4cf6c3c2e899ac88acf4fa56e9770

Add prefix to enum value with reserved name. (#3020)

php/tests/proto/test.proto

diff --git a/php/tests/proto/test.proto b/php/tests/proto/test.proto
index f0d009c..3922925 100644
--- a/php/tests/proto/test.proto
+++ b/php/tests/proto/test.proto
@@ -119,6 +119,7 @@
   ZERO = 0;
   ONE  = 1;
   TWO  = 2;
+  ECHO = 3;  // Test reserved name.
 }
 
 // Test prefix for reserved words.

src/google/protobuf/compiler/php/php_generator.cc

diff --git a/src/google/protobuf/compiler/php/php_generator.cc b/src/google/protobuf/compiler/php/php_generator.cc
index 4d475b1..ea850c0 100644
--- a/src/google/protobuf/compiler/php/php_generator.cc
+++ b/src/google/protobuf/compiler/php/php_generator.cc
@@ -49,8 +49,8 @@
     "GPBMetadata/Google/Protobuf/Internal/Descriptor.php";
 const std::string kDescriptorDirName = "Google/Protobuf/Internal";
 const std::string kDescriptorPackageName = "Google\\Protobuf\\Internal";
-const char* const kReservedNames[] = {"Empty"};
-const int kReservedNamesSize = 1;
+const char* const kReservedNames[] = {"Empty", "ECHO"};
+const int kReservedNamesSize = 2;
 
 namespace google {
 namespace protobuf {
@@ -559,7 +559,7 @@
     const EnumValueDescriptor* value = en->value(i);
     printer->Print(
         "->value(\"^name^\", ^number^)\n",
-        "name", value->name(),
+        "name", ClassNamePrefix(value->name(), en) + value->name(),
         "number", IntToString(value->number()));
   }
   printer->Print("->finalizeToPool();\n\n");
@@ -845,7 +845,7 @@
     const EnumValueDescriptor* value = en->value(i);
     GenerateEnumValueDocComment(&printer, value);
     printer.Print("const ^name^ = ^number^;\n",
-                  "name", value->name(),
+                  "name", ClassNamePrefix(value->name(), en) + value->name(),
                   "number", IntToString(value->number()));
   }