[Serializer] Skip uninitialized properties with deep_object_to_populate

mtarld · mtarld · commit 79c39c14f2c9 · 2023-12-27T09:53:17.000+01:00
diff --git a/src/Symfony/Component/Serializer/Normalizer/AbstractObjectNormalizer.php b/src/Symfony/Component/Serializer/Normalizer/AbstractObjectNormalizer.php
@@ -403,6 +403,14 @@ public function denormalize($data, string $type, string $format = null, array $c
                         ? $this->classDiscriminatorResolver->getTypeForMappedObject($object)
                         : $this->getAttributeValue($object, $attribute, $format, $attributeContext);
                 } catch (NoSuchPropertyException $e) {
+                } catch (UninitializedPropertyException $e) {
+                    if (!($context[self::SKIP_UNINITIALIZED_VALUES] ?? $this->defaultContext[self::SKIP_UNINITIALIZED_VALUES] ?? true)) {
+                        throw $e;
+                    }
+                } catch (\Error $e) {
+                    if (!(($context[self::SKIP_UNINITIALIZED_VALUES] ?? $this->defaultContext[self::SKIP_UNINITIALIZED_VALUES] ?? true) && $this->isUninitializedValueError($e))) {
+                        throw $e;
+                    }
                 }
             }
 
diff --git a/src/Symfony/Component/Serializer/Tests/Normalizer/Features/SkipUninitializedValuesTestTrait.php b/src/Symfony/Component/Serializer/Tests/Normalizer/Features/SkipUninitializedValuesTestTrait.php
@@ -12,14 +12,14 @@
 namespace Symfony\Component\Serializer\Tests\Normalizer\Features;
 
 use Symfony\Component\PropertyAccess\Exception\UninitializedPropertyException;
-use Symfony\Component\Serializer\Normalizer\NormalizerInterface;
+use Symfony\Component\Serializer\Normalizer\AbstractObjectNormalizer;
 
 /**
  * Test AbstractObjectNormalizer::SKIP_UNINITIALIZED_VALUES.
  */
 trait SkipUninitializedValuesTestTrait
 {
-    abstract protected function getNormalizerForSkipUninitializedValues(): NormalizerInterface;
+    abstract protected function getNormalizerForSkipUninitializedValues(): AbstractObjectNormalizer;
 
     /**
      * @requires PHP 7.4
@@ -33,6 +33,15 @@ public function testSkipUninitializedValues(array $context)
         $normalizer = $this->getNormalizerForSkipUninitializedValues();
         $result = $normalizer->normalize($object, null, $context);
         $this->assertSame(['initialized' => 'value'], $result);
+
+        $normalizer->denormalize(
+            ['unInitialized' => 'value'],
+            TypedPropertiesObjectWithGetters::class,
+            null,
+            ['object_to_populate' => $objectToPopulate = new TypedPropertiesObjectWithGetters(), 'deep_object_to_populate' => true] + $context
+        );
+
+        $this->assertSame('value', $objectToPopulate->getUninitialized());
     }
 
     public function skipUninitializedValuesFlagProvider(): iterable
diff --git a/src/Symfony/Component/Serializer/Tests/Normalizer/GetSetMethodNormalizerTest.php b/src/Symfony/Component/Serializer/Tests/Normalizer/GetSetMethodNormalizerTest.php
@@ -496,7 +496,7 @@ protected function getNormalizerForCacheableObjectAttributesTest(): GetSetMethod
         return new GetSetMethodNormalizer();
     }
 
-    protected function getNormalizerForSkipUninitializedValues(): NormalizerInterface
+    protected function getNormalizerForSkipUninitializedValues(): GetSetMethodNormalizer
     {
         return new GetSetMethodNormalizer(new ClassMetadataFactory(new AnnotationLoader(new AnnotationReader())));
     }
diff --git a/src/Symfony/Component/Serializer/Tests/Normalizer/PropertyNormalizerTest.php b/src/Symfony/Component/Serializer/Tests/Normalizer/PropertyNormalizerTest.php
@@ -26,7 +26,6 @@
 use Symfony\Component\Serializer\Normalizer\AbstractObjectNormalizer;
 use Symfony\Component\Serializer\Normalizer\ArrayDenormalizer;
 use Symfony\Component\Serializer\Normalizer\DenormalizerInterface;
-use Symfony\Component\Serializer\Normalizer\NormalizerInterface;
 use Symfony\Component\Serializer\Normalizer\PropertyNormalizer;
 use Symfony\Component\Serializer\Serializer;
 use Symfony\Component\Serializer\SerializerInterface;
@@ -455,7 +454,7 @@ protected function getNormalizerForCacheableObjectAttributesTest(): AbstractObje
         return new PropertyNormalizer();
     }
 
-    protected function getNormalizerForSkipUninitializedValues(): NormalizerInterface
+    protected function getNormalizerForSkipUninitializedValues(): PropertyNormalizer
     {
         return new PropertyNormalizer(new ClassMetadataFactory(new AnnotationLoader(new AnnotationReader())));
     }

Original file line number	Diff line number	Diff line change
`@@ -403,6 +403,14 @@ public function denormalize($data, string $type, string $format = null, array $c`
`403`	`403`	`? $this->classDiscriminatorResolver->getTypeForMappedObject($object)`
`404`	`404`	`: $this->getAttributeValue($object, $attribute, $format, $attributeContext);`
`405`	`405`	`} catch (NoSuchPropertyException $e) {`
	`406`	`+ } catch (UninitializedPropertyException $e) {`
	`407`	`+ if (!($context[self::SKIP_UNINITIALIZED_VALUES] ?? $this->defaultContext[self::SKIP_UNINITIALIZED_VALUES] ?? true)) {`
	`408`	`+ throw $e;`
	`409`	`+ }`
	`410`	`+ } catch (\Error $e) {`
	`411`	`+ if (!(($context[self::SKIP_UNINITIALIZED_VALUES] ?? $this->defaultContext[self::SKIP_UNINITIALIZED_VALUES] ?? true) && $this->isUninitializedValueError($e))) {`
	`412`	`+ throw $e;`
	`413`	`+ }`
`406`	`414`	`}`
`407`	`415`	`}`
`408`	`416`
Original file line number	Diff line number	Diff line change
`@@ -496,7 +496,7 @@ protected function getNormalizerForCacheableObjectAttributesTest(): GetSetMethod`
`496`	`496`	`return new GetSetMethodNormalizer();`
`497`	`497`	`}`
`498`	`498`
`499`		`- protected function getNormalizerForSkipUninitializedValues(): NormalizerInterface`
	`499`	`+ protected function getNormalizerForSkipUninitializedValues(): GetSetMethodNormalizer`
`500`	`500`	`{`
`501`	`501`	`return new GetSetMethodNormalizer(new ClassMetadataFactory(new AnnotationLoader(new AnnotationReader())));`
`502`	`502`	`}`
Original file line number	Diff line number	Diff line change
`@@ -26,7 +26,6 @@`
`26`	`26`	`use Symfony\Component\Serializer\Normalizer\AbstractObjectNormalizer;`
`27`	`27`	`use Symfony\Component\Serializer\Normalizer\ArrayDenormalizer;`
`28`	`28`	`use Symfony\Component\Serializer\Normalizer\DenormalizerInterface;`
`29`		`-use Symfony\Component\Serializer\Normalizer\NormalizerInterface;`
`30`	`29`	`use Symfony\Component\Serializer\Normalizer\PropertyNormalizer;`
`31`	`30`	`use Symfony\Component\Serializer\Serializer;`
`32`	`31`	`use Symfony\Component\Serializer\SerializerInterface;`
`@@ -455,7 +454,7 @@ protected function getNormalizerForCacheableObjectAttributesTest(): AbstractObje`
`455`	`454`	`return new PropertyNormalizer();`
`456`	`455`	`}`
`457`	`456`
`458`		`- protected function getNormalizerForSkipUninitializedValues(): NormalizerInterface`
	`457`	`+ protected function getNormalizerForSkipUninitializedValues(): PropertyNormalizer`
`459`	`458`	`{`
`460`	`459`	`return new PropertyNormalizer(new ClassMetadataFactory(new AnnotationLoader(new AnnotationReader())));`
`461`	`460`	`}`