Correct DQL INSTANCE OF to filter all possible child classes

lib/Doctrine/ORM/Query/SqlWalker.php

@@ -2038,8 +2038,10 @@ public function walkInstanceOfExpression($instanceOfExpr)
 
         $sql .= $class->discriminatorColumn['name'] . ($instanceOfExpr->not ? ' NOT IN ' : ' IN ');
 
-        $sqlParameterList = [];
+        $knownSubclasses = array_flip($discrClass->subClasses);
 
+        $sqlParameterList = [];
+        $discriminators = [];
         foreach ($instanceOfExpr->value as $parameter) {
             if ($parameter instanceof AST\InputParameter) {
                 $this->rsm->addMetadataParameterMapping($parameter->name, 'discriminatorValue');
@@ -2049,21 +2051,31 @@ public function walkInstanceOfExpression($instanceOfExpr)
                 continue;
             }
 
-            // Get name from ClassMetadata to resolve aliases.
-            $entityClassName    = $this->em->getClassMetadata($parameter)->name;
-            $discriminatorValue = $class->discriminatorValue;
+            // Trim first backslash
+            $parameter = ltrim($parameter, '\\');
 
-            if ($entityClassName !== $class->name) {
-                $discrMap = array_flip($class->discriminatorMap);
+            // Check parameter is really in the hierarchy
+            if ($parameter !== $discrClass->name && ! array_key_exists($parameter, $knownSubclasses)) {
+                throw QueryException::instanceOfUnrelatedClass($parameter, $discrClass->name);
+            }
 
-                if ( ! isset($discrMap[$entityClassName])) {
-                    throw QueryException::instanceOfUnrelatedClass($entityClassName, $class->rootEntityName);
-                }
+            // Include discriminators for parameter class and its subclass
+            $metadata = $this->em->getClassMetadata($parameter);
+            $hierarchyClasses = $metadata->subClasses;
+            $hierarchyClasses[] = $metadata->name;
 
-                $discriminatorValue = $discrMap[$entityClassName];
+            foreach ($hierarchyClasses as $class) {
+                $currentMetadata = $this->em->getClassMetadata($class);
+                $currentDiscriminator = $currentMetadata->discriminatorValue;
+
+                if (is_string($currentDiscriminator) && ! array_key_exists($currentDiscriminator, $discriminators)) {
+                    $discriminators[$currentDiscriminator] = true;
+                }
             }
+        }
 
-            $sqlParameterList[] = $this->conn->quote($discriminatorValue);
+        foreach (array_keys($discriminators) as $dis) {
+            $sqlParameterList[] = $this->conn->quote($dis);
         }
 
         $sql .= '(' . implode(', ', $sqlParameterList) . ')';

tests/Doctrine/Tests/ORM/Functional/InstanceOfAbstractTest.php

@@ -0,0 +1,113 @@
+<?php
+
+namespace Doctrine\Tests\ORM\Functional {
+
+    use Doctrine\Tests\OrmFunctionalTestCase;
+
+    class InstanceOfAbstractTest extends OrmFunctionalTestCase
+    {
+        protected function setUp()
+        {
+            parent::setUp();
+
+            $this->_schemaTool->createSchema(array(
+                $this->_em->getClassMetadata(__NAMESPACE__ . '\InstanceOfAbstractTest\Person'),
+                $this->_em->getClassMetadata(__NAMESPACE__ . '\InstanceOfAbstractTest\Employee'),
+            ));
+        }
+
+        public function testInstanceOf()
+        {
+            $this->loadData();
+
+            $dql = 'SELECT p FROM Doctrine\Tests\ORM\Functional\InstanceOfAbstractTest\Person p
+                    WHERE p INSTANCE OF Doctrine\Tests\ORM\Functional\InstanceOfAbstractTest\Person';
+            $query = $this->_em->createQuery($dql);
+            $result = $query->getResult();
+
+            $this->assertCount(1, $result);
+
+            foreach ($result as $r) {
+                $this->assertInstanceOf('Doctrine\Tests\ORM\Functional\InstanceOfAbstractTest\Person', $r);
+                $this->assertInstanceOf('Doctrine\Tests\ORM\Functional\InstanceOfAbstractTest\Employee', $r);
+                $this->assertEquals('bar', $r->getName());
+            }
+        }
+
+        private function loadData()
+        {
+            $employee = new InstanceOfAbstractTest\Employee();
+            $employee->setName('bar');
+            $employee->setDepartement('qux');
+
+            $this->_em->persist($employee);
+
+            $this->_em->flush($employee);
+        }
+    }
+}
+
+namespace Doctrine\Tests\ORM\Functional\InstanceOfAbstractTest {
+
+    /**
+     * @Entity()
+     * @Table(name="instance_of_abstract_test_person")
+     * @InheritanceType(value="JOINED")
+     * @DiscriminatorColumn(name="kind", type="string")
+     * @DiscriminatorMap(value={
+     *     "employee": "Doctrine\Tests\ORM\Functional\InstanceOfAbstractTest\Employee"
+     * })
+     */
+    abstract class Person
+    {
+        /**
+         * @Id()
+         * @GeneratedValue()
+         * @Column(type="integer")
+         */
+        private $id;
+
+        /**
+         * @Column(type="string")
+         */
+        private $name;
+
+        public function getId()
+        {
+            return $this->id;
+        }
+
+        public function getName()
+        {
+            return $this->name;
+        }
+
+        public function setName($name)
+        {
+            $this->name = $name;
+        }
+    }
+
+    /**
+     * @Entity()
+     * @Table(name="instance_of_abstract_test_employee")
+     */
+    class Employee extends Person
+    {
+        /**
+         * @Column(type="string")
+         */
+        private $departement;
+
+        public function getDepartement()
+        {
+            return $this->departement;
+        }
+
+        public function setDepartement($departement)
+        {
+            $this->departement = $departement;
+        }
+    }
+
+}

tests/Doctrine/Tests/ORM/Functional/InstanceOfMultiLevelTest.php

@@ -0,0 +1,153 @@
+<?php
+
+namespace Doctrine\Tests\ORM\Functional {
+
+    use Doctrine\Tests\OrmFunctionalTestCase;
+
+    class InstanceOfMultiLevelTest extends OrmFunctionalTestCase
+    {
+        protected function setUp()
+        {
+            parent::setUp();
+
+            $this->_schemaTool->createSchema(array(
+                $this->_em->getClassMetadata(__NAMESPACE__ . '\InstanceOfMultiLevelTest\Person'),
+                $this->_em->getClassMetadata(__NAMESPACE__ . '\InstanceOfMultiLevelTest\Employee'),
+                $this->_em->getClassMetadata(__NAMESPACE__ . '\InstanceOfMultiLevelTest\Engineer'),
+            ));
+        }
+
+        public function testInstanceOf()
+        {
+            $this->loadData();
+
+            $dql = 'SELECT p FROM Doctrine\Tests\ORM\Functional\InstanceOfMultiLevelTest\Person p
+                    WHERE p INSTANCE OF Doctrine\Tests\ORM\Functional\InstanceOfMultiLevelTest\Person';
+            $query = $this->_em->createQuery($dql);
+            $result = $query->getResult();
+
+            $this->assertCount(3, $result);
+
+            foreach ($result as $r) {
+                $this->assertInstanceOf('Doctrine\Tests\ORM\Functional\InstanceOfMultiLevelTest\Person', $r);
+                if ($r instanceof InstanceOfMultiLevelTest\Engineer) {
+                    $this->assertEquals('foobar', $r->getName());
+                    $this->assertEquals('doctrine', $r->getSpecialization());
+                } elseif ($r instanceof InstanceOfMultiLevelTest\Employee) {
+                    $this->assertEquals('bar', $r->getName());
+                    $this->assertEquals('qux', $r->getDepartement());
+                } else {
+                    $this->assertEquals('foo', $r->getName());
+                }
+            }
+        }
+
+        private function loadData()
+        {
+            $person = new InstanceOfMultiLevelTest\Person();
+            $person->setName('foo');
+
+            $employee = new InstanceOfMultiLevelTest\Employee();
+            $employee->setName('bar');
+            $employee->setDepartement('qux');
+
+            $engineer = new InstanceOfMultiLevelTest\Engineer();
+            $engineer->setName('foobar');
+            $engineer->setDepartement('dep');
+            $engineer->setSpecialization('doctrine');
+
+            $this->_em->persist($person);
+            $this->_em->persist($employee);
+            $this->_em->persist($engineer);
+
+            $this->_em->flush(array($person, $employee, $engineer));
+        }
+    }
+}
+
+namespace Doctrine\Tests\ORM\Functional\InstanceOfMultiLevelTest {
+    /**
+     * @Entity()
+     * @Table(name="instance_of_multi_level_test_person")
+     * @InheritanceType(value="JOINED")
+     * @DiscriminatorColumn(name="kind", type="string")
+     * @DiscriminatorMap(value={
+     *     "person": "Doctrine\Tests\ORM\Functional\InstanceOfMultiLevelTest\Person",
+     *     "employee": "Doctrine\Tests\ORM\Functional\InstanceOfMultiLevelTest\Employee",
+     *     "engineer": "Doctrine\Tests\ORM\Functional\InstanceOfMultiLevelTest\Engineer",
+     * })
+     */
+    class Person
+    {
+        /**
+         * @Id()
+         * @GeneratedValue()
+         * @Column(type="integer")
+         */
+        private $id;
+
+        /**
+         * @Column(type="string")
+         */
+        private $name;
+
+        public function getId()
+        {
+            return $this->id;
+        }
+
+        public function getName()
+        {
+            return $this->name;
+        }
+
+        public function setName($name)
+        {
+            $this->name = $name;
+        }
+    }
+
+    /**
+     * @Entity()
+     * @Table(name="instance_of_multi_level_employee")
+     */
+    class Employee extends Person
+    {
+        /**
+         * @Column(type="string")
+         */
+        private $departement;
+
+        public function getDepartement()
+        {
+            return $this->departement;
+        }
+
+        public function setDepartement($departement)
+        {
+            $this->departement = $departement;
+        }
+    }
+
+    /**
+     * @Entity()
+     * @Table(name="instance_of_multi_level_engineer")
+     */
+    class Engineer extends Employee
+    {
+        /**
+         * @Column(type="string")
+         */
+        private $specialization;
+
+        public function getSpecialization()
+        {
+            return $this->specialization;
+        }
+
+        public function setSpecialization($specialization)
+        {
+            $this->specialization = $specialization;
+        }
+    }
+}