support Stringable instances in all constraints

xabbuh · xabbuh · commit f118c4f3b81a · 2024-01-03T08:04:46.000+01:00
diff --git a/src/Symfony/Component/Validator/CHANGELOG.md b/src/Symfony/Component/Validator/CHANGELOG.md
@@ -4,6 +4,7 @@ CHANGELOG
 7.1
 ---
 
+ * Add support for `Stringable` values in `CidrValidator`, `CssColorValidator`, `ExpressionSyntaxValidator` and `PasswordStrengthValidator`
  * Add `MacAddress` constraint
  * Add `list` and `associative_array` types to `Type` constraint
  * Add the `Charset` constraint
diff --git a/src/Symfony/Component/Validator/Constraints/CidrValidator.php b/src/Symfony/Component/Validator/Constraints/CidrValidator.php
@@ -28,7 +28,7 @@ public function validate($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/Constraints/CssColorValidator.php b/src/Symfony/Component/Validator/Constraints/CssColorValidator.php
@@ -62,7 +62,7 @@ public function validate($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/Constraints/ExpressionSyntaxValidator.php b/src/Symfony/Component/Validator/Constraints/ExpressionSyntaxValidator.php
@@ -40,7 +40,7 @@ public function validate(mixed $expression, Constraint $constraint): void
             return;
         }
 
-        if (!\is_string($expression)) {
+        if (!\is_string($expression) && !$expression instanceof \Stringable) {
             throw new UnexpectedValueException($expression, 'string');
         }
 
diff --git a/src/Symfony/Component/Validator/Constraints/PasswordStrengthValidator.php b/src/Symfony/Component/Validator/Constraints/PasswordStrengthValidator.php
@@ -36,7 +36,7 @@ public function validate(#[\SensitiveParameter] mixed $value, Constraint $constr
             return;
         }
 
-        if (!\is_string($value)) {
+        if (!\is_string($value) && !$value instanceof \Stringable) {
             throw new UnexpectedValueException($value, 'string');
         }
         $passwordStrengthEstimator = $this->passwordStrengthEstimator ?? self::estimateStrength(...);

Original file line number	Diff line number	Diff line change
`@@ -28,7 +28,7 @@ public function validate($value, Constraint $constraint): void`
`28`	`28`	`return;`
`29`	`29`	`}`
`30`	`30`
`31`		`- if (!\is_string($value)) {`
	`31`	`+ if (!\is_string($value) && !$value instanceof \Stringable) {`
`32`	`32`	`throw new UnexpectedValueException($value, 'string');`
`33`	`33`	`}`
`34`	`34`
Original file line number	Diff line number	Diff line change
`@@ -62,7 +62,7 @@ public function validate($value, Constraint $constraint): void`
`62`	`62`	`return;`
`63`	`63`	`}`
`64`	`64`
`65`		`- if (!\is_string($value)) {`
	`65`	`+ if (!\is_string($value) && !$value instanceof \Stringable) {`
`66`	`66`	`throw new UnexpectedValueException($value, 'string');`
`67`	`67`	`}`
`68`	`68`
Original file line number	Diff line number	Diff line change
`@@ -40,7 +40,7 @@ public function validate(mixed $expression, Constraint $constraint): void`
`40`	`40`	`return;`
`41`	`41`	`}`
`42`	`42`
`43`		`- if (!\is_string($expression)) {`
	`43`	`+ if (!\is_string($expression) && !$expression instanceof \Stringable) {`
`44`	`44`	`throw new UnexpectedValueException($expression, 'string');`
`45`	`45`	`}`
`46`	`46`
Original file line number	Diff line number	Diff line change
`@@ -36,7 +36,7 @@ public function validate(#[\SensitiveParameter] mixed $value, Constraint $constr`
`36`	`36`	`return;`
`37`	`37`	`}`
`38`	`38`
`39`		`- if (!\is_string($value)) {`
	`39`	`+ if (!\is_string($value) && !$value instanceof \Stringable) {`
`40`	`40`	`throw new UnexpectedValueException($value, 'string');`
`41`	`41`	`}`
`42`	`42`	`$passwordStrengthEstimator = $this->passwordStrengthEstimator ?? self::estimateStrength(...);`