Merge branch '5.4' into 6.2

* 5.4:
  Fix Doctrine deprecations
  [Validator] Remove internal from methods on non-internal interfaces
  [PhpUnitBridge] Fix support for the NO_COLOR env var

Author: nicolas-grekas

Form/ChoiceList/ORMQueryBuilderLoader.php

@@ -11,6 +11,7 @@
 
 namespace Symfony\Bridge\Doctrine\Form\ChoiceList;
 
+use Doctrine\DBAL\ArrayParameterType;
 use Doctrine\DBAL\Connection;
 use Doctrine\DBAL\Types\ConversionException;
 use Doctrine\DBAL\Types\Type;
@@ -70,15 +71,15 @@ public function getEntitiesByIds(string $identifier, array $values): array
         $entity = current($qb->getRootEntities());
         $metadata = $qb->getEntityManager()->getClassMetadata($entity);
         if (\in_array($type = $metadata->getTypeOfField($identifier), ['integer', 'bigint', 'smallint'])) {
-            $parameterType = Connection::PARAM_INT_ARRAY;
+            $parameterType = class_exists(ArrayParameterType::class) ? ArrayParameterType::INTEGER : Connection::PARAM_INT_ARRAY;
 
             // Filter out non-integer values (e.g. ""). If we don't, some
             // databases such as PostgreSQL fail.
             $values = array_values(array_filter($values, function ($v) {
                 return (string) $v === (string) (int) $v || ctype_digit($v);
             }));
         } elseif (\in_array($type, ['ulid', 'uuid', 'guid'])) {
-            $parameterType = Connection::PARAM_STR_ARRAY;
+            $parameterType = class_exists(ArrayParameterType::class) ? ArrayParameterType::STRING : Connection::PARAM_STR_ARRAY;
 
             // Like above, but we just filter out empty strings.
             $values = array_values(array_filter($values, function ($v) {
@@ -99,7 +100,7 @@ public function getEntitiesByIds(string $identifier, array $values): array
                 unset($value);
             }
         } else {
-            $parameterType = Connection::PARAM_STR_ARRAY;
+            $parameterType = class_exists(ArrayParameterType::class) ? ArrayParameterType::STRING : Connection::PARAM_STR_ARRAY;
         }
         if (!$values) {
             return [];

Tests/DependencyInjection/DoctrineExtensionTest.php

@@ -187,7 +187,7 @@ public function testMappingTypeDetection()
 
         // The ordinary fixtures contain annotation
         $mappingType = $method->invoke($this->extension, __DIR__.'/../Fixtures', $container);
-        $this->assertSame($mappingType, 'annotation');
+        $this->assertSame($mappingType, 'attribute');
 
         // In the attribute folder, attributes are used
         $mappingType = $method->invoke($this->extension, __DIR__.'/../Fixtures/Attribute', $container);
@@ -275,9 +275,9 @@ public function testUnrecognizedCacheDriverException()
 
     public static function providerBundles()
     {
-        yield ['AnnotationsBundle', 'annotation', '/Entity'];
-        yield ['AnnotationsOneLineBundle', 'annotation', '/Entity'];
-        yield ['FullEmbeddableAnnotationsBundle', 'annotation', '/Entity'];
+        yield ['AnnotationsBundle', 'attribute', '/Entity'];
+        yield ['AnnotationsOneLineBundle', 'attribute', '/Entity'];
+        yield ['FullEmbeddableAnnotationsBundle', 'attribute', '/Entity'];
         yield ['AttributesBundle', 'attribute', '/Entity'];
         yield ['FullEmbeddableAttributesBundle', 'attribute', '/Entity'];
         yield ['XmlBundle', 'xml', '/Resources/config/doctrine'];
@@ -286,7 +286,7 @@ public static function providerBundles()
 
         yield ['SrcXmlBundle', 'xml', '/Resources/config/doctrine'];
 
-        yield ['NewAnnotationsBundle', 'annotation', \DIRECTORY_SEPARATOR.'src/Entity'];
+        yield ['NewAnnotationsBundle', 'attribute', \DIRECTORY_SEPARATOR.'src/Entity'];
         yield ['NewXmlBundle', 'xml', '/config/doctrine'];
     }
 

Tests/DoctrineTestHelper.php

@@ -12,10 +12,14 @@
 namespace Symfony\Bridge\Doctrine\Tests;
 
 use Doctrine\Common\Annotations\AnnotationReader;
+use Doctrine\DBAL\DriverManager;
+use Doctrine\DBAL\Schema\DefaultSchemaManagerFactory;
 use Doctrine\ORM\Configuration;
 use Doctrine\ORM\EntityManager;
 use Doctrine\ORM\Mapping\Driver\AnnotationDriver;
+use Doctrine\ORM\Mapping\Driver\AttributeDriver;
 use Doctrine\ORM\Mapping\Driver\XmlDriver;
+use Doctrine\ORM\ORMSetup;
 use Doctrine\Persistence\Mapping\Driver\MappingDriverChain;
 use Doctrine\Persistence\Mapping\Driver\SymfonyFileLocator;
 use PHPUnit\Framework\TestCase;
@@ -41,17 +45,30 @@ public static function createTestEntityManager(Configuration $config = null): En
             'memory' => true,
         ];
 
-        return EntityManager::create($params, $config ?? self::createTestConfiguration());
+        $config ??= self::createTestConfiguration();
+
+        if (!(new \ReflectionMethod(EntityManager::class, '__construct'))->isPublic()) {
+            return EntityManager::create($params, $config);
+        }
+
+        return new EntityManager(DriverManager::getConnection($params, $config), $config);
     }
 
     public static function createTestConfiguration(): Configuration
     {
-        $config = new Configuration();
+        $config = class_exists(ORMSetup::class) ? ORMSetup::createConfiguration(true) : new Configuration();
         $config->setEntityNamespaces(['SymfonyTestsDoctrine' => 'Symfony\Bridge\Doctrine\Tests\Fixtures']);
         $config->setAutoGenerateProxyClasses(true);
         $config->setProxyDir(sys_get_temp_dir());
         $config->setProxyNamespace('SymfonyTests\Doctrine');
-        $config->setMetadataDriverImpl(new AnnotationDriver(new AnnotationReader()));
+        if (class_exists(AttributeDriver::class)) {
+            $config->setMetadataDriverImpl(new AttributeDriver([__DIR__.'/../Tests/Fixtures' => 'Symfony\Bridge\Doctrine\Tests\Fixtures'], true));
+        } else {
+            $config->setMetadataDriverImpl(new AnnotationDriver(new AnnotationReader(), null, true));
+        }
+        if (class_exists(DefaultSchemaManagerFactory::class)) {
+            $config->setSchemaManagerFactory(new DefaultSchemaManagerFactory());
+        }
 
         return $config;
     }
@@ -65,7 +82,9 @@ public static function createTestConfigurationWithXmlLoader(): Configuration
             new XmlDriver(
                 new SymfonyFileLocator(
                     [__DIR__.'/../Tests/Resources/orm' => 'Symfony\\Bridge\\Doctrine\\Tests\\Fixtures'], '.orm.xml'
-                )
+                ),
+                '.orm.xml',
+                true
             ),
             'Symfony\\Bridge\\Doctrine\\Tests\\Fixtures'
         );

Tests/Fixtures/AssociationEntity.php

@@ -16,20 +16,23 @@
 /**
  * @ORM\Entity
  */
+#[ORM\Entity]
 class AssociationEntity
 {
     /**
      * @var int
      * @ORM\Id @ORM\GeneratedValue
      * @ORM\Column(type="integer")
      */
+    #[ORM\Id, ORM\GeneratedValue, ORM\Column(type: 'integer')]
     private $id;
 
     /**
      * @ORM\ManyToOne(targetEntity="SingleIntIdEntity")
      *
      * @var \Symfony\Bridge\Doctrine\Tests\Fixtures\SingleIntIdEntity
      */
+    #[ORM\ManyToOne(targetEntity: SingleIntIdEntity::class)]
     public $single;
 
     /**
@@ -41,5 +44,8 @@ class AssociationEntity
      *
      * @var \Symfony\Bridge\Doctrine\Tests\Fixtures\CompositeIntIdEntity
      */
+    #[ORM\ManyToOne(targetEntity: CompositeIntIdEntity::class)]
+    #[ORM\JoinColumn(name: 'composite_id1', referencedColumnName: 'id1')]
+    #[ORM\JoinColumn(name: 'composite_id2', referencedColumnName: 'id2')]
     public $composite;
 }

Tests/Fixtures/AssociationEntity2.php

@@ -16,20 +16,23 @@
 /**
  * @ORM\Entity
  */
+#[ORM\Entity]
 class AssociationEntity2
 {
     /**
      * @var int
      * @ORM\Id @ORM\GeneratedValue
      * @ORM\Column(type="integer")
      */
+    #[ORM\Id, ORM\GeneratedValue, ORM\Column(type: 'integer')]
     private $id;
 
     /**
      * @ORM\ManyToOne(targetEntity="SingleIntIdNoToStringEntity")
      *
      * @var \Symfony\Bridge\Doctrine\Tests\Fixtures\SingleIntIdNoToStringEntity
      */
+    #[ORM\ManyToOne(targetEntity: SingleIntIdNoToStringEntity::class)]
     public $single;
 
     /**
@@ -41,5 +44,8 @@ class AssociationEntity2
      *
      * @var \Symfony\Bridge\Doctrine\Tests\Fixtures\CompositeIntIdEntity
      */
+    #[ORM\ManyToOne(targetEntity: CompositeIntIdEntity::class)]
+    #[ORM\JoinColumn(name: 'composite_id1', referencedColumnName: 'id1')]
+    #[ORM\JoinColumn(name: 'composite_id2', referencedColumnName: 'id2')]
     public $composite;
 }

Tests/Fixtures/Bundles/AnnotationsBundle/Entity/Person.php

@@ -18,12 +18,15 @@
 /**
  * @Entity
  */
+#[Entity]
 class Person
 {
     /** @Id @Column(type="integer") */
+    #[Id, Column(type: 'integer')]
     protected $id;
 
     /** @Column(type="string") */
+    #[Column(type: 'string')]
     public $name;
 
     public function __construct($id, $name)

Tests/Fixtures/Bundles/AnnotationsOneLineBundle/Entity/Person.php

@@ -16,12 +16,15 @@
 use Doctrine\ORM\Mapping\Id;
 
 /** @Entity */
+#[Entity]
 class Person
 {
     /** @Id @Column(type="integer") */
+    #[Id, Column(type: 'integer')]
     protected $id;
 
     /** @Column(type="string") */
+    #[Column(type: 'string')]
     public $name;
 
     public function __construct($id, $name)

Tests/Fixtures/Bundles/AttributesBundle/AnnotatedEntity/Person.php

@@ -18,12 +18,15 @@
 /**
  * @Entity
  */
+#[Entity]
 class Person
 {
     /** @Id @Column(type="integer") */
+    #[Id, Column(type: 'integer')]
     protected $id;
 
     /** @Column(type="string") */
+    #[Column(type: 'string')]
     public $name;
 
     public function __construct($id, $name)

Tests/Fixtures/Bundles/FullEmbeddableAnnotationsBundle/Entity/Address.php

@@ -13,21 +13,24 @@
 
 use Doctrine\ORM\Mapping\Column;
 use Doctrine\ORM\Mapping\Embeddable;
-use Doctrine\ORM\Mapping\Id;
 
 /**
  * @Embeddable
  */
+#[Embeddable]
 class Address
 {
 
     /** @Column(type="string") */
+    #[Column(type: 'string')]
     public $street;
 
     /** @Column(type="string") */
+    #[Column(type: 'string')]
     public $zipCode;
 
     /** @Column(type="string") */
+    #[Column(type: 'string')]
     public $city;
 
     public function __construct($street, $zipCode, $city)

Tests/Fixtures/Bundles/FullEmbeddableAttributesBundle/Entity/Address.php

@@ -13,7 +13,6 @@
 
 use Doctrine\ORM\Mapping\Column;
 use Doctrine\ORM\Mapping\Embeddable;
-use Doctrine\ORM\Mapping\Id;
 
 #[Embeddable]
 class Address