minor #53255 [Validator] Update Charset constraint message (alexandre-daubois)

fabpot · fabpot · commit ce22a97021e4 · 2023-12-28T11:15:24.000+01:00
This PR was merged into the 7.1 branch. Discussion ---------- [Validator] Update `Charset` constraint message | Q | A | ------------- | --- | Branch? | 7.1 | Bug fix? | no | New feature? | no | Deprecations? | no | Issues | - | License | MIT After #53253 (comment) Commits ------- 1c170f9 [Validator] Update `Charset` constraint message
diff --git a/src/Symfony/Component/Validator/Constraints/Charset.php b/src/Symfony/Component/Validator/Constraints/Charset.php
@@ -27,7 +27,7 @@ final class Charset extends Constraint
     ];
 
     public array|string $encodings = [];
-    public string $message = 'The detected encoding "{{ detected }}" does not match one of the accepted encoding: "{{ encodings }}".';
+    public string $message = 'The detected character encoding "{{ detected }}" is invalid. Allowed encodings are "{{ encodings }}".';
 
     public function __construct(array|string $encodings = null, string $message = null, array $groups = null, mixed $payload = null, array $options = null)
     {
diff --git a/src/Symfony/Component/Validator/Tests/Constraints/CharsetValidatorTest.php b/src/Symfony/Component/Validator/Tests/Constraints/CharsetValidatorTest.php
@@ -40,7 +40,7 @@ public function testInvalidValues(string $value, array $encodings)
     {
         $this->validator->validate($value, new Charset(encodings: $encodings));
 
-        $this->buildViolation('The detected encoding "{{ detected }}" does not match one of the accepted encoding: "{{ encodings }}".')
+        $this->buildViolation('The detected character encoding "{{ detected }}" is invalid. Allowed encodings are "{{ encodings }}".')
             ->setParameter('{{ detected }}', mb_detect_encoding($value, $encodings, true))
             ->setParameter('{{ encodings }}', implode(', ', $encodings))
             ->setCode(Charset::BAD_ENCODING_ERROR)

Original file line number	Diff line number	Diff line change
`@@ -27,7 +27,7 @@ final class Charset extends Constraint`
`27`	`27`	`];`
`28`	`28`
`29`	`29`	`public array\|string $encodings = [];`
`30`		`- public string $message = 'The detected encoding "{{ detected }}" does not match one of the accepted encoding: "{{ encodings }}".';`
	`30`	`+ public string $message = 'The detected character encoding "{{ detected }}" is invalid. Allowed encodings are "{{ encodings }}".';`
`31`	`31`
`32`	`32`	`public function __construct(array\|string $encodings = null, string $message = null, array $groups = null, mixed $payload = null, array $options = null)`
`33`	`33`	`{`
Original file line number	Diff line number	Diff line change
`@@ -40,7 +40,7 @@ public function testInvalidValues(string $value, array $encodings)`
`40`	`40`	`{`
`41`	`41`	`$this->validator->validate($value, new Charset(encodings: $encodings));`
`42`	`42`
`43`		`- $this->buildViolation('The detected encoding "{{ detected }}" does not match one of the accepted encoding: "{{ encodings }}".')`
	`43`	`+ $this->buildViolation('The detected character encoding "{{ detected }}" is invalid. Allowed encodings are "{{ encodings }}".')`
`44`	`44`	`->setParameter('{{ detected }}', mb_detect_encoding($value, $encodings, true))`
`45`	`45`	`->setParameter('{{ encodings }}', implode(', ', $encodings))`
`46`	`46`	`->setCode(Charset::BAD_ENCODING_ERROR)`