diff options
| author |  Paul Yang <TeBoring@users.noreply.github.com> | 2017-04-20 01:19:03 -0700 |
|---|---|---|
| committer |  GitHub <noreply@github.com> | 2017-04-20 01:19:03 -0700 |
| commit | 4c57e8475f78ccac80407f03c2d23d30014785f9 (patch) | |
| tree | fa9c6ca31796db77c3367acac83233a44938e117 /php/tests | |
| parent | b97cd573e405dd511b09a9fae124427a29741395 (diff) | |
Prepend "PB" to generated classes whose name are reserved words. (#2990)
Diffstat (limited to 'php/tests')
| -rw-r--r-- | php/tests/generated_class_test.php | 11 | ||||
| -rw-r--r-- | php/tests/memory_leak_test.php | 3 | ||||
| -rw-r--r-- | php/tests/proto/test.proto | 10 | ||||
| -rw-r--r-- | php/tests/proto/test_prefix.proto | 5 |
4 files changed, 29 insertions, 0 deletions
diff --git a/php/tests/generated_class_test.php b/php/tests/generated_class_test.php index c5dee2d6..554d2bea 100644 --- a/php/tests/generated_class_test.php +++ b/php/tests/generated_class_test.php @@ -865,4 +865,15 @@ class GeneratedClassTest extends TestBase $m->setPrefixMessage($n); $this->assertSame(1, $m->getPrefixMessage()->getA()); } + + ######################################################### + # Test prefix for reserved words. + ######################################################### + + public function testPrefixForReservedWords() + { + $m = new \Foo\TestMessage_Empty(); + $m = new \Foo\PBEmpty(); + $m = new \PrefixEmpty(); + } } diff --git a/php/tests/memory_leak_test.php b/php/tests/memory_leak_test.php index ea7a4c96..361982b5 100644 --- a/php/tests/memory_leak_test.php +++ b/php/tests/memory_leak_test.php @@ -5,11 +5,14 @@ require_once('generated/NoNamespaceEnum.php'); require_once('generated/NoNamespaceMessage.php'); 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/PBEmpty.php'); require_once('generated/Foo/TestEnum.php'); require_once('generated/Foo/TestIncludePrefixMessage.php'); require_once('generated/Foo/TestMessage.php'); +require_once('generated/Foo/TestMessage_Empty.php'); require_once('generated/Foo/TestMessage_NestedEnum.php'); require_once('generated/Foo/TestMessage_Sub.php'); require_once('generated/Foo/TestPackedMessage.php'); diff --git a/php/tests/proto/test.proto b/php/tests/proto/test.proto index b6c14866..f0d009c8 100644 --- a/php/tests/proto/test.proto +++ b/php/tests/proto/test.proto @@ -108,6 +108,11 @@ message TestMessage { } NestedEnum optional_nested_enum = 101; + + // Test prefix for reserved words. + message Empty { + int32 a = 1; + } } enum TestEnum { @@ -116,6 +121,11 @@ enum TestEnum { TWO = 2; } +// Test prefix for reserved words. +message Empty { + int32 a = 1; +} + message TestPackedMessage { repeated int32 repeated_int32 = 90 [packed = true]; repeated int64 repeated_int64 = 91 [packed = true]; diff --git a/php/tests/proto/test_prefix.proto b/php/tests/proto/test_prefix.proto index 04582121..9bfbad7f 100644 --- a/php/tests/proto/test_prefix.proto +++ b/php/tests/proto/test_prefix.proto @@ -5,3 +5,8 @@ option php_class_prefix = "Prefix"; message TestPrefix { int32 a = 1; } + +// Test prefix for reserved words. +message Empty { + int32 a = 1; +} |