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) (merged a6d32de1 into 1541fe26).

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;