[Routing] fixed route matching when the prefix contains variables

symfony · Jun 4, 2011 · 95a267b · 95a267b
1 parent 6e95621
commit 95a267b
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 3 deletions.
diff --git a/Matcher/Dumper/PhpMatcherDumper.php b/Matcher/Dumper/PhpMatcherDumper.php
@@ -74,8 +74,10 @@ private function compileRoutes(RouteCollection $routes, $supportsRedirections)
         $code = array();
         foreach ($routes as $name => $route) {
             if ($route instanceof RouteCollection) {
+                $prefix = $route->getPrefix();
+                $optimizable = $prefix && count($route->all()) > 1 && false === strpos($route->getPrefix(), '{');
                 $indent = '';
-                if (count($route->all()) > 1 && $prefix = $route->getPrefix()) {
+                if ($optimizable) {
                     $code[] = sprintf("        if (0 === strpos(\$pathinfo, '%s')) {", $prefix);
                     $indent = '    ';
                 }
@@ -86,7 +88,7 @@ private function compileRoutes(RouteCollection $routes, $supportsRedirections)
                     }
                 }
 
-                if ($indent) {
+                if ($optimizable) {
                     $code[] = "        }\n";
                 }
             } else {

diff --git a/Matcher/UrlMatcher.php b/Matcher/UrlMatcher.php
@@ -87,7 +87,7 @@ protected function matchCollection($pathinfo, RouteCollection $routes)
     {
         foreach ($routes as $name => $route) {
             if ($route instanceof RouteCollection) {
-                if ($route->getPrefix() !== substr($pathinfo, 0, strlen($route->getPrefix()))) {
+                if (false === strpos($route->getPrefix(), '{') && $route->getPrefix() !== substr($pathinfo, 0, strlen($route->getPrefix()))) {
                     continue;
                 }