Merge pull request #5962 from kenjis/remove-SERVER-from-route

kenjis · web-flow · commit 8265dc2cc3ec · 2022-05-09T08:28:53.000+09:00
refactor: remove `$_SERVER['HTTP_HOST']` in RouteCollection
diff --git a/system/Router/RouteCollection.php b/system/Router/RouteCollection.php
@@ -218,13 +218,20 @@ class RouteCollection implements RouteCollectionInterface
      */
     protected $prioritizeDetected = false;
 
+    /**
+     * The current hostname from $_SERVER['HTTP_HOST']
+     */
+    private ?string $httpHost = null;
+
     /**
      * Constructor
      */
     public function __construct(FileLocator $locator, Modules $moduleConfig)
     {
         $this->fileLocator  = $locator;
         $this->moduleConfig = $moduleConfig;
+
+        $this->httpHost = Services::request()->getServer('HTTP_HOST');
     }
 
     /**
@@ -1176,7 +1183,7 @@ protected function create(string $verb, string $from, $to, ?array $options = nul
         // Hostname limiting?
         if (! empty($options['hostname'])) {
             // @todo determine if there's a way to whitelist hosts?
-            if (isset($_SERVER['HTTP_HOST']) && strtolower($_SERVER['HTTP_HOST']) !== strtolower($options['hostname'])) {
+            if (isset($this->httpHost) && strtolower($this->httpHost) !== strtolower($options['hostname'])) {
                 return;
             }
 
@@ -1302,7 +1309,7 @@ private function getMethodParams(string $from): string
     private function checkSubdomains($subdomains): bool
     {
         // CLI calls can't be on subdomain.
-        if (! isset($_SERVER['HTTP_HOST'])) {
+        if (! isset($this->httpHost)) {
             return false;
         }
 
@@ -1337,7 +1344,7 @@ private function determineCurrentSubdomain()
         // We have to ensure that a scheme exists
         // on the URL else parse_url will mis-interpret
         // 'host' as the 'path'.
-        $url = $_SERVER['HTTP_HOST'];
+        $url = $this->httpHost;
         if (strpos($url, 'http') !== 0) {
             $url = 'http://' . $url;
         }
diff --git a/tests/system/Commands/GenerateKeyTest.php b/tests/system/Commands/GenerateKeyTest.php
@@ -16,6 +16,8 @@
 
 /**
  * @internal
+ *
+ * @group SeparateProcess
  */
 final class GenerateKeyTest extends CIUnitTestCase
 {
diff --git a/tests/system/CommonFunctionsSendTest.php b/tests/system/CommonFunctionsSendTest.php
@@ -15,6 +15,8 @@
 
 /**
  * @internal
+ *
+ * @group SeparateProcess
  */
 final class CommonFunctionsSendTest extends CIUnitTestCase
 {
diff --git a/tests/system/CommonFunctionsTest.php b/tests/system/CommonFunctionsTest.php
@@ -37,6 +37,8 @@
  * @backupGlobals enabled
  *
  * @internal
+ *
+ * @group SeparateProcess
  */
 final class CommonFunctionsTest extends CIUnitTestCase
 {
diff --git a/tests/system/Config/BaseConfigTest.php b/tests/system/Config/BaseConfigTest.php
@@ -21,6 +21,8 @@
 
 /**
  * @internal
+ *
+ * @group SeparateProcess
  */
 final class BaseConfigTest extends CIUnitTestCase
 {
diff --git a/tests/system/Config/ConfigTest.php b/tests/system/Config/ConfigTest.php
@@ -17,6 +17,8 @@
 
 /**
  * @internal
+ *
+ * @group SeparateProcess
  */
 final class ConfigTest extends CIUnitTestCase
 {
diff --git a/tests/system/Config/DotEnvTest.php b/tests/system/Config/DotEnvTest.php
@@ -18,6 +18,8 @@
  * @backupGlobals enabled
  *
  * @internal
+ *
+ * @group SeparateProcess
  */
 final class DotEnvTest extends CIUnitTestCase
 {
diff --git a/tests/system/Config/ServicesTest.php b/tests/system/Config/ServicesTest.php
@@ -48,6 +48,8 @@
 
 /**
  * @internal
+ *
+ * @group SeparateProcess
  */
 final class ServicesTest extends CIUnitTestCase
 {
diff --git a/tests/system/Events/EventsTest.php b/tests/system/Events/EventsTest.php
@@ -17,6 +17,8 @@
 
 /**
  * @internal
+ *
+ * @group SeparateProcess
  */
 final class EventsTest extends CIUnitTestCase
 {
diff --git a/tests/system/Filters/HoneypotTest.php b/tests/system/Filters/HoneypotTest.php
@@ -20,6 +20,8 @@
  * @backupGlobals enabled
  *
  * @internal
+ *
+ * @group SeparateProcess
  */
 final class HoneypotTest extends CIUnitTestCase
 {
diff --git a/tests/system/HTTP/ContentSecurityPolicyTest.php b/tests/system/HTTP/ContentSecurityPolicyTest.php
@@ -22,6 +22,8 @@
  * See https://cspvalidator.org/
  *
  * @internal
+ *
+ * @group SeparateProcess
  */
 final class ContentSecurityPolicyTest extends CIUnitTestCase
 {
diff --git a/tests/system/HTTP/DownloadResponseTest.php b/tests/system/HTTP/DownloadResponseTest.php
@@ -19,6 +19,8 @@
 
 /**
  * @internal
+ *
+ * @group SeparateProcess
  */
 final class DownloadResponseTest extends CIUnitTestCase
 {
diff --git a/tests/system/HTTP/IncomingRequestTest.php b/tests/system/HTTP/IncomingRequestTest.php
@@ -20,6 +20,8 @@
  * @backupGlobals enabled
  *
  * @internal
+ *
+ * @group SeparateProcess
  */
 final class IncomingRequestTest extends CIUnitTestCase
 {
diff --git a/tests/system/HTTP/RedirectResponseTest.php b/tests/system/HTTP/RedirectResponseTest.php
@@ -23,6 +23,8 @@
 
 /**
  * @internal
+ *
+ * @group SeparateProcess
  */
 final class RedirectResponseTest extends CIUnitTestCase
 {
diff --git a/tests/system/HTTP/ResponseSendTest.php b/tests/system/HTTP/ResponseSendTest.php
@@ -23,6 +23,8 @@
  * test cases need to be run as separate processes.
  *
  * @internal
+ *
+ * @group SeparateProcess
  */
 final class ResponseSendTest extends CIUnitTestCase
 {
diff --git a/tests/system/Helpers/FormHelperTest.php b/tests/system/Helpers/FormHelperTest.php
@@ -19,6 +19,8 @@
 
 /**
  * @internal
+ *
+ * @group SeparateProcess
  */
 final class FormHelperTest extends CIUnitTestCase
 {
diff --git a/tests/system/RESTful/ResourceControllerTest.php b/tests/system/RESTful/ResourceControllerTest.php
@@ -39,6 +39,8 @@
  * @preserveGlobalState         disabled
  *
  * @internal
+ *
+ * @group SeparateProcess
  */
 final class ResourceControllerTest extends CIUnitTestCase
 {
@@ -53,8 +55,12 @@ protected function setUp(): void
     {
         parent::setUp();
 
-        $this->resetServices();
+        $this->resetServices(true);
+        $this->resetFactories();
+    }
 
+    private function createCodeigniter(): void
+    {
         $_SERVER['SERVER_PROTOCOL'] = 'HTTP/1.1';
 
         // Inject mock router.
@@ -86,11 +92,14 @@ public function testResourceGet()
         $_SERVER['REQUEST_URI']    = '/work';
         $_SERVER['REQUEST_METHOD'] = 'GET';
 
+        $this->createCodeigniter();
+
         ob_start();
         $this->codeigniter->useSafeOutput(true)->run($this->routes);
         $output = ob_get_clean();
 
-        $this->assertStringContainsString(lang('RESTful.notImplemented', ['index']), $output);
+        $error = json_decode($output)->messages->error;
+        $this->assertStringContainsString(lang('RESTful.notImplemented', ['index']), $error);
     }
 
     public function testResourceGetNew()
@@ -105,11 +114,14 @@ public function testResourceGetNew()
         $_SERVER['REQUEST_URI']    = '/work/new';
         $_SERVER['REQUEST_METHOD'] = 'GET';
 
+        $this->createCodeigniter();
+
         ob_start();
         $this->codeigniter->useSafeOutput(true)->run($this->routes);
         $output = ob_get_clean();
 
-        $this->assertStringContainsString(lang('RESTful.notImplemented', ['new']), $output);
+        $error = json_decode($output)->messages->error;
+        $this->assertStringContainsString(lang('RESTful.notImplemented', ['new']), $error);
     }
 
     public function testResourceGetEdit()
@@ -125,11 +137,14 @@ public function testResourceGetEdit()
         $_SERVER['REQUEST_URI']    = '/work/1/edit';
         $_SERVER['REQUEST_METHOD'] = 'GET';
 
+        $this->createCodeigniter();
+
         ob_start();
         $this->codeigniter->useSafeOutput(true)->run($this->routes);
         $output = ob_get_clean();
 
-        $this->assertStringContainsString(lang('RESTful.notImplemented', ['edit']), $output);
+        $error = json_decode($output)->messages->error;
+        $this->assertStringContainsString(lang('RESTful.notImplemented', ['edit']), $error);
     }
 
     public function testResourceGetOne()
@@ -144,11 +159,14 @@ public function testResourceGetOne()
         $_SERVER['REQUEST_URI']    = '/work/1';
         $_SERVER['REQUEST_METHOD'] = 'GET';
 
+        $this->createCodeigniter();
+
         ob_start();
         $this->codeigniter->useSafeOutput(true)->run($this->routes);
         $output = ob_get_clean();
 
-        $this->assertStringContainsString(lang('RESTful.notImplemented', ['show']), $output);
+        $error = json_decode($output)->messages->error;
+        $this->assertStringContainsString(lang('RESTful.notImplemented', ['show']), $error);
     }
 
     public function testResourcePost()
@@ -162,11 +180,14 @@ public function testResourcePost()
         $_SERVER['REQUEST_URI']    = '/work';
         $_SERVER['REQUEST_METHOD'] = 'POST';
 
+        $this->createCodeigniter();
+
         ob_start();
         $this->codeigniter->useSafeOutput(true)->run($this->routes);
         $output = ob_get_clean();
 
-        $this->assertStringContainsString(lang('RESTful.notImplemented', ['create']), $output);
+        $error = json_decode($output)->messages->error;
+        $this->assertStringContainsString(lang('RESTful.notImplemented', ['create']), $error);
     }
 
     public function testResourcePatch()
@@ -181,11 +202,14 @@ public function testResourcePatch()
         $_SERVER['REQUEST_URI']    = '/work/123';
         $_SERVER['REQUEST_METHOD'] = 'PATCH';
 
+        $this->createCodeigniter();
+
         ob_start();
         $this->codeigniter->useSafeOutput(true)->run($this->routes);
         $output = ob_get_clean();
 
-        $this->assertStringContainsString(lang('RESTful.notImplemented', ['patch']), $output);
+        $error = json_decode($output)->messages->error;
+        $this->assertStringContainsString(lang('RESTful.notImplemented', ['update']), $error);
     }
 
     public function testResourcePut()
@@ -200,11 +224,14 @@ public function testResourcePut()
         $_SERVER['REQUEST_URI']    = '/work/123';
         $_SERVER['REQUEST_METHOD'] = 'PUT';
 
+        $this->createCodeigniter();
+
         ob_start();
         $this->codeigniter->useSafeOutput(true)->run($this->routes);
         $output = ob_get_clean();
 
-        $this->assertStringContainsString(lang('RESTful.notImplemented', ['put']), $output);
+        $error = json_decode($output)->messages->error;
+        $this->assertStringContainsString(lang('RESTful.notImplemented', ['update']), $error);
     }
 
     public function testResourceDelete()
@@ -219,11 +246,14 @@ public function testResourceDelete()
         $_SERVER['REQUEST_URI']    = '/work/123';
         $_SERVER['REQUEST_METHOD'] = 'DELETE';
 
+        $this->createCodeigniter();
+
         ob_start();
         $this->codeigniter->useSafeOutput(true)->run($this->routes);
         $output = ob_get_clean();
 
-        $this->assertStringContainsString(lang('RESTful.notImplemented', ['delete']), $output);
+        $error = json_decode($output)->messages->error;
+        $this->assertStringContainsString(lang('RESTful.notImplemented', ['delete']), $error);
     }
 
     public function testModel()
diff --git a/tests/system/RESTful/ResourcePresenterTest.php b/tests/system/RESTful/ResourcePresenterTest.php
diff --git a/tests/system/Router/RouteCollectionTest.php b/tests/system/Router/RouteCollectionTest.php
diff --git a/tests/system/Security/SecurityCSRFSessionRandomizeTokenTest.php b/tests/system/Security/SecurityCSRFSessionRandomizeTokenTest.php
diff --git a/tests/system/Security/SecurityCSRFSessionTest.php b/tests/system/Security/SecurityCSRFSessionTest.php
diff --git a/tests/system/Session/SessionTest.php b/tests/system/Session/SessionTest.php
diff --git a/tests/system/Test/ControllerTestTraitTest.php b/tests/system/Test/ControllerTestTraitTest.php
diff --git a/tests/system/Test/TestCaseEmissionsTest.php b/tests/system/Test/TestCaseEmissionsTest.php

Original file line number	Diff line number	Diff line change
`@@ -16,6 +16,8 @@`
`16`	`16`
`17`	`17`	`/**`
`18`	`18`	`* @internal`
	`19`	`+ *`
	`20`	`+ * @group SeparateProcess`
`19`	`21`	`*/`
`20`	`22`	`final class GenerateKeyTest extends CIUnitTestCase`
`21`	`23`	`{`
Original file line number	Diff line number	Diff line change
`@@ -15,6 +15,8 @@`
`15`	`15`
`16`	`16`	`/**`
`17`	`17`	`* @internal`
	`18`	`+ *`
	`19`	`+ * @group SeparateProcess`
`18`	`20`	`*/`
`19`	`21`	`final class CommonFunctionsSendTest extends CIUnitTestCase`
`20`	`22`	`{`
Original file line number	Diff line number	Diff line change
`@@ -37,6 +37,8 @@`
`37`	`37`	`* @backupGlobals enabled`
`38`	`38`	`*`
`39`	`39`	`* @internal`
	`40`	`+ *`
	`41`	`+ * @group SeparateProcess`
`40`	`42`	`*/`
`41`	`43`	`final class CommonFunctionsTest extends CIUnitTestCase`
`42`	`44`	`{`
Original file line number	Diff line number	Diff line change
`@@ -21,6 +21,8 @@`
`21`	`21`
`22`	`22`	`/**`
`23`	`23`	`* @internal`
	`24`	`+ *`
	`25`	`+ * @group SeparateProcess`
`24`	`26`	`*/`
`25`	`27`	`final class BaseConfigTest extends CIUnitTestCase`
`26`	`28`	`{`
Original file line number	Diff line number	Diff line change
`@@ -17,6 +17,8 @@`
`17`	`17`
`18`	`18`	`/**`
`19`	`19`	`* @internal`
	`20`	`+ *`
	`21`	`+ * @group SeparateProcess`
`20`	`22`	`*/`
`21`	`23`	`final class ConfigTest extends CIUnitTestCase`
`22`	`24`	`{`
Original file line number	Diff line number	Diff line change
`@@ -18,6 +18,8 @@`
`18`	`18`	`* @backupGlobals enabled`
`19`	`19`	`*`
`20`	`20`	`* @internal`
	`21`	`+ *`
	`22`	`+ * @group SeparateProcess`
`21`	`23`	`*/`
`22`	`24`	`final class DotEnvTest extends CIUnitTestCase`
`23`	`25`	`{`
Original file line number	Diff line number	Diff line change
`@@ -48,6 +48,8 @@`
`48`	`48`
`49`	`49`	`/**`
`50`	`50`	`* @internal`
	`51`	`+ *`
	`52`	`+ * @group SeparateProcess`
`51`	`53`	`*/`
`52`	`54`	`final class ServicesTest extends CIUnitTestCase`
`53`	`55`	`{`
Original file line number	Diff line number	Diff line change
`@@ -20,6 +20,8 @@`
`20`	`20`	`* @backupGlobals enabled`
`21`	`21`	`*`
`22`	`22`	`* @internal`
	`23`	`+ *`
	`24`	`+ * @group SeparateProcess`
`23`	`25`	`*/`
`24`	`26`	`final class HoneypotTest extends CIUnitTestCase`
`25`	`27`	`{`