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

UrlMatcher class indent and doc fixes

Browse Source
This commit is contained in:
Ph3nol 2012-06-02 13:54:03 +02:00
parent 1541fe26e4
commit a6d32de181
1 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/Symfony/Component/Routing/Matcher/UrlMatcher.php
View File

@ -177,8 +177,16 @@ class UrlMatcher implements UrlMatcherInterface
$status = $scheme && $scheme !== $this->context->getScheme() ? self::REQUIREMENT_MISMATCH : self::REQUIREMENT_MATCH; $status = $scheme && $scheme !== $this->context->getScheme() ? self::REQUIREMENT_MISMATCH : self::REQUIREMENT_MATCH;
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;