[FrameworkBundle] [Command] Fix debug:router --no-interaction error …

Author: WilliamBoulle

Command/RouterDebugCommand.php

@@ -81,7 +81,21 @@ protected function execute(InputInterface $input, OutputInterface $output): int
         $routes = $this->router->getRouteCollection();
 
         if ($name) {
-            if (!($route = $routes->get($name)) && $matchingRoutes = $this->findRouteNameContaining($name, $routes)) {
+            $route = $routes->get($name);
+            $matchingRoutes = $this->findRouteNameContaining($name, $routes);
+
+            if (!$input->isInteractive() && !$route && \count($matchingRoutes) > 1) {
+                $helper->describe($io, $this->findRouteContaining($name, $routes), [
+                    'format' => $input->getOption('format'),
+                    'raw_text' => $input->getOption('raw'),
+                    'show_controllers' => $input->getOption('show-controllers'),
+                    'output' => $io,
+                ]);
+
+                return 0;
+            }
+
+            if (!$route && $matchingRoutes) {
                 $default = 1 === \count($matchingRoutes) ? $matchingRoutes[0] : null;
                 $name = $io->choice('Select one of the matching routes', $matchingRoutes, $default);
                 $route = $routes->get($name);
@@ -120,4 +134,16 @@ private function findRouteNameContaining(string $name, RouteCollection $routes):
 
         return $foundRoutesNames;
     }
+
+    private function findRouteContaining(string $name, RouteCollection $routes): RouteCollection
+    {
+        $foundRoutes = new RouteCollection();
+        foreach ($routes as $routeName => $route) {
+            if (false !== stripos($routeName, $name)) {
+                $foundRoutes->add($routeName, $route);
+            }
+        }
+
+        return $foundRoutes;
+    }
 }

Tests/Functional/RouterDebugCommandTest.php

@@ -61,6 +61,23 @@ public function testSearchMultipleRoutes()
         $this->assertStringContainsString('/test', $tester->getDisplay());
     }
 
+    public function testSearchMultipleRoutesWithoutInteraction()
+    {
+        $tester = $this->createCommandTester();
+        $ret = $tester->execute(['name' => 'routerdebug'], ['interactive' => false]);
+
+        $this->assertSame(0, $ret, 'Returns 0 in case of success');
+        $this->assertStringNotContainsString('Select one of the matching routes:', $tester->getDisplay());
+        $this->assertStringContainsString('routerdebug_session_welcome', $tester->getDisplay());
+        $this->assertStringContainsString('/session', $tester->getDisplay());
+        $this->assertStringContainsString('routerdebug_session_welcome_name', $tester->getDisplay());
+        $this->assertStringContainsString('/session/{name} ', $tester->getDisplay());
+        $this->assertStringContainsString('routerdebug_session_logout', $tester->getDisplay());
+        $this->assertStringContainsString('/session_logout', $tester->getDisplay());
+        $this->assertStringContainsString('routerdebug_test', $tester->getDisplay());
+        $this->assertStringContainsString('/test', $tester->getDisplay());
+    }
+
     public function testSearchWithThrow()
     {
         $this->expectException(\InvalidArgumentException::class);