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

[Routing] Better nesting for RouteCollections in dumped URL matcher classes

Browse Source 
With this change, a route prefixed with '/blogger' will be nested inside '/blog' (for example)
This commit is contained in:
Lee McDermott 2011-06-11 16:11:55 +01:00
parent f1e8c1bce5
commit 91f4097a09
1 changed files with 34 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
src/Symfony/Component/Routing/Matcher/Dumper/PhpMatcherDumper.php
View File

@ -72,16 +72,47 @@ EOF;
private function compileRoutes(RouteCollection $routes, $supportsRedirections, $parentPrefix = null)
{
$code = array();
foreach ($routes as $name => $route) {
$routeIterator = $routes->getIterator();
$keys = array_keys($routeIterator->getArrayCopy());
$i = 0;
foreach ($routeIterator as $name => $route) {
$i++;
if ($route instanceof RouteCollection) {
$prefix = $route->getPrefix();
$optimizable = $prefix && count($route->all()) > 1 && false === strpos($route->getPrefix(), '{');
$indent = '';
if ($optimizable) {
for ($j = $i; $j < count($keys); $j++) {
if ($keys[$j] === null) continue;
$testRoute = $routeIterator->offsetGet($keys[$j]);
$isCollection = ($testRoute instanceof RouteCollection);
$testPrefix = $isCollection ? $testRoute->getPrefix() : $testRoute->getPattern();
if (0 === strpos($testPrefix, $prefix)) {
$routeIterator->offsetUnset($keys[$j]);
if ($isCollection) {
$route->addCollection($testRoute);
}
else {
$route->add($keys[$j], $testRoute);
}
$i++;
$keys[$j] = null;
}
}
$code[] = sprintf(" if (0 === strpos(\$pathinfo, '%s')) {", $prefix);
$indent = ' ';
}
foreach ($this->compileRoutes($route, $supportsRedirections, $prefix) as $line) {
foreach (explode("\n", $line) as $l) {
$code[] = $indent.$l;
@ -89,6 +120,7 @@ EOF;
}
if ($optimizable) {
$code[] = " throw 0 < count(\$allow) ? new MethodNotAllowedException(array_unique(\$allow)) : new ResourceNotFoundException();";
$code[] = " }\n";
}
} else {