bug #53538 [Validator] Fix charset encoding detection in CharsetValidator (alexandre-daubois)

xabbuh · xabbuh · commit b40b65d6e736 · 2024-01-16T22:19:24.000+01:00
This PR was merged into the 7.1 branch. Discussion ---------- [Validator] Fix charset encoding detection in `CharsetValidator` | Q | A | ------------- | --- | Branch? | 7.1 | Bug fix? | yes | New feature? | no | Deprecations? | no | Issues | Fix #53154 (comment) | License | MIT After `@smnandre` suggestion, I updated the constraint to display a better message on the detected encoding. Indeed, if we fail to check the encoding is in the provided ones, then we fall back on any encoding detected by mbstring. Commits ------- 6393e29 [Validator] Fix charset encoding detection in `CharsetValidator`
diff --git a/src/Symfony/Component/Validator/Constraints/CharsetValidator.php b/src/Symfony/Component/Validator/Constraints/CharsetValidator.php
@@ -35,9 +35,9 @@ public function validate(mixed $value, Constraint $constraint): void
             throw new UnexpectedValueException($value, 'string');
         }
 
-        if (!\in_array($detected = mb_detect_encoding($value, $constraint->encodings, true), (array) $constraint->encodings, true)) {
+        if (!\in_array(mb_detect_encoding($value, $constraint->encodings, true), (array) $constraint->encodings, true)) {
             $this->context->buildViolation($constraint->message)
-                ->setParameter('{{ detected }}', $detected)
+                ->setParameter('{{ detected }}', mb_detect_encoding($value, strict: true))
                 ->setParameter('{{ encodings }}', implode(', ', $constraint->encodings))
                 ->setCode(Charset::BAD_ENCODING_ERROR)
                 ->addViolation();
diff --git a/src/Symfony/Component/Validator/Tests/Constraints/CharsetValidatorTest.php b/src/Symfony/Component/Validator/Tests/Constraints/CharsetValidatorTest.php
@@ -42,7 +42,7 @@ public function testInvalidValues(string $value, array $encodings)
         $this->validator->validate($value, new Charset(encodings: $encodings));
 
         $this->buildViolation('The detected character encoding is invalid ({{ detected }}). Allowed encodings are {{ encodings }}.')
-            ->setParameter('{{ detected }}', mb_detect_encoding($value, $encodings, true))
+            ->setParameter('{{ detected }}', 'UTF-8')
             ->setParameter('{{ encodings }}', implode(', ', $encodings))
             ->setCode(Charset::BAD_ENCODING_ERROR)
             ->assertRaised();
