aboutsummaryrefslogtreecommitdiff
path: root/php/tests/proto/test_empty_php_namespace.proto
diff options
context:
space:
mode:
authorPaul Yang <TeBoring@users.noreply.github.com>2018-05-25 13:43:22 -0700
committerGitHub <noreply@github.com>2018-05-25 13:43:22 -0700
commit4885b8058a93c1a16efe41fd1830d321e9bb2ce6 (patch)
tree0069b72edfd5639db022fb985b8a4e57abf6967c /php/tests/proto/test_empty_php_namespace.proto
parent449e532b087e43a45ca6d8eae640a6019e547aca (diff)
parentdadc95438ff732cb0c1d2961ce7bcf0d99d179b1 (diff)
downloadprotobuf-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_empty_php_namespace.proto')
-rw-r--r--php/tests/proto/test_empty_php_namespace.proto11
1 files changed, 11 insertions, 0 deletions
diff --git a/php/tests/proto/test_empty_php_namespace.proto b/php/tests/proto/test_empty_php_namespace.proto
index 7b4bc74d..c7ed1657 100644
--- a/php/tests/proto/test_empty_php_namespace.proto
+++ b/php/tests/proto/test_empty_php_namespace.proto
@@ -2,7 +2,18 @@ syntax = "proto3";
package foo;
option php_namespace = "";
+option php_metadata_namespace = "";
message TestEmptyNamespace {
int32 a = 1;
+
+ // Test nested messages, enums, and reserved names
+ NestedMessage nested_message = 2;
+ NestedEnum nested_enum = 3;
+ message NestedMessage {
+ int32 a = 1;
+ }
+ enum NestedEnum {
+ ZERO = 0;
+ };
}