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/tests/proto | |
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/tests/proto')
-rw-r--r-- | php/tests/proto/test.proto | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/php/tests/proto/test.proto b/php/tests/proto/test.proto index c971df21..e5dee0fb 100644 --- a/php/tests/proto/test.proto +++ b/php/tests/proto/test.proto @@ -100,6 +100,7 @@ message TestMessage { enum TestEnum { ZERO = 0; ONE = 1; + TWO = 2; } message TestPackedMessage { |