symfony · nicolas-grekas · Jun 2, 2023 · Jun 1, 2023
diff --git a/.github/deprecations-baseline.json b/.github/deprecations-baseline.json
diff --git a/.github/workflows/integration-tests.yml b/.github/workflows/integration-tests.yml
diff --git a/.github/workflows/unit-tests.yml b/.github/workflows/unit-tests.yml
@@ -89,6 +89,7 @@ jobs:
 
           # Create local composer packages for each patched components and reference them in composer.json files when cross-testing components
           if [[ ! "${{ matrix.mode }}" = *-deps ]]; then
+              echo SYMFONY_DEPRECATIONS_HELPER="baselineFile=$(pwd)/.github/deprecations-baseline.json" >> $GITHUB_ENV
               php .github/build-packages.php HEAD^ $SYMFONY_VERSION src/Symfony/Bridge/PhpUnit
           else
             echo SYMFONY_DEPRECATIONS_HELPER=weak >> $GITHUB_ENV

diff --git a/src/Symfony/Bridge/Doctrine/Form/ChoiceList/ORMQueryBuilderLoader.php b/src/Symfony/Bridge/Doctrine/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;
@@ -78,15 +79,15 @@ public function getEntitiesByIds(string $identifier, array $values)
         $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) {
@@ -107,7 +108,7 @@ public function getEntitiesByIds(string $identifier, array $values)
                 unset($value);
             }
         } else {
-            $parameterType = Connection::PARAM_STR_ARRAY;
+            $parameterType = class_exists(ArrayParameterType::class) ? ArrayParameterType::STRING : Connection::PARAM_STR_ARRAY;
         }
         if (!$values) {
             return [];

diff --git a/src/Symfony/Bridge/Doctrine/Test/DoctrineTestHelper.php b/src/Symfony/Bridge/Doctrine/Test/DoctrineTestHelper.php
@@ -12,10 +12,14 @@
 namespace Symfony\Bridge\Doctrine\Test;
 
 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;
@@ -53,7 +57,11 @@ public static function createTestEntityManager(Configuration $config = null)
             'memory' => true,
         ];
 
-        return EntityManager::create($params, $config);
+        if (!(new \ReflectionMethod(EntityManager::class, '__construct'))->isPublic()) {
+            return EntityManager::create($params, $config);
+        }
+
+        return new EntityManager(DriverManager::getConnection($params, $config), $config);
     }
 
     /**
@@ -65,12 +73,19 @@ public static function createTestConfiguration()
             trigger_deprecation('symfony/doctrine-bridge', '5.3', '"%s" is deprecated and will be removed in 6.0.', __CLASS__);
         }
 
-        $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 (\PHP_VERSION_ID >= 80000 && 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;
     }
@@ -91,7 +106,9 @@ public static function createTestConfigurationWithXmlLoader()
             new XmlDriver(
                 new SymfonyFileLocator(
                     [__DIR__.'/../Tests/Resources/orm' => 'Symfony\\Bridge\\Doctrine\\Tests\\Fixtures'], '.orm.xml'
-                )
+                ),
+                '.orm.xml',
+                true
             ),
             'Symfony\\Bridge\\Doctrine\\Tests\\Fixtures'
         );

diff --git a/src/Symfony/Bridge/Doctrine/Tests/DependencyInjection/DoctrineExtensionTest.php b/src/Symfony/Bridge/Doctrine/Tests/DependencyInjection/DoctrineExtensionTest.php
@@ -190,7 +190,7 @@ public function testMappingTypeDetection()
 
         // The ordinary fixtures contain annotation
         $mappingType = $method->invoke($this->extension, __DIR__.'/../Fixtures', $container);
-        $this->assertSame($mappingType, 'annotation');
+        $this->assertSame($mappingType, \PHP_VERSION_ID < 80000 ? 'annotation' : 'attribute');
 
         // In the attribute folder, attributes are used
         $mappingType = $method->invoke($this->extension, __DIR__.'/../Fixtures/Attribute', $container);
@@ -278,9 +278,9 @@ public function testUnrecognizedCacheDriverException()
 
     public static function providerBundles()
     {
-        yield ['AnnotationsBundle', 'annotation', '/Entity'];
-        yield ['AnnotationsOneLineBundle', 'annotation', '/Entity'];
-        yield ['FullEmbeddableAnnotationsBundle', 'annotation', '/Entity'];
+        yield ['AnnotationsBundle', \PHP_VERSION_ID < 80000 ? 'annotation' : 'attribute', '/Entity'];
+        yield ['AnnotationsOneLineBundle', \PHP_VERSION_ID < 80000 ? 'annotation' : 'attribute', '/Entity'];
+        yield ['FullEmbeddableAnnotationsBundle', \PHP_VERSION_ID < 80000 ? 'annotation' : 'attribute', '/Entity'];
         if (\PHP_VERSION_ID >= 80000) {
             yield ['AttributesBundle', 'attribute', '/Entity'];
             yield ['FullEmbeddableAttributesBundle', 'attribute', '/Entity'];
@@ -291,7 +291,7 @@ public static function providerBundles()
 
         yield ['SrcXmlBundle', 'xml', '/Resources/config/doctrine'];
 
-        yield ['NewAnnotationsBundle', 'annotation', \DIRECTORY_SEPARATOR.'src/Entity'];
+        yield ['NewAnnotationsBundle', \PHP_VERSION_ID < 80000 ? 'annotation' : 'attribute', \DIRECTORY_SEPARATOR.'src/Entity'];
         yield ['NewXmlBundle', 'xml', '/config/doctrine'];
     }
 

diff --git a/src/Symfony/Bridge/Doctrine/Tests/Fixtures/AssociationEntity.php b/src/Symfony/Bridge/Doctrine/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;
 }
diff --git a/src/Symfony/Bridge/Doctrine/Tests/Fixtures/AssociationEntity2.php b/src/Symfony/Bridge/Doctrine/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;
 }
diff --git a/src/Symfony/Bridge/Doctrine/Tests/Fixtures/Bundles/AnnotationsBundle/Entity/Person.php b/src/Symfony/Bridge/Doctrine/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)

diff --git a/...Symfony/Bridge/Doctrine/Tests/Fixtures/Bundles/AnnotationsOneLineBundle/Entity/Person.php b/...Symfony/Bridge/Doctrine/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)

diff --git a/...ymfony/Bridge/Doctrine/Tests/Fixtures/Bundles/AttributesBundle/AnnotatedEntity/Person.php b/...ymfony/Bridge/Doctrine/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)

diff --git a/...Bridge/Doctrine/Tests/Fixtures/Bundles/FullEmbeddableAnnotationsBundle/Entity/Address.php b/...Bridge/Doctrine/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)

diff --git a/.../Bridge/Doctrine/Tests/Fixtures/Bundles/FullEmbeddableAttributesBundle/Entity/Address.php b/.../Bridge/Doctrine/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

diff --git a/...Symfony/Bridge/Doctrine/Tests/Fixtures/Bundles/NewAnnotationsBundle/src/Entity/Person.php b/...Symfony/Bridge/Doctrine/Tests/Fixtures/Bundles/NewAnnotationsBundle/src/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)

diff --git a/src/Symfony/Bridge/Doctrine/Tests/Fixtures/CompositeIntIdEntity.php b/src/Symfony/Bridge/Doctrine/Tests/Fixtures/CompositeIntIdEntity.php
@@ -16,15 +16,19 @@
 use Doctrine\ORM\Mapping\Id;
 
 /** @Entity */
+#[Entity]
 class CompositeIntIdEntity
 {
     /** @Id @Column(type="integer") */
+    #[Id, Column(type: 'integer')]
     protected $id1;
 
     /** @Id @Column(type="integer") */
+    #[Id, Column(type: 'integer')]
     protected $id2;
 
     /** @Column(type="string") */
+    #[Column(type: 'string')]
     public $name;
 
     public function __construct($id1, $id2, $name)

diff --git a/src/Symfony/Bridge/Doctrine/Tests/Fixtures/CompositeObjectNoToStringIdEntity.php b/src/Symfony/Bridge/Doctrine/Tests/Fixtures/CompositeObjectNoToStringIdEntity.php
@@ -9,6 +9,7 @@
  *
  * @ORM\Entity
  */
+#[ORM\Entity]
 class CompositeObjectNoToStringIdEntity
 {
     /**
@@ -18,6 +19,9 @@ class CompositeObjectNoToStringIdEntity
      * @ORM\ManyToOne(targetEntity="SingleIntIdNoToStringEntity", cascade={"persist"})
      * @ORM\JoinColumn(name="object_one_id")
      */
+    #[ORM\Id]
+    #[ORM\ManyToOne(targetEntity: SingleIntIdNoToStringEntity::class, cascade: ['persist'])]
+    #[ORM\JoinColumn(name: 'object_one_id')]
     protected $objectOne;
 
     /**
@@ -27,6 +31,9 @@ class CompositeObjectNoToStringIdEntity
      * @ORM\ManyToOne(targetEntity="SingleIntIdNoToStringEntity", cascade={"persist"})
      * @ORM\JoinColumn(name="object_two_id")
      */
+    #[ORM\Id]
+    #[ORM\ManyToOne(targetEntity: SingleIntIdNoToStringEntity::class, cascade: ['persist'])]
+    #[ORM\JoinColumn(name: 'object_two_id')]
     protected $objectTwo;
 
     public function __construct(SingleIntIdNoToStringEntity $objectOne, SingleIntIdNoToStringEntity $objectTwo)

diff --git a/src/Symfony/Bridge/Doctrine/Tests/Fixtures/CompositeStringIdEntity.php b/src/Symfony/Bridge/Doctrine/Tests/Fixtures/CompositeStringIdEntity.php
@@ -16,15 +16,19 @@
 use Doctrine\ORM\Mapping\Id;
 
 /** @Entity */
+#[Entity]
 class CompositeStringIdEntity
 {
     /** @Id @Column(type="string") */
+    #[Id, Column(type: 'string')]
     protected $id1;
 
     /** @Id @Column(type="string") */
+    #[Id, Column(type: 'string')]
     protected $id2;
 
     /** @Column(type="string") */
+    #[Column(type: 'string')]
     public $name;
 
     public function __construct($id1, $id2, $name)

diff --git a/src/Symfony/Bridge/Doctrine/Tests/Fixtures/DoctrineLoaderEmbed.php b/src/Symfony/Bridge/Doctrine/Tests/Fixtures/DoctrineLoaderEmbed.php
@@ -16,15 +16,18 @@
 /**
  * @ORM\Embeddable
  */
+#[ORM\Embeddable]
 class DoctrineLoaderEmbed
 {
     /**
      * @ORM\Column(length=25)
      */
+    #[ORM\Column(length: 25)]
     public $embeddedMaxLength;
 
     /**
      * @ORM\Embedded(class=DoctrineLoaderNestedEmbed::class)
      */
+    #[ORM\Embedded(class: DoctrineLoaderNestedEmbed::class)]
     public $nestedEmbedded;
 }