From 2d671296c6d25011c0690c074e9c4b104eddda32 Mon Sep 17 00:00:00 2001
From: Christian Flothmann <christian.flothmann@sensiolabs.de>
Date: Thu, 3 May 2018 14:15:36 +0200
Subject: [PATCH] use brace-style regex delimiters

---
 Request.php           |  2 +-
 Tests/RequestTest.php | 15 +++++++++++++--
 2 files changed, 14 insertions(+), 3 deletions(-)

diff --git a/Request.php b/Request.php
index ecdcdbc25..e1309d477 100644
--- a/Request.php
+++ b/Request.php
@@ -581,7 +581,7 @@ public static function getTrustedProxies()
     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/Tests/RequestTest.php b/Tests/RequestTest.php
index 0c5451dfd..688a7c714 100644
--- a/Tests/RequestTest.php
+++ b/Tests/RequestTest.php
@@ -18,6 +18,11 @@
 
 class RequestTest extends TestCase
 {
+    protected function tearDown()
+    {
+        Request::setTrustedHosts(array());
+    }
+
     public function testInitialize()
     {
         $request = new Request();
@@ -1871,9 +1876,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()