feat: move queryparametervalidator

soyuka · soyuka · commit a7de6b14a9ba · 2022-01-04T09:46:49.000+01:00
diff --git a/src/Api/QueryParameterValidator/QueryParameterValidator.php b/src/Api/QueryParameterValidator/QueryParameterValidator.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace ApiPlatform\Core\Filter;
+namespace ApiPlatform\Api\QueryParameterValidator;
 
 use ApiPlatform\Core\Api\FilterLocatorTrait;
 use ApiPlatform\Exception\FilterValidationException;
diff --git a/src/Api/QueryParameterValidator/Validator/ArrayItems.php b/src/Api/QueryParameterValidator/Validator/ArrayItems.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace ApiPlatform\Core\Filter\Validator;
+namespace ApiPlatform\Api\QueryParameterValidator\Validator;
 
 final class ArrayItems implements ValidatorInterface
 {
diff --git a/src/Api/QueryParameterValidator/Validator/Bounds.php b/src/Api/QueryParameterValidator/Validator/Bounds.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace ApiPlatform\Core\Filter\Validator;
+namespace ApiPlatform\Api\QueryParameterValidator\Validator;
 
 final class Bounds implements ValidatorInterface
 {
diff --git a/src/Api/QueryParameterValidator/Validator/Enum.php b/src/Api/QueryParameterValidator/Validator/Enum.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace ApiPlatform\Core\Filter\Validator;
+namespace ApiPlatform\Api\QueryParameterValidator\Validator;
 
 final class Enum implements ValidatorInterface
 {
diff --git a/src/Api/QueryParameterValidator/Validator/Length.php b/src/Api/QueryParameterValidator/Validator/Length.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace ApiPlatform\Core\Filter\Validator;
+namespace ApiPlatform\Api\QueryParameterValidator\Validator;
 
 final class Length implements ValidatorInterface
 {
diff --git a/src/Api/QueryParameterValidator/Validator/MultipleOf.php b/src/Api/QueryParameterValidator/Validator/MultipleOf.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace ApiPlatform\Core\Filter\Validator;
+namespace ApiPlatform\Api\QueryParameterValidator\Validator;
 
 final class MultipleOf implements ValidatorInterface
 {
diff --git a/src/Api/QueryParameterValidator/Validator/Pattern.php b/src/Api/QueryParameterValidator/Validator/Pattern.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace ApiPlatform\Core\Filter\Validator;
+namespace ApiPlatform\Api\QueryParameterValidator\Validator;
 
 final class Pattern implements ValidatorInterface
 {
diff --git a/src/Api/QueryParameterValidator/Validator/Required.php b/src/Api/QueryParameterValidator/Validator/Required.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace ApiPlatform\Core\Filter\Validator;
+namespace ApiPlatform\Api\QueryParameterValidator\Validator;
 
 use ApiPlatform\Util\RequestParser;
 
diff --git a/src/Api/QueryParameterValidator/Validator/ValidatorInterface.php b/src/Api/QueryParameterValidator/Validator/ValidatorInterface.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace ApiPlatform\Core\Filter\Validator;
+namespace ApiPlatform\Api\QueryParameterValidator\Validator;
 
 interface ValidatorInterface
 {
diff --git a/src/Metadata/Operation.php b/src/Metadata/Operation.php
@@ -299,6 +299,8 @@ public function __construct(
         $this->securityMessage = $securityMessage;
         $this->securityPostDenormalize = $securityPostDenormalize;
         $this->securityPostDenormalizeMessage = $securityPostDenormalizeMessage;
+        $this->securityPostValidation = $securityPostValidation;
+        $this->securityPostValidationMessage = $securityPostValidationMessage;
         $this->compositeIdentifier = $compositeIdentifier;
         $this->exceptionToStatus = $exceptionToStatus;
         $this->queryParameterValidationEnabled = $queryParameterValidationEnabled;
diff --git a/src/deprecation.php b/src/deprecation.php
@@ -455,6 +455,15 @@
         // Validator
         ApiPlatform\Core\Validator\EventListener\ValidateListener::class => ApiPlatform\Symfony\EventListener\ValidateListener::class,
         ApiPlatform\Core\Validator\Exception\ValidationException::class => ApiPlatform\Symfony\EventListener\Exception\ValidationException::class,
+
+        ApiPlatform\Core\Filter\QueryParameterValidator::class => ApiPlatform\Api\QueryParameterValidator\QueryParameterValidator::class,
+        ApiPlatform\Core\Filter\Validator\ArrayItems::class => ApiPlatform\Api\QueryParameterValidator\Validator\ArrayItems::class,
+        ApiPlatform\Core\Filter\Validator\Bounds::class => ApiPlatform\Api\QueryParameterValidator\Validator\Bounds::class,
+        ApiPlatform\Core\Filter\Validator\Enum::class => ApiPlatform\Api\QueryParameterValidator\Validator\Enum::class,
+        ApiPlatform\Core\Filter\Validator\Length::class => ApiPlatform\Api\QueryParameterValidator\Validator\Length::class,
+        ApiPlatform\Core\Filter\Validator\MultipleOf::class => ApiPlatform\Api\QueryParameterValidator\Validator\MultipleOf::class,
+        ApiPlatform\Core\Filter\Validator\Pattern::class => ApiPlatform\Api\QueryParameterValidator\Validator\Pattern::class,
+        ApiPlatform\Core\Filter\Validator\Required::class => ApiPlatform\Api\QueryParameterValidator\Validator\Required::class,
     ];
 
     $deprecatedInterfaces = include 'deprecated_interfaces.php';
diff --git a/tests/Api/QueryParameterValidator/QueryParameterValidatorTest.php b/tests/Api/QueryParameterValidator/QueryParameterValidatorTest.php
@@ -11,10 +11,10 @@
 
 declare(strict_types=1);
 
-namespace ApiPlatform\Core\Tests\Filter;
+namespace ApiPlatform\Tests\Api\QueryParameterValidator;
 
+use ApiPlatform\Api\QueryParameterValidator\QueryParameterValidator;
 use ApiPlatform\Core\Api\FilterInterface;
-use ApiPlatform\Core\Filter\QueryParameterValidator;
 use ApiPlatform\Core\Tests\ProphecyTrait;
 use ApiPlatform\Exception\FilterValidationException;
 use ApiPlatform\Tests\Fixtures\TestBundle\Entity\Dummy;
diff --git a/tests/Api/QueryParameterValidator/Validator/ArrayItemsTest.php b/tests/Api/QueryParameterValidator/Validator/ArrayItemsTest.php
@@ -11,9 +11,9 @@
 
 declare(strict_types=1);
 
-namespace ApiPlatform\Core\Tests\Filter\Validator;
+namespace ApiPlatform\Tests\Api\QueryParameterValidator\Validator;
 
-use ApiPlatform\Core\Filter\Validator\ArrayItems;
+use ApiPlatform\Api\QueryParameterValidator\Validator\ArrayItems;
 use PHPUnit\Framework\TestCase;
 
 /**
diff --git a/tests/Api/QueryParameterValidator/Validator/BoundsTest.php b/tests/Api/QueryParameterValidator/Validator/BoundsTest.php
@@ -11,9 +11,9 @@
 
 declare(strict_types=1);
 
-namespace ApiPlatform\Core\Tests\Filter\Validator;
+namespace ApiPlatform\Tests\Api\QueryParameterValidator\Validator;
 
-use ApiPlatform\Core\Filter\Validator\Bounds;
+use ApiPlatform\Api\QueryParameterValidator\Validator\Bounds;
 use PHPUnit\Framework\TestCase;
 
 /**
diff --git a/tests/Api/QueryParameterValidator/Validator/EnumTest.php b/tests/Api/QueryParameterValidator/Validator/EnumTest.php
@@ -11,9 +11,9 @@
 
 declare(strict_types=1);
 
-namespace ApiPlatform\Core\Tests\Filter\Validator;
+namespace ApiPlatform\Tests\Api\QueryParameterValidator\Validator;
 
-use ApiPlatform\Core\Filter\Validator\Enum;
+use ApiPlatform\Api\QueryParameterValidator\Validator\Enum;
 use PHPUnit\Framework\TestCase;
 
 /**
diff --git a/tests/Api/QueryParameterValidator/Validator/LengthTest.php b/tests/Api/QueryParameterValidator/Validator/LengthTest.php
@@ -11,9 +11,9 @@
 
 declare(strict_types=1);
 
-namespace ApiPlatform\Core\Tests\Filter\Validator;
+namespace ApiPlatform\Tests\Api\QueryParameterValidator\Validator;
 
-use ApiPlatform\Core\Filter\Validator\Length;
+use ApiPlatform\Api\QueryParameterValidator\Validator\Length;
 use PHPUnit\Framework\TestCase;
 
 /**
diff --git a/tests/Api/QueryParameterValidator/Validator/MultipleOfTest.php b/tests/Api/QueryParameterValidator/Validator/MultipleOfTest.php
@@ -11,9 +11,9 @@
 
 declare(strict_types=1);
 
-namespace ApiPlatform\Core\Tests\Filter\Validator;
+namespace ApiPlatform\Tests\Api\QueryParameterValidator\Validator;
 
-use ApiPlatform\Core\Filter\Validator\MultipleOf;
+use ApiPlatform\Api\QueryParameterValidator\Validator\MultipleOf;
 use PHPUnit\Framework\TestCase;
 
 /**
diff --git a/tests/Api/QueryParameterValidator/Validator/PatternTest.php b/tests/Api/QueryParameterValidator/Validator/PatternTest.php
@@ -11,9 +11,9 @@
 
 declare(strict_types=1);
 
-namespace ApiPlatform\Core\Tests\Filter\Validator;
+namespace ApiPlatform\Tests\Api\QueryParameterValidator\Validator;
 
-use ApiPlatform\Core\Filter\Validator\Pattern;
+use ApiPlatform\Api\QueryParameterValidator\Validator\Pattern;
 use PHPUnit\Framework\TestCase;
 
 /**
diff --git a/tests/Api/QueryParameterValidator/Validator/RequiredTest.php b/tests/Api/QueryParameterValidator/Validator/RequiredTest.php
@@ -11,9 +11,9 @@
 
 declare(strict_types=1);
 
-namespace ApiPlatform\Core\Tests\Filter\Validator;
+namespace ApiPlatform\Tests\Api\QueryParameterValidator\Validator;
 
-use ApiPlatform\Core\Filter\Validator\Required;
+use ApiPlatform\Api\QueryParameterValidator\Validator\Required;
 use PHPUnit\Framework\TestCase;
 
 /**

Original file line number	Diff line number	Diff line change
`@@ -11,7 +11,7 @@`
`11`	`11`
`12`	`12`	`declare(strict_types=1);`
`13`	`13`
`14`		`-namespace ApiPlatform\Core\Filter\Validator;`
	`14`	`+namespace ApiPlatform\Api\QueryParameterValidator\Validator;`
`15`	`15`
`16`	`16`	`final class ArrayItems implements ValidatorInterface`
`17`	`17`	`{`