Remove BC layers related to new methods and new parameters

Author: nicolas-grekas

CHANGELOG.md

@@ -1,6 +1,11 @@
 CHANGELOG
 =========
 
+7.0
+---
+
+ * Add argument `$reflector` to `ArgumentResolverInterface::getArguments()` and `ArgumentMetadataFactoryInterface::createArgumentMetadata()`
+
 6.4
 ---
 

Controller/ArgumentResolverInterface.php

@@ -24,9 +24,7 @@ interface ArgumentResolverInterface
     /**
      * Returns the arguments to pass to the controller.
      *
-     * @param \ReflectionFunctionAbstract|null $reflector
-     *
      * @throws \RuntimeException When no value could be provided for a required argument
      */
-    public function getArguments(Request $request, callable $controller/* , \ReflectionFunctionAbstract $reflector = null */): array;
+    public function getArguments(Request $request, callable $controller, \ReflectionFunctionAbstract $reflector = null): array;
 }

Controller/TraceableArgumentResolver.php

@@ -28,12 +28,8 @@ public function __construct(ArgumentResolverInterface $resolver, Stopwatch $stop
         $this->stopwatch = $stopwatch;
     }
 
-    /**
-     * @param \ReflectionFunctionAbstract|null $reflector
-     */
-    public function getArguments(Request $request, callable $controller/* , \ReflectionFunctionAbstract $reflector = null */): array
+    public function getArguments(Request $request, callable $controller, \ReflectionFunctionAbstract $reflector = null): array
     {
-        $reflector = 2 < \func_num_args() ? func_get_arg(2) : null;
         $e = $this->stopwatch->start('controller.get_arguments');
 
         try {

ControllerMetadata/ArgumentMetadataFactoryInterface.php

@@ -19,9 +19,7 @@
 interface ArgumentMetadataFactoryInterface
 {
     /**
-     * @param \ReflectionFunctionAbstract|null $reflector
-     *
      * @return ArgumentMetadata[]
      */
-    public function createArgumentMetadata(string|object|array $controller/* , \ReflectionFunctionAbstract $reflector = null */): array;
+    public function createArgumentMetadata(string|object|array $controller, \ReflectionFunctionAbstract $reflector = null): array;
 }

Tests/Controller/TraceableArgumentResolverTest.php

@@ -29,7 +29,7 @@ public function testStopwatchEventIsStoppedWhenResolverThrows()
         $stopwatch->method('start')->willReturn($stopwatchEvent);
 
         $resolver = new class() implements ArgumentResolverInterface {
-            public function getArguments(Request $request, callable $controller): array
+            public function getArguments(Request $request, callable $controller, ?\ReflectionFunctionAbstract $reflector = null): array
             {
                 throw new \Exception();
             }