Revert "Improved route's priority match"

This reverts commit 54d60dc.
divineniiquaye · Apr 17, 2022 · 31cd493 · 31cd493
1 parent c15e09c
commit 31cd493
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 5 deletions.
diff --git a/src/Route.php b/src/Route.php
@@ -46,7 +46,7 @@ class Route
      *
      * If route path matches, 1 is expected return else 0 should be return as priority index.
      */
-    public const PRIORITY_REGEX = '#^([\/\w+][^<[{:]+\b)(.*)#';
+    public const PRIORITY_REGEX = '#^\\/?[\\/\\w+]+\\b#';
 
     /**
      * Slashes supported on browser when used.

diff --git a/src/Traits/DataTrait.php b/src/Traits/DataTrait.php
@@ -44,8 +44,8 @@ public function prefix(string $path)
                 $uri = \substr($uri, 1);
             }
 
-            \preg_match(Route::PRIORITY_REGEX, $this->data['path'] = ('/' . \ltrim($path, '/')) . $uri, $pM);
-            $this->data['prefix'] = !empty($pM[1] ?? null) ? $pM[1] : null;
+            \preg_match(Route::PRIORITY_REGEX, $this->data['path'] = '/' . \ltrim($path . $uri, '/'), $matches);
+            $this->data['prefix'] = $matches[0] ?? null;
         }
 
         return $this;
@@ -76,10 +76,11 @@ public function path(string $pattern)
                 throw new UriHandlerException(\sprintf('The route pattern "%s" is invalid as route path must be present in pattern.', $pattern));
             }
 
-            \preg_match(Route::PRIORITY_REGEX, $this->data['path'] = '/' . \ltrim($matches[3], '/'), $pM);
-            $this->data['prefix'] = !empty($pM[1] ?? null) ? $pM[1] : null;
+            \preg_match(Route::PRIORITY_REGEX, $matches[3], $static) && $this->data['prefix'] = $static[0];
         }
 
+        $this->data['path'] = '/' . \ltrim($matches[3] ?? $pattern, '/');
+
         return $this;
     }