From 4b98ddf6a695c5b70cfc7443e934088b65d03c0b Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Sun, 19 Nov 2023 17:56:33 +0900
Subject: [PATCH] test: use HTTP\Method constants

---
 tests/system/CodeIgniterTest.php            |  5 +-
 tests/system/Router/RouteCollectionTest.php | 73 +++++++++++----------
 tests/system/Router/RouterTest.php          |  3 +-
 3 files changed, 42 insertions(+), 39 deletions(-)

diff --git a/tests/system/CodeIgniterTest.php b/tests/system/CodeIgniterTest.php
index 948e9c2dcd5d..5d12863604f6 100644
--- a/tests/system/CodeIgniterTest.php
+++ b/tests/system/CodeIgniterTest.php
@@ -14,6 +14,7 @@
 use CodeIgniter\Config\Services;
 use CodeIgniter\Exceptions\ConfigException;
 use CodeIgniter\Exceptions\PageNotFoundException;
+use CodeIgniter\HTTP\Method;
 use CodeIgniter\HTTP\Response;
 use CodeIgniter\Router\Exceptions\RedirectException;
 use CodeIgniter\Router\RouteCollection;
@@ -721,7 +722,7 @@ public function testSpoofRequestMethodCanUsePUT(): void
         $_SERVER['SERVER_PROTOCOL'] = 'HTTP/1.1';
         $_SERVER['REQUEST_METHOD']  = 'POST';
 
-        $_POST['_method'] = 'PUT';
+        $_POST['_method'] = Method::PUT;
 
         $routes = \Config\Services::routes();
         $routes->setDefaultNamespace('App\Controllers');
@@ -733,7 +734,7 @@ public function testSpoofRequestMethodCanUsePUT(): void
         $this->codeigniter->run();
         ob_get_clean();
 
-        $this->assertSame('PUT', Services::incomingrequest()->getMethod());
+        $this->assertSame(Method::PUT, Services::incomingrequest()->getMethod());
     }
 
     public function testSpoofRequestMethodCannotUseGET(): void
diff --git a/tests/system/Router/RouteCollectionTest.php b/tests/system/Router/RouteCollectionTest.php
index 32989e952d57..06ab63f3e151 100644
--- a/tests/system/Router/RouteCollectionTest.php
+++ b/tests/system/Router/RouteCollectionTest.php
@@ -15,6 +15,7 @@
 use CodeIgniter\Config\Services;
 use CodeIgniter\controller;
 use CodeIgniter\Exceptions\PageNotFoundException;
+use CodeIgniter\HTTP\Method;
 use CodeIgniter\Test\CIUnitTestCase;
 use Config\Modules;
 use Config\Routing;
@@ -144,7 +145,7 @@ public function testAddIgnoresDefaultNamespaceWhenExists(): void
 
     public function testAddWorksWithCurrentHTTPMethods(): void
     {
-        Services::request()->setMethod('GET');
+        Services::request()->setMethod(Method::GET);
 
         $routes = $this->getCollector();
 
@@ -176,7 +177,7 @@ public function testAddWithLeadingSlash(): void
 
     public function testMatchIgnoresInvalidHTTPMethods(): void
     {
-        Services::request()->setMethod('GET');
+        Services::request()->setMethod(Method::GET);
 
         $routes = $this->getCollector();
 
@@ -189,7 +190,7 @@ public function testMatchIgnoresInvalidHTTPMethods(): void
 
     public function testAddWorksWithArrayOFHTTPMethods(): void
     {
-        Services::request()->setMethod('POST');
+        Services::request()->setMethod(Method::POST);
 
         $routes = $this->getCollector();
 
@@ -696,7 +697,7 @@ public function testPresenterScaffoldsCorrectly(): void
 
     public function testResourcesWithCustomController(): void
     {
-        Services::request()->setMethod('GET');
+        Services::request()->setMethod(Method::GET);
         $routes = $this->getCollector();
 
         $routes->resource('photos', ['controller' => '<script>gallery']);
@@ -713,7 +714,7 @@ public function testResourcesWithCustomController(): void
 
     public function testResourcesWithCustomPlaceholder(): void
     {
-        Services::request()->setMethod('GET');
+        Services::request()->setMethod(Method::GET);
         $routes = $this->getCollector();
 
         $routes->resource('photos', ['placeholder' => ':num']);
@@ -730,7 +731,7 @@ public function testResourcesWithCustomPlaceholder(): void
 
     public function testResourcesWithDefaultPlaceholder(): void
     {
-        Services::request()->setMethod('GET');
+        Services::request()->setMethod(Method::GET);
         $routes = $this->getCollector();
 
         $routes->setDefaultConstraint('num');
@@ -748,7 +749,7 @@ public function testResourcesWithDefaultPlaceholder(): void
 
     public function testResourcesWithBogusDefaultPlaceholder(): void
     {
-        Services::request()->setMethod('GET');
+        Services::request()->setMethod(Method::GET);
         $routes = $this->getCollector();
 
         $routes->setDefaultConstraint(':num');
@@ -766,7 +767,7 @@ public function testResourcesWithBogusDefaultPlaceholder(): void
 
     public function testResourcesWithOnly(): void
     {
-        Services::request()->setMethod('GET');
+        Services::request()->setMethod(Method::GET);
         $routes = $this->getCollector();
 
         $routes->resource('photos', ['only' => 'index']);
@@ -780,7 +781,7 @@ public function testResourcesWithOnly(): void
 
     public function testResourcesWithExcept(): void
     {
-        Services::request()->setMethod('GET');
+        Services::request()->setMethod(Method::GET);
         $routes = $this->getCollector();
 
         $routes->resource('photos', ['except' => 'edit,new']);
@@ -811,7 +812,7 @@ public function testResourcesWithWebsafe(): void
 
     public function testMatchSupportsMultipleMethods(): void
     {
-        Services::request()->setMethod('GET');
+        Services::request()->setMethod(Method::GET);
         $routes = $this->getCollector();
 
         $expected = ['here' => '\there'];
@@ -819,7 +820,7 @@ public function testMatchSupportsMultipleMethods(): void
         $routes->match(['GET', 'POST'], 'here', 'there');
         $this->assertSame($expected, $routes->getRoutes());
 
-        Services::request()->setMethod('POST');
+        Services::request()->setMethod(Method::POST);
         $routes = $this->getCollector();
         $routes->match(['GET', 'POST'], 'here', 'there');
         $this->assertSame($expected, $routes->getRoutes());
@@ -827,7 +828,7 @@ public function testMatchSupportsMultipleMethods(): void
 
     public function testGet(): void
     {
-        Services::request()->setMethod('GET');
+        Services::request()->setMethod(Method::GET);
         $routes = $this->getCollector();
 
         $expected = ['here' => '\there'];
@@ -949,7 +950,7 @@ public function testEnvironmentRestricts(): void
     {
         // ENVIRONMENT should be 'testing'
 
-        Services::request()->setMethod('GET');
+        Services::request()->setMethod(Method::GET);
         $routes = $this->getCollector();
 
         $expected = ['here' => '\there'];
@@ -1434,7 +1435,7 @@ static function (): void {},
 
     public function testRouteGroupWithFilterSimple(): void
     {
-        Services::request()->setMethod('GET');
+        Services::request()->setMethod(Method::GET);
         $routes = $this->getCollector();
 
         $routes->group(
@@ -1453,7 +1454,7 @@ static function ($routes): void {
 
     public function testRouteGroupWithFilterWithParams(): void
     {
-        Services::request()->setMethod('GET');
+        Services::request()->setMethod(Method::GET);
         $routes = $this->getCollector();
 
         $routes->group(
@@ -1471,7 +1472,7 @@ static function ($routes): void {
 
     public function test404OverrideNot(): void
     {
-        Services::request()->setMethod('GET');
+        Services::request()->setMethod(Method::GET);
         $routes = $this->getCollector();
 
         $this->assertNull($routes->get404Override());
@@ -1479,7 +1480,7 @@ public function test404OverrideNot(): void
 
     public function test404OverrideString(): void
     {
-        Services::request()->setMethod('GET');
+        Services::request()->setMethod(Method::GET);
         $routes = $this->getCollector();
 
         $routes->set404Override('Explode');
@@ -1488,7 +1489,7 @@ public function test404OverrideString(): void
 
     public function test404OverrideCallable(): void
     {
-        Services::request()->setMethod('GET');
+        Services::request()->setMethod(Method::GET);
         $routes = $this->getCollector();
 
         $routes->set404Override(static function (): void {
@@ -1499,7 +1500,7 @@ public function test404OverrideCallable(): void
 
     public function testOffsetParameters(): void
     {
-        Services::request()->setMethod('GET');
+        Services::request()->setMethod(Method::GET);
         $routes = $this->getCollector();
 
         $routes->get('users/(:num)', 'users/show/$1', ['offset' => 1]);
@@ -1515,7 +1516,7 @@ public function testOffsetParameters(): void
     public function testRouteToWithSubdomainMatch(): void
     {
         $_SERVER['HTTP_HOST'] = 'doc.example.com';
-        Services::request()->setMethod('GET');
+        Services::request()->setMethod(Method::GET);
 
         $routes = $this->getCollector();
 
@@ -1527,7 +1528,7 @@ public function testRouteToWithSubdomainMatch(): void
     public function testRouteToWithSubdomainMismatch(): void
     {
         $_SERVER['HTTP_HOST'] = 'dev.example.com';
-        Services::request()->setMethod('GET');
+        Services::request()->setMethod(Method::GET);
 
         $routes = $this->getCollector();
 
@@ -1539,7 +1540,7 @@ public function testRouteToWithSubdomainMismatch(): void
     public function testRouteToWithSubdomainNot(): void
     {
         $_SERVER['HTTP_HOST'] = 'example.com';
-        Services::request()->setMethod('GET');
+        Services::request()->setMethod(Method::GET);
 
         $routes = $this->getCollector();
 
@@ -1551,7 +1552,7 @@ public function testRouteToWithSubdomainNot(): void
     public function testRouteToWithGenericSubdomainMatch(): void
     {
         $_SERVER['HTTP_HOST'] = 'doc.example.com';
-        Services::request()->setMethod('GET');
+        Services::request()->setMethod(Method::GET);
 
         $routes = $this->getCollector();
 
@@ -1563,7 +1564,7 @@ public function testRouteToWithGenericSubdomainMatch(): void
     public function testRouteToWithGenericSubdomainMismatch(): void
     {
         $_SERVER['HTTP_HOST'] = 'dev.example.com';
-        Services::request()->setMethod('GET');
+        Services::request()->setMethod(Method::GET);
 
         $routes = $this->getCollector();
 
@@ -1575,7 +1576,7 @@ public function testRouteToWithGenericSubdomainMismatch(): void
     public function testRouteToWithGenericSubdomainNot(): void
     {
         $_SERVER['HTTP_HOST'] = 'example.com';
-        Services::request()->setMethod('GET');
+        Services::request()->setMethod(Method::GET);
 
         $routes = $this->getCollector();
 
@@ -1587,7 +1588,7 @@ public function testRouteToWithGenericSubdomainNot(): void
     public function testRouteToWithoutSubdomainMatch(): void
     {
         $_SERVER['HTTP_HOST'] = 'doc.example.com';
-        Services::request()->setMethod('GET');
+        Services::request()->setMethod(Method::GET);
 
         $routes = $this->getCollector();
 
@@ -1599,7 +1600,7 @@ public function testRouteToWithoutSubdomainMatch(): void
     public function testRouteToWithoutSubdomainMismatch(): void
     {
         $_SERVER['HTTP_HOST'] = 'dev.example.com';
-        Services::request()->setMethod('GET');
+        Services::request()->setMethod(Method::GET);
 
         $routes = $this->getCollector();
 
@@ -1611,7 +1612,7 @@ public function testRouteToWithoutSubdomainMismatch(): void
     public function testRouteToWithoutSubdomainNot(): void
     {
         $_SERVER['HTTP_HOST'] = 'example.com';
-        Services::request()->setMethod('GET');
+        Services::request()->setMethod(Method::GET);
 
         $routes = $this->getCollector();
 
@@ -1628,7 +1629,7 @@ public function testRouteToWithoutSubdomainNot(): void
     public function testRouteOverwritingDifferentSubdomains(): void
     {
         $_SERVER['HTTP_HOST'] = 'doc.domain.com';
-        Services::request()->setMethod('GET');
+        Services::request()->setMethod(Method::GET);
 
         $routes = $this->getCollector();
         $router = new Router($routes, Services::request());
@@ -1649,7 +1650,7 @@ public function testRouteOverwritingDifferentSubdomains(): void
     public function testRouteOverwritingTwoRules(): void
     {
         $_SERVER['HTTP_HOST'] = 'doc.domain.com';
-        Services::request()->setMethod('GET');
+        Services::request()->setMethod(Method::GET);
 
         $routes = $this->getCollector();
         $router = new Router($routes, Services::request());
@@ -1670,7 +1671,7 @@ public function testRouteOverwritingTwoRules(): void
     public function testRouteOverwritingTwoRulesLastApplies(): void
     {
         $_SERVER['HTTP_HOST'] = 'doc.domain.com';
-        Services::request()->setMethod('GET');
+        Services::request()->setMethod(Method::GET);
 
         $routes = $this->getCollector();
         $router = new Router($routes, Services::request());
@@ -1690,7 +1691,7 @@ public function testRouteOverwritingTwoRulesLastApplies(): void
     public function testRouteOverwritingMatchingSubdomain(): void
     {
         $_SERVER['HTTP_HOST'] = 'doc.domain.com';
-        Services::request()->setMethod('GET');
+        Services::request()->setMethod(Method::GET);
 
         $routes = $this->getCollector();
         $router = new Router($routes, Services::request());
@@ -1710,7 +1711,7 @@ public function testRouteOverwritingMatchingSubdomain(): void
     public function testRouteOverwritingMatchingHost(): void
     {
         $_SERVER['HTTP_HOST'] = 'doc.domain.com';
-        Services::request()->setMethod('GET');
+        Services::request()->setMethod(Method::GET);
 
         $routes = $this->getCollector();
         $router = new Router($routes, Services::request());
@@ -1734,7 +1735,7 @@ public function testRouteOverwritingMatchingHost(): void
      */
     public function testRouteDefaultNameSpace(): void
     {
-        Services::request()->setMethod('GET');
+        Services::request()->setMethod(Method::GET);
         $routes = $this->getCollector();
         $router = new Router($routes, Services::request());
 
@@ -1748,7 +1749,7 @@ public function testRouteDefaultNameSpace(): void
 
     public function testZeroAsURIPath(): void
     {
-        Services::request()->setMethod('GET');
+        Services::request()->setMethod(Method::GET);
         $routes = $this->getCollector();
         $router = new Router($routes, Services::request());
 
@@ -1796,7 +1797,7 @@ public function testAutoRoutesControllerNameReturnsFQCN($namespace): void
      */
     public function testRoutesControllerNameReturnsFQCN($namespace): void
     {
-        Services::request()->setMethod('GET');
+        Services::request()->setMethod(Method::GET);
         $routes = $this->getCollector();
         $routes->setAutoRoute(false);
         $routes->setDefaultNamespace($namespace);
diff --git a/tests/system/Router/RouterTest.php b/tests/system/Router/RouterTest.php
index 5312bb71234e..130b0a2e437c 100644
--- a/tests/system/Router/RouterTest.php
+++ b/tests/system/Router/RouterTest.php
@@ -15,6 +15,7 @@
 use CodeIgniter\Exceptions\PageNotFoundException;
 use CodeIgniter\HTTP\Exceptions\RedirectException;
 use CodeIgniter\HTTP\IncomingRequest;
+use CodeIgniter\HTTP\Method;
 use CodeIgniter\Router\Exceptions\RouterException;
 use CodeIgniter\Test\CIUnitTestCase;
 use Config\Modules;
@@ -65,7 +66,7 @@ protected function setUp(): void
         $this->collection->map($routes);
 
         $this->request = Services::request();
-        $this->request->setMethod('GET');
+        $this->request->setMethod(Method::GET);
     }
 
     public function testEmptyURIMatchesRoot(): void