Merge branch '4.4' into 5.4

derrabus · derrabus · commit ff2818d1c3d4 · 2022-04-22T10:14:12.000+02:00
* 4.4:
  Use mb_convert_encoding instead of utf8_decode
  [FrameworkBundle] Always add CacheCollectorPass
  Fix "Notice: Undefined index: headers" in messenger with Oracle
  Indicate support for doctrine/persistence 3
  Replace deprecated String.prototype.substr()
diff --git a/Tests/BinaryFileResponseTest.php b/Tests/BinaryFileResponseTest.php
@@ -94,7 +94,7 @@ public function testSetContentDispositionGeneratesSafeFallbackFilenameForWrongly
     {
         $response = new BinaryFileResponse(__FILE__);
 
-        $iso88591EncodedFilename = utf8_decode('föö.html');
+        $iso88591EncodedFilename = mb_convert_encoding('föö.html', 'ISO-8859-1', 'UTF-8');
         $response->setContentDisposition(ResponseHeaderBag::DISPOSITION_ATTACHMENT, $iso88591EncodedFilename);
 
         // the parameter filename* is invalid in this case (rawurldecode('f%F6%F6') does not provide a UTF-8 string but an ISO-8859-1 encoded one)

Original file line number	Diff line number	Diff line change
`@@ -94,7 +94,7 @@ public function testSetContentDispositionGeneratesSafeFallbackFilenameForWrongly`
`94`	`94`	`{`
`95`	`95`	`$response = new BinaryFileResponse(__FILE__);`
`96`	`96`
`97`		`- $iso88591EncodedFilename = utf8_decode('föö.html');`
	`97`	`+ $iso88591EncodedFilename = mb_convert_encoding('föö.html', 'ISO-8859-1', 'UTF-8');`
`98`	`98`	`$response->setContentDisposition(ResponseHeaderBag::DISPOSITION_ATTACHMENT, $iso88591EncodedFilename);`
`99`	`99`
`100`	`100`	`// the parameter filename* is invalid in this case (rawurldecode('f%F6%F6') does not provide a UTF-8 string but an ISO-8859-1 encoded one)`