[FrameworkBundle][Validator] Deprecate annotation occurrences

Author: alexandre-daubois

CHANGELOG.md

@@ -12,6 +12,9 @@ CHANGELOG
  * Deprecate `ValidatorBuilder::addDefaultDoctrineAnnotationReader()`
  * Add `number`, `finite-number` and `finite-float` types to `Type` constraint
  * Add the `withSeconds` option to the `Time` constraint that allows to pass time without seconds
+ * Deprecate `ValidatorBuilder::enableAnnotationMapping()`, use `ValidatorBuilder::enableAttributeMapping()` instead
+ * Deprecate `ValidatorBuilder::disableAnnotationMapping()`, use `ValidatorBuilder::disableAttributeMapping()` instead
+ * Deprecate `AnnotationLoader`, use `AttributeLoader` instead
 
 6.3
 ---

Mapping/Loader/AnnotationLoader.php

@@ -22,6 +22,8 @@
 /**
  * Loads validation metadata using a Doctrine annotation {@link Reader} or using PHP 8 attributes.
  *
+ * @deprecated since Symfony 6.4, use {@see AttributeLoader} instead
+ *
  * @author Bernhard Schussek <[email protected]>
  * @author Alexander M. Turek <[email protected]>
  */

Mapping/Loader/AttributeLoader.php

@@ -0,0 +1,27 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <[email protected]>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\Validator\Mapping\Loader;
+
+/**
+ * Loads validation metadata using PHP attributes.
+ *
+ * @author Bernhard Schussek <[email protected]>
+ * @author Alexander M. Turek <[email protected]>
+ * @author Alexandre Daubois <[email protected]>
+ */
+class AttributeLoader extends AnnotationLoader
+{
+    public function __construct()
+    {
+        parent::__construct(null);
+    }
+}

Tests/Command/DebugCommandTest.php

@@ -16,7 +16,7 @@
 use Symfony\Component\Validator\Command\DebugCommand;
 use Symfony\Component\Validator\Mapping\Factory\LazyLoadingMetadataFactory;
 use Symfony\Component\Validator\Mapping\Factory\MetadataFactoryInterface;
-use Symfony\Component\Validator\Mapping\Loader\AnnotationLoader;
+use Symfony\Component\Validator\Mapping\Loader\AttributeLoader;
 use Symfony\Component\Validator\Tests\Dummy\DummyClassOne;
 
 /**
@@ -26,7 +26,7 @@ class DebugCommandTest extends TestCase
 {
     public function testOutputWithClassArgument()
     {
-        $command = new DebugCommand(new LazyLoadingMetadataFactory(new AnnotationLoader()));
+        $command = new DebugCommand(new LazyLoadingMetadataFactory(new AttributeLoader()));
 
         $tester = new CommandTester($command);
         $tester->execute(['class' => DummyClassOne::class], ['decorated' => false]);
@@ -82,7 +82,7 @@ public function testOutputWithClassArgument()
 
     public function testOutputWithPathArgument()
     {
-        $command = new DebugCommand(new LazyLoadingMetadataFactory(new AnnotationLoader()));
+        $command = new DebugCommand(new LazyLoadingMetadataFactory(new AttributeLoader()));
 
         $tester = new CommandTester($command);
         $tester->execute(['class' => __DIR__.'/../Dummy'], ['decorated' => false]);

Tests/Constraints/BicValidatorTest.php

@@ -16,7 +16,7 @@
 use Symfony\Component\Validator\Exception\ConstraintDefinitionException;
 use Symfony\Component\Validator\Exception\UnexpectedValueException;
 use Symfony\Component\Validator\Mapping\ClassMetadata;
-use Symfony\Component\Validator\Mapping\Loader\AnnotationLoader;
+use Symfony\Component\Validator\Mapping\Loader\AttributeLoader;
 use Symfony\Component\Validator\Test\ConstraintValidatorTestCase;
 
 class BicValidatorTest extends ConstraintValidatorTestCase
@@ -74,7 +74,7 @@ public function testInvalidComparisonToPropertyPath()
     public function testInvalidComparisonToPropertyPathFromAttribute()
     {
         $classMetadata = new ClassMetadata(BicDummy::class);
-        (new AnnotationLoader())->loadClassMetadata($classMetadata);
+        (new AttributeLoader())->loadClassMetadata($classMetadata);
 
         [$constraint] = $classMetadata->properties['bic1']->constraints;
 
@@ -116,7 +116,7 @@ public function testInvalidComparisonToValue()
     public function testInvalidComparisonToValueFromAttribute()
     {
         $classMetadata = new ClassMetadata(BicDummy::class);
-        (new AnnotationLoader())->loadClassMetadata($classMetadata);
+        (new AttributeLoader())->loadClassMetadata($classMetadata);
 
         [$constraint] = $classMetadata->properties['bic1']->constraints;
 

Tests/Constraints/CardSchemeTest.php

@@ -14,14 +14,14 @@
 use PHPUnit\Framework\TestCase;
 use Symfony\Component\Validator\Constraints\CardScheme;
 use Symfony\Component\Validator\Mapping\ClassMetadata;
-use Symfony\Component\Validator\Mapping\Loader\AnnotationLoader;
+use Symfony\Component\Validator\Mapping\Loader\AttributeLoader;
 
 class CardSchemeTest extends TestCase
 {
     public function testAttributes()
     {
         $metadata = new ClassMetadata(CardSchemeDummy::class);
-        $loader = new AnnotationLoader();
+        $loader = new AttributeLoader();
         self::assertTrue($loader->loadClassMetadata($metadata));
 
         [$aConstraint] = $metadata->properties['a']->getConstraints();

Tests/Constraints/CascadeTest.php

@@ -15,14 +15,14 @@
 use Symfony\Component\Validator\Constraints\Cascade;
 use Symfony\Component\Validator\Mapping\CascadingStrategy;
 use Symfony\Component\Validator\Mapping\ClassMetadata;
-use Symfony\Component\Validator\Mapping\Loader\AnnotationLoader;
+use Symfony\Component\Validator\Mapping\Loader\AttributeLoader;
 
 class CascadeTest extends TestCase
 {
     public function testCascadeAttribute()
     {
         $metadata = new ClassMetadata(CascadeDummy::class);
-        $loader = new AnnotationLoader();
+        $loader = new AttributeLoader();
         self::assertSame(CascadingStrategy::NONE, $metadata->getCascadingStrategy());
         self::assertTrue($loader->loadClassMetadata($metadata));
         self::assertSame(CascadingStrategy::CASCADE, $metadata->getCascadingStrategy());

Tests/Constraints/ChoiceTest.php

@@ -14,7 +14,7 @@
 use PHPUnit\Framework\TestCase;
 use Symfony\Component\Validator\Constraints\Choice;
 use Symfony\Component\Validator\Mapping\ClassMetadata;
-use Symfony\Component\Validator\Mapping\Loader\AnnotationLoader;
+use Symfony\Component\Validator\Mapping\Loader\AttributeLoader;
 use Symfony\Component\Validator\Tests\Fixtures\ConstraintChoiceWithPreset;
 
 class ChoiceTest extends TestCase
@@ -29,7 +29,7 @@ public function testSetDefaultPropertyChoice()
     public function testAttributes()
     {
         $metadata = new ClassMetadata(ChoiceDummy::class);
-        $loader = new AnnotationLoader();
+        $loader = new AttributeLoader();
         self::assertTrue($loader->loadClassMetadata($metadata));
 
         /** @var Choice $aConstraint */

Tests/Constraints/CidrTest.php

@@ -16,7 +16,7 @@
 use Symfony\Component\Validator\Constraints\Ip;
 use Symfony\Component\Validator\Exception\ConstraintDefinitionException;
 use Symfony\Component\Validator\Mapping\ClassMetadata;
-use Symfony\Component\Validator\Mapping\Loader\AnnotationLoader;
+use Symfony\Component\Validator\Mapping\Loader\AttributeLoader;
 
 class CidrTest extends TestCase
 {
@@ -123,7 +123,7 @@ public static function getValidMinMaxValues(): array
     public function testAttributes()
     {
         $metadata = new ClassMetadata(CidrDummy::class);
-        $loader = new AnnotationLoader();
+        $loader = new AttributeLoader();
         self::assertTrue($loader->loadClassMetadata($metadata));
 
         [$aConstraint] = $metadata->properties['a']->getConstraints();

Tests/Constraints/CountTest.php

@@ -14,14 +14,14 @@
 use PHPUnit\Framework\TestCase;
 use Symfony\Component\Validator\Constraints\Count;
 use Symfony\Component\Validator\Mapping\ClassMetadata;
-use Symfony\Component\Validator\Mapping\Loader\AnnotationLoader;
+use Symfony\Component\Validator\Mapping\Loader\AttributeLoader;
 
 class CountTest extends TestCase
 {
     public function testAttributes()
     {
         $metadata = new ClassMetadata(CountDummy::class);
-        $loader = new AnnotationLoader();
+        $loader = new AttributeLoader();
         self::assertTrue($loader->loadClassMetadata($metadata));
 
         [$aConstraint] = $metadata->properties['a']->getConstraints();