Merge branch '2.8' into 3.4

nicolas-grekas · nicolas-grekas · commit 654dc2209b7e · 2018-11-15T13:34:45.000+01:00
* 2.8:
  [Validator] Added the missing constraints instance checks
diff --git a/src/Symfony/Component/Validator/Constraints/BicValidator.php b/src/Symfony/Component/Validator/Constraints/BicValidator.php
@@ -13,6 +13,7 @@
 
 use Symfony\Component\Validator\Constraint;
 use Symfony\Component\Validator\ConstraintValidator;
+use Symfony\Component\Validator\Exception\UnexpectedTypeException;
 
 /**
  * @author Michael Hirschler <michael.vhirsch@gmail.com>
@@ -26,6 +27,10 @@ class BicValidator extends ConstraintValidator
      */
     public function validate($value, Constraint $constraint)
     {
+        if (!$constraint instanceof Bic) {
+            throw new UnexpectedTypeException($constraint, __NAMESPACE__.'\Bic');
+        }
+
         if (null === $value || '' === $value) {
             return;
         }
diff --git a/src/Symfony/Component/Validator/Constraints/CountValidator.php b/src/Symfony/Component/Validator/Constraints/CountValidator.php
@@ -25,6 +25,10 @@ class CountValidator extends ConstraintValidator
      */
     public function validate($value, Constraint $constraint)
     {
+        if (!$constraint instanceof Count) {
+            throw new UnexpectedTypeException($constraint, __NAMESPACE__.'\Count');
+        }
+
         if (null === $value) {
             return;
         }
diff --git a/src/Symfony/Component/Validator/Constraints/UuidValidator.php b/src/Symfony/Component/Validator/Constraints/UuidValidator.php
@@ -66,14 +66,14 @@ class UuidValidator extends ConstraintValidator
      */
     public function validate($value, Constraint $constraint)
     {
-        if (null === $value || '' === $value) {
-            return;
-        }
-
         if (!$constraint instanceof Uuid) {
             throw new UnexpectedTypeException($constraint, __NAMESPACE__.'\Uuid');
         }
 
+        if (null === $value || '' === $value) {
+            return;
+        }
+
         if (!is_scalar($value) && !(\is_object($value) && method_exists($value, '__toString'))) {
             throw new UnexpectedTypeException($value, 'string');
         }

Original file line number	Diff line number	Diff line change
`@@ -25,6 +25,10 @@ class CountValidator extends ConstraintValidator`
`25`	`25`	`*/`
`26`	`26`	`public function validate($value, Constraint $constraint)`
`27`	`27`	`{`
	`28`	`+ if (!$constraint instanceof Count) {`
	`29`	`+ throw new UnexpectedTypeException($constraint, __NAMESPACE__.'\Count');`
	`30`	`+ }`
	`31`	`+`
`28`	`32`	`if (null === $value) {`
`29`	`33`	`return;`
`30`	`34`	`}`
Original file line number	Diff line number	Diff line change
`@@ -66,14 +66,14 @@ class UuidValidator extends ConstraintValidator`
`66`	`66`	`*/`
`67`	`67`	`public function validate($value, Constraint $constraint)`
`68`	`68`	`{`
`69`		`- if (null === $value \|\| '' === $value) {`
`70`		`- return;`
`71`		`- }`
`72`		`-`
`73`	`69`	`if (!$constraint instanceof Uuid) {`
`74`	`70`	`throw new UnexpectedTypeException($constraint, __NAMESPACE__.'\Uuid');`
`75`	`71`	`}`
`76`	`72`
	`73`	`+ if (null === $value \|\| '' === $value) {`
	`74`	`+ return;`
	`75`	`+ }`
	`76`	`+`
`77`	`77`	`if (!is_scalar($value) && !(\is_object($value) && method_exists($value, '__toString'))) {`
`78`	`78`	`throw new UnexpectedTypeException($value, 'string');`
`79`	`79`	`}`