remove data parameter from createConstructorArgument method

komik966 · komik966 · commit bc24d620196d · 2018-08-26T16:17:41.000+02:00
diff --git a/src/Symfony/Component/Serializer/Normalizer/AbstractNormalizer.php b/src/Symfony/Component/Serializer/Normalizer/AbstractNormalizer.php
@@ -361,7 +361,10 @@ protected function instantiateObject(array &$data, $class, array &$context, \Ref
                         $params = array_merge($params, $data[$paramName]);
                     }
                 } elseif ($allowed && !$ignored && (isset($data[$key]) || array_key_exists($key, $data))) {
-                    $params[] = $this->createConstructorArgument($data, $key, $constructorParameter, $context, $format);
+                    $params[] = $this->createConstructorArgument($data[$key], $key, $constructorParameter, $context, $format);
+
+                    // Don't run set for a parameter passed to the constructor
+                    unset($data[$key]);
                 } elseif (isset($context[static::DEFAULT_CONSTRUCTOR_ARGUMENTS][$class][$key])) {
                     $params[] = $context[static::DEFAULT_CONSTRUCTOR_ARGUMENTS][$class][$key];
                 } elseif ($constructorParameter->isDefaultValueAvailable()) {
@@ -388,7 +391,7 @@ protected function instantiateObject(array &$data, $class, array &$context, \Ref
     }
 
     /**
-     * @param array                $data
+     * @param mixed                $parameterData
      * @param string               $key
      * @param \ReflectionParameter $constructorParameter
      * @param array                $context
@@ -400,13 +403,9 @@ protected function instantiateObject(array &$data, $class, array &$context, \Ref
      * @throws RuntimeException
      * @throws MissingConstructorArgumentsException
      */
-    protected function createConstructorArgument(array &$data, string $key, \ReflectionParameter $constructorParameter, array &$context, string $format = null)
+    protected function createConstructorArgument($parameterData, string $key, \ReflectionParameter $constructorParameter, array &$context, string $format = null)
     {
-        $parameterData = $data[$key];
         if (null === $parameterData && $constructorParameter->allowsNull()) {
-            // Don't run set for a parameter passed to the constructor
-            unset($data[$key]);
-
             return null;
         }
         try {
@@ -415,19 +414,18 @@ protected function createConstructorArgument(array &$data, string $key, \Reflect
                     throw new LogicException(sprintf('Cannot create an instance of %s from serialized data because the serializer inject in "%s" is not a denormalizer', $constructorParameter->getClass(), static::class));
                 }
                 $parameterClass = $constructorParameter->getClass()->getName();
-                $parameterData = $this->serializer->denormalize($parameterData, $parameterClass, $format, $this->createChildContext($context, $constructorParameter->name));
+
+                return $this->serializer->denormalize($parameterData, $parameterClass, $format, $this->createChildContext($context, $constructorParameter->name));
             }
         } catch (\ReflectionException $e) {
             throw new RuntimeException(sprintf('Could not determine the class of the parameter "%s".', $key), 0, $e);
         } catch (MissingConstructorArgumentsException $e) {
             if (!$constructorParameter->getType()->allowsNull()) {
                 throw $e;
             }
-            $parameterData = null;
-        }
 
-        // Don't run set for a parameter passed to the constructor
-        unset($data[$key]);
+            return null;
+        }
 
         return $parameterData;
     }
