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

[Routing] Don't reorder past variable-length placeholders

Browse Source
This commit is contained in:
Nicolas Grekas 2018-06-04 19:54:36 +02:00
parent 582165f7e7
commit 7a750d4508
2 changed files with 15 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/Symfony/Component/Routing/Matcher/Dumper/StaticPrefixCollection.php
View File

@ -176,7 +176,7 @@ class StaticPrefixCollection
break;
}
$subPattern = substr($prefix, $i, $j - $i);
if ($prefix !== $anotherPrefix && !preg_match('/^\(\[[^\]]++\]\+\+\)$/', $subPattern) && !preg_match('{(?<!'.$subPattern.')}', '')) {
if ($prefix !== $anotherPrefix && !preg_match('{(?<!'.$subPattern.')}', '')) {
// sub-patterns of variable length are not considered as common prefixes because their greediness would break in-order matching
break;
}

36
src/Symfony/Component/Routing/Tests/Fixtures/dumper/url_matcher12.php
View File

@ -29,21 +29,13 @@ class ProjectUrlMatcher extends Symfony\Component\Routing\Matcher\UrlMatcher
$matchedPathinfo = $pathinfo;
$regexList = array(
0 => '{^(?'
.'|/abc([^/]++)/(?'
.'|1(?'
.'|(*:27)'
.'|0(?'
.'|(*:38)'
.'|0(*:46)'
.')'
.')'
.'|2(?'
.'|(*:59)'
.'|0(?'
.'|(*:70)'
.'|0(*:78)'
.')'
.')'
.'|/abc(?'
.'|([^/]++)/1(*:24)'
.'|([^/]++)/2(*:41)'
.'|([^/]++)/10(*:59)'
.'|([^/]++)/20(*:77)'
.'|([^/]++)/100(*:96)'
.'|([^/]++)/200(*:115)'
.')'
.')$}sD',
);
@ -53,12 +45,12 @@ class ProjectUrlMatcher extends Symfony\Component\Routing\Matcher\UrlMatcher
switch ($m = (int) $matches['MARK']) {
default:
$routes = array(
27 => array(array('_route' => 'r1'), array('foo'), null, null),
38 => array(array('_route' => 'r10'), array('foo'), null, null),
46 => array(array('_route' => 'r100'), array('foo'), null, null),
59 => array(array('_route' => 'r2'), array('foo'), null, null),
70 => array(array('_route' => 'r20'), array('foo'), null, null),
78 => array(array('_route' => 'r200'), array('foo'), null, null),
24 => array(array('_route' => 'r1'), array('foo'), null, null),
41 => array(array('_route' => 'r2'), array('foo'), null, null),
59 => array(array('_route' => 'r10'), array('foo'), null, null),
77 => array(array('_route' => 'r20'), array('foo'), null, null),
96 => array(array('_route' => 'r100'), array('foo'), null, null),
115 => array(array('_route' => 'r200'), array('foo'), null, null),
);
list($ret, $vars, $requiredMethods, $requiredSchemes) = $routes[$m];
@ -84,7 +76,7 @@ class ProjectUrlMatcher extends Symfony\Component\Routing\Matcher\UrlMatcher
return $ret;
}
if (78 === $m) {
if (115 === $m) {
break;
}
$regex = substr_replace($regex, 'F', $m - $offset, 1 + strlen($m));