Merge branch '2.0' into 2.1

* 2.0: fixed CS removed the Travis icon (as this is not stable enough -- many false positive, closes #6186) [Config] Loader::import must return imported data [HttpFoundation] fixed a small regression Conflicts: README.md src/Symfony/Bridge/Twig/Extension/FormExtension.php src/Symfony/Bundle/FrameworkBundle/Resources/views/Form/attributes.html.php src/Symfony/Bundle/FrameworkBundle/Resources/views/Form/form_widget.html.php src/Symfony/Bundle/FrameworkBundle/Templating/Helper/FormHelper.php src/Symfony/Component/Form/Form.php src/Symfony/Component/HttpFoundation/Request.php src/Symfony/Component/HttpFoundation/SessionStorage/PdoSessionStorage.php tests/Symfony/Tests/Bridge/Doctrine/Logger/DbalLoggerTest.php
CODIQ-BV · Dec 11, 2012 · 3728b40 · 3728b40
2 parents 92c9511 + 4de1a1f
commit 3728b40
Show file tree

Hide file tree

Showing 3 changed files with 1 addition and 3 deletions.
diff --git a/Request.php b/Request.php
@@ -992,7 +992,7 @@ public function getHost()
 
         // trim and remove port number from host
         // host is lowercase as per RFC 952/2181
-        $host = strtolower(trim(preg_replace('/:\d+$/', '', $host)));
+        $host = strtolower(preg_replace('/:\d+$/', '', trim($host)));
 
         // as the host can come from the user (HTTP_HOST and depending on the configuration, SERVER_NAME too can come from the user)
         // check that it does not contain forbidden characters (see RFC 952 and RFC 2181)

diff --git a/RequestMatcher.php b/RequestMatcher.php
@@ -235,4 +235,3 @@ protected function checkIp6($requestIp, $ip)
         return true;
     }
 }
-
diff --git a/Tests/RequestMatcherTest.php b/Tests/RequestMatcherTest.php
@@ -200,4 +200,3 @@ public function testAttributes()
         $this->assertFalse($matcher->matches($request));
     }
 }
-
Original file line number	Diff line number	Diff line change
Expand Up		@@ -235,4 +235,3 @@ protected function checkIp6($requestIp, $ip)
		return true;
		}
		}
Original file line number	Diff line number	Diff line change
Expand Up		@@ -200,4 +200,3 @@ public function testAttributes()
		$this->assertFalse($matcher->matches($request));
		}
		}