perf: change RouteCollection::$routes structure

Author: kenjis

system/Router/RouteCollection.php

@@ -110,13 +110,16 @@ class RouteCollection implements RouteCollectionInterface
      *
      * [
      *     verb => [
-     *         routeName => [
-     *             'route' => [
-     *                 routeKey(regex) => handler,
-     *                 or routeKey(regex)(from) => [routeKey(regex)(to) => handler], // redirect
-     *             ],
+     *         routeKey(regex) => [
+     *             'name'     => routeName
+     *             'handler'  => handler,
+     *         ],
+     *         // redirect route
+     *         or routeKey(regex)(from) => [
+     *             'name'     => routeName
+     *             'handler'  => [routeKey(regex)(to) => handler],
      *             'redirect' => statusCode,
-     *         ]
+     *         ],
      *     ],
      * ]
      */
@@ -133,6 +136,30 @@ class RouteCollection implements RouteCollectionInterface
         'cli'     => [],
     ];
 
+    /**
+     * Array of routes names
+     *
+     * @var array
+     *
+     * [
+     *     verb => [
+     *         routeName => routeKey(regex)
+     *     ],
+     * ]
+     */
+    protected $routesNames = [
+        '*'       => [],
+        'options' => [],
+        'get'     => [],
+        'head'    => [],
+        'post'    => [],
+        'put'     => [],
+        'delete'  => [],
+        'trace'   => [],
+        'connect' => [],
+        'cli'     => [],
+    ];
+
     /**
      * Array of routes options
      *
@@ -504,9 +531,8 @@ public function getRoutes(?string $verb = null): array
             // before any of the generic, "add" routes.
             $collection = $this->routes[$verb] + ($this->routes['*'] ?? []);
 
-            foreach ($collection as $r) {
-                $key          = key($r['route']);
-                $routes[$key] = $r['route'][$key];
+            foreach ($collection as $routeKey => $r) {
+                $routes[$routeKey] = $r['handler'];
             }
         }
 
@@ -603,11 +629,16 @@ public function add(string $from, $to, ?array $options = null): RouteCollectionI
     public function addRedirect(string $from, string $to, int $status = 302)
     {
         // Use the named route's pattern if this is a named route.
-        if (array_key_exists($to, $this->routes['*'])) {
-            $redirectTo = $this->routes['*'][$to]['route'];
-        } elseif (array_key_exists($to, $this->routes['get'])) {
-            $redirectTo = $this->routes['get'][$to]['route'];
+        if (array_key_exists($to, $this->routesNames['*'])) {
+            $routeName  = $to;
+            $routeKey   = $this->routesNames['*'][$routeName];
+            $redirectTo = [$routeKey => $this->routes['*'][$routeKey]['handler']];
+        } elseif (array_key_exists($to, $this->routesNames['get'])) {
+            $routeName  = $to;
+            $routeKey   = $this->routesNames['get'][$routeName];
+            $redirectTo = [$routeKey => $this->routes['get'][$routeKey]['handler']];
         } else {
+            // The named route is not found.
             $redirectTo = $to;
         }
 
@@ -623,11 +654,16 @@ public function addRedirect(string $from, string $to, int $status = 302)
      */
     public function isRedirect(string $routeKey): bool
     {
-        foreach ($this->routes['*'] as $name => $route) {
-            // Named route?
-            if ($name === $routeKey || key($route['route']) === $routeKey) {
-                return isset($route['redirect']) && is_numeric($route['redirect']);
-            }
+        if (isset($this->routes['*'][$routeKey]['redirect'])) {
+            return true;
+        }
+
+        // This logic is not used. Should be deprecated?
+        $routeName = $this->routes['*'][$routeKey]['name'] ?? null;
+        if ($routeName === $routeKey) {
+            $routeKey = $this->routesNames['*'][$routeName];
+
+            return isset($this->routes['*'][$routeKey]['redirect']);
         }
 
         return false;
@@ -640,11 +676,16 @@ public function isRedirect(string $routeKey): bool
      */
     public function getRedirectCode(string $routeKey): int
     {
-        foreach ($this->routes['*'] as $name => $route) {
-            // Named route?
-            if ($name === $routeKey || key($route['route']) === $routeKey) {
-                return $route['redirect'] ?? 0;
-            }
+        if (isset($this->routes['*'][$routeKey]['redirect'])) {
+            return $this->routes['*'][$routeKey]['redirect'];
+        }
+
+        // This logic is not used. Should be deprecated?
+        $routeName = $this->routes['*'][$routeKey]['name'] ?? null;
+        if ($routeName === $routeKey) {
+            $routeKey = $this->routesNames['*'][$routeName];
+
+            return $this->routes['*'][$routeKey]['redirect'];
         }
 
         return 0;
@@ -1059,9 +1100,11 @@ public function environment(string $env, Closure $callback): RouteCollectionInte
     public function reverseRoute(string $search, ...$params)
     {
         // Named routes get higher priority.
-        foreach ($this->routes as $collection) {
+        foreach ($this->routesNames as $collection) {
             if (array_key_exists($search, $collection)) {
-                return $this->buildReverseRoute(key($collection[$search]['route']), $params);
+                $routeKey = $collection[$search];
+
+                return $this->buildReverseRoute($routeKey, $params);
             }
         }
 
@@ -1077,9 +1120,8 @@ public function reverseRoute(string $search, ...$params)
         // If it's not a named route, then loop over
         // all routes to find a match.
         foreach ($this->routes as $collection) {
-            foreach ($collection as $route) {
-                $routeKey = key($route['route']);
-                $to       = $route['route'][$routeKey];
+            foreach ($collection as $routeKey => $route) {
+                $to = $route['handler'];
 
                 // ignore closures
                 if (! is_string($to)) {
@@ -1305,7 +1347,7 @@ protected function create(string $verb, string $from, $to, ?array $options = nul
         }
 
         // When redirecting to named route, $to is an array like `['zombies' => '\Zombies::index']`.
-        if (is_array($to) && count($to) === 2) {
+        if (is_array($to) && isset($to[0])) {
             $to = $this->processArrayCallableSyntax($from, $to);
         }
 
@@ -1385,20 +1427,21 @@ protected function create(string $verb, string $from, $to, ?array $options = nul
         // routes should always be the "source of truth".
         // this works only because discovered routes are added just prior
         // to attempting to route the request.
-        $fromExists = dot_array_search('*.route.' . $routeKey, $this->routes[$verb] ?? []) !== null;
-        if ((isset($this->routes[$verb][$name]) || $fromExists) && ! $overwrite) {
+        $fromExists = isset($this->routes[$verb][$routeKey]);
+        if ((isset($this->routesNames[$verb][$name]) || $fromExists) && ! $overwrite) {
             return;
         }
 
-        $this->routes[$verb][$name] = [
-            'route' => [$routeKey => $to],
+        $this->routes[$verb][$routeKey] = [
+            'name'    => $name,
+            'handler' => $to,
         ];
-
         $this->routesOptions[$verb][$routeKey] = $options;
+        $this->routesNames[$verb][$name]       = $routeKey;
 
         // Is this a redirect?
         if (isset($options['redirect']) && is_numeric($options['redirect'])) {
-            $this->routes['*'][$name]['redirect'] = $options['redirect'];
+            $this->routes['*'][$routeKey]['redirect'] = $options['redirect'];
         }
     }
 
@@ -1539,12 +1582,15 @@ private function determineCurrentSubdomain()
      */
     public function resetRoutes()
     {
-        $this->routes = ['*' => []];
+        $this->routes = $this->routesNames = ['*' => []];
 
         foreach ($this->defaultHTTPMethods as $verb) {
-            $this->routes[$verb] = [];
+            $this->routes[$verb]      = [];
+            $this->routesNames[$verb] = [];
         }
 
+        $this->routesOptions = [];
+
         $this->prioritizeDetected = false;
         $this->didDiscover        = false;
     }
@@ -1610,9 +1656,8 @@ public function getRegisteredControllers(?string $verb = '*'): array
 
         if ($verb === '*') {
             foreach ($this->defaultHTTPMethods as $tmpVerb) {
-                foreach ($this->routes[$tmpVerb] as $route) {
-                    $routeKey   = key($route['route']);
-                    $controller = $this->getControllerName($route['route'][$routeKey]);
+                foreach ($this->routes[$tmpVerb] as $routeKey => $route) {
+                    $controller = $this->getControllerName($route['handler']);
                     if ($controller !== null) {
                         $controllers[] = $controller;
                     }