bug #29076 [Serializer] Allow null values when denormalizing with constructor missing data (danut007ro)

dunglas · dunglas · commit ca5b64d0e0fe · 2018-11-08T22:02:02.000+01:00
This PR was squashed before being merged into the 4.1 branch (closes #29076). Discussion ---------- [Serializer] Allow null values when denormalizing with constructor missing data | Q | A | ------------- | --- | Branch? | 4.1 | Bug fix? | yes | New feature? | no | BC breaks? | no | Deprecations? | no | Tests pass? | yes | License | MIT When using `default_constructor_arguments` to denormalize objects, `null` values for a parameter weren't processed, so instantiating was failing. Commits ------- 5fd0f3f [Serializer] Allow null values when denormalizing with constructor missing data
diff --git a/src/Symfony/Component/Serializer/Normalizer/AbstractNormalizer.php b/src/Symfony/Component/Serializer/Normalizer/AbstractNormalizer.php
@@ -378,7 +378,7 @@ protected function instantiateObject(array &$data, $class, array &$context, \Ref
                     // Don't run set for a parameter passed to the constructor
                     $params[] = $parameterData;
                     unset($data[$key]);
-                } elseif (isset($context[static::DEFAULT_CONSTRUCTOR_ARGUMENTS][$class][$key])) {
+                } elseif (array_key_exists($key, $context[static::DEFAULT_CONSTRUCTOR_ARGUMENTS][$class] ?? array())) {
                     $params[] = $context[static::DEFAULT_CONSTRUCTOR_ARGUMENTS][$class][$key];
                 } elseif ($constructorParameter->isDefaultValueAvailable()) {
                     $params[] = $constructorParameter->getDefaultValue();
diff --git a/src/Symfony/Component/Serializer/Tests/Normalizer/ObjectNormalizerTest.php b/src/Symfony/Component/Serializer/Tests/Normalizer/ObjectNormalizerTest.php
@@ -245,11 +245,11 @@ public function testFillWithEmptyDataWhenMissingData()
 
         $result = $normalizer->denormalize($data, DummyValueObject::class, 'json', array(
             'default_constructor_arguments' => array(
-                DummyValueObject::class => array('foo' => '', 'bar' => ''),
+                DummyValueObject::class => array('foo' => '', 'bar' => '', 'baz' => null),
             ),
         ));
 
-        $this->assertEquals(new DummyValueObject(10, ''), $result);
+        $this->assertEquals(new DummyValueObject(10, '', null), $result);
     }
 
     public function testGroupsNormalize()
@@ -1117,11 +1117,13 @@ class DummyValueObject
 {
     private $foo;
     private $bar;
+    private $baz;
 
-    public function __construct($foo, $bar)
+    public function __construct($foo, $bar, $baz)
     {
         $this->foo = $foo;
         $this->bar = $bar;
+        $this->baz = $baz;
     }
 }
 

Original file line number	Diff line number	Diff line change
`@@ -245,11 +245,11 @@ public function testFillWithEmptyDataWhenMissingData()`
`245`	`245`
`246`	`246`	`$result = $normalizer->denormalize($data, DummyValueObject::class, 'json', array(`
`247`	`247`	`'default_constructor_arguments' => array(`
`248`		`- DummyValueObject::class => array('foo' => '', 'bar' => ''),`
	`248`	`+ DummyValueObject::class => array('foo' => '', 'bar' => '', 'baz' => null),`
`249`	`249`	`),`
`250`	`250`	`));`
`251`	`251`
`252`		`- $this->assertEquals(new DummyValueObject(10, ''), $result);`
	`252`	`+ $this->assertEquals(new DummyValueObject(10, '', null), $result);`
`253`	`253`	`}`
`254`	`254`
`255`	`255`	`public function testGroupsNormalize()`
`@@ -1117,11 +1117,13 @@ class DummyValueObject`
`1117`	`1117`	`{`
`1118`	`1118`	`private $foo;`
`1119`	`1119`	`private $bar;`
	`1120`	`+ private $baz;`
`1120`	`1121`
`1121`		`- public function __construct($foo, $bar)`
	`1122`	`+ public function __construct($foo, $bar, $baz)`
`1122`	`1123`	`{`
`1123`	`1124`	`$this->foo = $foo;`
`1124`	`1125`	`$this->bar = $bar;`
	`1126`	`+ $this->baz = $baz;`
`1125`	`1127`	`}`
`1126`	`1128`	`}`
`1127`	`1129`