From dd8d5f57d7068080283c2c03af01d806efbe6cf4 Mon Sep 17 00:00:00 2001 From: Paul Yang Date: Wed, 8 Mar 2017 14:31:34 -0800 Subject: Rename encode/decode to serializeToString/mergeFromString (#2795) This better shows the semantic of the API. For already setted fields, mergeFromString do replacement for singular fields and appending for repeated fields. --- php/src/Google/Protobuf/Internal/DescriptorPool.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'php/src/Google/Protobuf/Internal/DescriptorPool.php') diff --git a/php/src/Google/Protobuf/Internal/DescriptorPool.php b/php/src/Google/Protobuf/Internal/DescriptorPool.php index 23b304ac..1ef403cf 100644 --- a/php/src/Google/Protobuf/Internal/DescriptorPool.php +++ b/php/src/Google/Protobuf/Internal/DescriptorPool.php @@ -58,7 +58,7 @@ class DescriptorPool public function internalAddGeneratedFile($data) { $files = new FileDescriptorSet(); - $files->decode($data); + $files->mergeFromString($data); $file = FileDescriptor::buildFromProto($files->getFile()[0]); foreach ($file->getMessageType() as &$desc) { -- cgit v1.2.3