test: replace Services::request() with Services::incomingrequest()

These tests are for web tests.

Author: kenjis

tests/system/CodeIgniterTest.php

@@ -78,7 +78,7 @@ public function testRunClosureRoute()
         $routes->add('pages/(:segment)', static function ($segment) {
             echo 'You want to see "' . esc($segment) . '" page.';
         });
-        $router = Services::router($routes, Services::request());
+        $router = Services::router($routes, Services::incomingrequest());
         Services::injectMock('router', $router);
 
         ob_start();
@@ -97,7 +97,7 @@ public function testRun404Override()
         $routes = Services::routes();
         $routes->setAutoRoute(false);
         $routes->set404Override('Tests\Support\Controllers\Hello::index');
-        $router = Services::router($routes, Services::request());
+        $router = Services::router($routes, Services::incomingrequest());
         Services::injectMock('router', $router);
 
         ob_start();
@@ -116,7 +116,7 @@ public function testRun404OverrideControllerReturnsResponse()
         $routes = Services::routes();
         $routes->setAutoRoute(false);
         $routes->set404Override('Tests\Support\Controllers\Popcorn::pop');
-        $router = Services::router($routes, Services::request());
+        $router = Services::router($routes, Services::incomingrequest());
         Services::injectMock('router', $router);
 
         ob_start();
@@ -137,7 +137,7 @@ public function testRun404OverrideByClosure()
         $routes->set404Override(static function () {
             echo '404 Override by Closure.';
         });
-        $router = Services::router($routes, Services::request());
+        $router = Services::router($routes, Services::incomingrequest());
         Services::injectMock('router', $router);
 
         ob_start();
@@ -157,7 +157,7 @@ public function testControllersCanReturnString()
         // Inject mock router.
         $routes = Services::routes();
         $routes->add('pages/(:segment)', static fn ($segment) => 'You want to see "' . esc($segment) . '" page.');
-        $router = Services::router($routes, Services::request());
+        $router = Services::router($routes, Services::incomingrequest());
         Services::injectMock('router', $router);
 
         ob_start();
@@ -182,7 +182,7 @@ public function testControllersCanReturnResponseObject()
 
             return $response->setBody($string);
         });
-        $router = Services::router($routes, Services::request());
+        $router = Services::router($routes, Services::incomingrequest());
         Services::injectMock('router', $router);
 
         ob_start();
@@ -209,7 +209,7 @@ public function testControllersCanReturnDownloadResponseObject()
 
             return $response->download('some.txt', 'some text', true);
         });
-        $router = Services::router($routes, Services::request());
+        $router = Services::router($routes, Services::incomingrequest());
         Services::injectMock('router', $router);
 
         ob_start();
@@ -228,9 +228,9 @@ public function testControllersRunFilterByClassName()
 
         // Inject mock router.
         $routes = Services::routes();
-        $routes->add('pages/about', static fn () => Services::request()->getBody(), ['filter' => Customfilter::class]);
+        $routes->add('pages/about', static fn () => Services::incomingrequest()->getBody(), ['filter' => Customfilter::class]);
 
-        $router = Services::router($routes, Services::request());
+        $router = Services::router($routes, Services::incomingrequest());
         Services::injectMock('router', $router);
 
         ob_start();
@@ -258,7 +258,7 @@ public function testRoutesIsEmpty()
         $_SERVER['argc'] = 2;
 
         // Inject mock router.
-        $router = Services::router(null, Services::request(), false);
+        $router = Services::router(null, Services::incomingrequest(), false);
         Services::injectMock('router', $router);
 
         ob_start();
@@ -335,7 +335,7 @@ public function testRunRedirectionWithNamed()
         }, ['as' => 'name']);
         $routes->addRedirect('example', 'name');
 
-        $router = Services::router($routes, Services::request());
+        $router = Services::router($routes, Services::incomingrequest());
         Services::injectMock('router', $router);
 
         ob_start();
@@ -358,7 +358,7 @@ public function testRunRedirectionWithURI()
         });
         $routes->addRedirect('example', 'pages/uri');
 
-        $router = Services::router($routes, Services::request());
+        $router = Services::router($routes, Services::incomingrequest());
         Services::injectMock('router', $router);
 
         ob_start();
@@ -382,7 +382,7 @@ public function testRunRedirectionWithURINotSet()
         $routes = Services::routes();
         $routes->addRedirect('example', 'pages/notset');
 
-        $router = Services::router($routes, Services::request());
+        $router = Services::router($routes, Services::incomingrequest());
         Services::injectMock('router', $router);
 
         ob_start();
@@ -405,7 +405,7 @@ public function testRunRedirectionWithHTTPCode303()
         $routes = Services::routes();
         $routes->addRedirect('example', 'pages/notset', 301);
 
-        $router = Services::router($routes, Services::request());
+        $router = Services::router($routes, Services::incomingrequest());
         Services::injectMock('router', $router);
 
         ob_start();
@@ -422,7 +422,7 @@ public function testStoresPreviousURL()
         $_SERVER['argc'] = 2;
 
         // Inject mock router.
-        $router = Services::router(null, Services::request(), false);
+        $router = Services::router(null, Services::incomingrequest(), false);
         Services::injectMock('router', $router);
 
         ob_start();
@@ -446,7 +446,7 @@ public function testNotStoresPreviousURL()
         $routes = Services::routes();
         $routes->addRedirect('example', 'pages/notset', 301);
 
-        $router = Services::router($routes, Services::request());
+        $router = Services::router($routes, Services::incomingrequest());
         Services::injectMock('router', $router);
 
         ob_start();
@@ -470,7 +470,7 @@ public function testNotStoresPreviousURLByCheckingContentType()
 
             return $response->setContentType('image/jpeg', '');
         });
-        $router = Services::router($routes, Services::request());
+        $router = Services::router($routes, Services::incomingrequest());
         Services::injectMock('router', $router);
 
         ob_start();
@@ -537,7 +537,7 @@ public function testSpoofRequestMethodCanUsePUT()
         $this->codeigniter->useSafeOutput(true)->run();
         ob_get_clean();
 
-        $this->assertSame('put', Services::request()->getMethod());
+        $this->assertSame('put', Services::incomingrequest()->getMethod());
     }
 
     public function testSpoofRequestMethodCannotUseGET()
@@ -561,7 +561,7 @@ public function testSpoofRequestMethodCannotUseGET()
         $this->codeigniter->useSafeOutput(true)->run();
         ob_get_clean();
 
-        $this->assertSame('post', Services::request()->getMethod());
+        $this->assertSame('post', Services::incomingrequest()->getMethod());
     }
 
     /**
@@ -588,7 +588,7 @@ public function testPageCacheSendSecureHeaders()
 
             return $response->setBody($string);
         });
-        $router = Services::router($routes, Services::request());
+        $router = Services::router($routes, Services::incomingrequest());
         Services::injectMock('router', $router);
 
         /** @var Filters $filterConfig */
@@ -662,7 +662,7 @@ public function testPageCacheWithCacheQueryString($cacheQueryStringValue, int $e
             });
 
             // Inject router
-            $router = Services::router($routes, Services::request(null, false));
+            $router = Services::router($routes, Services::incomingrequest(null, false));
             Services::injectMock('router', $router);
 
             // Cache the page output using default caching function and $cacheConfig with value from the data provider