From 509c7bfb5b8d2f05c561a3fff57476e521939fea Mon Sep 17 00:00:00 2001 From: Bernhard Schussek Date: Sun, 15 Jan 2012 20:31:13 +0100 Subject: [PATCH] [Validator] Moved Optional and Required constraints to dedicated sub namespace. --- .../Validator/Constraints/{ => Collection}/Optional.php | 2 +- .../Validator/Constraints/{ => Collection}/Required.php | 2 +- .../Component/Validator/Constraints/CollectionValidator.php | 2 ++ .../Validator/Constraints/CollectionValidatorTest.php | 4 ++-- 4 files changed, 6 insertions(+), 4 deletions(-) rename src/Symfony/Component/Validator/Constraints/{ => Collection}/Optional.php (88%) rename src/Symfony/Component/Validator/Constraints/{ => Collection}/Required.php (88%) diff --git a/src/Symfony/Component/Validator/Constraints/Optional.php b/src/Symfony/Component/Validator/Constraints/Collection/Optional.php similarity index 88% rename from src/Symfony/Component/Validator/Constraints/Optional.php rename to src/Symfony/Component/Validator/Constraints/Collection/Optional.php index b8f258183f..8d4c7746db 100644 --- a/src/Symfony/Component/Validator/Constraints/Optional.php +++ b/src/Symfony/Component/Validator/Constraints/Collection/Optional.php @@ -9,7 +9,7 @@ * file that was distributed with this source code. */ -namespace Symfony\Component\Validator\Constraints; +namespace Symfony\Component\Validator\Constraints\Collection; use Symfony\Component\Validator\Constraint; diff --git a/src/Symfony/Component/Validator/Constraints/Required.php b/src/Symfony/Component/Validator/Constraints/Collection/Required.php similarity index 88% rename from src/Symfony/Component/Validator/Constraints/Required.php rename to src/Symfony/Component/Validator/Constraints/Collection/Required.php index 33a86fe4fd..5dda7434dc 100644 --- a/src/Symfony/Component/Validator/Constraints/Required.php +++ b/src/Symfony/Component/Validator/Constraints/Collection/Required.php @@ -9,7 +9,7 @@ * file that was distributed with this source code. */ -namespace Symfony\Component\Validator\Constraints; +namespace Symfony\Component\Validator\Constraints\Collection; use Symfony\Component\Validator\Constraint; diff --git a/src/Symfony/Component/Validator/Constraints/CollectionValidator.php b/src/Symfony/Component/Validator/Constraints/CollectionValidator.php index 832a9b2b6d..600dbc088a 100644 --- a/src/Symfony/Component/Validator/Constraints/CollectionValidator.php +++ b/src/Symfony/Component/Validator/Constraints/CollectionValidator.php @@ -14,6 +14,8 @@ namespace Symfony\Component\Validator\Constraints; use Symfony\Component\Validator\Constraint; use Symfony\Component\Validator\ConstraintValidator; use Symfony\Component\Validator\Exception\UnexpectedTypeException; +use Symfony\Component\Validator\Constraints\Collection\Optional; +use Symfony\Component\Validator\Constraints\Collection\Required; /** * @api diff --git a/tests/Symfony/Tests/Component/Validator/Constraints/CollectionValidatorTest.php b/tests/Symfony/Tests/Component/Validator/Constraints/CollectionValidatorTest.php index efed5ac65e..1dd37efa84 100644 --- a/tests/Symfony/Tests/Component/Validator/Constraints/CollectionValidatorTest.php +++ b/tests/Symfony/Tests/Component/Validator/Constraints/CollectionValidatorTest.php @@ -15,8 +15,8 @@ use Symfony\Component\Validator\ExecutionContext; use Symfony\Component\Validator\Constraints\Min; use Symfony\Component\Validator\Constraints\NotBlank; use Symfony\Component\Validator\Constraints\NotNull; -use Symfony\Component\Validator\Constraints\Required; -use Symfony\Component\Validator\Constraints\Optional; +use Symfony\Component\Validator\Constraints\Collection\Required; +use Symfony\Component\Validator\Constraints\Collection\Optional; use Symfony\Component\Validator\Constraints\Collection; use Symfony\Component\Validator\Constraints\CollectionValidator;