Merge branch '2.8' into 3.4

fabpot · fabpot · commit 40bcd7722bcd · 2018-05-07T09:00:50.000+02:00
* 2.8:
  use brace-style regex delimiters
  Fixed typo RecursiveIterator -&gt; RecursiveIteratorIterator
  [Validator] make phpdoc of ObjectInitializerInterface interface more accurate
diff --git a/src/Symfony/Component/Form/Util/InheritDataAwareIterator.php b/src/Symfony/Component/Form/Util/InheritDataAwareIterator.php
@@ -17,7 +17,7 @@
  * Contrary to \ArrayIterator, this iterator recognizes changes in the original
  * array during iteration.
  *
- * You can wrap the iterator into a {@link \RecursiveIterator} in order to
+ * You can wrap the iterator into a {@link \RecursiveIteratorIterator} in order to
  * enter any child form that inherits its parent's data and iterate the children
  * of that form as well.
  *
diff --git a/src/Symfony/Component/HttpFoundation/Request.php b/src/Symfony/Component/HttpFoundation/Request.php
@@ -641,7 +641,7 @@ public static function getTrustedHeaderSet()
     public static function setTrustedHosts(array $hostPatterns)
     {
         self::$trustedHostPatterns = array_map(function ($hostPattern) {
-            return sprintf('#%s#i', $hostPattern);
+            return sprintf('{%s}i', $hostPattern);
         }, $hostPatterns);
         // we need to reset trusted hosts on trusted host patterns change
         self::$trustedHosts = array();
diff --git a/src/Symfony/Component/HttpFoundation/Tests/RequestTest.php b/src/Symfony/Component/HttpFoundation/Tests/RequestTest.php
@@ -23,6 +23,7 @@ protected function tearDown()
     {
         // reset
         Request::setTrustedProxies(array(), -1);
+        Request::setTrustedHosts(array());
     }
 
     public function testInitialize()
@@ -2007,9 +2008,15 @@ public function testTrustedHosts()
 
         $request->headers->set('host', 'subdomain.trusted.com');
         $this->assertEquals('subdomain.trusted.com', $request->getHost());
+    }
 
-        // reset request for following tests
-        Request::setTrustedHosts(array());
+    public function testSetTrustedHostsDoesNotBreakOnSpecialCharacters()
+    {
+        Request::setTrustedHosts(array('localhost(\.local){0,1}#,example.com', 'localhost'));
+
+        $request = Request::create('/');
+        $request->headers->set('host', 'localhost');
+        $this->assertSame('localhost', $request->getHost());
     }
 
     public function testFactory()

Original file line number	Diff line number	Diff line change
`@@ -17,7 +17,7 @@`
`17`	`17`	`* Contrary to \ArrayIterator, this iterator recognizes changes in the original`
`18`	`18`	`* array during iteration.`
`19`	`19`	`*`
`20`		`- * You can wrap the iterator into a {@link \RecursiveIterator} in order to`
	`20`	`+ * You can wrap the iterator into a {@link \RecursiveIteratorIterator} in order to`
`21`	`21`	`* enter any child form that inherits its parent's data and iterate the children`
`22`	`22`	`* of that form as well.`
`23`	`23`	`*`
Original file line number	Diff line number	Diff line change
`@@ -641,7 +641,7 @@ public static function getTrustedHeaderSet()`
`641`	`641`	`public static function setTrustedHosts(array $hostPatterns)`
`642`	`642`	`{`
`643`	`643`	`self::$trustedHostPatterns = array_map(function ($hostPattern) {`
`644`		`- return sprintf('#%s#i', $hostPattern);`
	`644`	`+ return sprintf('{%s}i', $hostPattern);`
`645`	`645`	`}, $hostPatterns);`
`646`	`646`	`// we need to reset trusted hosts on trusted host patterns change`
`647`	`647`	`self::$trustedHosts = array();`