diff options
author | Paul Yang <TeBoring@users.noreply.github.com> | 2018-05-25 13:43:22 -0700 |
---|---|---|
committer | GitHub <noreply@github.com> | 2018-05-25 13:43:22 -0700 |
commit | 4885b8058a93c1a16efe41fd1830d321e9bb2ce6 (patch) | |
tree | 0069b72edfd5639db022fb985b8a4e57abf6967c /php/tests/proto/test_no_namespace.proto | |
parent | 449e532b087e43a45ca6d8eae640a6019e547aca (diff) | |
parent | dadc95438ff732cb0c1d2961ce7bcf0d99d179b1 (diff) | |
download | protobuf-4885b8058a93c1a16efe41fd1830d321e9bb2ce6.tar.gz protobuf-4885b8058a93c1a16efe41fd1830d321e9bb2ce6.tar.bz2 protobuf-4885b8058a93c1a16efe41fd1830d321e9bb2ce6.zip |
Merge pull request #4675 from TeBoring/3.6.x
Cherry-pick php generated code changes into 3.6.x
Diffstat (limited to 'php/tests/proto/test_no_namespace.proto')
-rw-r--r-- | php/tests/proto/test_no_namespace.proto | 14 |
1 files changed, 10 insertions, 4 deletions
diff --git a/php/tests/proto/test_no_namespace.proto b/php/tests/proto/test_no_namespace.proto index 58f13d47..cce42ea2 100644 --- a/php/tests/proto/test_no_namespace.proto +++ b/php/tests/proto/test_no_namespace.proto @@ -1,13 +1,19 @@ syntax = "proto3"; +option php_metadata_namespace = "\\"; + message NoNamespaceMessage { int32 a = 1; - enum NestedEnum { - ZERO = 0; + // Test nested messages, enums, and reserved names + NestedMessage nested_message = 2; + NestedEnum nested_enum = 3; + message NestedMessage { + int32 a = 1; } - NestedEnum b = 2; - repeated NestedEnum c = 3; + enum NestedEnum { + ZERO = 0; + }; } enum NoNamespaceEnum { |