Merge remote-tracking branch 'origin/php-constructor-null-optional' into release-31.0-patch

Author: FabioBatSilva

php/ext/google/protobuf/message.c

@@ -533,6 +533,14 @@ bool Message_InitFromPhp(upb_Message* msg, const upb_MessageDef* m, zval* init,
       return false;
     }
 
+    // Handle NULL optional field
+    if (Z_TYPE_P(val) == IS_NULL && upb_FieldDef_IsOptional(f)) {
+      upb_Message_ClearFieldByDef(msg, f);
+      zend_hash_move_forward_ex(table, &pos);
+      zval_dtor(&key);
+      continue;
+    }
+
     if (upb_FieldDef_IsMap(f)) {
       msgval.map_val = MapField_GetUpbMap(val, MapType_Get(f), arena);
       if (!msgval.map_val) return false;

php/tests/GeneratedClassTest.php

@@ -1666,6 +1666,26 @@ public function testOneofStringInArrayConstructor()
         $this->assertTrue(true);
     }
 
+    public function testOptionalValueConstructor()
+    {
+        $m = new TestMessage([
+            'optional_message' => new Sub([
+                'a' => 1
+            ]),
+            'true_optional_message' => null,
+            'repeated_message' => [
+                new Sub(['a' => 2]),
+                new Sub(['a' => 3])
+            ],
+        ]);
+
+        $this->assertFalse($m->hasTrueOptionalMessage());
+        $this->assertNull($m->getTrueOptionalMessage());
+
+        $this->assertEquals(1, $m->getOptionalMessage()->getA());
+        $this->assertCount(2, $m->getRepeatedMessage());
+    }
+
     #########################################################
     # Test clone.
     #########################################################