Skip to content

Commit 383d73e

Browse files
committed
feature symfony#38407 [Mime] Prefer .jpg instead of .jpeg (fabpot)
This PR was merged into the 5.2-dev branch. Discussion ---------- [Mime] Prefer .jpg instead of .jpeg | Q | A | ------------- | --- | Branch? | master | Bug fix? | no | New feature? | no <!-- please update src/**/CHANGELOG.md files --> | Deprecations? | no <!-- please update UPGRADE-*.md and src/**/CHANGELOG.md files --> | Tickets | Fix symfony#38364 <!-- prefix each issue number with "Fix #", no need to create an issue if none exist, explain below instead --> | License | MIT | Doc PR | Commits ------- 89adb21 [Mime] Prefer .jpg instead of .jpeg
2 parents edb5fed + 89adb21 commit 383d73e

File tree

2 files changed

+4
-4
lines changed

2 files changed

+4
-4
lines changed

src/Symfony/Component/HttpFoundation/Tests/File/UploadedFileTest.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -87,11 +87,11 @@ public function testGuessClientExtensionWithIncorrectMimeType()
8787
$file = new UploadedFile(
8888
__DIR__.'/Fixtures/test.gif',
8989
'original.gif',
90-
'image/jpeg',
90+
'image/png',
9191
null
9292
);
9393

94-
$this->assertEquals('jpeg', $file->guessClientExtension());
94+
$this->assertEquals('png', $file->guessClientExtension());
9595
}
9696

9797
public function testCaseSensitiveMimeType()

src/Symfony/Component/Mime/MimeTypes.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1320,7 +1320,7 @@ public function guessMimeType(string $path): ?string
13201320
'image/ief' => ['ief'],
13211321
'image/jls' => ['jls'],
13221322
'image/jp2' => ['jp2', 'jpg2'],
1323-
'image/jpeg' => ['jpeg', 'jpg', 'jpe'],
1323+
'image/jpeg' => ['jpg', 'jpeg', 'jpe'],
13241324
'image/jpeg2000' => ['jp2', 'jpg2'],
13251325
'image/jpeg2000-image' => ['jp2', 'jpg2'],
13261326
'image/jph' => ['jph'],
@@ -1338,7 +1338,7 @@ public function guessMimeType(string $path): ?string
13381338
'image/openraster' => ['ora'],
13391339
'image/pdf' => ['pdf'],
13401340
'image/photoshop' => ['psd'],
1341-
'image/pjpeg' => ['jpeg', 'jpg', 'jpe'],
1341+
'image/pjpeg' => ['jpg', 'jpeg', 'jpe'],
13421342
'image/png' => ['png'],
13431343
'image/prs.btif' => ['btif'],
13441344
'image/prs.pti' => ['pti'],

0 commit comments

Comments
 (0)