diff --git a/src/Symfony/Bundle/FrameworkBundle/Command/RouterDebugCommand.php b/src/Symfony/Bundle/FrameworkBundle/Command/RouterDebugCommand.php
index 01be52a02a..f51b5a6b1b 100644
--- a/src/Symfony/Bundle/FrameworkBundle/Command/RouterDebugCommand.php
+++ b/src/Symfony/Bundle/FrameworkBundle/Command/RouterDebugCommand.php
@@ -65,22 +65,22 @@ EOF
*/
protected function execute(InputInterface $input, OutputInterface $output)
{
- $router = $this->getContainer()->get('router');
+ $name = $input->getArgument('name');
- $routes = array();
- foreach ($router->getRouteCollection()->all() as $name => $route) {
- $routes[$name] = $route->compile();
- }
-
- if ($input->getArgument('name')) {
- $this->outputRoute($output, $routes, $input->getArgument('name'));
+ if ($name) {
+ $this->outputRoute($output, $name);
} else {
- $this->outputRoutes($output, $routes);
+ $this->outputRoutes($output);
}
}
- protected function outputRoutes(OutputInterface $output, $routes)
+ protected function outputRoutes(OutputInterface $output)
{
+ $routes = array();
+ foreach ($this->getContainer()->get('router')->getRouteCollection()->all() as $name => $route) {
+ $routes[$name] = $route->compile();
+ }
+
$output->writeln($this->getHelper('formatter')->formatSection('router', 'Current routes'));
$maxName = 4;
@@ -112,15 +112,16 @@ EOF
/**
* @throws \InvalidArgumentException When route does not exist
*/
- protected function outputRoute(OutputInterface $output, $routes, $name)
+ protected function outputRoute(OutputInterface $output, $name)
{
- $output->writeln($this->getHelper('formatter')->formatSection('router', sprintf('Route "%s"', $name)));
-
- if (!isset($routes[$name])) {
+ $route = $this->getContainer()->get('router')->getRouteCollection()->get($name);
+ if (!$route) {
throw new \InvalidArgumentException(sprintf('The route "%s" does not exist.', $name));
}
- $route = $routes[$name];
+ $output->writeln($this->getHelper('formatter')->formatSection('router', sprintf('Route "%s"', $name)));
+
+ $route = $route->compile();
$output->writeln(sprintf('Name %s', $name));
$output->writeln(sprintf('Pattern %s', $route->getPattern()));
$output->writeln(sprintf('Class %s', get_class($route)));