[DI][Serializer] Add missing deprecations

Author: nicolas-grekas

Normalizer/AbstractNormalizer.php

@@ -289,7 +289,18 @@ protected function getConstructor(array &$data, $class, array &$context, \Reflec
      */
     protected function instantiateObject(array &$data, $class, array &$context, \ReflectionClass $reflectionClass, $allowedAttributes/*, $format = null*/)
     {
-        $format = func_num_args() >= 6 ? func_get_arg(5) : null;
+        if (func_num_args() >= 6) {
+            $format = func_get_arg(5);
+        } else {
+            if (__CLASS__ !== get_class($this)) {
+                $r = new \ReflectionMethod($this, __FUNCTION__);
+                if (__CLASS__ !== $r->getDeclaringClass()->getName()) {
+                    @trigger_error(sprintf('Method %s() will have a 6th `$format = null` argument in version 4.0. Not defining it is deprecated since 3.2.', get_class($this), __FUNCTION__), E_USER_DEPRECATED);
+                }
+            }
+
+            $format = null;
+        }
 
         if (
             isset($context[static::OBJECT_TO_POPULATE]) &&

Tests/Normalizer/AbstractObjectNormalizerTest.php

@@ -59,9 +59,9 @@ protected function isAllowedAttribute($classOrObject, $attribute, $format = null
         return in_array($attribute, array('foo', 'baz'));
     }
 
-    public function instantiateObject(array &$data, $class, array &$context, \ReflectionClass $reflectionClass, $allowedAttributes)
+    public function instantiateObject(array &$data, $class, array &$context, \ReflectionClass $reflectionClass, $allowedAttributes, $format = null)
     {
-        return parent::instantiateObject($data, $class, $context, $reflectionClass, $allowedAttributes);
+        return parent::instantiateObject($data, $class, $context, $reflectionClass, $allowedAttributes, $format);
     }
 }