Merge pull request #7998 from kenjis/refactor-service-request

refactor: replace deprecated `Services::request(config, false)`
codeigniter4 · Oct 10, 2023 · ff5185a · ff5185a
2 parents eb1e7f6 + 93001f1
commit ff5185a
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 5 deletions.
diff --git a/system/Commands/Utilities/Routes/FilterCollector.php b/system/Commands/Utilities/Routes/FilterCollector.php
@@ -51,7 +51,7 @@ public function get(string $method, string $uri): array
             ];
         }
 
-        $request = Services::request(null, false);
+        $request = Services::incomingrequest(null, false);
         $request->setMethod($method);
 
         $router  = $this->createRouter($request);

diff --git a/system/Test/ControllerTestTrait.php b/system/Test/ControllerTestTrait.php
@@ -105,11 +105,11 @@ protected function setUpControllerTestTrait(): void
         }
 
         if (empty($this->request)) {
-            // Do some acrobatics so we can use the Request service with our own URI
+            // Do some acrobatics, so we can use the Request service with our own URI
             $tempUri = Services::uri();
             Services::injectMock('uri', $this->uri);
 
-            $this->withRequest(Services::request($this->appConfig, false));
+            $this->withRequest(Services::incomingrequest($this->appConfig, false));
 
             // Restore the URI service
             Services::injectMock('uri', $tempUri);

diff --git a/system/Test/ControllerTester.php b/system/Test/ControllerTester.php
@@ -108,7 +108,7 @@ protected function setUpControllerTester(): void
             $tempUri = Services::uri();
             Services::injectMock('uri', $this->uri);
 
-            $this->withRequest(Services::request($this->appConfig, false)->setBody($this->body));
+            $this->withRequest(Services::incomingrequest($this->appConfig, false)->setBody($this->body));
 
             // Restore the URI service
             Services::injectMock('uri', $tempUri);

diff --git a/system/Test/FeatureTestTrait.php b/system/Test/FeatureTestTrait.php
@@ -289,7 +289,7 @@ protected function setupRequest(string $method, ?string $path = null): IncomingR
 
         Services::injectMock('uri', $uri);
 
-        $request = Services::request($config, false);
+        $request = Services::incomingrequest($config, false);
 
         $request->setMethod($method);
         $request->setProtocolVersion('1.1');