main

6562680 · Aug 28, 2024 · cc9a2e7 · cc9a2e7
1 parent 0864922
commit cc9a2e7
Showing 1 changed file with 43 additions and 40 deletions.
diff --git a/src/Router.php b/src/Router.php
@@ -505,18 +505,16 @@ public function dispatch(
         }
 
         $dispatchHttpMethod = $contractHttpMethod;
-
         if ($this->dispatchForceMethod) {
             $dispatchHttpMethod = $this->dispatchForceMethod;
         }
 
-        $indexMatch = null;
+        $routeNodeCurrent = $this->routerNodeRoot;
 
         $middlewareIndex = [];
         $fallbackIndex = [];
 
-        $routeNodeCurrent = $this->routerNodeRoot;
-
+        $indexMatch = null;
         $pathCurrent = '';
 
         $slice = $contractRequestUri;
@@ -525,45 +523,32 @@ public function dispatch(
         while ( $slice ) {
             $part = array_shift($slice);
 
-            if (isset($routeNodeCurrent->routeIndexByPart[ $part ])) {
-                $indexMatch = $routeNodeCurrent->routeIndexByPart[ $part ];
-
-                break;
-            }
-
-            if (isset($routeNodeCurrent->childrenByPart[ $part ])) {
-                $routeNodeCurrent = $routeNodeCurrent->childrenByPart[ $part ];
-
-                $pathCurrent .= '/' . $routeNodeCurrent->part;
+            $isRoute = empty($slice);
 
-                if (isset($this->middlewareCollection->middlewareIndexByPath[ $pathCurrent ])) {
-                    $middlewareIndex += $this->middlewareCollection->middlewareIndexByPath[ $pathCurrent ];
-                }
+            if ($isRoute) {
+                if (isset($routeNodeCurrent->routeIndexByPart[ $part ])) {
+                    $indexMatch = $routeNodeCurrent->routeIndexByPart[ $part ];
 
-                if (isset($this->fallbackCollection->fallbackIndexByPath[ $pathCurrent ])) {
-                    $fallbackIndex += $this->fallbackCollection->fallbackIndexByPath[ $pathCurrent ];
+                    break;
                 }
 
-                continue;
-            }
-
-            foreach ( $routeNodeCurrent->routeIndexByRegex ?? [] as $regex => $routeIndex ) {
-                if (preg_match('/^' . $regex . '$/', $part, $matches)) {
-                    $indexMatch = $routeIndex;
+                foreach ( $routeNodeCurrent->routeIndexByRegex ?? [] as $regex => $routeIndex ) {
+                    if (preg_match('/^' . $regex . '$/', $part, $matches)) {
+                        $indexMatch = $routeIndex;
 
-                    foreach ( $matches as $key => $value ) {
-                        if (is_string($key)) {
-                            $contractActionAttributes[ $key ] = $value;
+                        foreach ( $matches as $key => $value ) {
+                            if (is_string($key)) {
+                                $contractActionAttributes[ $key ] = $value;
+                            }
                         }
-                    }
 
-                    break 2;
+                        break 2;
+                    }
                 }
-            }
 
-            foreach ( $routeNodeCurrent->childrenByRegex ?? [] as $regex => $routeNode ) {
-                if (preg_match('/^' . $regex . '$/', $part, $matches)) {
-                    $routeNodeCurrent = $routeNode;
+            } else {
+                if (isset($routeNodeCurrent->childrenByPart[ $part ])) {
+                    $routeNodeCurrent = $routeNodeCurrent->childrenByPart[ $part ];
 
                     $pathCurrent .= '/' . $routeNodeCurrent->part;
 
@@ -575,13 +560,31 @@ public function dispatch(
                         $fallbackIndex += $this->fallbackCollection->fallbackIndexByPath[ $pathCurrent ];
                     }
 
-                    foreach ( $matches as $key => $value ) {
-                        if (is_string($key)) {
-                            $contractActionAttributes[ $key ] = $value;
+                    continue;
+                }
+
+                foreach ( $routeNodeCurrent->childrenByRegex ?? [] as $regex => $routeNode ) {
+                    if (preg_match('/^' . $regex . '$/', $part, $matches)) {
+                        $routeNodeCurrent = $routeNode;
+
+                        $pathCurrent .= '/' . $routeNodeCurrent->part;
+
+                        if (isset($this->middlewareCollection->middlewareIndexByPath[ $pathCurrent ])) {
+                            $middlewareIndex += $this->middlewareCollection->middlewareIndexByPath[ $pathCurrent ];
+                        }
+
+                        if (isset($this->fallbackCollection->fallbackIndexByPath[ $pathCurrent ])) {
+                            $fallbackIndex += $this->fallbackCollection->fallbackIndexByPath[ $pathCurrent ];
                         }
-                    }
 
-                    continue 2;
+                        foreach ( $matches as $key => $value ) {
+                            if (is_string($key)) {
+                                $contractActionAttributes[ $key ] = $value;
+                            }
+                        }
+
+                        continue 2;
+                    }
                 }
             }
         }
@@ -1008,7 +1011,7 @@ protected function registerRouteGroup(RouteGroup $routeGroup) // : static
             $this->registerRoute($route);
         }
 
-        unset($this->routeGroupCurrent);
+        $this->routeGroupCurrent = null;
 
         return $this;
     }