DDC-1204, DDC-1203 - No need to throw this exception for abstract classes anymore

Author: beberlei

lib/Doctrine/ORM/Mapping/ClassMetadataFactory.php

@@ -327,7 +327,7 @@ protected function loadMetadata($name)
                     if (!$class->discriminatorColumn) {
                         throw MappingException::missingDiscriminatorColumn($class->name);
                     }
-                } else if ($parent && !in_array($class->name, array_values($class->discriminatorMap))) {
+                } else if ($parent && !$class->reflClass->isAbstract() && !in_array($class->name, array_values($class->discriminatorMap))) {
                     // enforce discriminator map for all entities of an inheritance hierachy, otherwise problems will occur.
                     throw MappingException::mappedClassNotPartOfDiscriminatorMap($class->name, $class->rootEntityName);
                 }

lib/Doctrine/ORM/Mapping/MappingException.php

@@ -289,7 +289,8 @@ public static function mappedClassNotPartOfDiscriminatorMap($className, $rootCla
     {
         return new self(
             "Entity '" . $className . "' has to be part of the descriminator map of '" . $rootClassName . "' " .
-            "to be properly mapped in the inheritance hierachy. If you want to avoid instantiation of this type mark it abstract."
+            "to be properly mapped in the inheritance hierachy. Alternatively you can make '".$className."' an abstract class " .
+            "to avoid this exception from occuring."
         );
     }
 }

tests/Doctrine/Tests/ORM/Mapping/BasicInheritanceMappingTest.php

@@ -85,7 +85,7 @@ public function testUnmappedSuperclassInHierachy()
      */
     public function testUnmappedEntityInHierachy()
     {
-        $this->setExpectedException('Doctrine\ORM\Mapping\MappingException', "Entity 'Doctrine\Tests\ORM\Mapping\HierachyBEntity' has to be part of the descriminator map of 'Doctrine\Tests\ORM\Mapping\HierachyBase' to be properly mapped in the inheritance hierachy. If you want to avoid instantiation of this type mark it abstract.");
+        $this->setExpectedException('Doctrine\ORM\Mapping\MappingException', "Entity 'Doctrine\Tests\ORM\Mapping\HierachyBEntity' has to be part of the descriminator map of 'Doctrine\Tests\ORM\Mapping\HierachyBase' to be properly mapped in the inheritance hierachy. Alternatively you can make 'Doctrine\Tests\ORM\Mapping\HierachyBEntity' an abstract class to avoid this exception from occuring.");
 
         $class = $this->_factory->getMetadataFor(__NAMESPACE__ . '\\HierachyE');
     }
@@ -209,7 +209,7 @@ abstract class HierachyASuperclass extends HierachyBase
 /**
  * @Entity
  */
-abstract class HierachyBEntity extends HierachyBase
+class HierachyBEntity extends HierachyBase
 {
     /** @Column(type="string") */
     public $b;