aboutsummaryrefslogtreecommitdiff
path: root/php
diff options
context:
space:
mode:
authorPaul Yang <TeBoring@users.noreply.github.com>2018-05-14 16:08:47 -0700
committerGitHub <noreply@github.com>2018-05-14 16:08:47 -0700
commit3d9e99b7e0d792abe76c56cfae641370017bfdd6 (patch)
tree1fc6ec28f749660d180c651b56ba5fb916905014 /php
parentac34bf8f5935b46119750b50f0c84f8fa7211479 (diff)
downloadprotobuf-3d9e99b7e0d792abe76c56cfae641370017bfdd6.tar.gz
protobuf-3d9e99b7e0d792abe76c56cfae641370017bfdd6.tar.bz2
protobuf-3d9e99b7e0d792abe76c56cfae641370017bfdd6.zip
Adopt php_metadata_namespace in php code generator (#4622)
* Adopt php_metadata_namespace in php code generator The php_metadata_namespace is corresponded to the relative directory of the metadata file. e.g., previously, the metadata file of foo.proto was GPBMetadata/Foo.php. If the php_metadata_namespace is "Metadata\\Bar", the metadata file will be Metadata/Bar/Foo.php. * Handle empty php_metadata_namespace
Diffstat (limited to 'php')
-rw-r--r--php/tests/proto/test_empty_php_namespace.proto1
-rw-r--r--php/tests/proto/test_no_namespace.proto2
-rw-r--r--php/tests/proto/test_php_namespace.proto1
3 files changed, 4 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..1d02f760 100644
--- a/php/tests/proto/test_empty_php_namespace.proto
+++ b/php/tests/proto/test_empty_php_namespace.proto
@@ -2,6 +2,7 @@ syntax = "proto3";
package foo;
option php_namespace = "";
+option php_metadata_namespace = "";
message TestEmptyNamespace {
int32 a = 1;
diff --git a/php/tests/proto/test_no_namespace.proto b/php/tests/proto/test_no_namespace.proto
index 58f13d47..03f89270 100644
--- a/php/tests/proto/test_no_namespace.proto
+++ b/php/tests/proto/test_no_namespace.proto
@@ -1,5 +1,7 @@
syntax = "proto3";
+option php_metadata_namespace = "\\";
+
message NoNamespaceMessage {
int32 a = 1;
diff --git a/php/tests/proto/test_php_namespace.proto b/php/tests/proto/test_php_namespace.proto
index 713187b9..bb57d617 100644
--- a/php/tests/proto/test_php_namespace.proto
+++ b/php/tests/proto/test_php_namespace.proto
@@ -2,6 +2,7 @@ syntax = "proto3";
package foo;
option php_namespace = "Php\\Test";
+option php_metadata_namespace = "Metadata\\Php\\Test";
message TestNamespace {
int32 a = 1;