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 | |
parent | 2b7430d96aeff2bb624c8d52182ff5e4b9f7f18a (diff) | |
download | protobuf-dd8d5f57d7068080283c2c03af01d806efbe6cf4.tar.gz protobuf-dd8d5f57d7068080283c2c03af01d806efbe6cf4.tar.bz2 protobuf-dd8d5f57d7068080283c2c03af01d806efbe6cf4.zip |
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')
-rw-r--r-- | php/src/Google/Protobuf/Internal/DescriptorPool.php | 2 | ||||
-rw-r--r-- | php/src/Google/Protobuf/Internal/Message.php | 8 |
2 files changed, 6 insertions, 4 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) { diff --git a/php/src/Google/Protobuf/Internal/Message.php b/php/src/Google/Protobuf/Internal/Message.php index 17ef8536..ca4fde02 100644 --- a/php/src/Google/Protobuf/Internal/Message.php +++ b/php/src/Google/Protobuf/Internal/Message.php @@ -562,12 +562,14 @@ class Message * Parses a protocol buffer contained in a string. * * This function takes a string in the (non-human-readable) binary wire - * format, matching the encoding output by encode(). + * format, matching the encoding output by serializeToString(). + * See mergeFrom() for merging behavior, if the field is already set in the + * specified message. * * @param string $data Binary protobuf data. * @return bool Return true on success. */ - public function decode($data) + public function mergeFromString($data) { $input = new InputStream($data); $this->parseFromStream($input); @@ -714,7 +716,7 @@ class Message * Serialize the message to string. * @return string Serialized binary protobuf data. */ - public function encode() + public function serializeToString() { $output = new OutputStream($this->byteSize()); $this->serializeToStream($output); |