diogo/symfony
Archived
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

remove logic that could not be triggered anyway

Browse Source 
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.
This commit is contained in:
Tobias Schultze 2012-11-17 16:58:52 +01:00
parent f7ea68f70c
commit 38802ea32c
1 changed files with 2 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/Symfony/Component/Routing/Matcher/Dumper/ApacheMatcherDumper.php
View File

@ -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));
}
/**