refactor: use DefinedRouteCollector in DebugBar

codeigniter4 · Jul 4, 2023 · 06faf73 · 06faf73
1 parent d1224cc
commit 06faf73
Showing 1 changed file with 13 additions and 29 deletions.
diff --git a/system/Debug/Toolbar/Collectors/Routes.php b/system/Debug/Toolbar/Collectors/Routes.php
@@ -11,6 +11,7 @@
 
 namespace CodeIgniter\Debug\Toolbar\Collectors;
 
+use CodeIgniter\Router\DefinedRouteCollector;
 use Config\Services;
 use ReflectionException;
 use ReflectionFunction;
@@ -55,9 +56,6 @@ public function display(): array
         $rawRoutes = Services::routes(true);
         $router    = Services::router(null, null, true);
 
-        // Matched Route
-        $route = $router->getMatchedRoute();
-
         // Get our parameters
         // Closure routes
         if (is_callable($router->controllerName())) {
@@ -100,32 +98,18 @@ public function display(): array
         ];
 
         // Defined Routes
-        $routes  = [];
-        $methods = [
-            'get',
-            'head',
-            'post',
-            'patch',
-            'put',
-            'delete',
-            'options',
-            'trace',
-            'connect',
-            'cli',
-        ];
-
-        foreach ($methods as $method) {
-            $raw = $rawRoutes->getRoutes($method);
-
-            foreach ($raw as $route => $handler) {
-                // filter for strings, as callbacks aren't displayable
-                if (is_string($handler)) {
-                    $routes[] = [
-                        'method'  => strtoupper($method),
-                        'route'   => $route,
-                        'handler' => $handler,
-                    ];
-                }
+        $routes = [];
+
+        $definedRouteCollector = new DefinedRouteCollector($rawRoutes);
+
+        foreach ($definedRouteCollector->collect() as $route) {
+            // filter for strings, as callbacks aren't displayable
+            if ($route['handler'] !== '(Closure)') {
+                $routes[] = [
+                    'method'  => strtoupper($route['method']),
+                    'route'   => $route['route'],
+                    'handler' => $route['handler'],
+                ];
             }
         }