merged branch Ph3nol/ph3-routing-component-fixes (PR #4486)
Commits -------a6d32de
UrlMatcher class indent and doc fixes Discussion ---------- [Routing] PHP CS and doc minor fixes Bug fix: no Feature addition: no Backwards compatibility break: no Symfony2 tests pass: yes --------------------------------------------------------------------------- by travisbot at 2012-06-02T12:03:36Z This pull request [passes](http://travis-ci.org/symfony/symfony/builds/1507232) (mergeda6d32de1
into1541fe26
).
This commit is contained in:
commit
2faba01d4f
@ -179,6 +179,14 @@ class UrlMatcher implements UrlMatcherInterface
|
|||||||
return array($status, null);
|
return array($status, null);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Get merged default parameters.
|
||||||
|
*
|
||||||
|
* @param array $params The parameters
|
||||||
|
* @param array $defaults The defaults
|
||||||
|
*
|
||||||
|
* @return array Merged default parameters
|
||||||
|
*/
|
||||||
protected function mergeDefaults($params, $defaults)
|
protected function mergeDefaults($params, $defaults)
|
||||||
{
|
{
|
||||||
$parameters = $defaults;
|
$parameters = $defaults;
|
||||||
|
Reference in New Issue
Block a user