Allow domain/sub-domain routes to overwrite existing routes. #1692

Author: lonnieezell

system/Router/RouteCollection.php

@@ -1232,7 +1232,8 @@ protected function fillRouteParams(string $from, array $params = null): string
 	 */
 	protected function create(string $verb, string $from, $to, array $options = null)
 	{
-		$prefix = is_null($this->group) ? '' : $this->group . '/';
+		$overwrite = false;
+		$prefix    = is_null($this->group) ? '' : $this->group . '/';
 
 		$from = filter_var($prefix . $from, FILTER_SANITIZE_STRING);
 
@@ -1253,6 +1254,8 @@ protected function create(string $verb, string $from, $to, array $options = null
 			{
 				return;
 			}
+
+			$overwrite = true;
 		}
 
 		// Limiting to subdomains?
@@ -1264,6 +1267,8 @@ protected function create(string $verb, string $from, $to, array $options = null
 			{
 				return;
 			}
+
+			$overwrite = true;
 		}
 
 		// Are we offsetting the binds?
@@ -1312,7 +1317,7 @@ protected function create(string $verb, string $from, $to, array $options = null
 		// routes should always be the "source of truth".
 		// this works only because discovered routes are added just prior
 		// to attempting to route the request.
-		if (isset($this->routes[$verb][$name]))
+		if (isset($this->routes[$verb][$name]) && ! $overwrite)
 		{
 			return;
 		}

tests/system/Router/RouteCollectionTest.php

@@ -771,6 +771,28 @@ public function testWithSubdomain()
 
 		$_SERVER['HTTP_HOST'] = 'adm.example.com';
 
+		$routes->add('/objects/(:alphanum)', 'Admin::objectsList/$1', ['subdomain' => 'adm']);
+		$routes->add('/objects/(:alphanum)', 'App::objectsList/$1');
+
+		$expects = [
+			'objects/([a-zA-Z0-9]+)' => '\Admin::objectsList/$1',
+		];
+
+		$this->assertEquals($expects, $routes->getRoutes());
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * @see https://github.com/codeigniter4/CodeIgniter4/issues/1692
+	 */
+	public function testWithSubdomainOrdered()
+	{
+		$routes = $this->getCollector();
+
+		$_SERVER['HTTP_HOST'] = 'adm.example.com';
+
+		$routes->add('/objects/(:alphanum)', 'App::objectsList/$1');
 		$routes->add('/objects/(:alphanum)', 'Admin::objectsList/$1', ['subdomain' => 'adm']);
 
 		$expects = [