Remove commented-out code sections

This removes comments added in #10431 on the 2.15.x branch, as suggested in #10460 (comment).
doctrine · Jan 26, 2023 · 3793b25 · 3793b25
1 parent 6568782
commit 3793b25
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 11 deletions.
diff --git a/lib/Doctrine/ORM/Mapping/ClassMetadataFactory.php b/lib/Doctrine/ORM/Mapping/ClassMetadataFactory.php
@@ -156,8 +156,6 @@ protected function doLoadMetadata($class, $parent, $rootEntityFound, array $nonS
                     $class->name,
                     end($nonSuperclassParents)
                 );
-                // enable this in 3.0
-                // throw MappingException::missingInheritanceTypeDeclaration(end($nonSuperclassParents), $class->name);
             }
 
             foreach ($class->embeddedClasses as $property => $embeddableClass) {

diff --git a/tests/Doctrine/Tests/ORM/Mapping/BasicInheritanceMappingTest.php b/tests/Doctrine/Tests/ORM/Mapping/BasicInheritanceMappingTest.php
@@ -230,15 +230,7 @@ public function testUndeclaredHierarchyRejection(string $rootEntity, string $chi
     {
         $this->expectDeprecationWithIdentifier('https://github.com/doctrine/orm/pull/10431');
 
-        /* on 3.0, use this instead: */
-        // self::expectException(MappingException::class);
-        // self::expectExceptionMessage(\sprintf(
-        //     "Entity class '%s' is a subclass of the root entity class '%s', but no inheritance mapping type was declared.",
-        //     $childClass,
-        //     $rootEntity
-        // ));
-
-         $this->cmf->getMetadataFor($childClass);
+        $this->cmf->getMetadataFor($childClass);
     }
 
     public function invalidHierarchyDeclarationClasses(): Generator