bug #29223 [Validator] Added the missing constraints instance checks (thomasbisignani)

nicolas-grekas · nicolas-grekas · commit b11ec05282ca · 2018-11-15T13:27:27.000+01:00
This PR was merged into the 2.8 branch. Discussion ---------- [Validator] Added the missing constraints instance checks | Q | A | ------------- | --- | Branch? | 2.8 | Bug fix? | yes | New feature? | no | BC breaks? | no | Deprecations? | no | Tests pass? | yes | Fixed tickets | | License | MIT | Doc PR | This PR adds the constraints instance checks missing to limit the validators use. This behavior is already implemented in all built-in validators, but it was missed in two validators. Commits ------- 0ecaead [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
@@ -26,6 +26,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
@@ -83,14 +83,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
`@@ -26,6 +26,10 @@ class CountValidator extends ConstraintValidator`
`26`	`26`	`*/`
`27`	`27`	`public function validate($value, Constraint $constraint)`
`28`	`28`	`{`
	`29`	`+ if (!$constraint instanceof Count) {`
	`30`	`+ throw new UnexpectedTypeException($constraint, __NAMESPACE__.'\Count');`
	`31`	`+ }`
	`32`	`+`
`29`	`33`	`if (null === $value) {`
`30`	`34`	`return;`
`31`	`35`	`}`
Original file line number	Diff line number	Diff line change
`@@ -83,14 +83,14 @@ class UuidValidator extends ConstraintValidator`
`83`	`83`	`*/`
`84`	`84`	`public function validate($value, Constraint $constraint)`
`85`	`85`	`{`
`86`		`- if (null === $value \|\| '' === $value) {`
`87`		`- return;`
`88`		`- }`
`89`		`-`
`90`	`86`	`if (!$constraint instanceof Uuid) {`
`91`	`87`	`throw new UnexpectedTypeException($constraint, __NAMESPACE__.'\Uuid');`
`92`	`88`	`}`
`93`	`89`
	`90`	`+ if (null === $value \|\| '' === $value) {`
	`91`	`+ return;`
	`92`	`+ }`
	`93`	`+`
`94`	`94`	`if (!is_scalar($value) && !(\is_object($value) && method_exists($value, '__toString'))) {`
`95`	`95`	`throw new UnexpectedTypeException($value, 'string');`
`96`	`96`	`}`