Add tests

theofidry · theofidry · commit e99a90b9e98e · 2016-07-03T12:09:45.000+01:00
diff --git a/src/Symfony/Component/Serializer/Normalizer/AbstractNormalizer.php b/src/Symfony/Component/Serializer/Normalizer/AbstractNormalizer.php
@@ -281,12 +281,13 @@ protected function getConstructor(array &$data, $class, array &$context, \Reflec
      * @param array            $context
      * @param \ReflectionClass $reflectionClass
      * @param array|bool       $allowedAttributes
+     * @param string|null      $format
      *
      * @return object
      *
      * @throws RuntimeException
      */
-    protected function instantiateObject(array &$data, $class, array &$context, \ReflectionClass $reflectionClass, $allowedAttributes)
+    protected function instantiateObject(array &$data, $class, array &$context, \ReflectionClass $reflectionClass, $allowedAttributes, $format = null)
     {
         if (
             isset($context[static::OBJECT_TO_POPULATE]) &&
@@ -320,12 +321,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 !== $constructogrParameter->getClass()) {
+                    if (null !== $constructorParameter->getClass()) {
                         $parameterData = $this->serializer->denormalize($parameterData, $constructorParameter->getClass()->getName(), null, $context);
                     }
 
                     // Don't run set for a parameter passed to the constructor
                     $params[] = $parameterData;
+                    unset($data[$key]);
                 } elseif ($constructorParameter->isDefaultValueAvailable()) {
                     $params[] = $constructorParameter->getDefaultValue();
                 } else {
diff --git a/src/Symfony/Component/Serializer/Normalizer/AbstractObjectNormalizer.php b/src/Symfony/Component/Serializer/Normalizer/AbstractObjectNormalizer.php
@@ -175,7 +175,7 @@ public function denormalize($data, $class, $format = null, array $context = arra
         $normalizedData = $this->prepareForDenormalization($data);
 
         $reflectionClass = new \ReflectionClass($class);
-        $object = $this->instantiateObject($normalizedData, $class, $context, $reflectionClass, $allowedAttributes);
+        $object = $this->instantiateObject($normalizedData, $class, $context, $reflectionClass, $allowedAttributes, $format);
 
         foreach ($normalizedData as $attribute => $value) {
             if ($this->nameConverter) {
diff --git a/src/Symfony/Component/Serializer/Tests/Normalizer/ObjectNormalizerTest.php b/src/Symfony/Component/Serializer/Tests/Normalizer/ObjectNormalizerTest.php
@@ -157,6 +157,24 @@ public function testConstructorWithObjectDenormalize()
         $this->assertEquals('bar', $obj->bar);
     }
 
+    public function testConstructorWithObjectTypeHintDenormalize()
+    {
+        $data = [
+            'id' => 10,
+            'inner' => [
+                'foo' => 'oof',
+                'bar' => 'rab',
+            ],
+        ];
+
+        $obj = $this->normalizer->denormalize($data, DummyWithConstructorObject::class);
+        $this->assertInstanceOf(DummyWithConstructorObject::class, $obj);
+        $this->assertEquals(10, $obj->getId);
+        $this->assertInstanceOf(ObjectInner::class, $obj->getInner());
+        $this->assertEquals('foo', $obj->getInner()->foo);
+        $this->assertEquals('bar', $obj->getInner()->bar);
+    }
+
     public function testGroupsNormalize()
     {
         $classMetadataFactory = new ClassMetadataFactory(new AnnotationLoader(new AnnotationReader()));
@@ -782,3 +800,25 @@ protected function isAllowedAttribute($classOrObject, $attribute, $format = null
         return false;
     }
 }
+
+class DummyWithConstructorObject
+{
+    private $id;
+    private $inner;
+
+    public function __construct($id, ObjectInner $inner)
+    {
+        $this->id = $id;
+        $this->inner = $inner;
+    }
+
+    public function getId()
+    {
+        return $this->id;
+    }
+
+    public function getInner()
+    {
+        return $this->inner;
+    }
+}

Original file line number	Diff line number	Diff line change
`@@ -281,12 +281,13 @@ protected function getConstructor(array &$data, $class, array &$context, \Reflec`
`281`	`281`	`* @param array $context`
`282`	`282`	`* @param \ReflectionClass $reflectionClass`
`283`	`283`	`* @param array\|bool $allowedAttributes`
	`284`	`+ * @param string\|null $format`
`284`	`285`	`*`
`285`	`286`	`* @return object`
`286`	`287`	`*`
`287`	`288`	`* @throws RuntimeException`
`288`	`289`	`*/`
`289`		`- protected function instantiateObject(array &$data, $class, array &$context, \ReflectionClass $reflectionClass, $allowedAttributes)`
	`290`	`+ protected function instantiateObject(array &$data, $class, array &$context, \ReflectionClass $reflectionClass, $allowedAttributes, $format = null)`
`290`	`291`	`{`
`291`	`292`	`if (`
`292`	`293`	`isset($context[static::OBJECT_TO_POPULATE]) &&`
`@@ -320,12 +321,13 @@ protected function instantiateObject(array &$data, $class, array &$context, \Ref`
`320`	`321`	`}`
`321`	`322`	`} elseif ($allowed && !$ignored && (isset($data[$key]) \|\| array_key_exists($key, $data))) {`
`322`	`323`	`$parameterData = $data[$key];`
`323`		`- if (null !== $constructogrParameter->getClass()) {`
	`324`	`+ if (null !== $constructorParameter->getClass()) {`
`324`	`325`	`$parameterData = $this->serializer->denormalize($parameterData, $constructorParameter->getClass()->getName(), null, $context);`
`325`	`326`	`}`
`326`	`327`
`327`	`328`	`// Don't run set for a parameter passed to the constructor`
`328`	`329`	`$params[] = $parameterData;`
	`330`	`+ unset($data[$key]);`
`329`	`331`	`} elseif ($constructorParameter->isDefaultValueAvailable()) {`
`330`	`332`	`$params[] = $constructorParameter->getDefaultValue();`
`331`	`333`	`} else {`