Remove ClassMetadataInfo

It has been deprecated for a long, long time.
doctrine · May 1, 2022 · ef84d64 · ef84d64
1 parent 467bc6f
commit ef84d64
Show file tree

Hide file tree

Showing 12 changed files with 3,405 additions and 3,483 deletions.
diff --git a/UPGRADE.md b/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.

diff --git a/lib/Doctrine/ORM/Mapping/Builder/ClassMetadataBuilder.php b/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;
     }