mirror/intervention_image
1
0
Fork 0
mirror of https://github.com/Intervention/image.git synced 2025-08-23 05:52:47 +02:00
Code Issues Releases Wiki Activity

Handle non-standard but still in use image/x-jpeg mimetype as JPEG (#1372)

Browse Source 
* Handle non-standard but still in use image/x-jpeg mimetype as JPEG

* Fix test
This commit is contained in:
Philippe Lonchampt
2024-07-02 17:53:07 +02:00
committed by GitHub
parent 137bdb356a
commit 4bc03a2304
3 changed files with 7 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/MediaType.php
View File

@@ -9,6 +9,7 @@ enum MediaType: string
case IMAGE_JPEG = 'image/jpeg'; case IMAGE_JPEG = 'image/jpeg';
case IMAGE_JPG = 'image/jpg'; case IMAGE_JPG = 'image/jpg';
case IMAGE_PJPEG = 'image/pjpeg'; case IMAGE_PJPEG = 'image/pjpeg';
case IMAGE_X_JPEG = 'image/x-jpeg';
case IMAGE_WEBP = 'image/webp'; case IMAGE_WEBP = 'image/webp';
case IMAGE_X_WEBP = 'image/x-webp'; case IMAGE_X_WEBP = 'image/x-webp';
case IMAGE_GIF = 'image/gif'; case IMAGE_GIF = 'image/gif';
@@ -41,7 +42,8 @@ enum MediaType: string
return match ($this) { return match ($this) {
self::IMAGE_JPEG, self::IMAGE_JPEG,
self::IMAGE_JPG, self::IMAGE_JPG,
self::IMAGE_PJPEG => Format::JPEG, self::IMAGE_PJPEG,
self::IMAGE_X_JPEG => Format::JPEG,
self::IMAGE_WEBP, self::IMAGE_WEBP,
self::IMAGE_X_WEBP => Format::WEBP, self::IMAGE_X_WEBP => Format::WEBP,
self::IMAGE_GIF => Format::GIF, self::IMAGE_GIF => Format::GIF,

2
tests/Unit/FormatTest.php
View File

@@ -43,7 +43,7 @@ final class FormatTest extends BaseTestCase
$format = Format::JPEG; $format = Format::JPEG;
$mediaTypes = $format->mediaTypes(); $mediaTypes = $format->mediaTypes();
$this->assertIsArray($mediaTypes); $this->assertIsArray($mediaTypes);
$this->assertCount(3, $mediaTypes); $this->assertCount(4, $mediaTypes);
} }
public function testMediaTypesWebp(): void public function testMediaTypesWebp(): void

3
tests/Unit/MediaTypeTest.php
View File

@@ -20,6 +20,9 @@ final class MediaTypeTest extends BaseTestCase
$mime = MediaType::IMAGE_JPG; $mime = MediaType::IMAGE_JPG;
$this->assertEquals(Format::JPEG, $mime->format()); $this->assertEquals(Format::JPEG, $mime->format());
$mime = MediaType::IMAGE_X_JPEG;
$this->assertEquals(Format::JPEG, $mime->format());
} }
public function testFormatWebp(): void public function testFormatWebp(): void