Revisit PR

symfony · wouterj · Feb 28, 2014 · Feb 19, 2015 · Feb 19, 2015 · Apr 6, 2015
commit 667e141bc79be83fa926228b691031daa630fddf
diff --git a/src/Symfony/Component/HttpKernel/Controller/ArgumentResolver/RequestArgumentResolver.php b/src/Symfony/Component/HttpKernel/Controller/ArgumentResolver/RequestArgumentResolver.php
@@ -24,10 +24,10 @@ class RequestArgumentResolver implements ArgumentResolverInterface
     /**
      * {@inheritDoc}
      */
-    public function accepts(Request $request, \ReflectionParameter $parameter)
+    public function supports(Request $request, \ReflectionParameter $parameter)
     {
         $class = $parameter->getClass();
-        
+
         return $class && $class->isInstance($request);
     }
 

diff --git a/...ny/Component/HttpKernel/Controller/ArgumentResolver/RequestAttributesArgumentResolver.php b/...ny/Component/HttpKernel/Controller/ArgumentResolver/RequestAttributesArgumentResolver.php
@@ -24,18 +24,16 @@ class RequestAttributesArgumentResolver implements ArgumentResolverInterface
     /**
      * {@inheritDoc}
      */
-    public function accepts(Request $request, \ReflectionParameter $parameter)
+    public function supports(Request $request, \ReflectionParameter $parameter)
     {
-        return array_key_exists($parameter->name, $request->attributes->all());
+        return $request->attributes->has($parameter->name);
     }
 
     /**
      * {@inheritDoc}
      */
     public function resolve(Request $request, \ReflectionParameter $parameter)
     {
-        $attributes = $request->attributes->all();
-
-        return $attributes[$parameter->name];
+        return $request->attributes->get($parameter->name);
     }
 }
diff --git a/src/Symfony/Component/HttpKernel/Controller/ArgumentResolverInterface.php b/src/Symfony/Component/HttpKernel/Controller/ArgumentResolverInterface.php
@@ -14,30 +14,30 @@
 use Symfony\Component\HttpFoundation\Request;
 
 /**
- * An ArgumentResolverInterface implementation resolves the arguments of 
+ * An ArgumentResolverInterface implementation resolves the arguments of
  * controllers.
  *
  * @author Wouter J <[email protected]>
  */
 interface ArgumentResolverInterface
 {
     /**
-     * Checks if the current parameter can be resolved by this argument 
+     * Checks if the current parameter can be resolved by this argument
      * resolver.
      *
      * @param Request              $request
      * @param \ReflectionParameter $parameter
      *
      * @return Boolean
      */
-    public function accepts(Request $request, \ReflectionParameter $parameter);
+    public function supports(Request $request, \ReflectionParameter $parameter);
 
     /**
      * Resolves the current parameter into an argument.
      *
      * @param Request              $request
      * @param \ReflectionParameter $parameter
-     * 
+     *
      * @return mixed The resolved argument
      */
     public function resolve(Request $request, \ReflectionParameter $parameter);

diff --git a/src/Symfony/Component/HttpKernel/Controller/ArgumentResolverManager.php b/src/Symfony/Component/HttpKernel/Controller/ArgumentResolverManager.php
@@ -31,7 +31,7 @@ class ArgumentResolverManager
      *
      * @param ArgumentResolverInterface $resolver
      */
-    public function addResolver(ArgumentResolverInterface $resolver)
+    public function add(ArgumentResolverInterface $resolver)
     {
         $this->resolvers[] = $resolver;
     }
@@ -48,6 +48,10 @@ public function addResolver(ArgumentResolverInterface $resolver)
      */
     public function getArguments(Request $request, $controller)
     {
+        if (!is_callable($controller)) {
+            throw new \InvalidArgumentException(sprintf('Expected a callable as second parameter, got "%s".', is_object($controller) ? get_class($controller) : gettype($controller)));
+        }
+
         if (is_array($controller)) {
             $controllerReflection = new \ReflectionMethod($controller[0], $controller[1]);
         } elseif (is_object($controller) && !$controller instanceof \Closure) {
@@ -62,7 +66,7 @@ public function getArguments(Request $request, $controller)
 
         foreach ($parameters as $parameter) {
             foreach ($this->resolvers as $argumentResolver) {
-                if ($argumentResolver->accepts($request, $parameter)) {
+                if ($argumentResolver->supports($request, $parameter)) {
                     $arguments[] = $argumentResolver->resolve($request, $parameter);
                     continue 2;
                 }

diff --git a/src/Symfony/Component/HttpKernel/Controller/ControllerResolver.php b/src/Symfony/Component/HttpKernel/Controller/ControllerResolver.php
@@ -86,57 +86,6 @@ public function getController(Request $request)
         return $callable;
     }
 
-    /**
-     * {@inheritdoc}
-     *
-     * @api
-     *
-     * @deprecated Deprecated since Symfony 2.6, will be removed in Symfony 3.0. Use ArgumentResolvers instead
-     */
-    public function getArguments(Request $request, $controller)
-    {
-        if (is_array($controller)) {
-            $r = new \ReflectionMethod($controller[0], $controller[1]);
-        } elseif (is_object($controller) && !$controller instanceof \Closure) {
-            $r = new \ReflectionObject($controller);
-            $r = $r->getMethod('__invoke');
-        } else {
-            $r = new \ReflectionFunction($controller);
-        }
-
-        return $this->doGetArguments($request, $controller, $r->getParameters());
-    }
-
-    /**
-     * @deprecated Deprecated since Symfony 2.6, will be removed in Symfony 3.0. Use ArgumentResolvers instead
-     */
-    protected function doGetArguments(Request $request, $controller, array $parameters)
-    {
-        $attributes = $request->attributes->all();
-        $arguments = array();
-        foreach ($parameters as $param) {
-            if (array_key_exists($param->name, $attributes)) {
-                $arguments[] = $attributes[$param->name];
-            } elseif ($param->getClass() && $param->getClass()->isInstance($request)) {
-                $arguments[] = $request;
-            } elseif ($param->isDefaultValueAvailable()) {
-                $arguments[] = $param->getDefaultValue();
-            } else {
-                if (is_array($controller)) {
-                    $repr = sprintf('%s::%s()', get_class($controller[0]), $controller[1]);
-                } elseif (is_object($controller)) {
-                    $repr = get_class($controller);
-                } else {
-                    $repr = $controller;
-                }
-
-                throw new \RuntimeException(sprintf('Controller "%s" requires that you provide a value for the "$%s" argument (because there is no default value or because there is a non optional argument after this one).', $repr, $param->name));
-            }
-        }
-
-        return $arguments;
-    }
-
     /**
      * Returns a callable for the given controller.
      *

diff --git a/src/Symfony/Component/HttpKernel/Controller/ControllerResolverInterface.php b/src/Symfony/Component/HttpKernel/Controller/ControllerResolverInterface.php
@@ -46,18 +46,4 @@ interface ControllerResolverInterface
      * @api
      */
     public function getController(Request $request);
-
-    /**
-     * Returns the arguments to pass to the controller.
-     *
-     * @param Request  $request    A Request instance
-     * @param callable $controller A PHP callable
-     *
-     * @return array An array of arguments to pass to the controller
-     *
-     * @throws \RuntimeException When value for argument given is not provided
-     *
-     * @api
-     */
-    public function getArguments(Request $request, $controller);
 }
diff --git a/src/Symfony/Component/HttpKernel/DependencyInjection/RegisterArgumentResolversPass.php b/src/Symfony/Component/HttpKernel/DependencyInjection/RegisterArgumentResolversPass.php
@@ -25,12 +25,12 @@ class RegisterArgumentResolversPass implements CompilerPassInterface
     /**
      * @var string
      */
-    protected $managerService;
+    private $managerService;
 
     /**
      * @var string
      */
-    protected $resolverTag;
+    private $resolverTag;
 
     public function __construct($managerService = 'argument_resolver.manager', $resolverTag = 'kernel.argument_resolver')
     {
@@ -50,7 +50,7 @@ public function process(ContainerBuilder $container)
         $definition = $container->findDefinition($this->managerService);
 
         foreach ($container->findTaggedServiceIds($this->resolverTag) as $id => $resolvers) {
-            $definition->addMethodCall('addResolver', array(new Reference($id)));
+            $definition->addMethodCall('add', array(new Reference($id)));
         }
     }
 }
diff --git a/src/Symfony/Component/HttpKernel/HttpKernel.php b/src/Symfony/Component/HttpKernel/HttpKernel.php
@@ -304,8 +304,8 @@ protected function getArgumentResolver()
         if (null === $this->argumentResolver) {
             // to keep BC
             $this->argumentResolver = new ArgumentResolverManager();
-            $this->argumentResolver->addResolver(new ArgumentResolver\RequestArgumentResolver());
-            $this->argumentResolver->addResolver(new ArgumentResolver\RequestAttributesArgumentResolver());
+            $this->argumentResolver->add(new ArgumentResolver\RequestArgumentResolver());
+            $this->argumentResolver->add(new ArgumentResolver\RequestAttributesArgumentResolver());
         }
 
         return $this->argumentResolver;

diff --git a/src/Symfony/Component/HttpKernel/Tests/Controller/ArgumentResolverManagerTest.php b/src/Symfony/Component/HttpKernel/Tests/Controller/ArgumentResolverManagerTest.php
@@ -25,15 +25,15 @@ public function setUp()
         $this->manager = new ArgumentResolverManager();
         $this->resolver1 = $this->getMock('Symfony\Component\HttpKernel\Controller\ArgumentResolverInterface');
         $this->resolver2 = $this->getMock('Symfony\Component\HttpKernel\Controller\ArgumentResolverInterface');
-        $this->manager->addResolver($this->resolver1);
-        $this->manager->addResolver($this->resolver2);
+        $this->manager->add($this->resolver1);
+        $this->manager->add($this->resolver2);
 
         $this->request = $this->getMock('Symfony\Component\HttpFoundation\Request');
     }
 
     public function testGetArgumentsFirstResolverAccepts()
     {
-        $this->resolver1->expects($this->any())->method('accepts')->will($this->returnValue(true)); 
+        $this->resolver1->expects($this->any())->method('accepts')->will($this->returnValue(true));
         $this->resolver1->expects($this->any())
             ->method('resolve')
             ->will($this->returnValue('resolved_value'));