Remove unsetting data, simplify block

joelwurtz · joelwurtz · commit f933bc3d885e · 2019-04-07T14:29:47.000+02:00
diff --git a/src/Symfony/Component/Serializer/Instantiator/Instantiator.php b/src/Symfony/Component/Serializer/Instantiator/Instantiator.php
@@ -49,50 +49,48 @@ public function instantiate(string $class, $data, $format = null, array $context
         $reflectionClass = new \ReflectionClass($class);
         $constructor = $reflectionClass->getConstructor();
 
-        if ($constructor) {
-            $constructorParameters = $constructor->getParameters();
-
-            $params = [];
-            foreach ($constructorParameters as $constructorParameter) {
-                $paramName = $constructorParameter->name;
-                $key = $this->nameConverter ? $this->nameConverter->normalize($paramName, $class, $format, $context) : $paramName;
-                $allowed = null === $allowedAttributes || \in_array($paramName, $allowedAttributes, true);
-
-                if ($allowed && $constructorParameter->isVariadic() && \array_key_exists($key, $data)) {
-                    if (!\is_array($data[$paramName])) {
-                        throw new RuntimeException(sprintf('Cannot create an instance of %s from serialized data because the variadic parameter %s can only accept an array.', $class, $constructorParameter->name));
-                    }
-
-                    $params = array_merge($params, $data[$paramName]);
-                } elseif ($allowed && \array_key_exists($key, $data)) {
-                    $parameterData = $data[$key];
-                    if (null === $parameterData && $constructorParameter->allowsNull()) {
-                        $params[] = null;
-                        // Don't run set for a parameter passed to the constructor
-                        unset($data[$key]);
-                        continue;
-                    }
-
-                    // Don't run set for a parameter passed to the constructor
-                    $params[] = $this->denormalizeParameter($reflectionClass, $constructorParameter, $paramName, $parameterData, $context, $format);
-                    unset($data[$key]);
-                } elseif (\array_key_exists($key, $context[self::DEFAULT_CONSTRUCTOR_ARGUMENTS][$class] ?? [])) {
-                    $params[] = $context[self::DEFAULT_CONSTRUCTOR_ARGUMENTS][$class][$key];
-                } elseif ($constructorParameter->isDefaultValueAvailable()) {
-                    $params[] = $constructorParameter->getDefaultValue();
-                } else {
-                    throw new MissingConstructorArgumentsException(sprintf('Cannot create an instance of %s from serialized data because its constructor requires parameter "%s" to be present.', $class, $constructorParameter->name));
+        if (null === $constructor) {
+            return new $class();
+        }
+
+        $constructorParameters = $constructor->getParameters();
+
+        $params = [];
+        foreach ($constructorParameters as $constructorParameter) {
+            $paramName = $constructorParameter->name;
+            $key = $this->nameConverter ? $this->nameConverter->normalize($paramName, $class, $format, $context) : $paramName;
+            $allowed = null === $allowedAttributes || \in_array($paramName, $allowedAttributes, true);
+
+            if ($allowed && $constructorParameter->isVariadic() && \array_key_exists($key, $data)) {
+                if (!\is_array($data[$paramName])) {
+                    throw new RuntimeException(sprintf('Cannot create an instance of %s from serialized data because the variadic parameter %s can only accept an array.', $class, $constructorParameter->name));
                 }
-            }
 
-            if ($constructor->isConstructor()) {
-                return $reflectionClass->newInstanceArgs($params);
+                $params = array_merge($params, $data[$paramName]);
+            } elseif ($allowed && \array_key_exists($key, $data)) {
+                $parameterData = $data[$key];
+
+                if (null === $parameterData && $constructorParameter->allowsNull()) {
+                    $params[] = null;
+
+                    continue;
+                }
+
+                $params[] = $this->denormalizeParameter($reflectionClass, $constructorParameter, $paramName, $parameterData, $context, $format);
+            } elseif (\array_key_exists($key, $context[self::DEFAULT_CONSTRUCTOR_ARGUMENTS][$class] ?? [])) {
+                $params[] = $context[self::DEFAULT_CONSTRUCTOR_ARGUMENTS][$class][$key];
+            } elseif ($constructorParameter->isDefaultValueAvailable()) {
+                $params[] = $constructorParameter->getDefaultValue();
+            } else {
+                throw new MissingConstructorArgumentsException(sprintf('Cannot create an instance of %s from serialized data because its constructor requires parameter "%s" to be present.', $class, $constructorParameter->name));
             }
+        }
 
-            return $constructor->invokeArgs(null, $params);
+        if ($constructor->isConstructor()) {
+            return $reflectionClass->newInstanceArgs($params);
         }
 
-        return new $class();
+        return $constructor->invokeArgs(null, $params);
     }
 
     private function denormalizeParameter(\ReflectionClass $class, \ReflectionParameter $parameter, $parameterName, $parameterData, array $context, $format = null)
