[11.x] Add support for AVIF image format in validation

src/Illuminate/Validation/Concerns/ValidatesAttributes.php

@@ -1347,7 +1347,7 @@ public function validateHexColor($attribute, $value)
      */
     public function validateImage($attribute, $value)
     {
-        return $this->validateMimes($attribute, $value, ['jpg', 'jpeg', 'png', 'gif', 'bmp', 'svg', 'webp']);
+        return $this->validateMimes($attribute, $value, ['jpg', 'jpeg', 'png', 'gif', 'bmp', 'svg', 'webp', 'avif']);
     }
 
     /**

tests/Validation/ValidationFileRuleTest.php

@@ -192,6 +192,12 @@ public function testImage()
             File::image(),
             UploadedFile::fake()->image('foo.png'),
         );
+
+        $this->passes(
+            File::image(),
+            UploadedFile::fake()->image('foo.avif'),
+            ['validation.image']
+        );
     }
 
     public function testSize()

tests/Validation/ValidationValidatorTest.php

@@ -4846,12 +4846,6 @@ public function testValidateImage()
         $v = new Validator($trans, ['x' => $file2], ['x' => 'image']);
         $this->assertTrue($v->passes());
 
-        $file2 = $this->getMockBuilder(UploadedFile::class)->onlyMethods(['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());
-
         $file3 = $this->getMockBuilder(UploadedFile::class)->onlyMethods(['guessExtension', 'getClientOriginalExtension'])->setConstructorArgs($uploadedFile)->getMock();
         $file3->expects($this->any())->method('guessExtension')->willReturn('gif');
         $file3->expects($this->any())->method('getClientOriginalExtension')->willReturn('gif');
@@ -4883,10 +4877,9 @@ public function testValidateImage()
         $v = new Validator($trans, ['x' => $file7], ['x' => 'Image']);
         $this->assertTrue($v->passes());
 
-        $file2 = $this->getMockBuilder(UploadedFile::class)->onlyMethods(['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']);
+        $file8 = $this->getMockBuilder(UploadedFile::class)->onlyMethods(['guessExtension', 'getClientOriginalExtension'])->setConstructorArgs($uploadedFile)->getMock();
+        $file8->expects($this->any())->method('guessExtension')->willReturn('avif');
+        $file8->expects($this->any())->method('getClientOriginalExtension')->willReturn('avif');        $v = new Validator($trans, ['x' => $file8], ['x' => 'Image']);
         $this->assertTrue($v->passes());
     }