diff options
| author | Paul Yang <TeBoring@users.noreply.github.com> | 2018-05-14 16:08:47 -0700 |
|---|---|---|
| committer | Bo Yang <teboring@google.com> | 2018-05-25 13:02:29 -0700 |
| commit | d8483a92d7867af37afb8b439e4f64c915654c1f (patch) | |
| tree | d3ca6733b546d267b2c67c5629e0283341123506 /php | |
| parent | 449e532b087e43a45ca6d8eae640a6019e547aca (diff) | |
| download | protobuf-d8483a92d7867af37afb8b439e4f64c915654c1f.tar.gz protobuf-d8483a92d7867af37afb8b439e4f64c915654c1f.tar.bz2 protobuf-d8483a92d7867af37afb8b439e4f64c915654c1f.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.proto | 1 | ||||
| -rw-r--r-- | php/tests/proto/test_no_namespace.proto | 2 | ||||
| -rw-r--r-- | php/tests/proto/test_php_namespace.proto | 1 |
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; |