diff --git a/src/Symfony/Component/HttpFoundation/Tests/File/MimeType/MimeTypeTest.php b/src/Symfony/Component/HttpFoundation/Tests/File/MimeType/MimeTypeTest.php index 42d5c436cd..b302f0a675 100644 --- a/src/Symfony/Component/HttpFoundation/Tests/File/MimeType/MimeTypeTest.php +++ b/src/Symfony/Component/HttpFoundation/Tests/File/MimeType/MimeTypeTest.php @@ -65,8 +65,7 @@ class MimeTypeTest extends TestCase public function testGuessWithDuplicatedFileType() { - $type = MimeTypeGuesser::getInstance()->guess(__DIR__.'/../Fixtures/test.docx'); - $this->assertTrue(\in_array($type, ['application/vnd.openxmlformats-officedocument.wordprocessingml.document', 'application/zip'], true)); + $this->assertContains(MimeTypeGuesser::getInstance()->guess(__DIR__.'/../Fixtures/test.docx'), ['application/vnd.openxmlformats-officedocument.wordprocessingml.document', 'application/zip']); } public function testGuessWithIncorrectPath() diff --git a/src/Symfony/Component/Mime/Tests/MimeTypesTest.php b/src/Symfony/Component/Mime/Tests/MimeTypesTest.php index 9b16ff6807..50d99ae515 100644 --- a/src/Symfony/Component/Mime/Tests/MimeTypesTest.php +++ b/src/Symfony/Component/Mime/Tests/MimeTypesTest.php @@ -75,7 +75,12 @@ class MimeTypesTest extends AbstractMimeTypeGuesserTest } /** - * PHP 8 detects .csv files as "application/csv" while PHP 7 returns "text/plain". + * PHP 8 detects .csv files as "application/csv" (or "text/csv", depending + * on your system) while PHP 7 returns "text/plain". + * + * "text/csv" is described by RFC 7111. + * + * @see https://datatracker.ietf.org/doc/html/rfc7111 * * @requires PHP 8 */ @@ -84,7 +89,7 @@ class MimeTypesTest extends AbstractMimeTypeGuesserTest $mt = new MimeTypes(); $mime = $mt->guessMimeType(__DIR__.'/Fixtures/mimetypes/abc.csv'); - $this->assertSame('application/csv', $mime); + $this->assertContains($mime, ['application/csv', 'text/csv']); $this->assertSame(['csv'], $mt->getExtensions($mime)); } }