feature #38407 [Mime] Prefer .jpg instead of .jpeg (fabpot)

fabpot · fabpot · commit 383d73ed600e · 2020-10-04T10:37:55.000+02:00
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  | Deprecations? | no  | Tickets | Fix #38364  | License | MIT | Doc PR | Commits ------- 89adb21 [Mime] Prefer .jpg instead of .jpeg
diff --git a/src/Symfony/Component/HttpFoundation/Tests/File/UploadedFileTest.php b/src/Symfony/Component/HttpFoundation/Tests/File/UploadedFileTest.php
@@ -87,11 +87,11 @@ public function testGuessClientExtensionWithIncorrectMimeType()
         $file = new UploadedFile(
             __DIR__.'/Fixtures/test.gif',
             'original.gif',
-            'image/jpeg',
+            'image/png',
             null
         );
 
-        $this->assertEquals('jpeg', $file->guessClientExtension());
+        $this->assertEquals('png', $file->guessClientExtension());
     }
 
     public function testCaseSensitiveMimeType()
diff --git a/src/Symfony/Component/Mime/MimeTypes.php b/src/Symfony/Component/Mime/MimeTypes.php
@@ -1320,7 +1320,7 @@ public function guessMimeType(string $path): ?string
         'image/ief' => ['ief'],
         'image/jls' => ['jls'],
         'image/jp2' => ['jp2', 'jpg2'],
-        'image/jpeg' => ['jpeg', 'jpg', 'jpe'],
+        'image/jpeg' => ['jpg', 'jpeg', 'jpe'],
         'image/jpeg2000' => ['jp2', 'jpg2'],
         'image/jpeg2000-image' => ['jp2', 'jpg2'],
         'image/jph' => ['jph'],
@@ -1338,7 +1338,7 @@ public function guessMimeType(string $path): ?string
         'image/openraster' => ['ora'],
         'image/pdf' => ['pdf'],
         'image/photoshop' => ['psd'],
-        'image/pjpeg' => ['jpeg', 'jpg', 'jpe'],
+        'image/pjpeg' => ['jpg', 'jpeg', 'jpe'],
         'image/png' => ['png'],
         'image/prs.btif' => ['btif'],
         'image/prs.pti' => ['pti'],
