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.

1 files changed, 10 insertions, 10 deletions

diff --git a/php/tests/memory_leak_test.php b/php/tests/memory_leak_test.php
index d4776d6f..cfcbe62e 100644
--- a/php/tests/memory_leak_test.php
+++ b/php/tests/memory_leak_test.php
@@ -22,10 +22,10 @@ $from = new TestMessage();
 TestUtil::setTestMessage($from);
 TestUtil::assertTestMessage($from);
 
-$data = $from->encode();
+$data = $from->serializeToString();
 
 $to = new TestMessage();
-$to->decode($data);
+$to->mergeFromString($data);
 
 TestUtil::assertTestMessage($to);
 
@@ -43,9 +43,9 @@ assert(1 === $m->getOneofInt32());
 assert(0.0 === $m->getOneofFloat());
 assert('' === $m->getOneofString());
 assert(NULL === $m->getOneofMessage());
-$data = $m->encode();
+$data = $m->serializeToString();
 $n = new TestMessage();
-$n->decode($data);
+$n->mergeFromString($data);
 assert(1 === $n->getOneofInt32());
 
 $m->setOneofFloat(2.0);
@@ -53,9 +53,9 @@ assert(0 === $m->getOneofInt32());
 assert(2.0 === $m->getOneofFloat());
 assert('' === $m->getOneofString());
 assert(NULL === $m->getOneofMessage());
-$data = $m->encode();
+$data = $m->serializeToString();
 $n = new TestMessage();
-$n->decode($data);
+$n->mergeFromString($data);
 assert(2.0 === $n->getOneofFloat());
 
 $m->setOneofString('abc');
@@ -63,9 +63,9 @@ assert(0 === $m->getOneofInt32());
 assert(0.0 === $m->getOneofFloat());
 assert('abc' === $m->getOneofString());
 assert(NULL === $m->getOneofMessage());
-$data = $m->encode();
+$data = $m->serializeToString();
 $n = new TestMessage();
-$n->decode($data);
+$n->mergeFromString($data);
 assert('abc' === $n->getOneofString());
 
 $sub_m = new TestMessage_Sub();
@@ -75,9 +75,9 @@ assert(0 === $m->getOneofInt32());
 assert(0.0 === $m->getOneofFloat());
 assert('' === $m->getOneofString());
 assert(1 === $m->getOneofMessage()->getA());
-$data = $m->encode();
+$data = $m->serializeToString();
 $n = new TestMessage();
-$n->decode($data);
+$n->mergeFromString($data);
 assert(1 === $n->getOneofMessage()->getA());
 
 $from = new TestMessage();