minor #17281 [Serializer] Unset object_to_populate after using it (dunglas)

fabpot · fabpot · commit 4c32c1a0b75d · 2016-01-12T19:26:02.000+01:00
This PR was submitted for the master branch but it was merged into the 2.7 branch instead (closes #17281). Discussion ---------- [Serializer] Unset object_to_populate after using it | Q | A | ------------- | --- | Bug fix? | no | New feature? | no | BC breaks? | no | Deprecations? | no | Tests pass? | yes | Fixed tickets | n/a | License | MIT | Doc PR | n/a The `object_to_populate` key must be unset after using it to avoid problems when normalizing sub objects. Needed for #17193. Commits ------- ff18b68 [Serializer] Unset object_to_populate after using it
diff --git a/src/Symfony/Component/Serializer/Normalizer/AbstractNormalizer.php b/src/Symfony/Component/Serializer/Normalizer/AbstractNormalizer.php
@@ -279,7 +279,9 @@ protected function prepareForDenormalization($data)
      * Instantiates an object using constructor parameters when needed.
      *
      * This method also allows to denormalize data into an existing object if
-     * it is present in the context with the object_to_populate key.
+     * it is present in the context with the object_to_populate. This object
+     * is removed from the context before being returned to avoid side effects
+     * when recursively normalizing an object graph.
      *
      * @param array            $data
      * @param string           $class
@@ -298,7 +300,10 @@ protected function instantiateObject(array &$data, $class, array &$context, \Ref
             is_object($context['object_to_populate']) &&
             $class === get_class($context['object_to_populate'])
         ) {
-            return $context['object_to_populate'];
+            $object = $context['object_to_populate'];
+            unset($context['object_to_populate']);
+
+            return $object;
         }
 
         $constructor = $reflectionClass->getConstructor();
