bug #30939 [Validator] throw UnexpectedValueException instead (xabbuh)

fabpot · fabpot · commit 9e2f506e376a · 2019-04-07T10:55:57.000+02:00
This PR was merged into the 4.3-dev branch. Discussion ---------- [Validator] throw UnexpectedValueException instead | Q | A | ------------- | --- | Branch? | master | Bug fix? | yes | New feature? | no | BC breaks? | no | Deprecations? | no | Tests pass? | yes | Fixed tickets | | License | MIT | Doc PR | #FOSSHackathons #EUFOSSA Commits ------- de12e23 throw UnexpectedValueException instead
diff --git a/src/Symfony/Component/Validator/Constraints/NotCompromisedPasswordValidator.php b/src/Symfony/Component/Validator/Constraints/NotCompromisedPasswordValidator.php
@@ -15,6 +15,7 @@
 use Symfony\Component\Validator\Constraint;
 use Symfony\Component\Validator\ConstraintValidator;
 use Symfony\Component\Validator\Exception\UnexpectedTypeException;
+use Symfony\Component\Validator\Exception\UnexpectedValueException;
 use Symfony\Contracts\HttpClient\Exception\ExceptionInterface;
 use Symfony\Contracts\HttpClient\HttpClientInterface;
 
@@ -61,7 +62,7 @@ public function validate($value, Constraint $constraint)
         }
 
         if (null !== $value && !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
`@@ -15,6 +15,7 @@`
`15`	`15`	`use Symfony\Component\Validator\Constraint;`
`16`	`16`	`use Symfony\Component\Validator\ConstraintValidator;`
`17`	`17`	`use Symfony\Component\Validator\Exception\UnexpectedTypeException;`
	`18`	`+use Symfony\Component\Validator\Exception\UnexpectedValueException;`
`18`	`19`	`use Symfony\Contracts\HttpClient\Exception\ExceptionInterface;`
`19`	`20`	`use Symfony\Contracts\HttpClient\HttpClientInterface;`
`20`	`21`
`@@ -61,7 +62,7 @@ public function validate($value, Constraint $constraint)`
`61`	`62`	`}`
`62`	`63`
`63`	`64`	`if (null !== $value && !is_scalar($value) && !(\is_object($value) && method_exists($value, '__toString'))) {`
`64`		`- throw new UnexpectedTypeException($value, 'string');`
	`65`	`+ throw new UnexpectedValueException($value, 'string');`
`65`	`66`	`}`
`66`	`67`
`67`	`68`	`$value = (string) $value;`