Merge pull request #7574 from kenjis/fix-AutoRouterImproved-4.4

fix: [4.4] AutoRouterImproved merge conflicts

Author: kenjis

system/Router/AutoRouterImproved.php

@@ -254,9 +254,9 @@ public function getRoute(string $uri, string $httpVerb): array
                     'Cannot access the default method "' . $this->method . '" with the method name URI path.'
                 );
             }
-        } elseif (method_exists($this->controller, $this->defaultMethod)) {
+        } elseif (method_exists($this->controller, $defaultMethod)) {
             // The default method is found.
-            $this->method = $this->defaultMethod;
+            $this->method = $defaultMethod;
         } else {
             // No method is found.
             throw PageNotFoundException::forControllerNotFound($this->controller, $method);

tests/system/Router/AutoRouterImprovedTest.php

@@ -80,7 +80,7 @@ public function testAutoRouteFindsModuleDefaultControllerAndMethodGet()
         $router = $this->createNewAutoRouter('get', 'App/Controllers');
 
         [$directory, $controller, $method, $params]
-            = $router->getRoute('test');
+            = $router->getRoute('test', 'get');
 
         $this->assertNull($directory);
         $this->assertSame('\\' . Index::class, $controller);
@@ -172,7 +172,7 @@ public function testAutoRouteFindsControllerWithSubSubfolder()
         $router = $this->createNewAutoRouter();
 
         [$directory, $controller, $method, $params]
-            = $router->getRoute('subfolder/sub/mycontroller/somemethod');
+            = $router->getRoute('subfolder/sub/mycontroller/somemethod', 'get');
 
         $this->assertSame('Subfolder/Sub/', $directory);
         $this->assertSame('\\' . \CodeIgniter\Router\Controllers\Subfolder\Sub\Mycontroller::class, $controller);
@@ -240,7 +240,7 @@ public function testAutoRouteFallbackToDefaultMethod()
         $router = $this->createNewAutoRouter();
 
         [$directory, $controller, $method, $params]
-            = $router->getRoute('index/15');
+            = $router->getRoute('index/15', 'get');
 
         $this->assertNull($directory);
         $this->assertSame('\\' . Index::class, $controller);
@@ -253,7 +253,7 @@ public function testAutoRouteFallbackToDefaultControllerOneParam()
         $router = $this->createNewAutoRouter();
 
         [$directory, $controller, $method, $params]
-            = $router->getRoute('subfolder/15');
+            = $router->getRoute('subfolder/15', 'get');
 
         $this->assertSame('Subfolder/', $directory);
         $this->assertSame('\\' . \CodeIgniter\Router\Controllers\Subfolder\Home::class, $controller);
@@ -266,7 +266,7 @@ public function testAutoRouteFallbackToDefaultControllerTwoParams()
         $router = $this->createNewAutoRouter();
 
         [$directory, $controller, $method, $params]
-            = $router->getRoute('subfolder/15/20');
+            = $router->getRoute('subfolder/15/20', 'get');
 
         $this->assertSame('Subfolder/', $directory);
         $this->assertSame('\\' . \CodeIgniter\Router\Controllers\Subfolder\Home::class, $controller);
@@ -279,7 +279,7 @@ public function testAutoRouteFallbackToDefaultControllerNoParams()
         $router = $this->createNewAutoRouter();
 
         [$directory, $controller, $method, $params]
-            = $router->getRoute('subfolder');
+            = $router->getRoute('subfolder', 'get');
 
         $this->assertSame('Subfolder/', $directory);
         $this->assertSame('\\' . \CodeIgniter\Router\Controllers\Subfolder\Home::class, $controller);