symfony · nicolas-grekas · May 20, 2025 · May 19, 2025 · nicolas-grekas · May 20, 2025
diff --git a/src/Symfony/Component/Validator/Constraints/Image.php b/src/Symfony/Component/Validator/Constraints/Image.php
@@ -64,7 +64,7 @@ class Image extends File
      */
     protected static $errorNames = self::ERROR_NAMES;
 
-    public $mimeTypes = 'image/*';
+    public $mimeTypes;
     public $minWidth;
     public $maxWidth;
     public $maxHeight;
@@ -140,7 +140,9 @@ public function __construct(
         ?string $allowPortraitMessage = null,
         ?string $corruptedMessage = null,
         ?array $groups = null,
-        mixed $payload = null
+        mixed $payload = null,
+        array|string|null $extensions = null,
+        ?string $extensionsMessage = null,
     ) {
         parent::__construct(
             $options,
@@ -163,7 +165,9 @@ public function __construct(
             $uploadExtensionErrorMessage,
             $uploadErrorMessage,
             $groups,
-            $payload
+            $payload,
+            $extensions,
+            $extensionsMessage,
         );
 
         $this->minWidth = $minWidth ?? $this->minWidth;
@@ -192,6 +196,10 @@ public function __construct(
         $this->allowPortraitMessage = $allowPortraitMessage ?? $this->allowPortraitMessage;
         $this->corruptedMessage = $corruptedMessage ?? $this->corruptedMessage;
 
+        if (null === $this->mimeTypes && [] === $this->extensions) {
+            $this->mimeTypes = 'image/*';
        }
+
         if (!\in_array('image/*', (array) $this->mimeTypes, true) && !\array_key_exists('mimeTypesMessage', $options ?? []) && null === $mimeTypesMessage) {
             $this->mimeTypesMessage = 'The mime type of the file is invalid ({{ type }}). Allowed mime types are {{ types }}.';
         }

diff --git a/src/Symfony/Component/Validator/Tests/Constraints/ImageValidatorTest.php b/src/Symfony/Component/Validator/Tests/Constraints/ImageValidatorTest.php
@@ -11,6 +11,8 @@
 
 namespace Symfony\Component\Validator\Tests\Constraints;
 
+use Symfony\Component\HttpFoundation\File\File;
+use Symfony\Component\Mime\MimeTypes;
 use Symfony\Component\Validator\Constraints\Image;
 use Symfony\Component\Validator\Constraints\ImageValidator;
 use Symfony\Component\Validator\Exception\ConstraintDefinitionException;
@@ -579,4 +581,75 @@ public static function provideInvalidMimeTypeWithNarrowedSet()
             ]),
         ];
     }
+
+    /**
+     * @dataProvider providerValidExtension
+     */
+    public function testExtensionValid(string $name)
+    {
+        if (!class_exists(MimeTypes::class)) {
+            $this->markTestSkipped('Guessing the mime type is not possible');
+        }
+
+        $constraint = new Image(mimeTypes: [], extensions: ['gif'], extensionsMessage: 'myMessage');
+
+        $this->validator->validate(new File(__DIR__.'/Fixtures/'.$name), $constraint);
+
+        $this->assertNoViolation();
+    }
+
+    public static function providerValidExtension(): iterable
+    {
+        yield ['test.gif'];
+        yield ['test.png.gif'];
+    }
+
+    /**
+     * @dataProvider provideInvalidExtension
+     */
+    public function testExtensionInvalid(string $name, string $extension)
+    {
+        $path = __DIR__.'/Fixtures/'.$name;
+        $constraint = new Image(extensions: ['png', 'svg'], extensionsMessage: 'myMessage');
+
+        $this->validator->validate(new File($path), $constraint);
+
+        $this->buildViolation('myMessage')
+            ->setParameters([
+                '{{ file }}' => '"'.$path.'"',
+                '{{ extension }}' => '"'.$extension.'"',
+                '{{ extensions }}' => '"png", "svg"',
+                '{{ name }}' => '"'.$name.'"',
+            ])
+            ->setCode(Image::INVALID_EXTENSION_ERROR)
+            ->assertRaised();
+    }
+
+    public static function provideInvalidExtension(): iterable
+    {
+        yield ['test.gif', 'gif'];
+        yield ['test.png.gif', 'gif'];
+    }
+
+    public function testExtensionAutodetectMimeTypesInvalid()
+    {
+        if (!class_exists(MimeTypes::class)) {
+            $this->markTestSkipped('Guessing the mime type is not possible');
+        }
+
+        $path = __DIR__.'/Fixtures/invalid-content.gif';
+        $constraint = new Image(mimeTypesMessage: 'myMessage', extensions: ['gif']);
+
+        $this->validator->validate(new File($path), $constraint);
+
+        $this->buildViolation('myMessage')
+            ->setParameters([
+                '{{ file }}' => '"'.$path.'"',
+                '{{ name }}' => '"invalid-content.gif"',
+                '{{ type }}' => '"text/plain"',
+                '{{ types }}' => '"image/gif"',
+            ])
+            ->setCode(Image::INVALID_MIME_TYPE_ERROR)
+            ->assertRaised();
+    }
 }