merged branch Tobion/controllernameparser (PR #6297)

fabpot · fabpot · commit 6e499a368bad · 2012-12-13T15:04:21.000+01:00
This PR was submitted for the master branch but it was merged into the 2.1 branch instead (closes #6297). Commits ------- 444fea4 [FrameworkBundle] refactor ControllerNameParser Discussion ---------- [FrameworkBundle] refactor ControllerNameParser bc break: no --------------------------------------------------------------------------- by Tobion at 2012-12-12T16:38:12Z Maybe merge into 2.1 instead? So master and 2.1 do not drift apart by pure refactorings? It also includes a phpdoc fix.
diff --git a/src/Symfony/Bundle/FrameworkBundle/Controller/ControllerNameParser.php b/src/Symfony/Bundle/FrameworkBundle/Controller/ControllerNameParser.php
@@ -38,6 +38,11 @@ public function __construct(KernelInterface $kernel)
      * Converts a short notation a:b:c to a class::method.
      *
      * @param string $controller A short notation controller (a:b:c)
+     *
+     * @return string A string with class::method
+     *
+     * @throws \InvalidArgumentException when the specified bundle is not enabled
+     *                                   or the controller cannot be found
      */
     public function parse($controller)
     {
@@ -47,39 +52,22 @@ public function parse($controller)
 
         list($bundle, $controller, $action) = $parts;
         $controller = str_replace('/', '\\', $controller);
-        $class = null;
-        $logs = array();
+        $bundles = array();
+
+        // this throws an exception if there is no such bundle
         foreach ($this->kernel->getBundle($bundle, false) as $b) {
             $try = $b->getNamespace().'\\Controller\\'.$controller.'Controller';
-            if (!class_exists($try)) {
-                $logs[] = sprintf('Unable to find controller "%s:%s" - class "%s" does not exist.', $bundle, $controller, $try);
-            } else {
-                $class = $try;
-
-                break;
+            if (class_exists($try)) {
+                return $try.'::'.$action.'Action';
             }
-        }
 
-        if (null === $class) {
-            $this->handleControllerNotFoundException($bundle, $controller, $logs);
+            $bundles[] = $b->getName();
+            $msg = sprintf('Unable to find controller "%s:%s" - class "%s" does not exist.', $bundle, $controller, $try);
         }
 
-        return $class.'::'.$action.'Action';
-    }
-
-    private function handleControllerNotFoundException($bundle, $controller, array $logs)
-    {
-        // just one log, return it as the exception
-        if (1 == count($logs)) {
-            throw new \InvalidArgumentException($logs[0]);
-        }
-
-        // many logs, use a message that mentions each searched bundle
-        $names = array();
-        foreach ($this->kernel->getBundle($bundle, false) as $b) {
-            $names[] = $b->getName();
+        if (count($bundles) > 1) {
+            $msg = sprintf('Unable to find controller "%s:%s" in bundles %s.', $bundle, $controller, implode(', ', $bundles));
         }
-        $msg = sprintf('Unable to find controller "%s:%s" in bundles %s.', $bundle, $controller, implode(', ', $names));
 
         throw new \InvalidArgumentException($msg);
     }
