[FrameworkBundle] changed the router:debug to use the shortcut notati…

…on for the controller
symfony · Oct 2, 2013 · 1d210f8 · 1d210f8
1 parent d997dfa
commit 1d210f8
Show file tree

Hide file tree

Showing 2 changed files with 21 additions and 6 deletions.
diff --git a/src/Symfony/Bundle/FrameworkBundle/Command/RouterDebugCommand.php b/src/Symfony/Bundle/FrameworkBundle/Command/RouterDebugCommand.php
@@ -17,6 +17,7 @@
 use Symfony\Component\Console\Input\InputOption;
 use Symfony\Component\Console\Output\OutputInterface;
 use Symfony\Component\Routing\RouterInterface;
+use Symfony\Component\Routing\Route;
 
 /**
  * A console command for retrieving information about routes
@@ -80,18 +81,35 @@ protected function execute(InputInterface $input, OutputInterface $output)
             if (!$route) {
                 throw new \InvalidArgumentException(sprintf('The route "%s" does not exist.', $name));
             }
+            $this->convertController($route);
             $helper->describe($output, $route, array(
                 'format'   => $input->getOption('format'),
                 'raw_text' => $input->getOption('raw'),
                 'name'     => $name,
             ));
         } else {
             $routes = $this->getContainer()->get('router')->getRouteCollection();
+
+            foreach ($routes as $route) {
+                $this->convertController($route);
+            }
+
             $helper->describe($output, $routes, array(
                 'format'           => $input->getOption('format'),
                 'raw_text'         => $input->getOption('raw'),
                 'show_controllers' => $input->getOption('show-controllers'),
             ));
         }
     }
+
+    private function convertController(Route $route)
+    {
+        $nameParser = $this->getContainer()->get('controller_name_converter');
+        if ($route->hasDefault('_controller')) {
+            try {
+                $route->setDefault('_controller', $nameParser->build($route->getDefault('_controller')));
+            } catch (\InvalidArgumentException $e) {
+            }
+        }
+    }
 }
diff --git a/src/Symfony/Bundle/FrameworkBundle/Console/Descriptor/TextDescriptor.php b/src/Symfony/Bundle/FrameworkBundle/Console/Descriptor/TextDescriptor.php
@@ -35,14 +35,11 @@ protected function describeRouteCollection(RouteCollection $routes, array $optio
             );
 
             if ($showControllers) {
-                $defaultData = $route->getDefaults();
-                $controller = $defaultData['_controller'] ? $defaultData['_controller'] : '';
+                $controller = $route->getDefault('_controller');
                 if ($controller instanceof \Closure) {
                     $controller = 'Closure';
-                } else {
-                    if (is_object($controller)) {
-                        $controller = get_class($controller);
-                    }
+                } elseif (is_object($controller)) {
+                    $controller = get_class($controller);
                 }
                 $row[] = $controller;
             }