Merge pull request #5918 from iRedds/routecollection-getroutes

Optimizing the RouteCollection::getRoutes() method
codeigniter4 · Apr 23, 2022 · ec0f3fa · ec0f3fa
2 parents 73c4e25 + 2c77ee5
commit ec0f3fa
Showing 1 changed file with 2 additions and 6 deletions.
diff --git a/system/Router/RouteCollection.php b/system/Router/RouteCollection.php
@@ -452,16 +452,12 @@ public function getRoutes(?string $verb = null): array
         // we might need to do.
         $this->discoverRoutes();
 
-        $routes     = [];
-        $collection = [];
+        $routes = [];
 
         if (isset($this->routes[$verb])) {
             // Keep current verb's routes at the beginning, so they're matched
             // before any of the generic, "add" routes.
-            if (isset($this->routes['*'])) {
-                $extraRules = array_diff_key($this->routes['*'], $this->routes[$verb]);
-                $collection = array_merge($this->routes[$verb], $extraRules);
-            }
+            $collection = $this->routes[$verb] + ($this->routes['*'] ?? []);
 
             foreach ($collection as $r) {
                 $key          = key($r['route']);