From 89adb2133b1444b713d0496c17f1e631445bcc39 Mon Sep 17 00:00:00 2001
From: Fabien Potencier <fabien@potencier.org>
Date: Sun, 4 Oct 2020 10:29:39 +0200
Subject: [PATCH] [Mime] Prefer .jpg instead of .jpeg

---
 .../Component/HttpFoundation/Tests/File/UploadedFileTest.php  | 4 ++--
 src/Symfony/Component/Mime/MimeTypes.php                      | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/Symfony/Component/HttpFoundation/Tests/File/UploadedFileTest.php b/src/Symfony/Component/HttpFoundation/Tests/File/UploadedFileTest.php
index 5565b0384f..50374aa081 100644
--- a/src/Symfony/Component/HttpFoundation/Tests/File/UploadedFileTest.php
+++ b/src/Symfony/Component/HttpFoundation/Tests/File/UploadedFileTest.php
@@ -87,11 +87,11 @@ class UploadedFileTest extends TestCase
         $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
index 7c0546586a..a908097521 100644
--- a/src/Symfony/Component/Mime/MimeTypes.php
+++ b/src/Symfony/Component/Mime/MimeTypes.php
@@ -1320,7 +1320,7 @@ final class MimeTypes implements MimeTypesInterface
         '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 @@ final class MimeTypes implements MimeTypesInterface
         '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'],