[9.x] Fix route:list command output (#41177)

laravel · Feb 22, 2022 · 97d67e1 · 97d67e1
1 parent 81e2441
commit 97d67e1
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 1 deletion.
diff --git a/src/Illuminate/Foundation/Console/RouteListCommand.php b/src/Illuminate/Foundation/Console/RouteListCommand.php
@@ -303,7 +303,7 @@ protected function forCli($routes)
             fn ($route) => array_merge($route, [
                 'action' => $this->formatActionForCli($route),
                 'method' => $route['method'] == 'GET|HEAD|POST|PUT|PATCH|DELETE|OPTIONS' ? 'ANY' : $route['method'],
-                'uri' => $route['domain'] ? ($route['domain'].'/'.$route['uri']) : $route['uri'],
+                'uri' => $route['domain'] ? ($route['domain'].'/'.ltrim($route['uri'], '/')) : $route['uri'],
             ]),
         );
 

diff --git a/tests/Testing/Console/RouteListCommandTest.php b/tests/Testing/Console/RouteListCommandTest.php
@@ -35,13 +35,21 @@ protected function setUp(): void
 
     public function testDisplayRoutesForCli()
     {
+        $this->router->get('/', function () {
+            //
+        });
+
         $this->router->get('closure', function () {
             return new RedirectResponse($this->urlGenerator->signedRoute('signed-route'));
         });
 
         $this->router->get('controller-method/{user}', [FooController::class, 'show']);
         $this->router->post('controller-invokable', FooController::class);
         $this->router->domain('{account}.example.com')->group(function () {
+            $this->router->get('/', function () {
+                //
+            });
+
             $this->router->get('user/{id}', function ($account, $id) {
                 //
             })->name('user.show')->middleware('web');
@@ -50,6 +58,8 @@ public function testDisplayRoutesForCli()
         $this->artisan(RouteListCommand::class)
             ->assertSuccessful()
             ->expectsOutput('')
+            ->expectsOutput('  GET|HEAD   / ..................................................... ')
+            ->expectsOutput('  GET|HEAD   {account}.example.com/ ................................ ')
             ->expectsOutput('  GET|HEAD   closure ............................................... ')
             ->expectsOutput('  POST       controller-invokable Illuminate\Tests\Testing\Console\…')
             ->expectsOutput('  GET|HEAD   controller-method/{user} Illuminate\Tests\Testing\Cons…')