bug #53350 [Validator] fix the exception being thrown (xabbuh)

chalasr · chalasr · commit 77f39fef4da3 · 2024-01-02T18:28:14.000+01:00
This PR was merged into the 5.4 branch. Discussion ---------- [Validator] fix the exception being thrown | Q | A | ------------- | --- | Branch? | 5.4 | Bug fix? | yes | New feature? | no | Deprecations? | no | Issues | | License | MIT An `UnexpectedValueException` is caught and transformed into a violation (`UnexpectedTypeException` indicates a misconfiguration of a constraint and is not caught). see also #27917 Commits ------- 3a8f10b fix the exception being thrown
diff --git a/src/Symfony/Component/Validator/Constraints/JsonValidator.php b/src/Symfony/Component/Validator/Constraints/JsonValidator.php
@@ -14,6 +14,7 @@
 use Symfony\Component\Validator\Constraint;
 use Symfony\Component\Validator\ConstraintValidator;
 use Symfony\Component\Validator\Exception\UnexpectedTypeException;
+use Symfony\Component\Validator\Exception\UnexpectedValueException;
 
 /**
  * @author Imad ZAIRIG <imadzairig@gmail.com>
@@ -34,7 +35,7 @@ public function validate($value, Constraint $constraint)
         }
 
         if (!\is_scalar($value) && !(\is_object($value) && method_exists($value, '__toString'))) {
-            throw new UnexpectedTypeException($value, 'string');
+            throw new UnexpectedValueException($value, 'string');
         }
 
         $value = (string) $value;

Original file line number	Diff line number	Diff line change
`@@ -14,6 +14,7 @@`
`14`	`14`	`use Symfony\Component\Validator\Constraint;`
`15`	`15`	`use Symfony\Component\Validator\ConstraintValidator;`
`16`	`16`	`use Symfony\Component\Validator\Exception\UnexpectedTypeException;`
	`17`	`+use Symfony\Component\Validator\Exception\UnexpectedValueException;`
`17`	`18`
`18`	`19`	`/**`
`19`	`20`	`* @author Imad ZAIRIG <[email protected]>`
`@@ -34,7 +35,7 @@ public function validate($value, Constraint $constraint)`
`34`	`35`	`}`
`35`	`36`
`36`	`37`	`if (!\is_scalar($value) && !(\is_object($value) && method_exists($value, '__toString'))) {`
`37`		`- throw new UnexpectedTypeException($value, 'string');`
	`38`	`+ throw new UnexpectedValueException($value, 'string');`
`38`	`39`	`}`
`39`	`40`
`40`	`41`	`$value = (string) $value;`