Skip joined entity creation for empty relation (#10889)

doctrine · Jun 10, 2024 · 75912dc · 75912dc
1 parent 59c8bc0
commit 75912dc
Show file tree

Hide file tree

Showing 2 changed files with 115 additions and 4 deletions.
diff --git a/src/Internal/Hydration/ObjectHydrator.php b/src/Internal/Hydration/ObjectHydrator.php
@@ -367,11 +367,15 @@ protected function hydrateRowData(array $row, array &$result)
                     $parentObject = $this->resultPointers[$parentAlias];
                 } else {
                     // Parent object of relation not found, mark as not-fetched again
-                    $element = $this->getEntity($data, $dqlAlias);
+                    if (isset($nonemptyComponents[$dqlAlias])) {
+                        $element = $this->getEntity($data, $dqlAlias);
 
-                    // Update result pointer and provide initial fetch data for parent
-                    $this->resultPointers[$dqlAlias]               = $element;
-                    $rowData['data'][$parentAlias][$relationField] = $element;
+                        // Update result pointer and provide initial fetch data for parent
+                        $this->resultPointers[$dqlAlias]               = $element;
+                        $rowData['data'][$parentAlias][$relationField] = $element;
+                    } else {
+                        $element = null;
+                    }
 
                     // Mark as not-fetched again
                     unset($this->_hints['fetched'][$parentAlias][$relationField]);

diff --git a/tests/Tests/ORM/Functional/Ticket/GH10889Test.php b/tests/Tests/ORM/Functional/Ticket/GH10889Test.php
@@ -0,0 +1,107 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Doctrine\Tests\ORM\Functional\Ticket;
+
+use Doctrine\ORM\Mapping as ORM;
+use Doctrine\Tests\OrmFunctionalTestCase;
+
+/**
+ * @see   https://github.com/doctrine/orm/issues/10889
+ *
+ * @group GH10889
+ */
+class GH10889Test extends OrmFunctionalTestCase
+{
+    protected function setUp(): void
+    {
+        parent::setUp();
+
+        $this->createSchemaForModels(
+            GH10889User::class,
+            GH10889Item::class,
+            GH10889Box::class
+        );
+    }
+
+    public function testIssue(): void
+    {
+        $user = new GH10889User();
+        $box  = new GH10889Box($user, null);
+
+        $this->_em->persist($user);
+        $this->_em->persist($box);
+        $this->_em->flush();
+        $this->_em->clear();
+
+        /** @var list<GH10889Box> $boxes */
+        $boxes = $this->_em
+            ->getRepository(GH10889Box::class)
+            ->createQueryBuilder('box')
+            ->leftJoin('box.item', 'item')->addSelect('item')
+            ->getQuery()
+            ->getResult();
+
+        $this->assertArrayHasKey(0, $boxes);
+        $this->assertEquals(1, $boxes[0]->user->id);
+        $this->assertNull($boxes[0]->item);
+    }
+}
+
+/**
+ * @ORM\Entity
+ */
+class GH10889User
+{
+    /**
+     * @ORM\Id
+     * @ORM\Column(type="integer")
+     * @ORM\GeneratedValue
+     *
+     * @var int
+     */
+    public $id;
+}
+
+/**
+ * @ORM\Entity
+ */
+class GH10889Item
+{
+    /**
+     * @ORM\Id
+     * @ORM\Column(type="integer")
+     * @ORM\GeneratedValue
+     *
+     * @var int
+     */
+    public $id;
+}
+
+/**
+ * @ORM\Entity
+ */
+class GH10889Box
+{
+    /**
+     * @ORM\Id
+     * @ORM\OneToOne(targetEntity="GH10889User")
+     *
+     * @var GH10889User
+     */
+    public $user;
+
+    /**
+     * @ORM\ManyToOne(targetEntity="GH10889Item")
+     *
+     * @var GH10889Item|null
+     */
+    public $item;
+
+    public function __construct(GH10889User $user, ?GH10889Item $item)
+    {
+        $this->user = $user;
+        $this->item = $item;
+    }
+}