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 /conformance/conformance_php.php | |
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 'conformance/conformance_php.php')
-rwxr-xr-x | conformance/conformance_php.php | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/conformance/conformance_php.php b/conformance/conformance_php.php index 69001971..20fb5082 100755 --- a/conformance/conformance_php.php +++ b/conformance/conformance_php.php @@ -46,7 +46,7 @@ function doTest($request) $response = new \Conformance\ConformanceResponse(); if ($request->getPayload() == "protobuf_payload") { try { - $test_message->decode($request->getProtobufPayload()); + $test_message->mergeFromString($request->getProtobufPayload()); } catch (Exception $e) { $response->setParseError($e->getMessage()); return $response; @@ -65,7 +65,7 @@ function doTest($request) if ($request->getRequestedOutputFormat() == WireFormat::UNSPECIFIED) { trigger_error("Unspecified output format.", E_USER_ERROR); } elseif ($request->getRequestedOutputFormat() == WireFormat::PROTOBUF) { - $response->setProtobufPayload($test_message->encode()); + $response->setProtobufPayload($test_message->serializeToString()); } elseif ($request->getRequestedOutputFormat() == WireFormat::JSON) { $response->setJsonPayload($test_message->jsonEncode()); } @@ -89,11 +89,11 @@ function doTestIO() } $request = new \Conformance\ConformanceRequest(); - $request->decode($serialized_request); + $request->mergeFromString($serialized_request); $response = doTest($request); - $serialized_response = $response->encode(); + $serialized_response = $response->serializeToString(); fwrite(STDOUT, pack("V", strlen($serialized_response))); fwrite(STDOUT, $serialized_response); |