From a84be72313a17241820dc9ea9c01bfa5f2b3cb91 Mon Sep 17 00:00:00 2001 From: Bogdan Date: Tue, 14 Jul 2026 20:37:22 +0200 Subject: [PATCH 1/3] refactor: simplify handleRequest method in CodeIgniter --- system/CodeIgniter.php | 25 ++++++++++++------------ tests/system/CodeIgniterTest.php | 33 ++++++++++++++++++++++++++++++++ 2 files changed, 45 insertions(+), 13 deletions(-) diff --git a/system/CodeIgniter.php b/system/CodeIgniter.php index a291809938e5..61f5faeab726 100644 --- a/system/CodeIgniter.php +++ b/system/CodeIgniter.php @@ -35,6 +35,7 @@ use Config\Cache; use Config\Feature; use Config\Kint as KintConfig; +use Config\Routing; use Config\Services; use Exception; use Kint; @@ -475,8 +476,7 @@ protected function handleRequest(?RouteCollectionInterface $routes, Cache $cache if ($routeFilters !== null) { $filters->enableFilters($routeFilters, 'before'); - $oldFilterOrder = config(Feature::class)->oldFilterOrder ?? false; // @phpstan-ignore nullCoalesce.property - if (! $oldFilterOrder) { + if (! config(Feature::class)->oldFilterOrder) { $routeFilters = array_reverse($routeFilters); } @@ -501,13 +501,13 @@ protected function handleRequest(?RouteCollectionInterface $routes, Cache $cache } $returned = $this->startController(); + $gathered = false; // If startController returned a Response (from an attribute or Closure), use it if ($returned instanceof ResponseInterface) { $this->gatherOutput($cacheConfig, $returned); - } - // Closure controller has run in startController(). - elseif (! is_callable($this->controller)) { + $gathered = true; + } elseif (! $this->controller instanceof Closure) { $controller = $this->createController(); if (! method_exists($controller, '_remap') && ! is_callable([$controller, $this->method], false)) { @@ -526,7 +526,9 @@ protected function handleRequest(?RouteCollectionInterface $routes, Cache $cache // If $returned is a string, then the controller output something, // probably a view, instead of echoing it directly. Send it along // so it can be used with the output. - $this->gatherOutput($cacheConfig, $returned); + if (! $gathered) { + $this->gatherOutput($cacheConfig, $returned); + } if ($this->enableFilters) { /** @var Filters $filters */ @@ -543,7 +545,7 @@ protected function handleRequest(?RouteCollectionInterface $routes, Cache $cache } } - // Execute controller attributes' after() methods AFTER framework filters + // Execute controller attributes' after() methods AFTER framework filters. if ((config('Routing')->useControllerAttributes ?? true) === true) { // @phpstan-ignore nullCoalesce.property $this->benchmark->start('route_attributes_after'); $this->response = $this->router->executeAfterAttributes($this->request, $this->response); @@ -560,8 +562,6 @@ protected function handleRequest(?RouteCollectionInterface $routes, Cache $cache $this->storePreviousURL(current_url(true)); } - unset($uri); - return $this->response; } @@ -889,7 +889,7 @@ protected function startController() $this->benchmark->start('controller_constructor'); // Is it routed to a Closure? - if (is_object($this->controller) && ($this->controller::class === 'Closure')) { + if ($this->controller instanceof Closure) { $controller = $this->controller; return $controller(...$this->router->params()); @@ -909,8 +909,7 @@ protected function startController() } // Execute route attributes' before() methods - // This runs after routing/validation but BEFORE expensive controller instantiation - if ((config('Routing')->useControllerAttributes ?? true) === true) { // @phpstan-ignore nullCoalesce.property + if ((config(Routing::class)->useControllerAttributes ?? true) === true) { // @phpstan-ignore nullCoalesce.property $this->benchmark->start('route_attributes_before'); $attributeResponse = $this->router->executeBeforeAttributes($this->request); $this->benchmark->stop('route_attributes_before'); @@ -1082,7 +1081,7 @@ public function storePreviousURL($uri) return; } // Ignore AJAX requests - if (method_exists($this->request, 'isAJAX') && $this->request->isAJAX()) { + if ($this->request instanceof IncomingRequest && $this->request->isAJAX()) { return; } diff --git a/tests/system/CodeIgniterTest.php b/tests/system/CodeIgniterTest.php index e5d371bfb941..a48cfa387cf7 100644 --- a/tests/system/CodeIgniterTest.php +++ b/tests/system/CodeIgniterTest.php @@ -1309,4 +1309,37 @@ public function testResetForWorkerMode(): void $this->assertSame($csp->getStyleNonce(), RichRenderer::$css_nonce); $this->assertTrue(RichRenderer::$needs_pre_render); } + + public function testGatherOutputCalledOnceWhenControllerReturnsResponse(): void + { + $this->resetServices(); + + $superglobals = service('superglobals'); + $superglobals->setServer('argv', ['index.php', 'pages/test']); + $superglobals->setServer('argc', 2); + $superglobals->setServer('REQUEST_URI', '/pages/test'); + $superglobals->setServer('SCRIPT_NAME', '/index.php'); + + $routes = service('routes'); + $routes->add('pages/test', static fn () => service('response')->setBody('Test Body')); + + $config = new App(); + $codeigniter = new class ($config) extends MockCodeIgniter { + public int $gatherOutputCalls = 0; + + protected function gatherOutput(?Cache $cacheConfig = null, $returned = null): void + { + $this->gatherOutputCalls++; + parent::gatherOutput($cacheConfig, $returned); + } + }; + + ob_start(); + $codeigniter->run($routes); + ob_end_clean(); + + // When startController() returns a ResponseInterface (e.g. from a closure route), + // gatherOutput() must be called exactly once — not twice as in the original bug. + $this->assertSame(1, $codeigniter->gatherOutputCalls); + } } From 7cbb3f5a678830067d4106913be05ac705533e0c Mon Sep 17 00:00:00 2001 From: Bogdan Date: Wed, 15 Jul 2026 19:08:58 +0200 Subject: [PATCH 2/3] refactor: CodeIgniter class optimizations and cleanup --- system/CodeIgniter.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/system/CodeIgniter.php b/system/CodeIgniter.php index 61f5faeab726..3c76a3ed0dde 100644 --- a/system/CodeIgniter.php +++ b/system/CodeIgniter.php @@ -909,7 +909,7 @@ protected function startController() } // Execute route attributes' before() methods - if ((config(Routing::class)->useControllerAttributes ?? true) === true) { // @phpstan-ignore nullCoalesce.property + if ((config('Routing')->useControllerAttributes ?? true)) { // @phpstan-ignore nullCoalesce.property $this->benchmark->start('route_attributes_before'); $attributeResponse = $this->router->executeBeforeAttributes($this->request); $this->benchmark->stop('route_attributes_before'); From 466ee3fa0c29a2c28666981b332dc179dd18b187 Mon Sep 17 00:00:00 2001 From: Bogdan Date: Wed, 15 Jul 2026 19:11:53 +0200 Subject: [PATCH 3/3] fix: restore strict boolean check for useControllerAttributes --- system/CodeIgniter.php | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/system/CodeIgniter.php b/system/CodeIgniter.php index 3c76a3ed0dde..88c44bf82822 100644 --- a/system/CodeIgniter.php +++ b/system/CodeIgniter.php @@ -35,7 +35,6 @@ use Config\Cache; use Config\Feature; use Config\Kint as KintConfig; -use Config\Routing; use Config\Services; use Exception; use Kint; @@ -909,7 +908,7 @@ protected function startController() } // Execute route attributes' before() methods - if ((config('Routing')->useControllerAttributes ?? true)) { // @phpstan-ignore nullCoalesce.property + if ((config('Routing')->useControllerAttributes ?? true) === true) { // @phpstan-ignore nullCoalesce.property $this->benchmark->start('route_attributes_before'); $attributeResponse = $this->router->executeBeforeAttributes($this->request); $this->benchmark->stop('route_attributes_before');