[Routing] fixed CS
This commit is contained in:
parent
84172c4839
commit
f0a6ed2e54
@ -54,9 +54,9 @@ class PhpGeneratorDumper extends GeneratorDumper
|
|||||||
$compiledRoute = $route->compile();
|
$compiledRoute = $route->compile();
|
||||||
|
|
||||||
$variables = str_replace("\n", '', var_export($compiledRoute->getVariables(), true));
|
$variables = str_replace("\n", '', var_export($compiledRoute->getVariables(), true));
|
||||||
$defaultsMerge='';
|
$defaultsMerge = '';
|
||||||
foreach ($compiledRoute->getDefaults() as $key => $value) {
|
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));
|
$requirements = str_replace("\n", '', var_export($compiledRoute->getRequirements(), true));
|
||||||
$tokens = str_replace("\n", '', var_export($compiledRoute->getTokens(), true));
|
$tokens = str_replace("\n", '', var_export($compiledRoute->getTokens(), true));
|
||||||
@ -66,7 +66,7 @@ class PhpGeneratorDumper extends GeneratorDumper
|
|||||||
$methods[] = <<<EOF
|
$methods[] = <<<EOF
|
||||||
protected function get{$escapedName}RouteInfo()
|
protected function get{$escapedName}RouteInfo()
|
||||||
{
|
{
|
||||||
\$defaults=\$this->defaults;
|
\$defaults = \$this->defaults;
|
||||||
$defaultsMerge
|
$defaultsMerge
|
||||||
return array($variables, \$defaults, $requirements, $tokens);
|
return array($variables, \$defaults, $requirements, $tokens);
|
||||||
}
|
}
|
||||||
|
@ -79,6 +79,7 @@ class Router implements RouterInterface
|
|||||||
$invalid[] = $key;
|
$invalid[] = $key;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
if ($isInvalid) {
|
if ($isInvalid) {
|
||||||
throw new \InvalidArgumentException(sprintf('The Router does not support the following options: \'%s\'.', implode('\', \'', $invalid)));
|
throw new \InvalidArgumentException(sprintf('The Router does not support the following options: \'%s\'.', implode('\', \'', $invalid)));
|
||||||
}
|
}
|
||||||
|
Reference in New Issue
Block a user