Skip to content

Commit d5d2090

Browse files
[Validator] Added the missing constraints instance checks
1 parent b2155be commit d5d2090

File tree

3 files changed

+13
-4
lines changed

3 files changed

+13
-4
lines changed

Constraints/BicValidator.php

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@
1313

1414
use Symfony\Component\Validator\Constraint;
1515
use Symfony\Component\Validator\ConstraintValidator;
16+
use Symfony\Component\Validator\Exception\UnexpectedTypeException;
1617

1718
/**
1819
* @author Michael Hirschler <michael.vhirsch@gmail.com>
@@ -26,6 +27,10 @@ class BicValidator extends ConstraintValidator
2627
*/
2728
public function validate($value, Constraint $constraint)
2829
{
30+
if (!$constraint instanceof Bic) {
31+
throw new UnexpectedTypeException($constraint, __NAMESPACE__.'\Bic');
32+
}
33+
2934
if (null === $value || '' === $value) {
3035
return;
3136
}

Constraints/CountValidator.php

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,10 @@ class CountValidator extends ConstraintValidator
2626
*/
2727
public function validate($value, Constraint $constraint)
2828
{
29+
if (!$constraint instanceof Count) {
30+
throw new UnexpectedTypeException($constraint, __NAMESPACE__.'\Count');
31+
}
32+
2933
if (null === $value) {
3034
return;
3135
}

Constraints/UuidValidator.php

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -83,14 +83,14 @@ class UuidValidator extends ConstraintValidator
8383
*/
8484
public function validate($value, Constraint $constraint)
8585
{
86-
if (null === $value || '' === $value) {
87-
return;
88-
}
89-
9086
if (!$constraint instanceof Uuid) {
9187
throw new UnexpectedTypeException($constraint, __NAMESPACE__.'\Uuid');
9288
}
9389

90+
if (null === $value || '' === $value) {
91+
return;
92+
}
93+
9494
if (!is_scalar($value) && !(\is_object($value) && method_exists($value, '__toString'))) {
9595
throw new UnexpectedTypeException($value, 'string');
9696
}

0 commit comments

Comments
 (0)