From b06537e351aea47373d901d896108ad62b37a70f Mon Sep 17 00:00:00 2001 From: lsmith77 Date: Tue, 17 Apr 2012 10:08:13 +0200 Subject: [PATCH] refactored code to use get() when outputting a single route this is useful for a CMS, where in most cases there will be too many routes to make it feasible to load all of them. here a router implementation will be used that will return an empty collection for ->all(). with this refactoring the given routes will not be listed via router:debug, but would still be shown when using router:debug [name] --- .../Command/RouterDebugCommand.php | 31 ++++++++++--------- 1 file changed, 16 insertions(+), 15 deletions(-) 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)));