bug #37049 [Serializer] take into account the context when preserving empty array objects (xabbuh)

fabpot · fabpot · commit a2f4342d0857 · 2020-06-02T10:39:56.000+02:00
This PR was merged into the 4.4 branch. Discussion ---------- [Serializer] take into account the context when preserving empty array objects | Q | A | ------------- | --- | Branch? | 4.4 | Bug fix? | yes | New feature? | no | Deprecations? | no | Tickets | Fix #37041 | License | MIT | Doc PR | Commits ------- 98fff21 take into account the context when preserving empty array objects
diff --git a/src/Symfony/Component/Serializer/Serializer.php b/src/Symfony/Component/Serializer/Serializer.php
@@ -20,6 +20,7 @@
 use Symfony\Component\Serializer\Exception\LogicException;
 use Symfony\Component\Serializer\Exception\NotEncodableValueException;
 use Symfony\Component\Serializer\Exception\NotNormalizableValueException;
+use Symfony\Component\Serializer\Normalizer\AbstractObjectNormalizer;
 use Symfony\Component\Serializer\Normalizer\CacheableSupportsMethodInterface;
 use Symfony\Component\Serializer\Normalizer\ContextAwareDenormalizerInterface;
 use Symfony\Component\Serializer\Normalizer\ContextAwareNormalizerInterface;
@@ -157,7 +158,7 @@ public function normalize($data, $format = null, array $context = [])
         }
 
         if (\is_array($data) || $data instanceof \Traversable) {
-            if ($data instanceof \Countable && 0 === $data->count()) {
+            if (($context[AbstractObjectNormalizer::PRESERVE_EMPTY_OBJECTS] ?? false) === true && $data instanceof \Countable && 0 === $data->count()) {
                 return $data;
             }
 
diff --git a/src/Symfony/Component/Serializer/Tests/SerializerTest.php b/src/Symfony/Component/Serializer/Tests/SerializerTest.php
@@ -491,6 +491,27 @@ public function testNotNormalizableValueExceptionMessageForAResource()
         (new Serializer())->normalize(tmpfile());
     }
 
+    public function testNormalizeTransformEmptyArrayObjectToArray()
+    {
+        $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->assertSame('{"foo":[],"bar":["notempty"],"baz":{"nested":[]}}', $serializer->serialize($object, 'json'));
+    }
+
     public function testNormalizePreserveEmptyArrayObject()
     {
         $serializer = new Serializer(

Original file line number	Diff line number	Diff line change
`@@ -20,6 +20,7 @@`
`20`	`20`	`use Symfony\Component\Serializer\Exception\LogicException;`
`21`	`21`	`use Symfony\Component\Serializer\Exception\NotEncodableValueException;`
`22`	`22`	`use Symfony\Component\Serializer\Exception\NotNormalizableValueException;`
	`23`	`+use Symfony\Component\Serializer\Normalizer\AbstractObjectNormalizer;`
`23`	`24`	`use Symfony\Component\Serializer\Normalizer\CacheableSupportsMethodInterface;`
`24`	`25`	`use Symfony\Component\Serializer\Normalizer\ContextAwareDenormalizerInterface;`
`25`	`26`	`use Symfony\Component\Serializer\Normalizer\ContextAwareNormalizerInterface;`
`@@ -157,7 +158,7 @@ public function normalize($data, $format = null, array $context = [])`
`157`	`158`	`}`
`158`	`159`
`159`	`160`	`if (\is_array($data) \|\| $data instanceof \Traversable) {`
`160`		`- if ($data instanceof \Countable && 0 === $data->count()) {`
	`161`	`+ if (($context[AbstractObjectNormalizer::PRESERVE_EMPTY_OBJECTS] ?? false) === true && $data instanceof \Countable && 0 === $data->count()) {`
`161`	`162`	`return $data;`
`162`	`163`	`}`
`163`	`164`