Merge pull request #1 from dunglas/theofidry-feature/param-object

Prevent BC in instantiateObject

Author: theofidry

src/Symfony/Component/Serializer/Normalizer/AbstractNormalizer.php

@@ -268,17 +268,6 @@ protected function getConstructor(array &$data, $class, array &$context, \Reflec
         return $reflectionClass->getConstructor();
     }
 
-    /**
-     * @see instantiateComplexObject
-     * @deprecated Since 3.1, will be removed in 4.0. Use instantiateComplexObject instead.
-     */
-    protected function instantiateObject(array &$data, $class, array &$context, \ReflectionClass $reflectionClass, $allowedAttributes)
-    {
-        @trigger_error(sprintf('"%s()" has been deprecated since Symfony 3.1 and will be removed in version 4.0. Use "%s::instantiateComplexObject()" instead.', __METHOD__, __CLASS__), E_USER_DEPRECATED);
-
-        return $this->instantiateComplexObject($data, $class, $context, $reflectionClass, $allowedAttributes);
-    }
-
     /**
      * Instantiates an object using constructor parameters when needed.
      *
@@ -298,8 +287,10 @@ protected function instantiateObject(array &$data, $class, array &$context, \Ref
      *
      * @throws RuntimeException
      */
-    protected function instantiateComplexObject(array &$data, $class, array &$context, \ReflectionClass $reflectionClass, $allowedAttributes, $format = null)
+    protected function instantiateObject(array &$data, $class, array &$context, \ReflectionClass $reflectionClass, $allowedAttributes/*, $format = null*/)
     {
+        $format = func_num_args() >= 6 ? func_get_arg(5) : null;
+
         if (
             isset($context[static::OBJECT_TO_POPULATE]) &&
             is_object($context[static::OBJECT_TO_POPULATE]) &&

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->instantiateComplexObject($normalizedData, $class, $context, $reflectionClass, $allowedAttributes, $format);
+        $object = $this->instantiateObject($normalizedData, $class, $context, $reflectionClass, $allowedAttributes, $format);
 
         foreach ($normalizedData as $attribute => $value) {
             if ($this->nameConverter) {

src/Symfony/Component/Serializer/Normalizer/GetSetMethodNormalizer.php

@@ -47,7 +47,7 @@ public function denormalize($data, $class, $format = null, array $context = arra
         $normalizedData = $this->prepareForDenormalization($data);
 
         $reflectionClass = new \ReflectionClass($class);
-        $object = $this->instantiateComplexObject($normalizedData, $class, $context, $reflectionClass, $allowedAttributes, $format);
+        $object = $this->instantiateObject($normalizedData, $class, $context, $reflectionClass, $allowedAttributes, $format);
 
         $classMethods = get_class_methods($object);
         foreach ($normalizedData as $attribute => $value) {