diff options
| author |  Paul Yang <TeBoring@users.noreply.github.com> | 2017-03-08 14:31:34 -0800 |
|---|---|---|
| committer |  GitHub <noreply@github.com> | 2017-03-08 14:31:34 -0800 |
| commit | dd8d5f57d7068080283c2c03af01d806efbe6cf4 (patch) | |
| tree | cbb2cb26804889ddfe61094044faaa6be4a47a12 /php/src/Google/Protobuf/Internal/DescriptorPool.php | |
| parent | 2b7430d96aeff2bb624c8d52182ff5e4b9f7f18a (diff) | |
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.
Diffstat (limited to 'php/src/Google/Protobuf/Internal/DescriptorPool.php')
| -rw-r--r-- | php/src/Google/Protobuf/Internal/DescriptorPool.php | 2 |
1 files changed, 1 insertions, 1 deletions
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) { |