diff options
| author |  Paul Yang <TeBoring@users.noreply.github.com> | 2017-06-05 00:10:18 -0700 |
|---|---|---|
| committer |  GitHub <noreply@github.com> | 2017-06-05 00:10:18 -0700 |
| commit | 6f325805c0bc956f927b0e2dbfb4dd8133b4ed69 (patch) | |
| tree | 2f7d596b8e19933b67868d7378bb663960b75f87 /php/src/GPBMetadata | |
| parent | fbaad3617fbfadafbcc653a621620a5081df64eb (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 'php/src/GPBMetadata')
| -rw-r--r-- | php/src/GPBMetadata/Google/Protobuf/Internal/Descriptor.php | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/php/src/GPBMetadata/Google/Protobuf/Internal/Descriptor.php b/php/src/GPBMetadata/Google/Protobuf/Internal/Descriptor.php index 1b6b3d60..636a0ad4 100644 --- a/php/src/GPBMetadata/Google/Protobuf/Internal/Descriptor.php +++ b/php/src/GPBMetadata/Google/Protobuf/Internal/Descriptor.php @@ -145,6 +145,7 @@ class Descriptor ->optional('csharp_namespace', \Google\Protobuf\Internal\GPBType::STRING, 37) ->optional('swift_prefix', \Google\Protobuf\Internal\GPBType::STRING, 39) ->optional('php_class_prefix', \Google\Protobuf\Internal\GPBType::STRING, 40) + ->optional('php_namespace', \Google\Protobuf\Internal\GPBType::STRING, 41) ->repeated('uninterpreted_option', \Google\Protobuf\Internal\GPBType::MESSAGE, 999, 'google.protobuf.internal.UninterpretedOption') ->finalizeToPool(); |