commit dd8d5f57d7068080283c2c03af01d806efbe6cf4
author Paul Yang <TeBoring@users.noreply.github.com> Wed Mar 08 14:31:34 2017 -0800
committer GitHub <noreply@github.com> Wed Mar 08 14:31:34 2017 -0800
tree cbb2cb26804889ddfe61094044faaa6be4a47a12
parent 2b7430d96aeff2bb624c8d52182ff5e4b9f7f18a

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.

php/tests/php_implementation_test.php

diff --git a/php/tests/php_implementation_test.php b/php/tests/php_implementation_test.php
index 00125db..ec6b8d5 100644
--- a/php/tests/php_implementation_test.php
+++ b/php/tests/php_implementation_test.php
@@ -290,14 +290,14 @@
     public function testDecode()
     {
         $m = new TestMessage();
-        $m->decode(TestUtil::getGoldenTestMessage());
+        $m->mergeFromString(TestUtil::getGoldenTestMessage());
         TestUtil::assertTestMessage($m);
     }
 
     public function testDescriptorDecode()
     {
         $file_desc_set = new FileDescriptorSet();
-        $file_desc_set->decode(hex2bin(
+        $file_desc_set->mergeFromString(hex2bin(
             "0a3b0a12746573745f696e636c7564652e70726f746f120362617222180a" .
             "0b54657374496e636c75646512090a0161180120012805620670726f746f33"));