Skip to content

Display name #77

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Jul 31, 2013
Merged

Display name #77

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
9d4c5f3
Prevent fatal error
dantleech Jul 30, 2013
b0b84b9
cleanup error handling in generate
dbu Jul 30, 2013
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 18 additions & 4 deletions ChainRouter.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -217,9 +217,7 @@ public function generate($name, $parameters = array(), $absolute = false)
try {
return $router->generate($name, $parameters, $absolute);
} catch (RouteNotFoundException $e) {
$hint = ($router instanceof VersatileGeneratorInterface)
? $router->getRouteDebugMessage($name, $parameters)
: "Route '$name' not found";
$hint = $this->getErrorMessage($name, $router, $parameters);
$debug[] = $hint;
if ($this->logger) {
$this->logger->info('Router '.get_class($router)." was unable to generate route. Reason: '$hint': ".$e->getMessage());
Expand All @@ -231,12 +229,28 @@ public function generate($name, $parameters = array(), $absolute = false)
$debug = array_unique($debug);
$info = implode(', ', $debug);
} else {
$info = "No route '$name' found";
$info = $this->getErrorMessage($name);
}

throw new RouteNotFoundException(sprintf('None of the chained routers were able to generate route: %s', $info));
}

private function getErrorMessage($name, $router = null, $parameters = null)
{
if ($router instanceof VersatileGeneratorInterface) {
$displayName = $router->getRouteDebugMessage($name, $parameters);
} elseif (is_object($name)) {
$displayName = method_exists($name, '__toString')
? (string) $name
: get_class($name)
;
} else {
$displayName = (string) $name;
}

return "Route '$displayName' not found";
}

/**
* {@inheritdoc}
*/
Expand Down