From 4bc03a23043b00d1aca5678b777b506fd4f0a26f Mon Sep 17 00:00:00 2001 From: Philippe Lonchampt Date: Tue, 2 Jul 2024 17:53:07 +0200 Subject: [PATCH] Handle non-standard but still in use image/x-jpeg mimetype as JPEG (#1372) * Handle non-standard but still in use image/x-jpeg mimetype as JPEG * Fix test --- src/MediaType.php | 4 +++- tests/Unit/FormatTest.php | 2 +- tests/Unit/MediaTypeTest.php | 3 +++ 3 files changed, 7 insertions(+), 2 deletions(-) diff --git a/src/MediaType.php b/src/MediaType.php index 91012715..5fa468c4 100644 --- a/src/MediaType.php +++ b/src/MediaType.php @@ -9,6 +9,7 @@ enum MediaType: string case IMAGE_JPEG = 'image/jpeg'; case IMAGE_JPG = 'image/jpg'; case IMAGE_PJPEG = 'image/pjpeg'; + case IMAGE_X_JPEG = 'image/x-jpeg'; case IMAGE_WEBP = 'image/webp'; case IMAGE_X_WEBP = 'image/x-webp'; case IMAGE_GIF = 'image/gif'; @@ -41,7 +42,8 @@ enum MediaType: string return match ($this) { self::IMAGE_JPEG, self::IMAGE_JPG, - self::IMAGE_PJPEG => Format::JPEG, + self::IMAGE_PJPEG, + self::IMAGE_X_JPEG => Format::JPEG, self::IMAGE_WEBP, self::IMAGE_X_WEBP => Format::WEBP, self::IMAGE_GIF => Format::GIF, diff --git a/tests/Unit/FormatTest.php b/tests/Unit/FormatTest.php index ca6a2319..afc70cc6 100644 --- a/tests/Unit/FormatTest.php +++ b/tests/Unit/FormatTest.php @@ -43,7 +43,7 @@ final class FormatTest extends BaseTestCase $format = Format::JPEG; $mediaTypes = $format->mediaTypes(); $this->assertIsArray($mediaTypes); - $this->assertCount(3, $mediaTypes); + $this->assertCount(4, $mediaTypes); } public function testMediaTypesWebp(): void diff --git a/tests/Unit/MediaTypeTest.php b/tests/Unit/MediaTypeTest.php index 564aa44a..ca3dfe90 100644 --- a/tests/Unit/MediaTypeTest.php +++ b/tests/Unit/MediaTypeTest.php @@ -20,6 +20,9 @@ final class MediaTypeTest extends BaseTestCase $mime = MediaType::IMAGE_JPG; $this->assertEquals(Format::JPEG, $mime->format()); + + $mime = MediaType::IMAGE_X_JPEG; + $this->assertEquals(Format::JPEG, $mime->format()); } public function testFormatWebp(): void