feature #53249 [Validator] support Stringable instances in CharsetValidator (xabbuh)

fabpot · fabpot · commit 269ab1a3fa39 · 2023-12-28T19:04:52.000+01:00
This PR was merged into the 7.1 branch. Discussion ---------- [Validator] support `Stringable` instances in `CharsetValidator` | Q | A | ------------- | --- | Branch? | 7.1 | Bug fix? | no | New feature? | yes | Deprecations? | no | Issues | | License | MIT Commits ------- 1f77c3e support Stringable instances in CharsetValidator
diff --git a/src/Symfony/Component/Validator/Constraints/CharsetValidator.php b/src/Symfony/Component/Validator/Constraints/CharsetValidator.php
@@ -31,7 +31,7 @@ public function validate(mixed $value, Constraint $constraint): void
             return;
         }
 
-        if (!\is_string($value)) {
+        if (!\is_string($value) && !$value instanceof \Stringable) {
             throw new UnexpectedValueException($value, 'string');
         }
 
diff --git a/src/Symfony/Component/Validator/Tests/Constraints/CharsetValidatorTest.php b/src/Symfony/Component/Validator/Tests/Constraints/CharsetValidatorTest.php
@@ -26,7 +26,7 @@ protected function createValidator(): CharsetValidator
     /**
      * @dataProvider provideValidValues
      */
-    public function testEncodingIsValid(string $value, array $encodings)
+    public function testEncodingIsValid(string|\Stringable $value, array $encodings)
     {
         $this->validator->validate($value, new Charset(encodings: $encodings));
 
@@ -66,6 +66,12 @@ public static function provideValidValues()
         yield ['my ûtf 8', ['ASCII', 'UTF-8']];
         yield ['my ûtf 8', ['UTF-8']];
         yield ['string', ['ISO-8859-1']];
+        yield [new class() implements \Stringable {
+            public function __toString(): string
+            {
+                return 'my ûtf 8';
+            }
+        }, ['UTF-8']];
     }
 
     public static function provideInvalidValues()

Original file line number	Diff line number	Diff line change
`@@ -31,7 +31,7 @@ public function validate(mixed $value, Constraint $constraint): void`
`31`	`31`	`return;`
`32`	`32`	`}`
`33`	`33`
`34`		`- if (!\is_string($value)) {`
	`34`	`+ if (!\is_string($value) && !$value instanceof \Stringable) {`
`35`	`35`	`throw new UnexpectedValueException($value, 'string');`
`36`	`36`	`}`
`37`	`37`