Add ARRAY for reserved name (#3150)

3 files changed, 8 insertions, 2 deletions

diff --git a/php/tests/generated_class_test.php b/php/tests/generated_class_test.php
index b42397bb..be641b6e 100644
--- a/php/tests/generated_class_test.php
+++ b/php/tests/generated_class_test.php
@@ -876,6 +876,7 @@ class GeneratedClassTest extends TestBase
         $m = new \Foo\TestMessage_Empty();
         $m = new \Foo\PBEmpty();
         $m = new \PrefixEmpty();
+        $m = new \Foo\PBARRAY();
     }
 
     #########################################################
@@ -886,8 +887,8 @@ class GeneratedClassTest extends TestBase
     {
         $m = (new TestMessage())
             ->setOptionalInt32(1)
-            ->setOptionalInt64(2);
+            ->setOptionalUInt32(2);
         $this->assertSame(1, $m->getOptionalInt32());
-        $this->assertSame(2, $m->getOptionalInt64());
+        $this->assertSame(2, $m->getOptionalUInt32());
     }
 }
diff --git a/php/tests/memory_leak_test.php b/php/tests/memory_leak_test.php
index 361982b5..5eac56f0 100644
--- a/php/tests/memory_leak_test.php
+++ b/php/tests/memory_leak_test.php
@@ -8,6 +8,7 @@ require_once('generated/NoNamespaceMessage_NestedEnum.php');
 require_once('generated/PrefixEmpty.php');
 require_once('generated/PrefixTestPrefix.php');
 require_once('generated/Bar/TestInclude.php');
+require_once('generated/Foo/PBARRAY.php');
 require_once('generated/Foo/PBEmpty.php');
 require_once('generated/Foo/TestEnum.php');
 require_once('generated/Foo/TestIncludePrefixMessage.php');
diff --git a/php/tests/proto/test.proto b/php/tests/proto/test.proto
index 39229254..583bf8e1 100644
--- a/php/tests/proto/test.proto
+++ b/php/tests/proto/test.proto
@@ -127,6 +127,10 @@ message Empty {
   int32 a = 1;
 }
 
+message ARRAY {
+  int32 a = 1;
+}
+
 message TestPackedMessage {
   repeated int32    repeated_int32    = 90  [packed = true];
   repeated int64    repeated_int64    = 91  [packed = true];