Skip to content

Commit

Permalink
slight refactoring in UrlMatcher
Browse files Browse the repository at this point in the history
  • Loading branch information
Tobion committed Oct 26, 2012
1 parent 1277e67 commit 7447ef7
Showing 1 changed file with 2 additions and 3 deletions.
5 changes: 2 additions & 3 deletions src/Symfony/Component/Routing/Matcher/UrlMatcher.php
Expand Up @@ -174,13 +174,12 @@ protected function handleRouteRequirements($pathinfo, $name, Route $route)
*/
protected function mergeDefaults($params, $defaults)
{
$parameters = $defaults;
foreach ($params as $key => $value) {
if (!is_int($key)) {
$parameters[$key] = $value;
$defaults[$key] = $value;
}
}

return $parameters;
return $defaults;
}
}

0 comments on commit 7447ef7

Please sign in to comment.