diff --git a/src/Symfony/Component/Routing/Matcher/Dumper/ApacheMatcherDumper.php b/src/Symfony/Component/Routing/Matcher/Dumper/ApacheMatcherDumper.php index 73ace8afa6..8017a7bc34 100644 --- a/src/Symfony/Component/Routing/Matcher/Dumper/ApacheMatcherDumper.php +++ b/src/Symfony/Component/Routing/Matcher/Dumper/ApacheMatcherDumper.php @@ -47,16 +47,16 @@ class ApacheMatcherDumper extends MatcherDumper $rules = array("# skip \"real\" requests\nRewriteCond %{REQUEST_FILENAME} -f\nRewriteRule .* - [QSA,L]"); $methodVars = array(); $hostnameRegexUnique = 0; - $prevHosnameRegex = ''; + $prevHostnameRegex = ''; foreach ($this->getRoutes()->all() as $name => $route) { $compiledRoute = $route->compile(); $hostnameRegex = $compiledRoute->getHostnameRegex(); - if (null !== $hostnameRegex && $prevHosnameRegex !== $hostnameRegex) { + if (null !== $hostnameRegex && $prevHostnameRegex !== $hostnameRegex) { - $prevHosnameRegex = $hostnameRegex; + $prevHostnameRegex = $hostnameRegex; $hostnameRegexUnique++; $rule = array(); @@ -214,14 +214,9 @@ class ApacheMatcherDumper extends MatcherDumper */ private function regexToApacheRegex($regex) { - $delimiter = $regex[0]; - $regexPatternEnd = strrpos($regex, $delimiter); - if (strlen($regex) < 2 || 0 === $regexPatternEnd) { - throw new \LogicException('The "%s" route regex "%s" is invalid', $name, $regex); - } - $regex = preg_replace('/\?<.+?>/', '', substr($regex, 1, $regexPatternEnd - 1)); + $regexPatternEnd = strrpos($regex, $regex[0]); - return $regex; + return preg_replace('/\?<.+?>/', '', substr($regex, 1, $regexPatternEnd - 1)); } /**