backport laravel / framework #35518

Author: rizqyhi

src/Illuminate/Validation/Validator.php

@@ -1222,6 +1222,10 @@ protected function validateMimes($attribute, $value, $parameters)
 			return false;
 		}
 
+        if (in_array('jpg', $parameters) || in_array('jpeg', $parameters)) {
+            $parameters = array_unique(array_merge($parameters, ['jpg', 'jpeg']));
+        }
+
 		return $value->getPath() != '' && in_array($value->guessExtension(), $parameters);
 	}
 

tests/Validation/ValidationValidatorTest.php

@@ -991,11 +991,18 @@ public function testValidateImage()
 		$this->assertFalse($v->passes());
 
 		$v = new Validator($trans, [], ['x' => 'Image']);
-		$file2 = $this->getMock(UploadedFile::class, ['guessExtension'], $uploadedFile);
-		$file2->expects($this->any())->method('guessExtension')->willReturn('jpeg');
+		$file2 = $this->getMock(UploadedFile::class, ['guessExtension', 'getClientOriginalExtension'], $uploadedFile);
+        $file2->expects($this->any())->method('guessExtension')->willReturn('jpg');
+		$file2->expects($this->any())->method('getClientOriginalExtension')->willReturn('jpeg');
 		$v->setFiles(['x' => $file2]);
 		$this->assertTrue($v->passes());
 
+        $file2 = $this->getMock(UploadedFile::class, ['guessExtension', 'getClientOriginalExtension'], $uploadedFile);
+        $file2->expects($this->any())->method('guessExtension')->willReturn('jpg');
+        $file2->expects($this->any())->method('getClientOriginalExtension')->willReturn('jpg');
+        $v->setFiles(['x' => $file2]);
+        $this->assertTrue($v->passes());
+
 		$file3 = $this->getMock(UploadedFile::class, ['guessExtension'], $uploadedFile);
 		$file3->expects($this->any())->method('guessExtension')->willReturn('gif');
 		$v->setFiles(['x' => $file3]);
@@ -1010,12 +1017,6 @@ public function testValidateImage()
 		$file5->expects($this->any())->method('guessExtension')->willReturn('png');
 		$v->setFiles(['x' => $file5]);
 		$this->assertTrue($v->passes());
-
-        $file6 = $this->getMock(UploadedFile::class, ['guessExtension', 'getClientOriginalExtension'], $uploadedFile);
-        $file6->expects($this->any())->method('guessExtension')->willReturn('jpg');
-        $file6->expects($this->any())->method('getClientOriginalExtension')->willReturn('jpg');
-        $v->setFiles(['x' => $file6]);
-        $this->assertTrue($v->passes());
 	}
 
 
@@ -1036,6 +1037,18 @@ public function testValidateMime()
 		$v = new Validator($trans, [], ['x' => 'mimes:php']);
 		$v->setFiles(['x' => $file2]);
 		$this->assertFalse($v->passes());
+
+        $file = $this->getMock(UploadedFile::class, ['guessExtension', 'getClientOriginalExtension'], $uploadedFile);
+        $file->expects($this->any())->method('guessExtension')->willReturn('jpg');
+        $file->expects($this->any())->method('getClientOriginalExtension')->willReturn('jpg');
+        $v = new Validator($trans, ['x' => $file], ['x' => 'mimes:jpeg']);
+        $this->assertTrue($v->passes());
+
+        $file = $this->getMock(UploadedFile::class, ['guessExtension', 'getClientOriginalExtension'], $uploadedFile);
+        $file->expects($this->any())->method('guessExtension')->willReturn('jpg');
+        $file->expects($this->any())->method('getClientOriginalExtension')->willReturn('jpeg');
+        $v = new Validator($trans, ['x' => $file], ['x' => 'mimes:jpg']);
+        $this->assertTrue($v->passes());
 	}