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

[Routing] fixed CS

Browse Source
This commit is contained in:
Fabien Potencier 2011-03-14 13:54:48 +01:00
parent 84172c4839
commit f0a6ed2e54
2 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/Symfony/Component/Routing/Generator/Dumper/PhpGeneratorDumper.php
View File

@ -54,9 +54,9 @@ class PhpGeneratorDumper extends GeneratorDumper
$compiledRoute = $route->compile();
$variables = str_replace("\n", '', var_export($compiledRoute->getVariables(), true));
$defaultsMerge='';
$defaultsMerge = '';
foreach ($compiledRoute->getDefaults() as $key => $value) {
$defaultsMerge.=' $defaults[\''.$key.'\']='.str_replace("\n", '', var_export($value, true)).';'."\n";
$defaultsMerge .= ' $defaults[\''.$key.'\'] = '.str_replace("\n", '', var_export($value, true)).';'."\n";
}
$requirements = str_replace("\n", '', var_export($compiledRoute->getRequirements(), true));
$tokens = str_replace("\n", '', var_export($compiledRoute->getTokens(), true));
@ -66,7 +66,7 @@ class PhpGeneratorDumper extends GeneratorDumper
$methods[] = <<<EOF
protected function get{$escapedName}RouteInfo()
{
\$defaults=\$this->defaults;
\$defaults = \$this->defaults;
$defaultsMerge
return array($variables, \$defaults, $requirements, $tokens);
}

1
src/Symfony/Component/Routing/Router.php
View File

@ -79,6 +79,7 @@ class Router implements RouterInterface
$invalid[] = $key;
}
}
if ($isInvalid) {
throw new \InvalidArgumentException(sprintf('The Router does not support the following options: \'%s\'.', implode('\', \'', $invalid)));
}