diff --git a/lib/Doctrine/ORM/Utility/HierarchyDiscriminatorResolver.php b/lib/Doctrine/ORM/Utility/HierarchyDiscriminatorResolver.php index a8ac100a5..9b08b7f17 100644 --- a/lib/Doctrine/ORM/Utility/HierarchyDiscriminatorResolver.php +++ b/lib/Doctrine/ORM/Utility/HierarchyDiscriminatorResolver.php @@ -6,20 +6,27 @@ use Doctrine\Common\Persistence\Mapping\ClassMetadata; use Doctrine\ORM\EntityManagerInterface; /** - * Class HierarchyDiscriminatorResolver - * @package Doctrine\ORM\Utility * @internal This class exists only to avoid code duplication, do not reuse it externally */ -class HierarchyDiscriminatorResolver +final class HierarchyDiscriminatorResolver { + private function __construct() + { + } + + /** + * This method is needed to make INSTANCEOF work correctly with inheritance: if the class at hand has inheritance, + * it extracts all the discriminators from the child classes and returns them + */ public static function resolveDiscriminatorsForClass( ClassMetadata $rootClassMetadata, EntityManagerInterface $entityManager - ) { + ): array { $hierarchyClasses = $rootClassMetadata->subClasses; $hierarchyClasses[] = $rootClassMetadata->name; $discriminators = []; + foreach ($hierarchyClasses as $class) { $currentMetadata = $entityManager->getClassMetadata($class); $currentDiscriminator = $currentMetadata->discriminatorValue;