[Validator] Deprecate annotations in favor of attributes

Author: derrabus

DependencyInjection/FrameworkExtension.php

@@ -181,6 +181,7 @@
 use Symfony\Component\Validator\Mapping\Loader\PropertyInfoLoader;
 use Symfony\Component\Validator\ObjectInitializerInterface;
 use Symfony\Component\Validator\Validation;
+use Symfony\Component\Validator\ValidatorBuilder;
 use Symfony\Component\Webhook\Controller\WebhookController;
 use Symfony\Component\WebLink\HttpHeaderSerializer;
 use Symfony\Component\Workflow;
@@ -1609,7 +1610,7 @@ private function registerValidationConfiguration(array $config, ContainerBuilder
 
         if (\array_key_exists('enable_annotations', $config) && $config['enable_annotations']) {
             $validatorBuilder->addMethodCall('enableAnnotationMapping', [true]);
-            if ($this->isInitializedConfigEnabled('annotations')) {
+            if ($this->isInitializedConfigEnabled('annotations') && method_exists(ValidatorBuilder::class, 'setDoctrineAnnotationReader')) {
                 $validatorBuilder->addMethodCall('setDoctrineAnnotationReader', [new Reference('annotation_reader')]);
             }
         }

Tests/CacheWarmer/ValidatorCacheWarmerTest.php

@@ -26,7 +26,7 @@ public function testWarmUp()
         $validatorBuilder->addXmlMapping(__DIR__.'/../Fixtures/Validation/Resources/person.xml');
         $validatorBuilder->addYamlMapping(__DIR__.'/../Fixtures/Validation/Resources/author.yml');
         $validatorBuilder->addMethodMapping('loadValidatorMetadata');
-        $validatorBuilder->enableAnnotationMapping(true)->addDefaultDoctrineAnnotationReader();
+        $validatorBuilder->enableAnnotationMapping();
 
         $file = sys_get_temp_dir().'/cache-validator.php';
         @unlink($file);
@@ -46,7 +46,7 @@ public function testWarmUpWithAnnotations()
     {
         $validatorBuilder = new ValidatorBuilder();
         $validatorBuilder->addYamlMapping(__DIR__.'/../Fixtures/Validation/Resources/categories.yml');
-        $validatorBuilder->enableAnnotationMapping(true)->addDefaultDoctrineAnnotationReader();
+        $validatorBuilder->enableAnnotationMapping();
 
         $file = sys_get_temp_dir().'/cache-validator-with-annotations.php';
         @unlink($file);

Tests/DependencyInjection/FrameworkExtensionTestCase.php

@@ -81,6 +81,7 @@
 use Symfony\Component\Validator\DependencyInjection\AddConstraintValidatorsPass;
 use Symfony\Component\Validator\Validation;
 use Symfony\Component\Validator\Validator\ValidatorInterface;
+use Symfony\Component\Validator\ValidatorBuilder;
 use Symfony\Component\Webhook\Client\RequestParser;
 use Symfony\Component\Webhook\Controller\WebhookController;
 use Symfony\Component\Workflow;
@@ -1308,12 +1309,17 @@ public function testValidationLegacyAnnotations()
 
         $this->assertCount(8, $calls);
         $this->assertSame('enableAnnotationMapping', $calls[4][0]);
-        $this->assertSame('setDoctrineAnnotationReader', $calls[5][0]);
-        $this->assertEquals([new Reference('annotation_reader')], $calls[5][1]);
-        $this->assertSame('addMethodMapping', $calls[6][0]);
-        $this->assertSame(['loadValidatorMetadata'], $calls[6][1]);
-        $this->assertSame('setMappingCache', $calls[7][0]);
-        $this->assertEquals([new Reference('validator.mapping.cache.adapter')], $calls[7][1]);
+        if (method_exists(ValidatorBuilder::class, 'setDoctrineAnnotationReader')) {
+            $this->assertSame('setDoctrineAnnotationReader', $calls[5][0]);
+            $this->assertEquals([new Reference('annotation_reader')], $calls[5][1]);
+            $i = 6;
+        } else {
+            $i = 5;
+        }
+        $this->assertSame('addMethodMapping', $calls[$i][0]);
+        $this->assertSame(['loadValidatorMetadata'], $calls[$i][1]);
+        $this->assertSame('setMappingCache', $calls[++$i][0]);
+        $this->assertEquals([new Reference('validator.mapping.cache.adapter')], $calls[$i][1]);
         // no cache this time
     }
 

Tests/Fixtures/Validation/Category.php

@@ -10,8 +10,6 @@ class Category
 
     public $id;
 
-    /**
-     * @Assert\Type("string")
-     */
+    #[Assert\Type('string')]
     public $name;
 }