UrlMatcher class indent and doc fixes

2012-06-02 13:54:03 +02:00 · 2012-06-02 13:54:03 +02:00 · a6d32de181
commit a6d32de181
parent 1541fe26e4
1 changed files with 9 additions and 1 deletions
--- a/src/Symfony/Component/Routing/Matcher/UrlMatcher.php
+++ b/src/Symfony/Component/Routing/Matcher/UrlMatcher.php
@ -177,8 +177,16 @@ class UrlMatcher implements UrlMatcherInterface
            $status = $scheme && $scheme !== $this->context->getScheme() ? self::REQUIREMENT_MISMATCH : self::REQUIREMENT_MATCH;

            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)
    {
        $parameters = $defaults;