From 38802ea32ca92f3e3e9db973c43a08d6dc1b7646 Mon Sep 17 00:00:00 2001 From: Tobias Schultze Date: Sat, 17 Nov 2012 16:58:52 +0100 Subject: [PATCH] remove logic that could not be triggered anyway the regex by the compiler is always valid. even if it was invalid like '' it wasn't caught by the exception and would have given a php notice. --- .../Routing/Matcher/Dumper/ApacheMatcherDumper.php | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/src/Symfony/Component/Routing/Matcher/Dumper/ApacheMatcherDumper.php b/src/Symfony/Component/Routing/Matcher/Dumper/ApacheMatcherDumper.php index f39ea3d539..8017a7bc34 100644 --- a/src/Symfony/Component/Routing/Matcher/Dumper/ApacheMatcherDumper.php +++ b/src/Symfony/Component/Routing/Matcher/Dumper/ApacheMatcherDumper.php @@ -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 route regex "%s" is invalid', $regex); - } - $regex = preg_replace('/\?<.+?>/', '', substr($regex, 1, $regexPatternEnd - 1)); + $regexPatternEnd = strrpos($regex, $regex[0]); - return $regex; + return preg_replace('/\?<.+?>/', '', substr($regex, 1, $regexPatternEnd - 1)); } /**