Merge pull request #8957 from kenjis/fix-RouteCollection-TypeError

fix: TypeError in DefinedRouteCollector::collect()
codeigniter4 · Jun 17, 2024 · 7aced76 · 7aced76
2 parents 3e2aefb + 4e35d38
commit 7aced76
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 0 deletions.
diff --git a/system/Router/DefinedRouteCollector.php b/system/Router/DefinedRouteCollector.php
@@ -38,6 +38,10 @@ public function collect(): Generator
             $routes = $this->routeCollection->getRoutes($method);
 
             foreach ($routes as $route => $handler) {
+                // The route key should be a string, but it is stored as an array key,
+                // it might be an integer.
+                $route = (string) $route;
+
                 if (is_string($handler) || $handler instanceof Closure) {
                     if ($handler instanceof Closure) {
                         $view = $this->routeCollection->getRoutesOptions($route, $method)['view'] ?? false;

diff --git a/tests/system/Router/DefinedRouteCollectorTest.php b/tests/system/Router/DefinedRouteCollectorTest.php
@@ -50,8 +50,10 @@ public function testCollect(): void
     {
         $routes = $this->createRouteCollection();
         $routes->get('journals', 'Blogs');
+        $routes->get('100', 'Home::index');
         $routes->get('product/(:num)', 'Catalog::productLookupByID/$1');
         $routes->get('feed', static fn () => 'A Closure route.');
+        $routes->get('200', static fn () => 'A Closure route.');
         $routes->view('about', 'pages/about');
 
         $collector = new DefinedRouteCollector($routes);
@@ -69,6 +71,12 @@ public function testCollect(): void
                 'name'    => 'journals',
                 'handler' => '\App\Controllers\Blogs',
             ],
+            [
+                'method'  => 'GET',
+                'route'   => '100',
+                'name'    => '100',
+                'handler' => '\App\Controllers\Home::index',
+            ],
             [
                 'method'  => 'GET',
                 'route'   => 'product/([0-9]+)',
@@ -81,6 +89,12 @@ public function testCollect(): void
                 'name'    => 'feed',
                 'handler' => '(Closure)',
             ],
+            [
+                'method'  => 'GET',
+                'route'   => '200',
+                'name'    => '200',
+                'handler' => '(Closure)',
+            ],
             [
                 'method'  => 'GET',
                 'route'   => 'about',