Merge pull request #25 from msmakouz/feature/annotations-2.0

Allow doctrine/annotations 2.x
spiral-packages · May 8, 2023 · 2894e90 · 2894e90
2 parents 01b8b79 + 91387c8
commit 2894e90
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 9 deletions.
diff --git a/composer.json b/composer.json
@@ -19,7 +19,7 @@
         "php": "^8.1",
         "spiral/filters": "^3.1",
         "spiral/validation": "^3.1",
-        "doctrine/annotations": "^1.13",
+        "doctrine/annotations": "^1.13 || ^2.0",
         "symfony/cache": "^6.0",
         "symfony/psr-http-message-bridge": "^2",
         "symfony/validator": "^6.0",

diff --git a/src/Bootloader/ValidatorBootloader.php b/src/Bootloader/ValidatorBootloader.php
@@ -16,6 +16,7 @@
 use Symfony\Component\Validator\Constraints\EmailValidator;
 use Symfony\Component\Validator\ConstraintValidatorFactoryInterface;
 use Symfony\Component\Validator\ContainerConstraintValidatorFactory;
+use Symfony\Component\Validator\Validator\ValidatorInterface;
 
 class ValidatorBootloader extends Bootloader
 {
@@ -24,7 +25,8 @@ class ValidatorBootloader extends Bootloader
     ];
 
     protected const SINGLETONS = [
-        Validation::class => [self::class, 'initValidation'],
+        Validation::class => Validation::class,
+        ValidatorInterface::class => [self::class, 'initSymfonyValidator'],
         ConstraintValidatorFactoryInterface::class => ContainerConstraintValidatorFactory::class,
     ];
 
@@ -50,14 +52,12 @@ public function boot(ValidationProvider $provider, ValidationBootloader $validat
         $validation->setDefaultValidator(FilterDefinition::class);
     }
 
-    private function initValidation(ConstraintValidatorFactoryInterface $validatorFactory): ValidationInterface
+    private function initSymfonyValidator(ConstraintValidatorFactoryInterface $validatorFactory): ValidatorInterface
     {
-        return new Validation(
-            \Symfony\Component\Validator\Validation::createValidatorBuilder()
-                ->enableAnnotationMapping()
-                ->setConstraintValidatorFactory($validatorFactory)
-                ->getValidator()
-        );
+        return \Symfony\Component\Validator\Validation::createValidatorBuilder()
+            ->enableAnnotationMapping()
+            ->setConstraintValidatorFactory($validatorFactory)
+            ->getValidator();
     }
 
     /**

diff --git a/tests/src/Functional/Bootloader/ValidatorBootloaderTest.php b/tests/src/Functional/Bootloader/ValidatorBootloaderTest.php
@@ -14,6 +14,8 @@
 use Symfony\Component\Validator\Constraints\EmailValidator;
 use Symfony\Component\Validator\ConstraintValidatorFactoryInterface;
 use Symfony\Component\Validator\ContainerConstraintValidatorFactory;
+use Symfony\Component\Validator\Validator\RecursiveValidator;
+use Symfony\Component\Validator\Validator\ValidatorInterface;
 
 final class ValidatorBootloaderTest extends TestCase
 {
@@ -49,4 +51,9 @@ public function testEmailValidatorShouldBeBound(): void
             (new \ReflectionProperty($validator, 'defaultMode'))->getValue($validator)
         );
     }
+
+    public function testSymfonyValidatorShouldBeBoundAsSingleton(): void
+    {
+        $this->assertContainerBoundAsSingleton(ValidatorInterface::class, RecursiveValidator::class);
+    }
 }