ISSUE-345: use Constraint directory

tatevikg1 · tatevikg1 · commit 6212beb270a0 · 2025-04-26T15:08:23.000+04:00
diff --git a/config/services/validators.yml b/config/services/validators.yml
@@ -4,17 +4,17 @@ services:
     autoconfigure: true
     public: false
 
-  PhpList\RestBundle\Validator\UniqueEmailValidator:
+  PhpList\RestBundle\Validator\Constraint\UniqueEmailValidator:
     autowire: true
     autoconfigure: true
     tags: [ 'validator.constraint_validator' ]
 
-  PhpList\RestBundle\Validator\EmailExistsValidator:
+  PhpList\RestBundle\Validator\Constraint\EmailExistsValidator:
     autowire: true
     autoconfigure: true
     tags: [ 'validator.constraint_validator' ]
 
-  PhpList\RestBundle\Validator\TemplateExistsValidator:
+  PhpList\RestBundle\Validator\Constraint\TemplateExistsValidator:
     autowire: true
     autoconfigure: true
     tags: [ 'validator.constraint_validator' ]
@@ -27,5 +27,5 @@ services:
     autowire: true
     autoconfigure: true
 
-  PhpList\RestBundle\Validator\ContainsPlaceholderValidator:
+  PhpList\RestBundle\Validator\Constraint\ContainsPlaceholderValidator:
     tags: ['validator.constraint_validator']
diff --git a/src/Entity/Request/CreateMessageRequest.php b/src/Entity/Request/CreateMessageRequest.php
@@ -9,8 +9,8 @@
 use PhpList\RestBundle\Entity\Request\Message\MessageMetadataRequest;
 use PhpList\RestBundle\Entity\Request\Message\MessageOptionsRequest;
 use PhpList\RestBundle\Entity\Request\Message\MessageScheduleRequest;
+use PhpList\RestBundle\Validator\Constraint as CustomAssert;
 use Symfony\Component\Validator\Constraints as Assert;
-use PhpList\RestBundle\Validator as CustomAssert;
 
 class CreateMessageRequest implements RequestInterface
 {
diff --git a/src/Entity/Request/CreateSubscriberRequest.php b/src/Entity/Request/CreateSubscriberRequest.php
@@ -4,7 +4,7 @@
 
 namespace PhpList\RestBundle\Entity\Request;
 
-use PhpList\RestBundle\Validator as CustomAssert;
+use PhpList\RestBundle\Validator\Constraint as CustomAssert;
 use Symfony\Component\Validator\Constraints as Assert;
 
 class CreateSubscriberRequest implements RequestInterface
diff --git a/src/Entity/Request/CreateTemplateRequest.php b/src/Entity/Request/CreateTemplateRequest.php
@@ -4,9 +4,9 @@
 
 namespace PhpList\RestBundle\Entity\Request;
 
+use PhpList\RestBundle\Validator\Constraint as CustomAssert;
 use Symfony\Component\HttpFoundation\File\UploadedFile;
 use Symfony\Component\Validator\Constraints as Assert;
-use PhpList\RestBundle\Validator as CustomAssert;
 
 class CreateTemplateRequest
 {
diff --git a/src/Entity/Request/SubscriptionRequest.php b/src/Entity/Request/SubscriptionRequest.php
@@ -4,7 +4,7 @@
 
 namespace PhpList\RestBundle\Entity\Request;
 
-use PhpList\RestBundle\Validator\EmailExists;
+use PhpList\RestBundle\Validator\Constraint\EmailExists;
 use Symfony\Component\Validator\Constraints as Assert;
 
 class SubscriptionRequest implements RequestInterface
diff --git a/src/Entity/Request/UpdateMessageRequest.php b/src/Entity/Request/UpdateMessageRequest.php
@@ -8,8 +8,8 @@
 use PhpList\RestBundle\Entity\Request\Message\MessageFormatRequest;
 use PhpList\RestBundle\Entity\Request\Message\MessageOptionsRequest;
 use PhpList\RestBundle\Entity\Request\Message\MessageScheduleRequest;
+use PhpList\RestBundle\Validator\Constraint as CustomAssert;
 use Symfony\Component\Validator\Constraints as Assert;
-use PhpList\RestBundle\Validator as CustomAssert;
 
 class UpdateMessageRequest extends CreateMessageRequest
 {
diff --git a/src/Entity/Request/UpdateSubscriberRequest.php b/src/Entity/Request/UpdateSubscriberRequest.php
@@ -4,7 +4,7 @@
 
 namespace PhpList\RestBundle\Entity\Request;
 
-use PhpList\RestBundle\Validator as CustomAssert;
+use PhpList\RestBundle\Validator\Constraint as CustomAssert;
 use Symfony\Component\Validator\Constraints as Assert;
 
 class UpdateSubscriberRequest implements RequestInterface
diff --git a/src/Validator/Constraint/ContainsPlaceholder.php b/src/Validator/Constraint/ContainsPlaceholder.php
@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-namespace PhpList\RestBundle\Validator;
+namespace PhpList\RestBundle\Validator\Constraint;
 
 use Symfony\Component\Validator\Constraint;
 
diff --git a/src/Validator/Constraint/ContainsPlaceholderValidator.php b/src/Validator/Constraint/ContainsPlaceholderValidator.php
@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-namespace PhpList\RestBundle\Validator;
+namespace PhpList\RestBundle\Validator\Constraint;
 
 use InvalidArgumentException;
 use Symfony\Component\Validator\Constraint;
diff --git a/src/Validator/Constraint/EmailExists.php b/src/Validator/Constraint/EmailExists.php
@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-namespace PhpList\RestBundle\Validator;
+namespace PhpList\RestBundle\Validator\Constraint;
 
 use Symfony\Component\Validator\Constraint;
 
diff --git a/src/Validator/Constraint/EmailExistsValidator.php b/src/Validator/Constraint/EmailExistsValidator.php
@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-namespace PhpList\RestBundle\Validator;
+namespace PhpList\RestBundle\Validator\Constraint;
 
 use PhpList\Core\Domain\Repository\Subscription\SubscriberRepository;
 use Symfony\Component\HttpKernel\Exception\NotFoundHttpException;
diff --git a/src/Validator/Constraint/TemplateExists.php b/src/Validator/Constraint/TemplateExists.php
@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-namespace PhpList\RestBundle\Validator;
+namespace PhpList\RestBundle\Validator\Constraint;
 
 use Symfony\Component\Validator\Constraint;
 
diff --git a/src/Validator/Constraint/TemplateExistsValidator.php b/src/Validator/Constraint/TemplateExistsValidator.php
@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-namespace PhpList\RestBundle\Validator;
+namespace PhpList\RestBundle\Validator\Constraint;
 
 use PhpList\Core\Domain\Repository\Messaging\TemplateRepository;
 use Symfony\Component\HttpKernel\Exception\ConflictHttpException;
diff --git a/src/Validator/Constraint/UniqueEmail.php b/src/Validator/Constraint/UniqueEmail.php
@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-namespace PhpList\RestBundle\Validator;
+namespace PhpList\RestBundle\Validator\Constraint;
 
 use Symfony\Component\Validator\Constraint;
 
diff --git a/src/Validator/Constraint/UniqueEmailValidator.php b/src/Validator/Constraint/UniqueEmailValidator.php
@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-namespace PhpList\RestBundle\Validator;
+namespace PhpList\RestBundle\Validator\Constraint;
 
 use PhpList\Core\Domain\Repository\Subscription\SubscriberRepository;
 use Symfony\Component\HttpKernel\Exception\ConflictHttpException;
diff --git a/tests/Unit/Validator/Constraint/EmailExistsValidatorTest.php b/tests/Unit/Validator/Constraint/EmailExistsValidatorTest.php
@@ -2,19 +2,19 @@
 
 declare(strict_types=1);
 
-namespace PhpList\RestBundle\Tests\Unit\Validator;
+namespace PhpList\RestBundle\Tests\Unit\Validator\Constraint;
 
 use PhpList\Core\Domain\Model\Subscription\Subscriber;
 use PhpList\Core\Domain\Repository\Subscription\SubscriberRepository;
-use PhpList\RestBundle\Validator\EmailExists;
-use PhpList\RestBundle\Validator\EmailExistsValidator;
+use PhpList\RestBundle\Validator\Constraint\EmailExists;
+use PhpList\RestBundle\Validator\Constraint\EmailExistsValidator;
 use PHPUnit\Framework\MockObject\MockObject;
 use PHPUnit\Framework\TestCase;
+use Symfony\Component\HttpKernel\Exception\NotFoundHttpException;
 use Symfony\Component\Validator\Constraint;
 use Symfony\Component\Validator\Context\ExecutionContextInterface;
 use Symfony\Component\Validator\Exception\UnexpectedTypeException;
 use Symfony\Component\Validator\Exception\UnexpectedValueException;
-use Symfony\Component\HttpKernel\Exception\NotFoundHttpException;
 
 class EmailExistsValidatorTest extends TestCase
 {
diff --git a/tests/Unit/Validator/Constraint/TemplateExistsValidatorTest.php b/tests/Unit/Validator/Constraint/TemplateExistsValidatorTest.php
@@ -2,19 +2,19 @@
 
 declare(strict_types=1);
 
-namespace PhpList\RestBundle\Tests\Unit\Validator;
+namespace PhpList\RestBundle\Tests\Unit\Validator\Constraint;
 
 use PhpList\Core\Domain\Model\Messaging\Template;
 use PhpList\Core\Domain\Repository\Messaging\TemplateRepository;
-use PhpList\RestBundle\Validator\TemplateExists;
-use PhpList\RestBundle\Validator\TemplateExistsValidator;
+use PhpList\RestBundle\Validator\Constraint\TemplateExists;
+use PhpList\RestBundle\Validator\Constraint\TemplateExistsValidator;
 use PHPUnit\Framework\MockObject\MockObject;
 use PHPUnit\Framework\TestCase;
+use Symfony\Component\HttpKernel\Exception\ConflictHttpException;
 use Symfony\Component\Validator\Constraint;
 use Symfony\Component\Validator\Context\ExecutionContextInterface;
 use Symfony\Component\Validator\Exception\UnexpectedTypeException;
 use Symfony\Component\Validator\Exception\UnexpectedValueException;
-use Symfony\Component\HttpKernel\Exception\ConflictHttpException;
 
 class TemplateExistsValidatorTest extends TestCase
 {
diff --git a/tests/Unit/Validator/Constraint/UniqueEmailValidatorTest.php b/tests/Unit/Validator/Constraint/UniqueEmailValidatorTest.php
@@ -2,12 +2,12 @@
 
 declare(strict_types=1);
 
-namespace PhpList\RestBundle\Tests\Unit\Validator;
+namespace PhpList\RestBundle\Tests\Unit\Validator\Constraint;
 
 use PhpList\Core\Domain\Model\Subscription\Subscriber;
 use PhpList\Core\Domain\Repository\Subscription\SubscriberRepository;
-use PhpList\RestBundle\Validator\UniqueEmail;
-use PhpList\RestBundle\Validator\UniqueEmailValidator;
+use PhpList\RestBundle\Validator\Constraint\UniqueEmail;
+use PhpList\RestBundle\Validator\Constraint\UniqueEmailValidator;
 use PHPUnit\Framework\MockObject\MockObject;
 use PHPUnit\Framework\TestCase;
 use Symfony\Component\HttpKernel\Exception\ConflictHttpException;

Original file line number	Diff line number	Diff line change
`@@ -9,8 +9,8 @@`
`9`	`9`	`use PhpList\RestBundle\Entity\Request\Message\MessageMetadataRequest;`
`10`	`10`	`use PhpList\RestBundle\Entity\Request\Message\MessageOptionsRequest;`
`11`	`11`	`use PhpList\RestBundle\Entity\Request\Message\MessageScheduleRequest;`
	`12`	`+use PhpList\RestBundle\Validator\Constraint as CustomAssert;`
`12`	`13`	`use Symfony\Component\Validator\Constraints as Assert;`
`13`		`-use PhpList\RestBundle\Validator as CustomAssert;`
`14`	`14`
`15`	`15`	`class CreateMessageRequest implements RequestInterface`
`16`	`16`	`{`
Original file line number	Diff line number	Diff line change
`@@ -4,9 +4,9 @@`
`4`	`4`
`5`	`5`	`namespace PhpList\RestBundle\Entity\Request;`
`6`	`6`
	`7`	`+use PhpList\RestBundle\Validator\Constraint as CustomAssert;`
`7`	`8`	`use Symfony\Component\HttpFoundation\File\UploadedFile;`
`8`	`9`	`use Symfony\Component\Validator\Constraints as Assert;`
`9`		`-use PhpList\RestBundle\Validator as CustomAssert;`
`10`	`10`
`11`	`11`	`class CreateTemplateRequest`
`12`	`12`	`{`
Original file line number	Diff line number	Diff line change
`@@ -8,8 +8,8 @@`
`8`	`8`	`use PhpList\RestBundle\Entity\Request\Message\MessageFormatRequest;`
`9`	`9`	`use PhpList\RestBundle\Entity\Request\Message\MessageOptionsRequest;`
`10`	`10`	`use PhpList\RestBundle\Entity\Request\Message\MessageScheduleRequest;`
	`11`	`+use PhpList\RestBundle\Validator\Constraint as CustomAssert;`
`11`	`12`	`use Symfony\Component\Validator\Constraints as Assert;`
`12`		`-use PhpList\RestBundle\Validator as CustomAssert;`
`13`	`13`
`14`	`14`	`class UpdateMessageRequest extends CreateMessageRequest`
`15`	`15`	`{`