Merge pull request #5980 from kenjis/fix-RouteCollectionTest

test: RouteCollectionTest

Author: kenjis

tests/system/Router/RouteCollectionTest.php

@@ -1145,10 +1145,10 @@ public function testWithDotCoSubdomain()
 
     public function testWithDifferentSubdomainMissing()
     {
-        $routes = $this->getCollector();
-
         $_SERVER['HTTP_HOST'] = 'adm.example.com';
 
+        $routes = $this->getCollector();
+
         $routes->add('/objects/(:alphanum)', 'Admin::objectsList/$1', ['subdomain' => 'nothere']);
         $routes->add('/objects/(:alphanum)', 'App::objectsList/$1', ['subdomain' => '*']);
 
@@ -1178,10 +1178,10 @@ public function testWithNoSubdomainAndDot()
      */
     public function testWithSubdomainOrdered()
     {
-        $routes = $this->getCollector();
-
         $_SERVER['HTTP_HOST'] = 'adm.example.com';
 
+        $routes = $this->getCollector();
+
         $routes->add('/objects/(:alphanum)', 'App::objectsList/$1');
         $routes->add('/objects/(:alphanum)', 'Admin::objectsList/$1', ['subdomain' => 'adm']);
 
@@ -1422,10 +1422,10 @@ public function testRouteToWithSubdomainMismatch()
 
     public function testRouteToWithSubdomainNot()
     {
-        $routes = $this->getCollector();
-
-        Services::request()->setMethod('get');
         $_SERVER['HTTP_HOST'] = 'example.com';
+        Services::request()->setMethod('get');
+
+        $routes = $this->getCollector();
 
         $routes->get('i/(:any)', 'App\Controllers\Site\CDoc::item/$1', ['subdomain' => 'doc', 'as' => 'doc_item']);
 
@@ -1434,10 +1434,10 @@ public function testRouteToWithSubdomainNot()
 
     public function testRouteToWithGenericSubdomainMatch()
     {
-        $routes = $this->getCollector();
-
-        Services::request()->setMethod('get');
         $_SERVER['HTTP_HOST'] = 'doc.example.com';
+        Services::request()->setMethod('get');
+
+        $routes = $this->getCollector();
 
         $routes->get('i/(:any)', 'App\Controllers\Site\CDoc::item/$1', ['subdomain' => '*', 'as' => 'doc_item']);
 
@@ -1446,10 +1446,10 @@ public function testRouteToWithGenericSubdomainMatch()
 
     public function testRouteToWithGenericSubdomainMismatch()
     {
-        $routes = $this->getCollector();
-
-        Services::request()->setMethod('get');
         $_SERVER['HTTP_HOST'] = 'dev.example.com';
+        Services::request()->setMethod('get');
+
+        $routes = $this->getCollector();
 
         $routes->get('i/(:any)', 'App\Controllers\Site\CDoc::item/$1', ['subdomain' => '*', 'as' => 'doc_item']);
 
@@ -1458,10 +1458,10 @@ public function testRouteToWithGenericSubdomainMismatch()
 
     public function testRouteToWithGenericSubdomainNot()
     {
-        $routes = $this->getCollector();
-
-        Services::request()->setMethod('get');
         $_SERVER['HTTP_HOST'] = 'example.com';
+        Services::request()->setMethod('get');
+
+        $routes = $this->getCollector();
 
         $routes->get('i/(:any)', 'App\Controllers\Site\CDoc::item/$1', ['subdomain' => '*', 'as' => 'doc_item']);
 
@@ -1482,10 +1482,10 @@ public function testRouteToWithoutSubdomainMatch()
 
     public function testRouteToWithoutSubdomainMismatch()
     {
-        $routes = $this->getCollector();
-
-        Services::request()->setMethod('get');
         $_SERVER['HTTP_HOST'] = 'dev.example.com';
+        Services::request()->setMethod('get');
+
+        $routes = $this->getCollector();
 
         $routes->get('i/(:any)', 'App\Controllers\Site\CDoc::item/$1', ['hostname' => 'example.com', 'as' => 'doc_item']);
 
@@ -1532,8 +1532,8 @@ public function testRouteOverwritingDifferentSubdomains()
 
     public function testRouteOverwritingTwoRules()
     {
-        Services::request()->setMethod('get');
         $_SERVER['HTTP_HOST'] = 'doc.domain.com';
+        Services::request()->setMethod('get');
 
         $routes = $this->getCollector();
         $router = new Router($routes, Services::request());
@@ -1553,8 +1553,8 @@ public function testRouteOverwritingTwoRules()
 
     public function testRouteOverwritingTwoRulesLastApplies()
     {
-        Services::request()->setMethod('get');
         $_SERVER['HTTP_HOST'] = 'doc.domain.com';
+        Services::request()->setMethod('get');
 
         $routes = $this->getCollector();
         $router = new Router($routes, Services::request());
@@ -1573,8 +1573,8 @@ public function testRouteOverwritingTwoRulesLastApplies()
 
     public function testRouteOverwritingMatchingSubdomain()
     {
-        Services::request()->setMethod('get');
         $_SERVER['HTTP_HOST'] = 'doc.domain.com';
+        Services::request()->setMethod('get');
 
         $routes = $this->getCollector();
         $router = new Router($routes, Services::request());
@@ -1593,8 +1593,8 @@ public function testRouteOverwritingMatchingSubdomain()
 
     public function testRouteOverwritingMatchingHost()
     {
-        Services::request()->setMethod('get');
         $_SERVER['HTTP_HOST'] = 'doc.domain.com';
+        Services::request()->setMethod('get');
 
         $routes = $this->getCollector();
         $router = new Router($routes, Services::request());