commit 09295965758bd92764dbad18fa26d5458ece878f
author Paul Yang <TeBoring@users.noreply.github.com> Thu Jul 30 12:00:13 2020 -0700
committer Adam Cozzette <acozzette@google.com> Fri Aug 07 14:44:49 2020 -0700
tree dd7aaee81a39b16e3cce82bac994163d7315d7db
parent 02ade8bc3203a1c3701a58f2721ff4c8fa94e6e4

Check realoneof in json parsing (#7763)

* Check realoneof in json parsing

* Fix whichoneof to also work for synthetic oneof

php/tests/encode_decode_test.php

diff --git a/php/tests/encode_decode_test.php b/php/tests/encode_decode_test.php
index ea8bd65..cea1e6a 100644
--- a/php/tests/encode_decode_test.php
+++ b/php/tests/encode_decode_test.php
@@ -344,6 +344,24 @@
       $this->assertSame(0, $m2->getTrueOptionalInt32());
     }
 
+    public function testJsonEncodeDecodeOptional()
+    {
+      $m = new TestMessage();
+      $this->assertFalse($m->hasTrueOptionalInt32());
+      $data = $m->serializeToJsonString();
+      $this->assertSame("{}", $data);
+
+      $m->setTrueOptionalInt32(0);
+      $this->assertTrue($m->hasTrueOptionalInt32());
+      $data = $m->serializeToJsonString();
+      $this->assertNotSame("{}", $data);
+
+      $m2 = new TestMessage();
+      $m2->mergeFromJsonString($data);
+      $this->assertTrue($m2->hasTrueOptionalInt32());
+      $this->assertSame(0, $m2->getTrueOptionalInt32());
+    }
+
     public function testJsonEncodeDecodeOneof()
     {
         $m = new TestMessage();