Merge branch '3.4' into 4.3

* 3.4: [HttpFoundation] Allow redirecting to URLs that contain a semicolon
symfony · Nov 17, 2019 · 0ac9ebf · 0ac9ebf
2 parents c8f4571 + ef5fed4
commit 0ac9ebf
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 5 deletions.
diff --git a/RedirectResponse.php b/RedirectResponse.php
@@ -93,7 +93,7 @@ public function setTargetUrl($url)
 <html>
     <head>
         <meta charset="UTF-8" />
-        <meta http-equiv="refresh" content="0;url=%1$s" />
+        <meta http-equiv="refresh" content="0;url=\'%1$s\'" />
 
         <title>Redirecting to %1$s</title>
     </head>

diff --git a/Tests/RedirectResponseTest.php b/Tests/RedirectResponseTest.php
@@ -20,10 +20,7 @@ public function testGenerateMetaRedirect()
     {
         $response = new RedirectResponse('foo.bar');
 
-        $this->assertEquals(1, preg_match(
-            '#<meta http-equiv="refresh" content="\d+;url=foo\.bar" />#',
-            preg_replace(['/\s+/', '/\'/'], [' ', '"'], $response->getContent())
-        ));
+        $this->assertRegExp('#<meta http-equiv="refresh" content="\d+;url=\'foo\.bar\'" />#', preg_replace('/\s+/', ' ', $response->getContent()));
     }
 
     public function testRedirectResponseConstructorNullUrl()