Merge branch '6.4' into 7.0

* 6.4:
  [Validator] Deprecate annotations in favor of attributes
  More intuitive Logic Exception message
  [Serializer] Deprecate annotations in favor of attributes

Author: derrabus

Tests/Validator/DoctrineLoaderTest.php

@@ -28,7 +28,7 @@
 use Symfony\Component\Validator\Mapping\ClassMetadata;
 use Symfony\Component\Validator\Mapping\PropertyMetadata;
 use Symfony\Component\Validator\Mapping\TraversalStrategy;
-use Symfony\Component\Validator\Tests\Fixtures\Entity;
+use Symfony\Component\Validator\Tests\Fixtures\NestedAttribute\Entity;
 use Symfony\Component\Validator\Validation;
 
 /**
@@ -40,7 +40,6 @@ public function testLoadClassMetadata()
     {
         $validator = Validation::createValidatorBuilder()
             ->enableAnnotationMapping(true)
-            ->addDefaultDoctrineAnnotationReader()
             ->addLoader(new DoctrineLoader(DoctrineTestHelper::createTestEntityManager(), '{^Symfony\\\\Bridge\\\\Doctrine\\\\Tests\\\\Fixtures\\\\DoctrineLoader}'))
             ->getValidator()
         ;
@@ -144,7 +143,6 @@ public function testExtractEnum()
         $validator = Validation::createValidatorBuilder()
             ->addMethodMapping('loadValidatorMetadata')
             ->enableAnnotationMapping(true)
-            ->addDefaultDoctrineAnnotationReader()
             ->addLoader(new DoctrineLoader(DoctrineTestHelper::createTestEntityManager(), '{^Symfony\\\\Bridge\\\\Doctrine\\\\Tests\\\\Fixtures\\\\DoctrineLoader}'))
             ->getValidator()
         ;
@@ -162,7 +160,6 @@ public function testFieldMappingsConfiguration()
     {
         $validator = Validation::createValidatorBuilder()
             ->enableAnnotationMapping(true)
-            ->addDefaultDoctrineAnnotationReader()
             ->addXmlMappings([__DIR__.'/../Resources/validator/BaseUser.xml'])
             ->addLoader(
                 new DoctrineLoader(
@@ -204,7 +201,6 @@ public function testClassNoAutoMapping()
     {
         $validator = Validation::createValidatorBuilder()
             ->enableAnnotationMapping(true)
-            ->addDefaultDoctrineAnnotationReader()
             ->addLoader(new DoctrineLoader(DoctrineTestHelper::createTestEntityManager(), '{.*}'))
             ->getValidator();
 

composer.json

@@ -41,15 +41,13 @@
         "symfony/uid": "^6.4|^7.0",
         "symfony/validator": "^6.4|^7.0",
         "symfony/var-dumper": "^6.4|^7.0",
-        "doctrine/annotations": "^1.13.1|^2",
         "doctrine/collections": "^1.0|^2.0",
         "doctrine/data-fixtures": "^1.1",
         "doctrine/dbal": "^3.6",
         "doctrine/orm": "^2.15",
         "psr/log": "^1|^2|^3"
     },
     "conflict": {
-        "doctrine/annotations": "<1.13.1",
         "doctrine/dbal": "<3.6",
         "doctrine/lexer": "<1.1",
         "doctrine/orm": "<2.15",