fix tests

theofidry · theofidry · commit 988eba11b605 · 2016-07-10T18:16:12.000+01:00
diff --git a/src/Symfony/Component/Serializer/Normalizer/AbstractNormalizer.php b/src/Symfony/Component/Serializer/Normalizer/AbstractNormalizer.php
@@ -323,14 +323,13 @@ protected function instantiateObject(array &$data, $class, array &$context, \Ref
                     }
                 } elseif ($allowed && !$ignored && (isset($data[$key]) || array_key_exists($key, $data))) {
                     $parameterData = $data[$key];
-                    if (null !== $constructorParameter->getType()) {
-                        try {
+                    try {
+                        if (null !== $constructorParameter->getClass()) {
                             $parameterClass = $constructorParameter->getClass()->getName();
-                        } catch (\ReflectionException $e) {
-                            throw new RuntimeException(sprintf('Could not determine the class of the parameter "%s".', $key), 0, $e);
+                            $parameterData = $this->serializer->deserialize($parameterData, $parameterClass, $format, $context);
                         }
-
-                        $parameterData = $this->serializer->deserialize($parameterData, $parameterClass, $format, $context);
+                    } catch (\ReflectionException $e) {
+                        throw new RuntimeException(sprintf('Could not determine the class of the parameter "%s".', $key), 0, $e);
                     }
 
                     // Don't run set for a parameter passed to the constructor

Original file line number	Diff line number	Diff line change
`@@ -323,14 +323,13 @@ protected function instantiateObject(array &$data, $class, array &$context, \Ref`
`323`	`323`	`}`
`324`	`324`	`} elseif ($allowed && !$ignored && (isset($data[$key]) \|\| array_key_exists($key, $data))) {`
`325`	`325`	`$parameterData = $data[$key];`
`326`		`- if (null !== $constructorParameter->getType()) {`
`327`		`- try {`
	`326`	`+ try {`
	`327`	`+ if (null !== $constructorParameter->getClass()) {`
`328`	`328`	`$parameterClass = $constructorParameter->getClass()->getName();`
`329`		`- } catch (\ReflectionException $e) {`
`330`		`- throw new RuntimeException(sprintf('Could not determine the class of the parameter "%s".', $key), 0, $e);`
	`329`	`+ $parameterData = $this->serializer->deserialize($parameterData, $parameterClass, $format, $context);`
`331`	`330`	`}`
`332`		`-`
`333`		`- $parameterData = $this->serializer->deserialize($parameterData, $parameterClass, $format, $context);`
	`331`	`+ } catch (\ReflectionException $e) {`
	`332`	`+ throw new RuntimeException(sprintf('Could not determine the class of the parameter "%s".', $key), 0, $e);`
`334`	`333`	`}`
`335`	`334`
`336`	`335`	`// Don't run set for a parameter passed to the constructor`