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/ext | |
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/ext')
-rw-r--r-- | php/ext/google/protobuf/encode_decode.c | 4 | ||||
-rw-r--r-- | php/ext/google/protobuf/message.c | 4 | ||||
-rw-r--r-- | php/ext/google/protobuf/protobuf.h | 4 |
3 files changed, 6 insertions, 6 deletions
diff --git a/php/ext/google/protobuf/encode_decode.c b/php/ext/google/protobuf/encode_decode.c index 78b12a06..e5a5f307 100644 --- a/php/ext/google/protobuf/encode_decode.c +++ b/php/ext/google/protobuf/encode_decode.c @@ -1234,7 +1234,7 @@ static const upb_handlers* msgdef_json_serialize_handlers( // PHP encode/decode methods // ----------------------------------------------------------------------------- -PHP_METHOD(Message, encode) { +PHP_METHOD(Message, serializeToString) { zval* php_descriptor = get_ce_obj(Z_OBJCE_P(getThis())); Descriptor* desc = (Descriptor*)zend_object_store_get_object(php_descriptor TSRMLS_CC); @@ -1260,7 +1260,7 @@ PHP_METHOD(Message, encode) { } } -PHP_METHOD(Message, decode) { +PHP_METHOD(Message, mergeFromString) { zval* php_descriptor = get_ce_obj(Z_OBJCE_P(getThis())); Descriptor* desc = (Descriptor*)zend_object_store_get_object(php_descriptor TSRMLS_CC); diff --git a/php/ext/google/protobuf/message.c b/php/ext/google/protobuf/message.c index b35df311..59ce6ae6 100644 --- a/php/ext/google/protobuf/message.c +++ b/php/ext/google/protobuf/message.c @@ -39,8 +39,8 @@ zend_object_handlers* message_handlers; static zend_function_entry message_methods[] = { PHP_ME(Message, clear, NULL, ZEND_ACC_PUBLIC) - PHP_ME(Message, encode, NULL, ZEND_ACC_PUBLIC) - PHP_ME(Message, decode, NULL, ZEND_ACC_PUBLIC) + PHP_ME(Message, serializeToString, NULL, ZEND_ACC_PUBLIC) + PHP_ME(Message, mergeFromString, NULL, ZEND_ACC_PUBLIC) PHP_ME(Message, jsonEncode, NULL, ZEND_ACC_PUBLIC) PHP_ME(Message, jsonDecode, NULL, ZEND_ACC_PUBLIC) PHP_ME(Message, mergeFrom, NULL, ZEND_ACC_PUBLIC) diff --git a/php/ext/google/protobuf/protobuf.h b/php/ext/google/protobuf/protobuf.h index 1562bbaf..28cea95c 100644 --- a/php/ext/google/protobuf/protobuf.h +++ b/php/ext/google/protobuf/protobuf.h @@ -267,8 +267,8 @@ PHP_METHOD(Message, __construct); const upb_pbdecodermethod *new_fillmsg_decodermethod(Descriptor *desc, const void *owner); -PHP_METHOD(Message, encode); -PHP_METHOD(Message, decode); +PHP_METHOD(Message, serializeToString); +PHP_METHOD(Message, mergeFromString); PHP_METHOD(Message, jsonEncode); PHP_METHOD(Message, jsonDecode); |