feat: fallback to default method

Author: kenjis

system/Router/AutoRouterImproved.php

@@ -12,6 +12,7 @@
 namespace CodeIgniter\Router;
 
 use CodeIgniter\Exceptions\PageNotFoundException;
+use CodeIgniter\Router\Exceptions\MethodNotFoundException;
 use ReflectionClass;
 use ReflectionException;
 
@@ -177,8 +178,21 @@ public function getRoute(string $uri): array
         // Check parameter count
         try {
             $this->checkParameters($uri);
-        } catch (ReflectionException $e) {
-            throw PageNotFoundException::forControllerNotFound($this->controller, $this->method);
+        } catch (MethodNotFoundException $e) {
+            // Fallback to the default method
+            if (! isset($methodSegment)) {
+                throw PageNotFoundException::forControllerNotFound($this->controller, $this->method);
+            }
+
+            array_unshift($this->params, $methodSegment);
+            $method       = $this->method;
+            $this->method = $this->defaultMethod;
+
+            try {
+                $this->checkParameters($uri);
+            } catch (MethodNotFoundException $e) {
+                throw PageNotFoundException::forControllerNotFound($this->controller, $method);
+            }
         }
 
         return [$this->directory, $this->controller, $this->method, $this->params];
@@ -201,12 +215,21 @@ private function protectDefinedRoutes(): void
 
     private function checkParameters(string $uri): void
     {
-        $refClass  = new ReflectionClass($this->controller);
-        $refMethod = $refClass->getMethod($this->method);
-        $refParams = $refMethod->getParameters();
+        try {
+            $refClass = new ReflectionClass($this->controller);
+        } catch (ReflectionException $e) {
+            throw PageNotFoundException::forControllerNotFound($this->controller, $this->method);
+        }
+
+        try {
+            $refMethod = $refClass->getMethod($this->method);
+            $refParams = $refMethod->getParameters();
+        } catch (ReflectionException $e) {
+            throw new MethodNotFoundException();
+        }
 
         if (! $refMethod->isPublic()) {
-            throw PageNotFoundException::forMethodNotFound($this->method);
+            throw new MethodNotFoundException();
         }
 
         if (count($refParams) < count($this->params)) {

system/Router/Exceptions/MethodNotFoundException.php

@@ -0,0 +1,21 @@
+<?php
+
+/**
+ * This file is part of CodeIgniter 4 framework.
+ *
+ * (c) CodeIgniter Foundation <[email protected]>
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+namespace CodeIgniter\Router\Exceptions;
+
+use RuntimeException;
+
+/**
+ * @internal
+ */
+final class MethodNotFoundException extends RuntimeException
+{
+}

tests/system/Router/AutoRouterImprovedTest.php

@@ -199,6 +199,19 @@ public function testAutoRouteFindsDefaultDashFolder()
         $this->assertSame([], $params);
     }
 
+    public function testAutoRouteFallbackToDefaultMethod()
+    {
+        $router = $this->createNewAutoRouter();
+
+        [$directory, $controller, $method, $params]
+            = $router->getRoute('index/15');
+
+        $this->assertNull($directory);
+        $this->assertSame('\\' . Index::class, $controller);
+        $this->assertSame('getIndex', $method);
+        $this->assertSame(['15'], $params);
+    }
+
     public function testAutoRouteRejectsSingleDot()
     {
         $this->expectException(PageNotFoundException::class);

tests/system/Router/Controllers/Index.php

@@ -15,7 +15,7 @@
 
 class Index extends Controller
 {
-    public function getIndex()
+    public function getIndex($p1 = '')
     {
     }