diff options
author | Paul Yang <TeBoring@users.noreply.github.com> | 2018-05-25 13:43:22 -0700 |
---|---|---|
committer | GitHub <noreply@github.com> | 2018-05-25 13:43:22 -0700 |
commit | 4885b8058a93c1a16efe41fd1830d321e9bb2ce6 (patch) | |
tree | 0069b72edfd5639db022fb985b8a4e57abf6967c /php/tests/memory_leak_test.php | |
parent | 449e532b087e43a45ca6d8eae640a6019e547aca (diff) | |
parent | dadc95438ff732cb0c1d2961ce7bcf0d99d179b1 (diff) | |
download | protobuf-4885b8058a93c1a16efe41fd1830d321e9bb2ce6.tar.gz protobuf-4885b8058a93c1a16efe41fd1830d321e9bb2ce6.tar.bz2 protobuf-4885b8058a93c1a16efe41fd1830d321e9bb2ce6.zip |
Merge pull request #4675 from TeBoring/3.6.x
Cherry-pick php generated code changes into 3.6.x
Diffstat (limited to 'php/tests/memory_leak_test.php')
-rw-r--r-- | php/tests/memory_leak_test.php | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/php/tests/memory_leak_test.php b/php/tests/memory_leak_test.php index ad55d578..5456919b 100644 --- a/php/tests/memory_leak_test.php +++ b/php/tests/memory_leak_test.php @@ -15,9 +15,9 @@ require_once('generated/Foo/TestEnum.php'); require_once('generated/Foo/TestIncludeNamespaceMessage.php'); require_once('generated/Foo/TestIncludePrefixMessage.php'); require_once('generated/Foo/TestMessage.php'); -require_once('generated/Foo/TestMessage_Empty.php'); -require_once('generated/Foo/TestMessage_NestedEnum.php'); -require_once('generated/Foo/TestMessage_Sub.php'); +require_once('generated/Foo/TestMessage/PBEmpty.php'); +require_once('generated/Foo/TestMessage/NestedEnum.php'); +require_once('generated/Foo/TestMessage/Sub.php'); require_once('generated/Foo/TestPackedMessage.php'); require_once('generated/Foo/TestPhpDoc.php'); require_once('generated/Foo/TestRandomFieldOrder.php'); @@ -37,7 +37,7 @@ require_once('test_util.php'); use Google\Protobuf\Internal\RepeatedField; use Google\Protobuf\Internal\GPBType; use Foo\TestMessage; -use Foo\TestMessage_Sub; +use Foo\TestMessage\Sub; $from = new TestMessage(); TestUtil::setTestMessage($from); @@ -97,7 +97,7 @@ $n = new TestMessage(); $n->mergeFromString($data); assert('abc' === $n->getOneofString()); -$sub_m = new TestMessage_Sub(); +$sub_m = new Sub(); $sub_m->setA(1); $m->setOneofMessage($sub_m); assert(0 === $m->getOneofInt32()); |