[FrameworkBundle] Display the class name in 'debug:router' when the controller is a service

lyrixx · lyrixx · commit aadae0df3a94 · 2016-12-08T20:17:39.000+01:00
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\Console\Style\SymfonyStyle;
+use Symfony\Component\DependencyInjection\Exception\ServiceNotFoundException;
 use Symfony\Component\Routing\RouterInterface;
 use Symfony\Component\Routing\Route;
 
@@ -85,7 +86,16 @@ protected function execute(InputInterface $input, OutputInterface $output)
                 throw new \InvalidArgumentException(sprintf('The route "%s" does not exist.', $name));
             }
 
-            $this->convertController($route);
+            // Converts a short notation service:method to a class::method.
+            if ('txt' === $input->getOption('format') && $route->hasDefault('_controller') && 1 === substr_count($route->getDefault('_controller'), ':')) {
+                list($service, $method) = explode(':', $route->getDefault('_controller'));
+                try {
+                    $route->setDefault('_controller', sprintf("%s::%s\n   (service: %s)", get_class($this->getContainer()->get($service)), $method, $service));
+                } catch (ServiceNotFoundException $e) {
+                }
+            } else {
+                $this->convertController($route);
+            }
 
             $helper->describe($io, $route, array(
                 'format' => $input->getOption('format'),
@@ -109,8 +119,8 @@ protected function execute(InputInterface $input, OutputInterface $output)
 
     private function convertController(Route $route)
     {
-        $nameParser = $this->getContainer()->get('controller_name_converter');
         if ($route->hasDefault('_controller')) {
+            $nameParser = $this->getContainer()->get('controller_name_converter');
             try {
                 $route->setDefault('_controller', $nameParser->build($route->getDefault('_controller')));
             } catch (\InvalidArgumentException $e) {
