10BC0 catch any UnexpectedValueException on validation · symfony/symfony@9d30a98 · GitHub
[go: up one dir, main page]
Skip to content

Commit 9d30a98

Browse files
xabbuhxabbuh
committed
catch any UnexpectedValueException on validation
1 parent 5dadd95 commit 9d30a98

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

47 files changed

+111
-48
lines changed

‎src/Symfony/Component/Validator/Constraints/AllValidator.php‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@
1414
use Symfony\Component\Validator\Constraint;
1515
use Symfony\Component\Validator\ConstraintValidator;
1616
use Symfony\Component\Validator\Exception\UnexpectedTypeException;
17+
use Symfony\Component\Validator\Exception\UnexpectedValueException;
1718

1819
/**
1920
* @author Bernhard Schussek <bschussek@gmail.com>
@@ -34,7 +35,7 @@ public function validate($value, Constraint $constraint)
3435
}
3536

3637
if (!\is_array($value) && !$value instanceof \Traversable) {
37-
throw new UnexpectedTypeException($value, 'array or Traversable');
38+
throw new UnexpectedValueException($value, 'array or Traversable');
3839
}
3940

4041
$context = $this->context;

‎src/Symfony/Component/Validator/Constraints/BicValidator.php‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
use Symfony\Component\Validator\Constraint;
1616
use Symfony\Component\Validator\ConstraintValidator;
1717
use Symfony\Component\Validator\Exception\LogicException;
18-
use Symfony\Component\Validator\Exception\UnexpectedTypeException;
18+
use Symfony\Component\Validator\Exception\UnexpectedValueException;
1919

2020
/**
2121
* @author Michael Hirschler <michael.vhirsch@gmail.com>
@@ -34,7 +34,7 @@ public function validate($value, Constraint $constraint)
3434
}
3535

3636
if (!is_scalar($value) && !(\is_object($value) && method_exists($value, '__toString'))) {
37-
throw new UnexpectedTypeException($value, 'string');
37+
throw new UnexpectedValueException($value, 'string');
3838
}
3939

4040
$canonicalize = str_replace(' ', '', $value);

‎src/Symfony/Component/Validator/Constraints/ChoiceValidator.php‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@
1515
use Symfony\Component\Validator\ConstraintValidator;
1616
use Symfony\Component\Validator\Exception\ConstraintDefinitionException;
1717
use Symfony\Component\Validator\Exception\UnexpectedTypeException;
18+
use Symfony\Component\Validator\Exception\UnexpectedValueException;
1819

1920
/**
2021
* ChoiceValidator validates that the value is one of the expected values.
@@ -43,7 +44,7 @@ public function validate($value, Constraint $constraint)
4344
}
4445

4546
if ($constraint->multiple && !\is_array($value)) {
46-
throw new UnexpectedTypeException($value, 'array');
47+
throw new UnexpectedValueException($value, 'array');
4748
}
4849

4950
if ($constraint->callback) {

‎src/Symfony/Component/Validator/Constraints/CollectionValidator.php‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@
1414
use Symfony\Component\Validator\Constraint;
1515
use Symfony\Component\Validator\ConstraintValidator;
1616
use Symfony\Component\Validator\Exception\UnexpectedTypeException;
17+
use Symfony\Component\Validator\Exception\UnexpectedValueException;
1718

1819
/**
1920
* @author Bernhard Schussek <bschussek@gmail.com>
@@ -34,7 +35,7 @@ public function validate($value, Constraint $constraint)
3435
}
3536

3637
if (!\is_array($value) && !($value instanceof \Traversable && $value instanceof \ArrayAccess)) {
37-
throw new UnexpectedTypeException($value, 'array or Traversable and ArrayAccess');
38+
throw new UnexpectedValueException($value, 'array or Traversable and ArrayAccess');
3839
}
3940

4041
// We need to keep the initialized context when CollectionValidator

‎src/Symfony/Component/Validator/Constraints/CountValidator.php‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@
1414
use Symfony\Component\Validator\Constraint;
1515
use Symfony\Component\Validator\ConstraintValidator;
1616
use Symfony\Component\Validator\Exception\UnexpectedTypeException;
17+
use Symfony\Component\Validator\Exception\UnexpectedValueException;
1718

1819
/**
1920
* @author Bernhard Schussek <bschussek@gmail.com>
@@ -30,7 +31,7 @@ public function validate($value, Constraint $constraint)
3031
}
3132

3233
if (!\is_array($value) && !$value instanceof \Countable) {
33-
throw new UnexpectedTypeException($value, 'array or \Countable');
34+
throw new UnexpectedValueException($value, 'array or \Countable');
3435
}
3536

3637
$count = \count($value);

‎src/Symfony/Component/Validator/Constraints/CountryValidator.php‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@
1616
use Symfony\Component\Validator\ConstraintValidator;
1717
use Symfony\Component\Validator\Exception\LogicException;
1818
use Symfony\Component\Validator\Exception\UnexpectedTypeException;
19+
use Symfony\Component\Validator\Exception\UnexpectedValueException;
1920

2021
/**
2122
* Validates whether a value is a valid country code.
@@ -38,7 +39,7 @@ public function validate($value, Constraint $constraint)
3839
}
3940

4041
if (!is_scalar($value) && !(\is_object($value) && method_exists($value, '__toString'))) {
41-
throw new UnexpectedTypeException($value, 'string');
42+
throw new UnexpectedValueException($value, 'string');
4243
}
4344

4445
if (!class_exists(Intl::class)) {

‎src/Symfony/Component/Validator/Constraints/CurrencyValidator.php‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@
1616
use Symfony\Component\Validator\ConstraintValidator;
1717
use Symfony\Component\Validator\Exception\LogicException;
1818
use Symfony\Component\Validator\Exception\UnexpectedTypeException;
19+
use Symfony\Component\Validator\Exception\UnexpectedValueException;
1920

2021
/**
2122
* Validates whether a value is a valid currency.
@@ -39,7 +40,7 @@ public function validate($value, Constraint $constraint)
3940
}
4041

4142
if (!is_scalar($value) && !(\is_object($value) && method_exists($value, '__toString'))) {
42-
throw new UnexpectedTypeException($value, 'string');
43+
throw new UnexpectedValueException($value, 'string');
4344
}
4445

4546
if (!class_exists(Intl::class)) {

‎src/Symfony/Component/Validator/Constraints/DateTimeValidator.php‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@
1313

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

1718
/**
1819
* @author Bernhard Schussek <bschussek@gmail.com>
@@ -40,7 +41,7 @@ public function validate($value, Constraint $constraint)
4041
}
4142

4243
if (!is_scalar($value) && !(\is_object($value) && method_exists($value, '__toString'))) {
43-
throw new UnexpectedTypeException($value, 'string');
44+
throw new UnexpectedValueException($value, 'string');
4445
}
4546

4647
$value = (string) $value;

‎src/Symfony/Component/Validator/Constraints/DateValidator.php‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@
1414
use Symfony\Component\Validator\Constraint;
1515
use Symfony\Component\Validator\ConstraintValidator;
1616
use Symfony\Component\Validator\Exception\UnexpectedTypeException;
17+
use Symfony\Component\Validator\Exception\UnexpectedValueException;
1718

1819
/**
1920
* @author Bernhard Schussek <bschussek@gmail.com>
@@ -58,7 +59,7 @@ public function validate($value, Constraint $constraint)
5859
}
5960

6061
if (!is_scalar($value) && !(\is_object($value) && method_exists($value, '__toString'))) {
61-
throw new UnexpectedTypeException($value, 'string');
62+
throw new UnexpectedValueException($value, 'string');
6263
}
6364

6465
$value = (string) $value;

‎src/Symfony/Component/Validator/Constraints/EmailValidator.php‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@
1717
use Symfony\Component\Validator\ConstraintValidator;
1818
use Symfony\Component\Validator\Exception\LogicException;
1919
use Symfony\Component\Validator\Exception\UnexpectedTypeException;
20+
use Symfony\Component\Validator\Exception\UnexpectedValueException;
2021

2122
/**
2223
* @author Bernhard Schussek <bschussek@gmail.com>
@@ -75,7 +76,7 @@ public function validate($value, Constraint $constraint)
7576
}
7677

7778
if (!is_scalar($value) && !(\is_object($value) && method_exists($value, '__toString'))) {
78-
throw new UnexpectedTypeException($value, 'string');
79+
throw new UnexpectedValueException($value, 'string');
7980
}
8081

8182
$value = (string) $value;

0 commit comments

Comments
 (0)
0