merged branch Ph3nol/ph3-routing-component-fixes (PR symfony#4486)

fabpot · fabpot · commit 2faba01d4ff6 · 2012-06-08T09:46:03.000+02:00
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) (merged a6d32de into 1541fe2).
diff --git a/src/Symfony/Component/Routing/Matcher/UrlMatcher.php b/src/Symfony/Component/Routing/Matcher/UrlMatcher.php
@@ -177,8 +177,16 @@ protected function handleRouteRequirements($pathinfo, $name, Route $route)
             $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;
