diff options
| author | Brent Shaffer <betterbrent@google.com> | 2018-05-23 16:43:30 -0700 |
|---|---|---|
| committer | Paul Yang <TeBoring@users.noreply.github.com> | 2018-05-23 16:43:30 -0700 |
| commit | 6ae6e1baa2ef07d4abe81976a2577797598b2d31 (patch) | |
| tree | 7a5475e0af698f271240eac0cff583a3fc6883c4 /php/tests/generated_phpdoc_test.php | |
| parent | a77d3a981a253cc89881434dd0c68f816b45a60e (diff) | |
| download | protobuf-6ae6e1baa2ef07d4abe81976a2577797598b2d31.tar.gz protobuf-6ae6e1baa2ef07d4abe81976a2577797598b2d31.tar.bz2 protobuf-6ae6e1baa2ef07d4abe81976a2577797598b2d31.zip | |
PHP namespaces for nested messages and enums (#4536)
* uses namespaces for nested messages and enums
* fixes namespaces for PHP dist
* fixes namespace for Descriptors, adds Cardinality and Kind
* fixes nested namespaces for reserved words and adds tests
* adds tests and generator fix for php class prefixes
* fixes escaping of protobuf packages, enum comments, misc others
* nice refactor of generated code
* adds class files for backwards compatibility
* simplifies code with templates
* adds compatibility files to makefile
* cleanup of generator and fixes nested namespace bug
* regenerates proto types
* remove internal BC classes
* adds deprecated warning, adds methods back
* simplifies if statement
* fixes dist files
* addresses review comments
* adds back TYPE_URL_PREFIX constant
* adds @deprecated to old nested class files
* skips tests which require a separate process when protobuf.so is enabled
* Adds tests for legacy nested classes that do not require separate processes to test
* uses legacy names for GPBUtil message check
* adds block for IDE @deprecated message
* Namespace for nested message/enum in c extension
* Remove unused code
Diffstat (limited to 'php/tests/generated_phpdoc_test.php')
| -rw-r--r-- | php/tests/generated_phpdoc_test.php | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/php/tests/generated_phpdoc_test.php b/php/tests/generated_phpdoc_test.php index 505dafea..526927fc 100644 --- a/php/tests/generated_phpdoc_test.php +++ b/php/tests/generated_phpdoc_test.php @@ -201,7 +201,7 @@ class GeneratedPhpdocTest extends TestBase [ 'setRepeatedMessage', ], - '@param \Foo\TestMessage_Sub[]|\Google\Protobuf\Internal\RepeatedField $var' + '@param \Foo\TestMessage\Sub[]|\Google\Protobuf\Internal\RepeatedField $var' ], [ [ @@ -294,14 +294,14 @@ class GeneratedPhpdocTest extends TestBase 'getOptionalMessage', 'getOneofMessage' ], - '@return \Foo\TestMessage_Sub' + '@return \Foo\TestMessage\Sub' ], [ [ 'setOptionalMessage', 'setOneofMessage' ], - '@param \Foo\TestMessage_Sub $var' + '@param \Foo\TestMessage\Sub $var' ], [ [ |