From a6d32de18170b3553e42498560cfae6aee1b3ba0 Mon Sep 17 00:00:00 2001
From: Ph3nol <ph3@slynett.com>
Date: Sat, 2 Jun 2012 13:54:03 +0200
Subject: [PATCH] UrlMatcher class indent and doc fixes

---
 src/Symfony/Component/Routing/Matcher/UrlMatcher.php | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/src/Symfony/Component/Routing/Matcher/UrlMatcher.php b/src/Symfony/Component/Routing/Matcher/UrlMatcher.php
index d3dd78c286..98f71cff6b 100644
--- 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;