[HttpKernel] made a small internal refactoring to ease extensibility

fabpot · fabpot · commit 54999ef02d62 · 2011-08-08T23:20:53.000+02:00
diff --git a/src/Symfony/Component/HttpKernel/Controller/ControllerResolver.php b/src/Symfony/Component/HttpKernel/Controller/ControllerResolver.php
@@ -93,29 +93,38 @@ public function getController(Request $request)
      */
     public function getArguments(Request $request, $controller)
     {
-        $attributes = $request->attributes->all();
-
         if (is_array($controller)) {
             $r = new \ReflectionMethod($controller[0], $controller[1]);
-            $repr = sprintf('%s::%s()', get_class($controller[0]), $controller[1]);
         } elseif (is_object($controller)) {
             $r = new \ReflectionObject($controller);
             $r = $r->getMethod('__invoke');
-            $repr = get_class($controller);
         } else {
             $r = new \ReflectionFunction($controller);
-            $repr = $controller;
         }
 
+        return $this->doGetArguments($request, $controller, $r->getParameters());
+    }
+
+    protected function doGetArguments(Request $request, $controller, array $parameters)
+    {
+        $attributes = $request->attributes->all();
         $arguments = array();
-        foreach ($r->getParameters() as $param) {
+        foreach ($parameters as $param) {
             if (array_key_exists($param->getName(), $attributes)) {
                 $arguments[] = $attributes[$param->getName()];
             } 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->getName()));
             }
         }
