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

Couple more CS fixes

Browse Source
This commit is contained in:
Lee McDermott 2011-06-13 02:40:21 +01:00
parent 5a986bfc27
commit 49dd558444
1 changed files with 10 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -72,16 +72,16 @@ EOF;
private function compileRoutes(RouteCollection $routes, $supportsRedirections, $parentPrefix = null) private function compileRoutes(RouteCollection $routes, $supportsRedirections, $parentPrefix = null)
{ {
$code = array(); $code = array();
$routeIterator = $routes->getIterator(); $routeIterator = $routes->getIterator();
$keys = array_keys($routeIterator->getArrayCopy()); $keys = array_keys($routeIterator->getArrayCopy());
$keysCount = count($keys); $keysCount = count($keys);
$i = 0; $i = 0;
foreach ($routeIterator as $name => $route) { foreach ($routeIterator as $name => $route) {
$i++; $i++;
if ($route instanceof RouteCollection) { if ($route instanceof RouteCollection) {
$prefix = $route->getPrefix(); $prefix = $route->getPrefix();
$optimizable = $prefix && count($route->all()) > 1 && false === strpos($route->getPrefix(), '{'); $optimizable = $prefix && count($route->all()) > 1 && false === strpos($route->getPrefix(), '{');
@ -91,7 +91,7 @@ EOF;
if ($keys[$j] === null) { if ($keys[$j] === null) {
continue; continue;
} }
$testRoute = $routeIterator->offsetGet($keys[$j]); $testRoute = $routeIterator->offsetGet($keys[$j]);
$isCollection = ($testRoute instanceof RouteCollection); $isCollection = ($testRoute instanceof RouteCollection);
@ -99,23 +99,22 @@ EOF;
if (0 === strpos($testPrefix, $prefix)) { if (0 === strpos($testPrefix, $prefix)) {
$routeIterator->offsetUnset($keys[$j]); $routeIterator->offsetUnset($keys[$j]);
if ($isCollection) { if ($isCollection) {
$route->addCollection($testRoute); $route->addCollection($testRoute);
} } else {
else {
$route->add($keys[$j], $testRoute); $route->add($keys[$j], $testRoute);
} }
$i++; $i++;
$keys[$j] = null; $keys[$j] = null;
} }
} }
$code[] = sprintf(" if (0 === strpos(\$pathinfo, '%s')) {", $prefix); $code[] = sprintf(" if (0 === strpos(\$pathinfo, '%s')) {", $prefix);
$indent = ' '; $indent = ' ';
} }
foreach ($this->compileRoutes($route, $supportsRedirections, $prefix) as $line) { foreach ($this->compileRoutes($route, $supportsRedirections, $prefix) as $line) {
foreach (explode("\n", $line) as $l) { foreach (explode("\n", $line) as $l) {
$code[] = $indent.$l; $code[] = $indent.$l;