Merge pull request #3 from msmakouz/bugfix/nyholm-bridge

Changing Dto to Model in namespaces, adding nyholm-bridge
spiral-packages · Jul 26, 2022 · e379940 · e379940
2 parents 8331f94 + d685824
commit e379940
Show file tree

Hide file tree

Showing 7 changed files with 17 additions and 16 deletions.
diff --git a/composer.json b/composer.json
@@ -27,7 +27,8 @@
     "require-dev": {
         "mockery/mockery": "^1.5",
         "spiral/framework": "3.0.x-dev",
-        "spiral/http": "^3.0",
+        "spiral/nyholm-bridge": "^1.2",
+        "spiral/attributes": "^2.8 || ^3.0",
         "phpunit/phpunit": "^9.5",
         "spiral/testing": "^2.0",
         "vimeo/psalm": "^4.9"

diff --git a/src/LaravelValidation.php b/src/LaravelValidation.php
@@ -5,8 +5,8 @@
 namespace Spiral\Validation\Laravel;
 
 use Illuminate\Contracts\Validation\Factory;
-use Spiral\Filters\Filter;
-use Spiral\Filters\FilterBag;
+use Spiral\Filters\Model\Filter;
+use Spiral\Filters\Model\FilterBag;
 use Spiral\Validation\ValidationInterface;
 use Spiral\Validation\ValidatorInterface;
 

diff --git a/src/LaravelValidator.php b/src/LaravelValidator.php
@@ -6,7 +6,7 @@
 
 use Illuminate\Contracts\Validation\Factory;
 use Illuminate\Contracts\Validation\Validator;
-use Spiral\Filters\FilterBag;
+use Spiral\Filters\Model\FilterBag;
 use Spiral\Validation\ValidatorInterface;
 
 class LaravelValidator implements ValidatorInterface

diff --git a/tests/app/Filters/CreatePostFilter.php b/tests/app/Filters/CreatePostFilter.php
@@ -5,9 +5,9 @@
 namespace Spiral\Validation\Laravel\Tests\App\Filters;
 
 use Spiral\Filters\Attribute\Input\Post;
-use Spiral\Filters\Filter;
-use Spiral\Filters\FilterDefinitionInterface;
-use Spiral\Filters\HasFilterDefinition;
+use Spiral\Filters\Model\Filter;
+use Spiral\Filters\Model\FilterDefinitionInterface;
+use Spiral\Filters\Model\HasFilterDefinition;
 use Spiral\Validation\Laravel\FilterDefinition;
 use Spiral\Validation\Laravel\Attribute\Input\File;
 use Symfony\Component\HttpFoundation\File\UploadedFile;

diff --git a/tests/app/Filters/FilterWithArrayMapping.php b/tests/app/Filters/FilterWithArrayMapping.php
@@ -4,9 +4,9 @@
 
 namespace Spiral\Validation\Laravel\Tests\App\Filters;
 
-use Spiral\Filters\Filter;
-use Spiral\Filters\FilterDefinitionInterface;
-use Spiral\Filters\HasFilterDefinition;
+use Spiral\Filters\Model\Filter;
+use Spiral\Filters\Model\FilterDefinitionInterface;
+use Spiral\Filters\Model\HasFilterDefinition;
 use Spiral\Validation\Laravel\FilterDefinition;
 
 final class FilterWithArrayMapping extends Filter implements HasFilterDefinition

diff --git a/tests/app/Filters/SimpleFilter.php b/tests/app/Filters/SimpleFilter.php
@@ -5,9 +5,9 @@
 namespace Spiral\Validation\Laravel\Tests\App\Filters;
 
 use Spiral\Filters\Attribute\Input\Post;
-use Spiral\Filters\Filter;
-use Spiral\Filters\FilterDefinitionInterface;
-use Spiral\Filters\HasFilterDefinition;
+use Spiral\Filters\Model\Filter;
+use Spiral\Filters\Model\FilterDefinitionInterface;
+use Spiral\Filters\Model\HasFilterDefinition;
 use Spiral\Validation\Laravel\FilterDefinition;
 
 final class SimpleFilter extends Filter implements HasFilterDefinition

diff --git a/tests/src/Functional/TestCase.php b/tests/src/Functional/TestCase.php
@@ -4,12 +4,12 @@
 
 namespace Spiral\Validation\Laravel\Tests\Functional;
 
-use Spiral\Attributes\Bootloader\AttributesBootloader;
 use Spiral\Boot\Environment;
 use Spiral\Boot\EnvironmentInterface;
+use Spiral\Bootloader\Attributes\AttributesBootloader;
 use Spiral\Bootloader\Security\FiltersBootloader;
 use Spiral\Core\Container;
-use Spiral\Http\Bootloader\DiactorosBootloader;
+use Spiral\Nyholm\Bootloader\NyholmBootloader;
 use Spiral\Testing\TestableKernelInterface;
 use Spiral\Validation\Bootloader\ValidationBootloader;
 use Spiral\Validation\Laravel\Bootloader\ValidatorBootloader;
@@ -25,7 +25,7 @@ public function defineBootloaders(): array
     {
         return [
             AttributesBootloader::class,
-            DiactorosBootloader::class,
+            NyholmBootloader::class,
             FiltersBootloader::class,
             ValidationBootloader::class,
             ValidatorBootloader::class,