Fix single table inheritance with intermediate abstract class(es)

lib/Doctrine/ORM/Persisters/Entity/SingleTablePersister.php

@@ -10,6 +10,9 @@
 use Doctrine\ORM\Utility\PersisterHelper;
 
 use function array_flip;
+use function array_intersect;
+use function array_map;
+use function array_unshift;
 use function implode;
 
 /**
@@ -145,16 +148,13 @@ protected function getSelectConditionCriteriaSQL(Criteria $criteria)
     /** @return string */
     protected function getSelectConditionDiscriminatorValueSQL()
     {
-        $values = [];
+        $values = array_map(
+            [$this->conn, 'quote'],
+            array_flip(array_intersect($this->class->discriminatorMap, $this->class->subClasses))
+        );
 
         if ($this->class->discriminatorValue !== null) { // discriminators can be 0
-            $values[] = $this->conn->quote($this->class->discriminatorValue);
-        }
-
-        $discrValues = array_flip($this->class->discriminatorMap);
-
-        foreach ($this->class->subClasses as $subclassName) {
-            $values[] = $this->conn->quote($discrValues[$subclassName]);
+            array_unshift($values, $this->conn->quote($this->class->discriminatorValue));
         }
 
         $discColumnName = $this->class->getDiscriminatorColumn()['name'];

tests/Doctrine/Tests/ORM/Functional/Ticket/GH10625Test.php

@@ -0,0 +1,83 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Doctrine\Tests\ORM\Functional\Ticket;
+
+use Doctrine\ORM\Mapping as ORM;
+use Doctrine\Tests\OrmFunctionalTestCase;
+
+/**
+ * @group GH-10625
+ */
+class GH10625Test extends OrmFunctionalTestCase
+{
+    protected function setUp(): void
+    {
+        parent::setUp();
+
+        $this->createSchemaForModels(
+            GH10625Root::class,
+            GH10625Middle::class,
+            GH10625Leaf::class
+        );
+    }
+
+    /**
+     * @dataProvider queryClasses
+     */
+    public function testLoadFieldsFromAllClassesInHierarchy(string $queryClass): void
+    {
+        $entity = new GH10625Leaf();
+
+        $this->_em->persist($entity);
+        $this->_em->flush();
+        $this->_em->clear();
+
+        $loadedEntity = $this->_em->find($queryClass, $entity->id);
+
+        self::assertNotNull($loadedEntity);
+        self::assertInstanceOf(GH10625Leaf::class, $loadedEntity);
+    }
+
+    public static function queryClasses(): array
+    {
+        return [
+            'query via root entity' => [GH10625Root::class],
+            'query via intermediate entity' => [GH10625Middle::class],
+            'query via leaf entity' => [GH10625Leaf::class],
+        ];
+    }
+}
+
+/**
+ * @ORM\Entity
+ * @ORM\InheritanceType("SINGLE_TABLE")
+ * @ORM\DiscriminatorMap({ "1": "GH10625Leaf"})
+ * ^- This DiscriminatorMap contains the single non-abstract Entity class only
+ */
+abstract class GH10625Root
+{
+    /**
+     * @ORM\Id
+     * @ORM\GeneratedValue(strategy="AUTO")
+     * @ORM\Column(type="integer")
+     *
+     * @var int
+     */
+    public $id;
+}
+
+/**
+ * @ORM\Entity
+ */
+abstract class GH10625Middle extends GH10625Root
+{
+}
+
+/**
+ * @ORM\Entity
+ */
+class GH10625Leaf extends GH10625Middle
+{
+}