Remove ClassMetadataInfo

It has been deprecated for a long, long time.

UPGRADE.md

@@ -1,5 +1,9 @@
 # Upgrade to 3.0
 
+## BC BREAK: Remove `Doctrine\ORM\Mapping\ClassMetadataInfo`
+
+Use `Doctrine\ORM\Mapping\ClassMetadata` instead.
+
 ## BC BREAK: Remove `Doctrine\ORM\Tools\DisconnectedClassMetadataFactory`
 
 No replacement is provided.

lib/Doctrine/ORM/Mapping/Builder/ClassMetadataBuilder.php

@@ -4,11 +4,7 @@
 
 namespace Doctrine\ORM\Mapping\Builder;
 
-use Doctrine\Deprecations\Deprecation;
 use Doctrine\ORM\Mapping\ClassMetadata;
-use Doctrine\ORM\Mapping\ClassMetadataInfo;
-
-use function get_class;
 
 /**
  * Builder Object for ClassMetadata
@@ -17,29 +13,15 @@
  */
 class ClassMetadataBuilder
 {
-    /** @var ClassMetadataInfo */
+    /** @var ClassMetadata */
     private $cm;
 
-    public function __construct(ClassMetadataInfo $cm)
+    public function __construct(ClassMetadata $cm)
     {
-        if (! $cm instanceof ClassMetadata) {
-            Deprecation::trigger(
-                'doctrine/orm',
-                'https://github.com/doctrine/orm/pull/249',
-                'Passing an instance of %s to %s is deprecated, please pass a ClassMetadata instance instead.',
-                get_class($cm),
-                __METHOD__,
-                ClassMetadata::class
-            );
-        }
-
         $this->cm = $cm;
     }
 
-    /**
-     * @return ClassMetadataInfo
-     */
-    public function getClassMetadata()
+    public function getClassMetadata(): ClassMetadata
     {
         return $this->cm;
     }

lib/Doctrine/ORM/Mapping/ClassMetadataInfo.php → lib/Doctrine/ORM/Mapping/ClassMetadata.php

@@ -17,7 +17,7 @@
 use Doctrine\ORM\Cache\Exception\NonCacheableEntityAssociation;
 use Doctrine\ORM\EntityRepository;
 use Doctrine\ORM\Id\AbstractIdGenerator;
-use Doctrine\Persistence\Mapping\ClassMetadata;
+use Doctrine\Persistence\Mapping\ClassMetadata as PersistenceClassMetadata;
 use Doctrine\Persistence\Mapping\ReflectionService;
 use InvalidArgumentException;
 use LogicException;
@@ -71,7 +71,7 @@
  *    the serialized representation).
  *
  * @template-covariant T of object
- * @template-implements ClassMetadata<T>
+ * @template-implements PersistenceClassMetadata<T>
  * @psalm-type FieldMapping = array{
  *      type: string,
  *      fieldName: string,
@@ -96,7 +96,7 @@
  *      options?: array<string, mixed>
  * }
  */
-class ClassMetadataInfo implements ClassMetadata
+class ClassMetadata implements PersistenceClassMetadata
 {
     /* The inheritance mapping types */
     /**
@@ -1311,7 +1311,7 @@ public function getFieldMapping($fieldName)
     /**
      * Gets the mapping of an association.
      *
-     * @see ClassMetadataInfo::$associationMappings
+     * @see ClassMetadata::$associationMappings
      *
      * @param string $fieldName The field name that represents the association in
      *                          the object model.
@@ -1356,7 +1356,7 @@ public function getFieldName($columnName)
     /**
      * Gets the result set mapping.
      *
-     * @see ClassMetadataInfo::$sqlResultSetMappings
+     * @see ClassMetadata::$sqlResultSetMappings
      *
      * @param string $name The result set mapping name.
      *
@@ -1803,7 +1803,7 @@ protected function _validateAndCompleteOneToOneMapping(array $mapping)
 
             if ($uniqueConstraintColumns) {
                 if (! $this->table) {
-                    throw new RuntimeException('ClassMetadataInfo::setTable() has to be called before defining a one to one relationship.');
+                    throw new RuntimeException('ClassMetadata::setTable() has to be called before defining a one to one relationship.');
                 }
 
                 $this->table['uniqueConstraints'][$mapping['fieldName'] . '_uniq'] = ['columns' => $uniqueConstraintColumns];
@@ -3312,7 +3312,7 @@ public function mapEmbedded(array $mapping)
      *
      * @return void
      */
-    public function inlineEmbeddable($property, ClassMetadataInfo $embeddable)
+    public function inlineEmbeddable($property, ClassMetadata $embeddable)
     {
         foreach ($embeddable->fieldMappings as $fieldMapping) {
             $fieldMapping['originalClass'] ??= $embeddable->name;

lib/Doctrine/ORM/Mapping/ClassMetadataFactory.php

@@ -249,7 +249,7 @@ protected function validateRuntimeMetadata(ClassMetadata $class, ?ClassMetadataI
                     }
                 }
             } else {
-                assert($parent instanceof ClassMetadataInfo); // https://github.com/doctrine/orm/issues/8746
+                assert($parent instanceof ClassMetadata); // https://github.com/doctrine/orm/issues/8746
                 if (
                     ! $class->reflClass->isAbstract()
                     && ! in_array($class->name, $class->discriminatorMap, true)
@@ -477,7 +477,7 @@ private function addInheritedSqlResultSetMappings(ClassMetadata $subClass, Class
      *
      * @throws ORMException
      */
-    private function completeIdGeneratorMapping(ClassMetadataInfo $class): void
+    private function completeIdGeneratorMapping(ClassMetadata $class): void
     {
         $idGenType = $class->generatorType;
         if ($idGenType === ClassMetadata::GENERATOR_TYPE_AUTO) {
@@ -612,7 +612,7 @@ private function truncateSequenceName(string $schemaElementName): string
     /**
      * Inherits the ID generator mapping from a parent class.
      */
-    private function inheritIdGeneratorMapping(ClassMetadataInfo $class, ClassMetadataInfo $parent): void
+    private function inheritIdGeneratorMapping(ClassMetadata $class, ClassMetadata $parent): void
     {
         if ($parent->isIdGeneratorSequence()) {
             $class->setSequenceGeneratorDefinition($parent->sequenceGeneratorDefinition);

lib/Doctrine/ORM/Mapping/Driver/DatabaseDriver.php

@@ -14,7 +14,6 @@
 use Doctrine\Inflector\Inflector;
 use Doctrine\Inflector\InflectorFactory;
 use Doctrine\ORM\Mapping\ClassMetadata;
-use Doctrine\ORM\Mapping\ClassMetadataInfo;
 use Doctrine\ORM\Mapping\MappingException;
 use Doctrine\Persistence\Mapping\ClassMetadata as PersistenceClassMetadata;
 use Doctrine\Persistence\Mapping\Driver\MappingDriver;
@@ -319,7 +318,7 @@ private function reverseEngineerMappingFromDatabase(): void
     /**
      * Build indexes from a class metadata.
      */
-    private function buildIndexes(ClassMetadataInfo $metadata): void
+    private function buildIndexes(ClassMetadata $metadata): void
     {
         $tableName = $metadata->table['name'];
         $indexes   = $this->tables[$tableName]->getIndexes();
@@ -342,7 +341,7 @@ private function buildIndexes(ClassMetadataInfo $metadata): void
     /**
      * Build field mapping from class metadata.
      */
-    private function buildFieldMappings(ClassMetadataInfo $metadata): void
+    private function buildFieldMappings(ClassMetadata $metadata): void
     {
         $tableName      = $metadata->table['name'];
         $columns        = $this->tables[$tableName]->getColumns();
@@ -457,7 +456,7 @@ private function buildFieldMapping(string $tableName, Column $column): array
      *
      * @return void
      */
-    private function buildToOneAssociationMappings(ClassMetadataInfo $metadata)
+    private function buildToOneAssociationMappings(ClassMetadata $metadata)
     {
         $tableName   = $metadata->table['name'];
         $primaryKeys = $this->getTablePrimaryKeys($this->tables[$tableName]);

lib/Doctrine/ORM/PersistentCollection.php

@@ -131,10 +131,7 @@ public function getOwner()
         return $this->owner;
     }
 
-    /**
-     * @return Mapping\ClassMetadata
-     */
-    public function getTypeClass(): Mapping\ClassMetadataInfo
+    public function getTypeClass(): Mapping\ClassMetadata
     {
         return $this->typeClass;
     }

lib/Doctrine/ORM/Tools/SchemaValidator.php

@@ -5,10 +5,8 @@
 namespace Doctrine\ORM\Tools;
 
 use Doctrine\DBAL\Types\Type;
-use Doctrine\Deprecations\Deprecation;
 use Doctrine\ORM\EntityManagerInterface;
 use Doctrine\ORM\Mapping\ClassMetadata;
-use Doctrine\ORM\Mapping\ClassMetadataInfo;
 
 use function array_diff;
 use function array_key_exists;
@@ -17,7 +15,6 @@
 use function class_exists;
 use function class_parents;
 use function count;
-use function get_class;
 use function implode;
 use function in_array;
 
@@ -70,19 +67,8 @@ public function validateMapping()
      * @return string[]
      * @psalm-return list<string>
      */
-    public function validateClass(ClassMetadataInfo $class)
+    public function validateClass(ClassMetadata $class)
     {
-        if (! $class instanceof ClassMetadata) {
-            Deprecation::trigger(
-                'doctrine/orm',
-                'https://github.com/doctrine/orm/pull/249',
-                'Passing an instance of %s to %s is deprecated, please pass a ClassMetadata instance instead.',
-                get_class($class),
-                __METHOD__,
-                ClassMetadata::class
-            );
-        }
-
         $ce  = [];
         $cmf = $this->em->getMetadataFactory();
 

phpcs.xml.dist

@@ -201,7 +201,7 @@
 
     <rule ref="PSR2.Methods.MethodDeclaration.Underscore">
         <exclude-pattern>lib/Doctrine/ORM/AbstractQuery.php</exclude-pattern>
-        <exclude-pattern>lib/Doctrine/ORM/Mapping/ClassMetadataInfo.php</exclude-pattern>
+        <exclude-pattern>lib/Doctrine/ORM/Mapping/ClassMetadata.php</exclude-pattern>
         <exclude-pattern>lib/Doctrine/ORM/NativeQuery.php</exclude-pattern>
         <exclude-pattern>lib/Doctrine/ORM/Query.php</exclude-pattern>
         <exclude-pattern>lib/Doctrine/ORM/Query/TreeWalkerAdapter.php</exclude-pattern>

phpstan-baseline.neon

@@ -140,20 +140,15 @@ parameters:
 			count: 1
 			path: lib/Doctrine/ORM/Mapping/ClassMetadataFactory.php
 
-		-
-			message: "#^Parameter \\#2 \\$class of method Doctrine\\\\ORM\\\\Mapping\\\\QuoteStrategy\\:\\:getSequenceName\\(\\) expects Doctrine\\\\ORM\\\\Mapping\\\\ClassMetadata, Doctrine\\\\ORM\\\\Mapping\\\\ClassMetadataInfo given\\.$#"
-			count: 2
-			path: lib/Doctrine/ORM/Mapping/ClassMetadataFactory.php
-
 		-
 			message: "#^Method Doctrine\\\\ORM\\\\Mapping\\\\NamingStrategy\\:\\:joinColumnName\\(\\) invoked with 2 parameters, 1 required\\.$#"
 			count: 2
-			path: lib/Doctrine/ORM/Mapping/ClassMetadataInfo.php
+			path: lib/Doctrine/ORM/Mapping/ClassMetadata.php
 
 		-
 			message: "#^Negated boolean expression is always false\\.$#"
 			count: 1
-			path: lib/Doctrine/ORM/Mapping/ClassMetadataInfo.php
+			path: lib/Doctrine/ORM/Mapping/ClassMetadata.php
 
 		-
 			message: "#^Call to an undefined method Doctrine\\\\Persistence\\\\Mapping\\\\ClassMetadata\\:\\:mapEmbedded\\(\\)\\.$#"

psalm-baseline.xml

@@ -382,7 +382,7 @@
       <code>$parent-&gt;idGenerator</code>
     </RedundantConditionGivenDocblockType>
   </file>
-  <file src="lib/Doctrine/ORM/Mapping/ClassMetadataInfo.php">
+  <file src="lib/Doctrine/ORM/Mapping/ClassMetadata.php">
     <DeprecatedProperty occurrences="4">
       <code>$this-&gt;columnNames</code>
       <code>$this-&gt;columnNames</code>

psalm.xml

@@ -71,7 +71,7 @@
                 <!-- Persistence 2 compatibility -->
                 <file name="lib/Doctrine/ORM/EntityManager.php"/>
                 <file name="lib/Doctrine/ORM/Mapping/ClassMetadataFactory.php"/>
-                <file name="lib/Doctrine/ORM/Mapping/ClassMetadataInfo.php"/>
+                <file name="lib/Doctrine/ORM/Mapping/ClassMetadata.php"/>
             </errorLevel>
         </MissingParamType>
         <RedundantCastGivenDocblockType>
@@ -105,7 +105,7 @@
                 <!-- DBAL 3.2 forward compatibility -->
                 <referencedClass name="Doctrine\DBAL\Platforms\PostgreSQLPlatform"/>
                 <referencedClass name="Doctrine\DBAL\Platforms\SQLServerPlatform"/>
-                
+
                 <!-- Persistence 2 compatibility -->
                 <referencedClass name="Doctrine\Persistence\ObjectManagerAware"/>
             </errorLevel>