[Validator] Improve Image constraint invalid mime type message

fancyweb · fancyweb · commit 0e66dbe54ae7 · 2022-01-20T13:45:54.000+01:00
diff --git a/src/Symfony/Component/Validator/Constraints/Image.php b/src/Symfony/Component/Validator/Constraints/Image.php
@@ -184,5 +184,9 @@ public function __construct(
         $this->allowLandscapeMessage = $allowLandscapeMessage ?? $this->allowLandscapeMessage;
         $this->allowPortraitMessage = $allowPortraitMessage ?? $this->allowPortraitMessage;
         $this->corruptedMessage = $corruptedMessage ?? $this->corruptedMessage;
+
+        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
@@ -511,4 +511,36 @@ public function provideDetectCorruptedConstraints(): iterable
             new Image(detectCorrupted: true, corruptedMessage: 'myMessage'),
         ];
     }
+
+    /**
+     * @dataProvider provideInvalidMimeTypeWithNarrowedSet
+     */
+    public function testInvalidMimeTypeWithNarrowedSet(Image $constraint)
+    {
+        $this->validator->validate($this->image, $constraint);
+
+        $this->buildViolation('The mime type of the file is invalid ({{ type }}). Allowed mime types are {{ types }}.')
+            ->setParameter('{{ file }}', sprintf('"%s"', $this->image))
+            ->setParameter('{{ type }}', '"image/gif"')
+            ->setParameter('{{ types }}', '"image/jpeg", "image/png"')
+            ->setParameter('{{ name }}', '"test.gif"')
+            ->setCode(Image::INVALID_MIME_TYPE_ERROR)
+            ->assertRaised();
+    }
+
+    public function provideInvalidMimeTypeWithNarrowedSet()
+    {
+        yield 'Doctrine style' => [new Image([
+            'mimeTypes' => [
+                'image/jpeg',
+                'image/png',
+            ],
+        ])];
+        yield 'Named arguments' => [
+            new Image(mimeTypes: [
+                'image/jpeg',
+                'image/png',
+            ]),
+        ];
+    }
 }

Original file line number	Diff line number	Diff line change
`@@ -184,5 +184,9 @@ public function __construct(`
`184`	`184`	`$this->allowLandscapeMessage = $allowLandscapeMessage ?? $this->allowLandscapeMessage;`
`185`	`185`	`$this->allowPortraitMessage = $allowPortraitMessage ?? $this->allowPortraitMessage;`
`186`	`186`	`$this->corruptedMessage = $corruptedMessage ?? $this->corruptedMessage;`
	`187`	`+`
	`188`	`+ if (!\in_array('image/*', (array) $this->mimeTypes, true) && !\array_key_exists('mimeTypesMessage', $options ?? []) && null === $mimeTypesMessage) {`
	`189`	`+ $this->mimeTypesMessage = 'The mime type of the file is invalid ({{ type }}). Allowed mime types are {{ types }}.';`
	`190`	`+ }`
`187`	`191`	`}`
`188`	`192`	`}`