fix merge

xabbuh · xabbuh · commit 9c96ea949891 · 2023-12-28T19:10:09.000+01:00
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 character encoding "{{ detected }}" is invalid. Allowed encodings are "{{ encodings }}".')
+        $this->buildViolation('The detected character encoding is invalid ({{ detected }}). 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
`@@ -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 character encoding "{{ detected }}" is invalid. Allowed encodings are "{{ encodings }}".')`
	`43`	`+ $this->buildViolation('The detected character encoding is invalid ({{ detected }}). 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)`