Merge pull request #10595 from zajca/zajca-fix-10591

[PHP] Fix empty message serialization for Any
protocolbuffers · Oct 3, 2022 · a6eda18 · a6eda18
2 parents 7755973 + 743c675
commit a6eda18
Show file tree

Hide file tree

Showing 3 changed files with 29 additions and 2 deletions.
diff --git a/php/src/Google/Protobuf/Internal/Message.php b/php/src/Google/Protobuf/Internal/Message.php
@@ -1980,8 +1980,12 @@ public function jsonByteSize()
                 $size += 9;
                 $size += $value_msg->jsonByteSize();
             } else {
-                // Size for value. +1 for comma, -2 for "{}".
-                $size += $value_msg->jsonByteSize() -1;
+                $value_size = $value_msg->jsonByteSize();
+                // size === 2 it's empty message {} which is not serialized inside any
+                if ($value_size !== 2) {
+                    // Size for value. +1 for comma, -2 for "{}".
+                    $size += $value_size -1;
+                }
             }
         } elseif (get_class($this) === 'Google\Protobuf\FieldMask') {
             $field_mask = GPBUtil::formatFieldMask($this);

diff --git a/php/tests/EncodeDecodeTest.php b/php/tests/EncodeDecodeTest.php
@@ -5,6 +5,7 @@
 
 use Google\Protobuf\RepeatedField;
 use Google\Protobuf\GPBType;
+use Foo\EmptyAnySerialization;
 use Foo\TestInt32Value;
 use Foo\TestInt64Value;
 use Foo\TestUInt32Value;
@@ -1513,4 +1514,22 @@ public function wrappersDataProvider()
             [TestStringValue::class, "a", "\"a\"", "", "\"\""],
         ];
     }
+
+    public function testEmptyAnySerialization()
+    {
+        $m = new EmptyAnySerialization();
+
+        $any = new Any();
+        $any->pack($m);
+
+        $data = $any->serializeToJsonString();
+        $this->assertEquals('{"@type":"type.googleapis.com/foo.EmptyAnySerialization"}', $data);
+
+        $any = new Any();
+        $any->mergeFromJsonString($data);
+
+        $m = $any->unpack();
+        $this->assertInstanceOf(EmptyAnySerialization::class, $m);
+        $this->assertEquals('', $m->getA());
+    }
 }
diff --git a/php/tests/proto/test.proto b/php/tests/proto/test.proto
@@ -168,6 +168,10 @@ message ARRAY {
   int32 a = 1;
 }
 
+message EmptyAnySerialization {
+  string a = 1;
+}
+
 message TestPackedMessage {
   repeated int32    repeated_int32    = 90  [packed = true];
   repeated int64    repeated_int64    = 91  [packed = true];