Migrate to attributes

docs/en/reference/advanced-configuration.rst

@@ -132,7 +132,7 @@ The attribute driver can be injected in the ``Doctrine\ORM\Configuration``:
 .. code-block:: php
 
     <?php
-    use Doctrine\ORM\ORMSetup;
+    use Doctrine\ORM\Mapping\Driver\AttributeDriver;
 
     $driverImpl = new AttributeDriver(['/path/to/lib/MyProject/Entities']);
     $config->setMetadataDriverImpl($driverImpl);

lib/Doctrine/ORM/ORMSetup.php

@@ -4,13 +4,8 @@
 
 namespace Doctrine\ORM;
 
-use Doctrine\Common\Annotations\AnnotationReader;
-use Doctrine\Common\Annotations\PsrCachedReader;
-use Doctrine\Deprecations\Deprecation;
-use Doctrine\ORM\Mapping\Driver\AnnotationDriver;
 use Doctrine\ORM\Mapping\Driver\AttributeDriver;
 use Doctrine\ORM\Mapping\Driver\XmlDriver;
-use LogicException;
 use Psr\Cache\CacheItemPoolInterface;
 use Redis;
 use RuntimeException;
@@ -22,74 +17,10 @@
 use function class_exists;
 use function extension_loaded;
 use function md5;
-use function sprintf;
 use function sys_get_temp_dir;
 
 final class ORMSetup
 {
-    /**
-     * Creates a configuration with an annotation metadata driver.
-     *
-     * @deprecated Use another mapping driver.
-     *
-     * @param string[] $paths
-     */
-    public static function createAnnotationMetadataConfiguration(
-        array $paths,
-        bool $isDevMode = false,
-        string|null $proxyDir = null,
-        CacheItemPoolInterface|null $cache = null,
-    ): Configuration {
-        Deprecation::trigger(
-            'doctrine/orm',
-            'https://github.com/doctrine/orm/issues/10098',
-            '%s is deprecated and will be removed in Doctrine ORM 3.0',
-            __METHOD__,
-        );
-        $config = self::createConfiguration($isDevMode, $proxyDir, $cache);
-        $config->setMetadataDriverImpl(self::createDefaultAnnotationDriver($paths));
-
-        return $config;
-    }
-
-    /**
-     * Adds a new default annotation driver with a correctly configured annotation reader.
-     *
-     * @deprecated Use another mapping driver.
-     *
-     * @param string[] $paths
-     */
-    public static function createDefaultAnnotationDriver(
-        array $paths = [],
-        CacheItemPoolInterface|null $cache = null,
-    ): AnnotationDriver {
-        Deprecation::trigger(
-            'doctrine/orm',
-            'https://github.com/doctrine/orm/issues/10098',
-            '%s is deprecated and will be removed in Doctrine ORM 3.0',
-            __METHOD__,
-        );
-        if (! class_exists(AnnotationReader::class)) {
-            throw new LogicException(sprintf(
-                'The annotation metadata driver cannot be enabled because the "doctrine/annotations" library'
-                . ' is not installed. Please run "composer require doctrine/annotations" or choose a different'
-                . ' metadata driver.',
-            ));
-        }
-
-        $reader = new AnnotationReader();
-
-        if ($cache === null && class_exists(ArrayAdapter::class)) {
-            $cache = new ArrayAdapter();
-        }
-
-        if ($cache !== null) {
-            $reader = new PsrCachedReader($reader, $cache);
-        }
-
-        return new AnnotationDriver($reader, $paths);
-    }
-
     /**
      * Creates a configuration with an attribute metadata driver.
      *

phpstan-baseline.neon

@@ -140,36 +140,6 @@ parameters:
 			count: 1
 			path: lib/Doctrine/ORM/Mapping/ClassMetadataInfo.php
 
-		-
-			message: "#^Call to an undefined method Doctrine\\\\Persistence\\\\Mapping\\\\ClassMetadata\\:\\:mapEmbedded\\(\\)\\.$#"
-			count: 1
-			path: lib/Doctrine/ORM/Mapping/Driver/AnnotationDriver.php
-
-		-
-			message: "#^Call to an undefined method Doctrine\\\\Persistence\\\\Mapping\\\\ClassMetadata\\:\\:mapManyToMany\\(\\)\\.$#"
-			count: 1
-			path: lib/Doctrine/ORM/Mapping/Driver/AnnotationDriver.php
-
-		-
-			message: "#^Call to an undefined method Doctrine\\\\Persistence\\\\Mapping\\\\ClassMetadata\\:\\:mapManyToOne\\(\\)\\.$#"
-			count: 1
-			path: lib/Doctrine/ORM/Mapping/Driver/AnnotationDriver.php
-
-		-
-			message: "#^Call to an undefined method Doctrine\\\\Persistence\\\\Mapping\\\\ClassMetadata\\:\\:mapOneToMany\\(\\)\\.$#"
-			count: 1
-			path: lib/Doctrine/ORM/Mapping/Driver/AnnotationDriver.php
-
-		-
-			message: "#^Call to an undefined method Doctrine\\\\Persistence\\\\Mapping\\\\ClassMetadata\\:\\:mapOneToOne\\(\\)\\.$#"
-			count: 1
-			path: lib/Doctrine/ORM/Mapping/Driver/AnnotationDriver.php
-
-		-
-			message: "#^Expression on left side of \\?\\? is not nullable\\.$#"
-			count: 1
-			path: lib/Doctrine/ORM/Mapping/Driver/AnnotationDriver.php
-
 		-
 			message: "#^Expression on left side of \\?\\? is not nullable\\.$#"
 			count: 1

psalm-baseline.xml

@@ -482,36 +482,6 @@
       <code>$class-&gt;associationMappings[$fieldName]['joinColumns']</code>
     </PossiblyUndefinedArrayOffset>
   </file>
-  <file src="lib/Doctrine/ORM/Mapping/Driver/AnnotationDriver.php">
-    <DocblockTypeContradiction occurrences="1">
-      <code>new ReflectionClass($metadata-&gt;name)</code>
-    </DocblockTypeContradiction>
-    <InvalidArgument occurrences="1"/>
-    <LessSpecificReturnStatement occurrences="1">
-      <code>$mapping</code>
-    </LessSpecificReturnStatement>
-    <MoreSpecificImplementedParamType occurrences="1">
-      <code>$metadata</code>
-    </MoreSpecificImplementedParamType>
-    <MoreSpecificReturnType occurrences="1"/>
-    <PossiblyNullArgument occurrences="1">
-      <code>$listenerClassName</code>
-    </PossiblyNullArgument>
-    <PossiblyUndefinedArrayOffset occurrences="2">
-      <code>$primaryTable['indexes']</code>
-      <code>$primaryTable['uniqueConstraints']</code>
-    </PossiblyUndefinedArrayOffset>
-    <RedundantConditionGivenDocblockType occurrences="1">
-      <code>$metadata-&gt;getReflectionClass()</code>
-    </RedundantConditionGivenDocblockType>
-    <UndefinedInterfaceMethod occurrences="5">
-      <code>mapEmbedded</code>
-      <code>mapManyToMany</code>
-      <code>mapManyToOne</code>
-      <code>mapOneToMany</code>
-      <code>mapOneToOne</code>
-    </UndefinedInterfaceMethod>
-  </file>
   <file src="lib/Doctrine/ORM/Mapping/Driver/AttributeDriver.php">
     <DocblockTypeContradiction occurrences="1">
       <code>new ReflectionClass($metadata-&gt;name)</code>

tests/Doctrine/Performance/EntityManagerFactory.php

@@ -14,6 +14,7 @@
 use Doctrine\ORM\Configuration;
 use Doctrine\ORM\EntityManager;
 use Doctrine\ORM\EntityManagerInterface;
+use Doctrine\ORM\Mapping\Driver\AttributeDriver;
 use Doctrine\ORM\ORMSetup;
 use Doctrine\ORM\Proxy\ProxyFactory;
 use Doctrine\ORM\Tools\SchemaTool;
@@ -30,7 +31,7 @@ public static function getEntityManager(array $schemaClassNames): EntityManagerI
         $config->setProxyDir(__DIR__ . '/../Tests/Proxies');
         $config->setProxyNamespace('Doctrine\Tests\Proxies');
         $config->setAutoGenerateProxyClasses(ProxyFactory::AUTOGENERATE_EVAL);
-        $config->setMetadataDriverImpl(ORMSetup::createDefaultAnnotationDriver([
+        $config->setMetadataDriverImpl(new AttributeDriver([
             realpath(__DIR__ . '/Models/Cache'),
             realpath(__DIR__ . '/Models/GeoNames'),
         ]));
@@ -56,7 +57,7 @@ public static function makeEntityManagerWithNoResultsConnection(): EntityManager
         $config->setProxyDir(__DIR__ . '/../Tests/Proxies');
         $config->setProxyNamespace('Doctrine\Tests\Proxies');
         $config->setAutoGenerateProxyClasses(ProxyFactory::AUTOGENERATE_EVAL);
-        $config->setMetadataDriverImpl(ORMSetup::createDefaultAnnotationDriver([
+        $config->setMetadataDriverImpl(new AttributeDriver([
             realpath(__DIR__ . '/Models/Cache'),
             realpath(__DIR__ . '/Models/Generic'),
             realpath(__DIR__ . '/Models/GeoNames'),

tests/Doctrine/Tests/Mocks/EntityManagerMock.php

@@ -8,6 +8,7 @@
 use Doctrine\DBAL\Connection;
 use Doctrine\ORM\Configuration;
 use Doctrine\ORM\EntityManager;
+use Doctrine\ORM\Mapping\Driver\AttributeDriver;
 use Doctrine\ORM\ORMSetup;
 use Doctrine\ORM\Proxy\ProxyFactory;
 use Doctrine\ORM\UnitOfWork;
@@ -26,7 +27,7 @@ public function __construct(Connection $conn, Configuration|null $config = null,
             $config = new Configuration();
             $config->setProxyDir(__DIR__ . '/../Proxies');
             $config->setProxyNamespace('Doctrine\Tests\Proxies');
-            $config->setMetadataDriverImpl(ORMSetup::createDefaultAnnotationDriver());
+            $config->setMetadataDriverImpl(new AttributeDriver([]));
         }
 
         parent::__construct($conn, $config, $eventManager);

tests/Doctrine/Tests/Models/CMS/CmsAddress.php

@@ -16,43 +16,25 @@
 use Doctrine\ORM\Mapping\OneToOne;
 use Doctrine\ORM\Mapping\Table;
 
-/**
- * CmsAddress
- *
- * @Entity
- * @Table(name="cms_addresses")
- * @EntityListeners({"CmsAddressListener"})
- */
 #[ORM\Entity]
 #[ORM\Table(name: 'cms_addresses')]
 #[ORM\EntityListeners(['CmsAddressListener'])]
 class CmsAddress
 {
-    /**
-     * @var int
-     * @Column(type="integer")
-     * @Id
-     * @GeneratedValue
-     */
+    /** @var int */
     #[ORM\Id, ORM\GeneratedValue, ORM\Column(type: 'integer')]
     public $id;
 
-    /**
-     * @var string
-     * @Column(length=50)
-     */
+    /** @var string */
+    #[Column(length: 50)]
     public $country;
 
-    /**
-     * @var string
-     * @Column(length=50)
-     */
+    /** @var string */
+    #[Column(length: 50)]
     public $zip;
 
-    /**
-     * @var string
-     * @Column(length=50)
-     */
+    /** @var string */
+    #[Column(length: 50)]
     public $city;
 
     /**
@@ -62,11 +44,9 @@ class CmsAddress
      */
     public $street;
 
-    /**
-     * @var CmsUser
-     * @OneToOne(targetEntity="CmsUser", inversedBy="address")
-     * @JoinColumn(referencedColumnName="id")
-     */
+    /** @var CmsUser */
+    #[OneToOne(targetEntity: 'CmsUser', inversedBy: 'address')]
+    #[JoinColumn(referencedColumnName: 'id')]
     public $user;
 
     public function getId(): int

tests/Doctrine/Tests/Models/CMS/CmsArticle.php

@@ -15,50 +15,36 @@
 use Doctrine\ORM\Mapping\Table;
 use Doctrine\ORM\Mapping\Version;
 
-/**
- * @Entity
- * @Table(name="cms_articles")
- */
+#[Table(name: 'cms_articles')]
+#[Entity]
 class CmsArticle
 {
-    /**
-     * @var int
-     * @Id
-     * @Column(type="integer")
-     * @GeneratedValue(strategy="AUTO")
-     */
+    /** @var int */
+    #[Id]
+    #[Column(type: 'integer')]
+    #[GeneratedValue(strategy: 'AUTO')]
     public $id;
 
-    /**
-     * @var string
-     * @Column(type="string", length=255)
-     */
+    /** @var string */
+    #[Column(type: 'string', length: 255)]
     public $topic;
 
-    /**
-     * @var string
-     * @Column(type="text")
-     */
+    /** @var string */
+    #[Column(type: 'text')]
     public $text;
 
-    /**
-     * @var CmsUser
-     * @ManyToOne(targetEntity="CmsUser", inversedBy="articles")
-     * @JoinColumn(name="user_id", referencedColumnName="id")
-     */
+    /** @var CmsUser */
+    #[ManyToOne(targetEntity: 'CmsUser', inversedBy: 'articles')]
+    #[JoinColumn(name: 'user_id', referencedColumnName: 'id')]
     public $user;
 
-    /**
-     * @var Collection<int, CmsComment>
-     * @OneToMany(targetEntity="CmsComment", mappedBy="article")
-     */
+    /** @var Collection<int, CmsComment> */
+    #[OneToMany(targetEntity: 'CmsComment', mappedBy: 'article')]
     public $comments;
 
-    /**
-     * @var int
-     * @Version
-     * @Column(type="integer")
-     */
+    /** @var int */
+    #[Version]
+    #[Column(type: 'integer')]
     public $version;
 
     public function setAuthor(CmsUser $author): void