Merge branch '4.3' into 4.4

* 4.3:
  Fix inconsistent return points.
  pass translation parameters to the trans filter
  [Mime] fixed wrong mimetype
  [ProxyManagerBridge] Polyfill for unmaintained version
  [HttpClient] Declare `$active` first to prevent weird issue
  Remove deprecated assertContains
  [HttpClient] fix tests
  SCA: dropped unused mocks, duplicate import and a function alias usage
  Added correct plural for box -> boxes
  [Config] fix test
  Fix remaining tests
  Improve fa (persian) translation

Author: nicolas-grekas

MimeTypes.php

@@ -2431,12 +2431,12 @@ public function guessMimeType(string $path): ?string
         'odc' => ['application/vnd.oasis.opendocument.chart'],
         'odf' => ['application/vnd.oasis.opendocument.formula'],
         'odft' => ['application/vnd.oasis.opendocument.formula-template'],
-        'odg' => ['vnd.oasis.opendocument.graphics', 'application/vnd.oasis.opendocument.graphics'],
+        'odg' => ['application/vnd.oasis.opendocument.graphics'],
         'odi' => ['application/vnd.oasis.opendocument.image'],
         'odm' => ['application/vnd.oasis.opendocument.text-master'],
-        'odp' => ['vnd.oasis.opendocument.presentation', 'application/vnd.oasis.opendocument.presentation'],
-        'ods' => ['vnd.oasis.opendocument.spreadsheet', 'application/vnd.oasis.opendocument.spreadsheet'],
-        'odt' => ['vnd.oasis.opendocument.text', 'application/vnd.oasis.opendocument.text'],
+        'odp' => ['application/vnd.oasis.opendocument.presentation'],
+        'ods' => ['application/vnd.oasis.opendocument.spreadsheet'],
+        'odt' => ['application/vnd.oasis.opendocument.text'],
         'oga' => ['audio/ogg', 'audio/vorbis', 'audio/x-flac+ogg', 'audio/x-ogg', 'audio/x-oggflac', 'audio/x-speex+ogg', 'audio/x-vorbis', 'audio/x-vorbis+ogg'],
         'ogg' => ['audio/ogg', 'audio/vorbis', 'audio/x-flac+ogg', 'audio/x-ogg', 'audio/x-oggflac', 'audio/x-speex+ogg', 'audio/x-vorbis', 'audio/x-vorbis+ogg', 'video/ogg', 'video/x-ogg', 'video/x-theora', 'video/x-theora+ogg'],
         'ogm' => ['video/x-ogm', 'video/x-ogm+ogg'],

Resources/bin/update_mime_types.php

@@ -108,10 +108,6 @@
     'mp4' => ['video/mp4'],
     'mpeg' => ['video/mpeg'],
     'mpg' => ['video/mpeg'],
-    'odg' => ['vnd.oasis.opendocument.graphics'],
-    'odp' => ['vnd.oasis.opendocument.presentation'],
-    'ods' => ['vnd.oasis.opendocument.spreadsheet'],
-    'odt' => ['vnd.oasis.opendocument.text'],
     'ogg' => ['audio/ogg'],
     'pdf' => ['application/pdf'],
     'php' => ['application/x-php'],

Tests/EmailTest.php

@@ -330,7 +330,7 @@ public function testGenerateBody()
         $this->assertCount(2, $parts = $related[0]->getParts());
         $this->assertInstanceOf(AlternativePart::class, $parts[0]);
         $generatedHtml = $parts[0]->getParts()[1];
-        $this->assertContains('cid:'.$parts[1]->getContentId(), $generatedHtml->getBody());
+        $this->assertStringContainsString('cid:'.$parts[1]->getContentId(), $generatedHtml->getBody());
 
         $content = 'html content <img src="cid:test.gif">';
         $r = fopen('php://memory', 'r+', false);

Tests/Part/MessagePartTest.php

@@ -23,9 +23,9 @@ class MessagePartTest extends TestCase
     public function testConstructor()
     {
         $p = new MessagePart((new Email())->from('[email protected]')->text('content'));
-        $this->assertContains('content', $p->getBody());
-        $this->assertContains('content', $p->bodyToString());
-        $this->assertContains('content', implode('', iterator_to_array($p->bodyToIterable())));
+        $this->assertStringContainsString('content', $p->getBody());
+        $this->assertStringContainsString('content', $p->bodyToString());
+        $this->assertStringContainsString('content', implode('', iterator_to_array($p->bodyToIterable())));
         $this->assertEquals('message', $p->getMediaType());
         $this->assertEquals('rfc822', $p->getMediaSubType());
     }