[13.x] Register subdomain routes before routes that are not linked to a domain (#55921)

* wip

* wip

* wip

* linting

Author: gdebrauwer

src/Illuminate/Routing/RouteCollection.php

@@ -62,10 +62,22 @@ protected function addToCollections($route)
         $domainAndUri = $route->getDomain().$route->uri();
 
         foreach ($methods as $method) {
-            $this->routes[$method][$domainAndUri] = $route;
+            if ($route->getDomain()) {
+                $domainRoutes = array_filter($this->routes[$method] ?? [], fn ($route) => $route->getDomain() !== null);
+
+                $this->routes[$method] = $domainRoutes + [$domainAndUri => $route] + ($this->routes[$method] ?? []);
+            } else {
+                $this->routes[$method][$domainAndUri] = $route;
+            }
         }
 
-        $this->allRoutes[implode('|', $methods).$domainAndUri] = $route;
+        if ($route->getDomain()) {
+            $domainRoutes = array_filter($this->allRoutes, fn ($route) => $route->getDomain() !== null);
+
+            $this->allRoutes = $domainRoutes + [implode('|', $methods).$domainAndUri => $route] + $this->allRoutes;
+        } else {
+            $this->allRoutes[implode('|', $methods).$domainAndUri] = $route;
+        }
     }
 
     /**

tests/Routing/RouteCollectionTest.php

@@ -359,4 +359,64 @@ public function testOverlappingRoutesMatchesFirstRoute()
         $this->assertCount(2, $this->routeCollection->getRoutes());
         $this->assertEquals('first', $this->routeCollection->match($request)->getName());
     }
+
+    public function testPrependsRoutesWithDomain()
+    {
+        $this->routeCollection->add(
+            $noDomainGet1 = new Route('GET', 'no-domain-get1', ['uses' => 'NoDomainController@index'])
+        );
+
+        $this->routeCollection->add(
+            $fooDomainGet1 = (new Route('GET', 'foo-domain-get1', ['uses' => 'FooDomainController@index']))->domain('foo.test')
+        );
+
+        $this->routeCollection->add(
+            $barDomainGet1 = (new Route('GET', 'bar-domain-get1', ['uses' => 'BarDomainController@index']))->domain('bar.test')
+        );
+
+        $this->routeCollection->add(
+            $noDomainGet2 = new Route('GET', 'no-domain-get2', ['uses' => 'NoDomainController@show'])
+        );
+
+        $this->routeCollection->add(
+            $fooDomainGet2 = (new Route('GET', 'foo-domain-get2', ['uses' => 'FooDomainController@show']))->domain('foo.test')
+        );
+
+        $this->routeCollection->add(
+            $barDomainGet2 = (new Route('GET', 'bar-domain-get2', ['uses' => 'BarDomainController@show']))->domain('bar.test')
+        );
+
+        $this->assertSame([
+            $fooDomainGet1,
+            $barDomainGet1,
+            $fooDomainGet2,
+            $barDomainGet2,
+            $noDomainGet1,
+            $noDomainGet2,
+        ], $this->routeCollection->getRoutes());
+
+        $this->assertSame([
+            'GET' => [
+                'foo.testfoo-domain-get1' => $fooDomainGet1,
+                'bar.testbar-domain-get1' => $barDomainGet1,
+
+                'foo.testfoo-domain-get2' => $fooDomainGet2,
+                'bar.testbar-domain-get2' => $barDomainGet2,
+
+                'no-domain-get1' => $noDomainGet1,
+                'no-domain-get2' => $noDomainGet2,
+            ],
+
+            'HEAD' => [
+                'foo.testfoo-domain-get1' => $fooDomainGet1,
+                'bar.testbar-domain-get1' => $barDomainGet1,
+
+                'foo.testfoo-domain-get2' => $fooDomainGet2,
+                'bar.testbar-domain-get2' => $barDomainGet2,
+
+                'no-domain-get1' => $noDomainGet1,
+                'no-domain-get2' => $noDomainGet2,
+            ],
+        ], $this->routeCollection->getRoutesByMethod());
+    }
 }

tests/Testing/Console/RouteListCommandTest.php

@@ -63,8 +63,8 @@ public function testDisplayRoutesForCli()
         $this->artisan(RouteListCommand::class)
             ->assertSuccessful()
             ->expectsOutput('')
-            ->expectsOutput('  GET|HEAD   / ..................................................... ')
             ->expectsOutput('  GET|HEAD   {account}.example.com/ ................................ ')
+            ->expectsOutput('  GET|HEAD   / ..................................................... ')
             ->expectsOutput('  GET|HEAD   closure ............................................... ')
             ->expectsOutput('  POST       controller-invokable Illuminate\Tests\Testing\Console\…')
             ->expectsOutput('  GET|HEAD   controller-method/{user} Illuminate\Tests\Testing\Cons…')