From d8483a92d7867af37afb8b439e4f64c915654c1f Mon Sep 17 00:00:00 2001
From: Paul Yang <TeBoring@users.noreply.github.com>
Date: Mon, 14 May 2018 16:08:47 -0700
Subject: 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
---
 php/tests/proto/test_empty_php_namespace.proto | 1 +
 php/tests/proto/test_no_namespace.proto        | 2 ++
 php/tests/proto/test_php_namespace.proto       | 1 +
 3 files changed, 4 insertions(+)

(limited to 'php')

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;
-- 
cgit v1.2.3