fix: support variadic FormRequest auto-routes and closure benchmark cleanup

Author: michalsn

system/CodeIgniter.php

@@ -380,7 +380,8 @@ protected function handleRequest(?RouteCollectionInterface $routes, ?Cache $cach
         if ($returned instanceof ResponseInterface) {
             $this->gatherOutput($returned);
         }
-        // Closure controller has run in startController().
+        // Closure controller has run in startController() - benchmarks were
+        // stopped there as well.
         elseif (! is_callable($this->controller)) {
             $controller = $this->createController();
 
@@ -392,9 +393,6 @@ protected function handleRequest(?RouteCollectionInterface $routes, ?Cache $cach
             Events::trigger('post_controller_constructor');
 
             $returned = $this->runController($controller);
-        } else {
-            $this->benchmark->stop('controller_constructor');
-            $this->benchmark->stop('controller');
         }
 
         // If $returned is a string, then the controller output something,
@@ -589,9 +587,15 @@ protected function startController()
         // Is it routed to a Closure?
         if (is_object($this->controller) && ($this->controller::class === 'Closure')) {
             $controller = $this->controller;
-            $resolved   = $this->resolveCallableParams(new ReflectionFunction($controller), $this->router->params());
 
-            return $controller(...$resolved);
+            try {
+                $resolved = $this->resolveCallableParams(new ReflectionFunction($controller), $this->router->params());
+
+                return $controller(...$resolved);
+            } finally {
+                $this->benchmark->stop('controller_constructor');
+                $this->benchmark->stop('controller');
+            }
         }
 
         // No controller specified - we don't know what to do now.
@@ -668,18 +672,20 @@ protected function runController($class)
 
         // The controller method param types may not be string.
         // So cannot set `declare(strict_types=1)` in this file.
-        if (method_exists($class, '_remap')) {
-            // FormRequest injection is not supported for _remap() because its
-            // signature is fixed to ($method, ...$params). Instantiate the
-            // FormRequest manually inside _remap() if needed.
-            $output = $class->_remap($this->method, ...$params);
-        } else {
-            $resolved = $this->resolveMethodParams($class, $this->method, $params);
-            $output   = $class->{$this->method}(...$resolved);
+        try {
+            if (method_exists($class, '_remap')) {
+                // FormRequest injection is not supported for _remap() because its
+                // signature is fixed to ($method, ...$params). Instantiate the
+                // FormRequest manually inside _remap() if needed.
+                $output = $class->_remap($this->method, ...$params);
+            } else {
+                $resolved = $this->resolveMethodParams($class, $this->method, $params);
+                $output   = $class->{$this->method}(...$resolved);
+            }
+        } finally {
+            $this->benchmark->stop('controller');
         }
 
-        $this->benchmark->stop('controller');
-
         return $output;
     }
 

system/Router/AutoRouterImproved.php

@@ -445,12 +445,20 @@ private function checkParameters(): void
 
         // FormRequest parameters are injected by the framework and do not
         // consume URI segments, so exclude them from the count.
-        $uriParamCount = count(array_filter(
+        $nonFormRequestParams = array_values(array_filter(
             $refParams,
             static fn ($p): bool => FormRequest::getFormRequestClass($p) === null,
         ));
 
-        if ($uriParamCount < count($this->params)) {
+        // A variadic parameter absorbs any number of trailing URI segments,
+        // so there is no upper bound to enforce.
+        foreach ($nonFormRequestParams as $p) {
+            if ($p->isVariadic()) {
+                return;
+            }
+        }
+
+        if (count($nonFormRequestParams) < count($this->params)) {
             throw new PageNotFoundException(
                 'The param count in the URI are greater than the controller method params.'
                 . ' Handler:' . $this->controller . '::' . $this->method

tests/system/Router/AutoRouterImprovedTest.php

@@ -184,6 +184,30 @@ public function testUriParamCountExceedsNonFormRequestParams(): void
         $router->getRoute('mycontroller/formmethodwithparam/42/extra', Method::GET);
     }
 
+    public function testVariadicParamAlongsideFormRequestAcceptsMultipleUriSegments(): void
+    {
+        $router = $this->createNewAutoRouter();
+
+        [$directory, $controller, $method, $params]
+            = $router->getRoute('mycontroller/formmethod-variadic/php/ci4/tags', Method::GET);
+
+        $this->assertSame('\\' . Mycontroller::class, $controller);
+        $this->assertSame('getFormmethodVariadic', $method);
+        $this->assertSame(['php', 'ci4', 'tags'], $params);
+    }
+
+    public function testVariadicParamAlongsideFormRequestAcceptsZeroUriSegments(): void
+    {
+        $router = $this->createNewAutoRouter();
+
+        [$directory, $controller, $method, $params]
+            = $router->getRoute('mycontroller/formmethod-variadic', Method::GET);
+
+        $this->assertSame('\\' . Mycontroller::class, $controller);
+        $this->assertSame('getFormmethodVariadic', $method);
+        $this->assertSame([], $params);
+    }
+
     public function testAutoRouteFindsControllerWithFile(): void
     {
         $router = $this->createNewAutoRouter();

tests/system/Router/Controllers/Mycontroller.php

@@ -33,4 +33,8 @@ public function getFormmethod(MyFormRequest $request): void
     public function getFormmethodWithParam(string $id, MyFormRequest $request): void
     {
     }
+
+    public function getFormmethodVariadic(MyFormRequest $request, string ...$tags): void
+    {
+    }
 }