Move regex extraction to Route

Ensuring this logic is reusable elsewhere.
nikic · Sep 19, 2023 · 396e842 · 396e842
1 parent ebac654
commit 396e842
Show file tree

Hide file tree

Showing 3 changed files with 45 additions and 34 deletions.
diff --git a/src/BadRouteException.php b/src/BadRouteException.php
@@ -22,8 +22,8 @@ public static function shadowedByVariableRoute(string $route, string $shadowedRe
                 'Static route "%s" is shadowed by previously defined variable route "%s" for method "%s"',
                 $route,
                 $shadowedRegex,
-                $method
-            )
+                $method,
+            ),
         );
     }
 

diff --git a/src/DataGenerator/RegexBasedAbstract.php b/src/DataGenerator/RegexBasedAbstract.php
@@ -13,7 +13,6 @@
 use function count;
 use function is_string;
 use function max;
-use function preg_quote;
 use function round;
 
 // phpcs:ignore SlevomatCodingStandard.Classes.SuperfluousAbstractClassNaming.SuperfluousSuffix
@@ -103,41 +102,13 @@ private function addStaticRoute(string $httpMethod, array $routeData, mixed $han
     /** @param array<string|array{0: string, 1:string}> $routeData */
     private function addVariableRoute(string $httpMethod, array $routeData, mixed $handler): void
     {
-        [$regex, $variables] = $this->buildRegexForRoute($routeData);
+        $route = Route::fromParsedRoute($httpMethod, $routeData, $handler);
+        $regex = $route->regex;
 
         if (isset($this->methodToRegexToRoutesMap[$httpMethod][$regex])) {
             throw BadRouteException::alreadyRegistered($regex, $httpMethod);
         }
 
-        $this->methodToRegexToRoutesMap[$httpMethod][$regex] = new Route(
-            $httpMethod,
-            $handler,
-            $regex,
-            $variables,
-        );
-    }
-
-    /**
-     * @param array<string|array{0: string, 1:string}> $routeData
-     *
-     * @return array{0: string, 1: array<string, string>}
-     */
-    private function buildRegexForRoute(array $routeData): array
-    {
-        $regex = '';
-        $variables = [];
-        foreach ($routeData as $part) {
-            if (is_string($part)) {
-                $regex .= preg_quote($part, '~');
-                continue;
-            }
-
-            [$varName, $regexPart] = $part;
-
-            $variables[$varName] = $varName;
-            $regex .= '(' . $regexPart . ')';
-        }
-
-        return [$regex, $variables];
+        $this->methodToRegexToRoutesMap[$httpMethod][$regex] = $route;
     }
 }
diff --git a/src/Route.php b/src/Route.php
@@ -3,10 +3,50 @@
 
 namespace FastRoute;
 
+use function is_string;
 use function preg_match;
+use function preg_quote;
 
 class Route
 {
+    /** @param array<string|array{0: string, 1:string}> $routeData */
+    public static function fromParsedRoute(string $httpMethod, array $routeData, mixed $handler): self
+    {
+        [$regex, $variables] = self::extractRegex($routeData);
+
+        return new self(
+            $httpMethod,
+            $handler,
+            $regex,
+            $variables,
+        );
+    }
+
+    /**
+     * @param array<string|array{0: string, 1:string}> $routeData
+     *
+     * @return array{0: string, 1: array<string, string>}
+     */
+    private static function extractRegex(array $routeData): array
+    {
+        $regex = '';
+        $variables = [];
+
+        foreach ($routeData as $part) {
+            if (is_string($part)) {
+                $regex .= preg_quote($part, '~');
+                continue;
+            }
+
+            [$varName, $regexPart] = $part;
+
+            $variables[$varName] = $varName;
+            $regex .= '(' . $regexPart . ')';
+        }
+
+        return [$regex, $variables];
+    }
+
     /** @param array<string, string> $variables */
     public function __construct(public string $httpMethod, public mixed $handler, public string $regex, public array $variables)
     {