[Routing] Compile static routes when variables are fixed

mtarld · mtarld · commit d93649f499b1 · 2020-02-21T18:12:40.000+01:00
diff --git a/src/Symfony/Component/Routing/Matcher/Dumper/CompiledUrlMatcherDumper.php b/src/Symfony/Component/Routing/Matcher/Dumper/CompiledUrlMatcherDumper.php
@@ -182,7 +182,9 @@ private function groupStaticRoutes(RouteCollection $collection): array
 
             if (!$compiledRoute->getPathVariables()) {
                 $host = !$compiledRoute->getHostVariables() ? $route->getHost() : '';
-                $url = $route->getPath();
+                $url = preg_replace_callback('#{([^}]+)}#', static function (array $matches) use ($route) {
+                    return $route->getRequirement($matches[1]);
+                }, $route->getPath());
                 if ($hasTrailingSlash) {
                     $url = substr($url, 0, -1);
                 }
diff --git a/src/Symfony/Component/Routing/RouteCompiler.php b/src/Symfony/Component/Routing/RouteCompiler.php
@@ -184,6 +184,12 @@ private static function compilePattern(Route $route, string $pattern, bool $isHo
                 $regexp = self::transformCapturingGroupsToNonCapturings($regexp);
             }
 
+            // Fixed variable, could be transformed as text token
+            if (preg_quote($regexp, self::REGEX_DELIMITER) === $regexp) {
+                $tokens[] = ['text', ($isSeparator ? $precedingChar : '').$regexp];
+                continue;
+            }
+
             if ($important) {
                 $token = ['variable', $isSeparator ? $precedingChar : '', $regexp, $varName, false, true];
             } else {
@@ -198,6 +204,8 @@ private static function compilePattern(Route $route, string $pattern, bool $isHo
             $tokens[] = ['text', substr($pattern, $pos)];
         }
 
+        $tokens = self::mergeContiguousTextTokens($tokens);
+
         // find the first optional token
         $firstOptional = PHP_INT_MAX;
         if (!$isHost) {
@@ -237,6 +245,21 @@ private static function compilePattern(Route $route, string $pattern, bool $isHo
         ];
     }
 
+    private static function mergeContiguousTextTokens(array $tokens): array
+    {
+        $mergedTokens = [$tokens[0]];
+        for ($i = 1; $i < \count($tokens); ++$i) {
+            if ('text' !== $tokens[$i][0] || 'variable' === end($mergedTokens)[0]) {
+                $mergedTokens[] = $tokens[$i];
+                continue;
+            }
+
+            $mergedTokens[count($mergedTokens) - 1][1] .= $tokens[$i][1];
+        }
+
+        return $mergedTokens;
+    }
+
     /**
      * Determines the longest static prefix possible for a route.
      */
