Fix serializer do not transform empty \Traversable to Array

soyuka · soyuka · commit 1c979c017296 · 2020-04-27T15:30:41.000+02:00
diff --git a/src/Symfony/Component/Serializer/Serializer.php b/src/Symfony/Component/Serializer/Serializer.php
@@ -157,6 +157,10 @@ public function normalize($data, $format = null, array $context = [])
         }
 
         if (\is_array($data) || $data instanceof \Traversable) {
+            if ($data instanceof \Countable && 0 === $data->count()) {
+                return $data;
+            }
+
             $normalized = [];
             foreach ($data as $key => $val) {
                 $normalized[$key] = $this->normalize($val, $format, $context);
@@ -173,7 +177,7 @@ public function normalize($data, $format = null, array $context = [])
             throw new NotNormalizableValueException(sprintf('Could not normalize object of type "%s", no supporting normalizer found.', \get_class($data)));
         }
 
-        throw new NotNormalizableValueException(sprintf('An unexpected value could not be normalized: %s.', !\is_resource($data) ? var_export($data, true) : sprintf('%s resource', get_resource_type($data))));
+        throw new NotNormalizableValueException(sprintf('An unexpected value could not be normalized: "%s".', !\is_resource($data) ? var_export($data, true) : sprintf('"%s" resource', get_resource_type($data))));
     }
 
     /**
diff --git a/src/Symfony/Component/Serializer/Tests/SerializerTest.php b/src/Symfony/Component/Serializer/Tests/SerializerTest.php
@@ -25,6 +25,7 @@
 use Symfony\Component\Serializer\Mapping\Factory\ClassMetadataFactory;
 use Symfony\Component\Serializer\Mapping\Factory\ClassMetadataFactoryInterface;
 use Symfony\Component\Serializer\Mapping\Loader\AnnotationLoader;
+use Symfony\Component\Serializer\Normalizer\AbstractObjectNormalizer;
 use Symfony\Component\Serializer\Normalizer\ArrayDenormalizer;
 use Symfony\Component\Serializer\Normalizer\CustomNormalizer;
 use Symfony\Component\Serializer\Normalizer\DenormalizerAwareInterface;
@@ -490,6 +491,26 @@ public function testNotNormalizableValueExceptionMessageForAResource()
         (new Serializer())->normalize(tmpfile());
     }
 
+    public function testNormalizePreserveEmptyArrayObject()
+    {
+        $serializer = new Serializer(
+          [
+              new PropertyNormalizer(),
+              new ObjectNormalizer(),
+              new ArrayDenormalizer(),
+          ],
+          [
+              'json' => new JsonEncoder(),
+          ]
+        );
+
+        $object = [];
+        $object['foo'] = new \ArrayObject();
+        $object['bar'] = new \ArrayObject(['notempty']);
+        $object['baz'] = new \ArrayObject(['nested' => new \ArrayObject()]);
+        $this->assertEquals('{"foo":{},"bar":["notempty"],"baz":{"nested":{}}}', $serializer->serialize($object, 'json', [AbstractObjectNormalizer::PRESERVE_EMPTY_OBJECTS => true]));
+    }
+
     private function serializerWithClassDiscriminator()
     {
         $classMetadataFactory = new ClassMetadataFactory(new AnnotationLoader(new AnnotationReader()));

Original file line number	Diff line number	Diff line change
`@@ -157,6 +157,10 @@ public function normalize($data, $format = null, array $context = [])`
`157`	`157`	`}`
`158`	`158`
`159`	`159`	`if (\is_array($data) \|\| $data instanceof \Traversable) {`
	`160`	`+ if ($data instanceof \Countable && 0 === $data->count()) {`
	`161`	`+ return $data;`
	`162`	`+ }`
	`163`	`+`
`160`	`164`	`$normalized = [];`
`161`	`165`	`foreach ($data as $key => $val) {`
`162`	`166`	`$normalized[$key] = $this->normalize($val, $format, $context);`
`@@ -173,7 +177,7 @@ public function normalize($data, $format = null, array $context = [])`
`173`	`177`	`throw new NotNormalizableValueException(sprintf('Could not normalize object of type "%s", no supporting normalizer found.', \get_class($data)));`
`174`	`178`	`}`
`175`	`179`
`176`		`- throw new NotNormalizableValueException(sprintf('An unexpected value could not be normalized: %s.', !\is_resource($data) ? var_export($data, true) : sprintf('%s resource', get_resource_type($data))));`
	`180`	`+ throw new NotNormalizableValueException(sprintf('An unexpected value could not be normalized: "%s".', !\is_resource($data) ? var_export($data, true) : sprintf('"%s" resource', get_resource_type($data))));`
`177`	`181`	`}`
`178`	`182`
`179`	`183`	`/**`