Merge pull request #5 from msmakouz/feature/default-validator

Adding default validator
spiral-packages · Sep 29, 2022 · cec2797 · cec2797
2 parents 363943a + 5111c84
commit cec2797
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 7 deletions.
diff --git a/composer.json b/composer.json
@@ -17,18 +17,18 @@
     ],
     "require": {
         "php": "^8.1",
-        "spiral/filters": "^3.0",
-        "spiral/validation": "^3.0",
-        "spiral/boot": "^3.0",
+        "spiral/filters": "^3.1",
+        "spiral/validation": "^3.1",
+        "spiral/boot": "^3.1",
         "illuminate/validation": "^8.0|^9.0",
         "symfony/psr-http-message-bridge": "^2.0",
-        "spiral/console": "^3.0"
+        "spiral/console": "^3.1"
     },
     "require-dev": {
         "mockery/mockery": "^1.5",
-        "spiral/framework": "^3.0",
+        "spiral/framework": "^3.1",
         "spiral/nyholm-bridge": "^1.2",
-        "spiral/attributes": "^2.8 || ^3.0",
+        "spiral/attributes": "^2.8 || ^3.1",
         "phpunit/phpunit": "^9.5",
         "spiral/testing": "^2.0",
         "vimeo/psalm": "^4.9"

diff --git a/src/Bootloader/ValidatorBootloader.php b/src/Bootloader/ValidatorBootloader.php
@@ -38,12 +38,13 @@ public function init(HttpBootloader $http): void
         ]);
     }
 
-    public function boot(ValidationProvider $provider): void
+    public function boot(ValidationProvider $provider, ValidationBootloader $validation): void
     {
         $provider->register(
             FilterDefinition::class,
             static fn(LaravelValidation $validation) => $validation
         );
+        $validation->setDefaultValidator(FilterDefinition::class);
     }
 
     private function initValidation(TranslatorInterface $translator): ValidationInterface

diff --git a/tests/src/Functional/Bootloader/ValidatorBootloaderTest.php b/tests/src/Functional/Bootloader/ValidatorBootloaderTest.php
@@ -8,6 +8,7 @@
 use Spiral\Validation\Laravel\Bootloader\ValidatorBootloader;
 use Spiral\Validation\Laravel\FilterDefinition;
 use Spiral\Validation\Laravel\LaravelValidation;
+use Spiral\Validation\ValidationInterface;
 use Spiral\Validation\ValidationProviderInterface;
 
 final class ValidatorBootloaderTest extends TestCase
@@ -22,5 +23,6 @@ public function testValidationRegistered(): void
         $provider = $this->getContainer()->get(ValidationProviderInterface::class);
 
         $this->assertInstanceOf(LaravelValidation::class, $provider->getValidation(FilterDefinition::class));
+        $this->assertContainerBoundAsSingleton(ValidationInterface::class, LaravelValidation::class);
     }
 }