Merge branch '4.3' into 4.4

nicolas-grekas · nicolas-grekas · commit 502040dd2b0c · 2019-11-17T11:10:42.000+01:00
* 4.3:
  [FrameworkBundle] Remove project dir from Translator cache vary scanned directories
  [HttpFoundation] Allow redirecting to URLs that contain a semicolon
  catch exceptions when using PDO directly
  [SecurityBundle] fix failing test
diff --git a/RedirectResponse.php b/RedirectResponse.php
@@ -98,7 +98,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 testRedirectResponseConstructorEmptyUrl()

Original file line number	Diff line number	Diff line change
`@@ -20,10 +20,7 @@ public function testGenerateMetaRedirect()`
`20`	`20`	`{`
`21`	`21`	`$response = new RedirectResponse('foo.bar');`
`22`	`22`
`23`		`- $this->assertEquals(1, preg_match(`
`24`		`- '#<meta http-equiv="refresh" content="\d+;url=foo\.bar" />#',`
`25`		`- preg_replace(['/\s+/', '/\'/'], [' ', '"'], $response->getContent())`
`26`		`- ));`
	`23`	`+ $this->assertRegExp('#<meta http-equiv="refresh" content="\d+;url=\'foo\.bar\'" />#', preg_replace('/\s+/', ' ', $response->getContent()));`
`27`	`24`	`}`
`28`	`25`
`29`	`26`	`public function testRedirectResponseConstructorEmptyUrl()`