From c39d432727a826d9750faa7a7c0c4668de7c2d21 Mon Sep 17 00:00:00 2001
From: NEGits <33746490+NEGits@users.noreply.github.com>
Date: Mon, 30 Nov 2020 15:14:20 +0100
Subject: [PATCH] [6.x] Fix validating image/jpeg images after Symfony/Mime
 update (#35419)

* [6.x]  Fix validating image/jpeg images after Symfony/Mime update

Symfony/Mime v5.20 changed the returned extension for an image with image/jpeg mime type: symfony/mime@aa1d922. This commit adds `.jpg`, which fixes the validation.

* [6.x] Add test for image validation with jpg extension

(cherry picked from commit fff077c1f84169302b31fe812d132b62666ade07)
---
 src/Illuminate/Validation/Concerns/ValidatesAttributes.php | 2 +-
 tests/Validation/ValidationValidatorTest.php               | 6 ++++++
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/src/Illuminate/Validation/Concerns/ValidatesAttributes.php b/src/Illuminate/Validation/Concerns/ValidatesAttributes.php
index 7d9a9a6355a0..3bf1980123d2 100644
--- a/src/Illuminate/Validation/Concerns/ValidatesAttributes.php
+++ b/src/Illuminate/Validation/Concerns/ValidatesAttributes.php
@@ -1011,7 +1011,7 @@ public function validateLte($attribute, $value, $parameters)
      */
     public function validateImage($attribute, $value)
     {
-        return $this->validateMimes($attribute, $value, ['jpeg', 'png', 'gif', 'bmp', 'svg', 'webp']);
+        return $this->validateMimes($attribute, $value, ['jpg', 'jpeg', 'png', 'gif', 'bmp', 'svg', 'webp']);
     }
 
     /**
diff --git a/tests/Validation/ValidationValidatorTest.php b/tests/Validation/ValidationValidatorTest.php
index a8ee201e2a38..970fad7385b1 100755
--- a/tests/Validation/ValidationValidatorTest.php
+++ b/tests/Validation/ValidationValidatorTest.php
@@ -2514,6 +2514,12 @@ public function testValidateImage()
         $file7->expects($this->any())->method('getClientOriginalExtension')->will($this->returnValue('webp'));
         $v = new Validator($trans, ['x' => $file7], ['x' => 'Image']);
         $this->assertTrue($v->passes());
+
+        $file2 = $this->getMockBuilder(UploadedFile::class)->setMethods(['guessExtension', 'getClientOriginalExtension'])->setConstructorArgs($uploadedFile)->getMock();
+        $file2->expects($this->any())->method('guessExtension')->willReturn('jpg');
+        $file2->expects($this->any())->method('getClientOriginalExtension')->willReturn('jpg');
+        $v = new Validator($trans, ['x' => $file2], ['x' => 'Image']);
+        $this->assertTrue($v->passes());
     }
 
     public function testValidateImageDoesNotAllowPhpExtensionsOnImageMime()