aboutsummaryrefslogtreecommitdiffhomepage
path: root/src/google/protobuf/descriptor.proto
diff options
context:
space:
mode:
authorGravatar Paul Yang <TeBoring@users.noreply.github.com>2017-06-05 00:10:18 -0700
committerGravatar GitHub <noreply@github.com>2017-06-05 00:10:18 -0700
commit6f325805c0bc956f927b0e2dbfb4dd8133b4ed69 (patch)
tree2f7d596b8e19933b67868d7378bb663960b75f87 /src/google/protobuf/descriptor.proto
parentfbaad3617fbfadafbcc653a621620a5081df64eb (diff)
Add new file option php_namespace. (#3162)
* Add new file option php_namespace. Use this option to change the namespace of php generated classes. Default is empty. When this option is empty, the package name will be used for determining the namespace. * Uncomment commented tests * Revert gdb test change * Update csharp descriptor. * Add test for empty php_namespace.
Diffstat (limited to 'src/google/protobuf/descriptor.proto')
-rw-r--r--src/google/protobuf/descriptor.proto5
1 files changed, 5 insertions, 0 deletions
diff --git a/src/google/protobuf/descriptor.proto b/src/google/protobuf/descriptor.proto
index f859c429..c7fbaaf6 100644
--- a/src/google/protobuf/descriptor.proto
+++ b/src/google/protobuf/descriptor.proto
@@ -380,6 +380,11 @@ message FileOptions {
// from this .proto. Default is empty.
optional string php_class_prefix = 40;
+ // Use this option to change the namespace of php generated classes. Default
+ // is empty. When this option is empty, the package name will be used for
+ // determining the namespace.
+ optional string php_namespace = 41;
+
// The parser stores options it doesn't recognize here. See above.
repeated UninterpretedOption uninterpreted_option = 999;