From d15624f72f920cfc79ea86b7d3c0a7586ad71574 Mon Sep 17 00:00:00 2001
From: Benjamin Eberlei <kontakt@beberlei.de>
Date: Wed, 20 Mar 2024 15:45:47 +0100
Subject: [PATCH] [GH-11185] Bugfix: do not use collection batch loading for
 indexBy assocations. (#11380)

---
 src/UnitOfWork.php                            |  2 +-
 .../Ticket/GH11149/EagerProduct.php           | 41 ++++++++++++++++
 .../GH11149/EagerProductTranslation.php       | 45 ++++++++++++++++++
 .../Functional/Ticket/GH11149/GH11149Test.php | 47 +++++++++++++++++++
 .../ORM/Functional/Ticket/GH11149/Locale.php  | 27 +++++++++++
 5 files changed, 161 insertions(+), 1 deletion(-)
 create mode 100644 tests/Tests/ORM/Functional/Ticket/GH11149/EagerProduct.php
 create mode 100644 tests/Tests/ORM/Functional/Ticket/GH11149/EagerProductTranslation.php
 create mode 100644 tests/Tests/ORM/Functional/Ticket/GH11149/GH11149Test.php
 create mode 100644 tests/Tests/ORM/Functional/Ticket/GH11149/Locale.php

diff --git a/src/UnitOfWork.php b/src/UnitOfWork.php
index 3bb9b8efeb6..25b88221583 100644
--- a/src/UnitOfWork.php
+++ b/src/UnitOfWork.php
@@ -3166,7 +3166,7 @@ public function createEntity($className, array $data, &$hints = [])
 
                     if ($hints['fetchMode'][$class->name][$field] === ClassMetadata::FETCH_EAGER) {
                         $isIteration = isset($hints[Query::HINT_INTERNAL_ITERATION]) && $hints[Query::HINT_INTERNAL_ITERATION];
-                        if ($assoc['type'] === ClassMetadata::ONE_TO_MANY && ! $isIteration && ! $targetClass->isIdentifierComposite) {
+                        if ($assoc['type'] === ClassMetadata::ONE_TO_MANY && ! $isIteration && ! $targetClass->isIdentifierComposite && ! isset($assoc['indexBy'])) {
                             $this->scheduleCollectionForBatchLoading($pColl, $class);
                         } else {
                             $this->loadCollection($pColl);
diff --git a/tests/Tests/ORM/Functional/Ticket/GH11149/EagerProduct.php b/tests/Tests/ORM/Functional/Ticket/GH11149/EagerProduct.php
new file mode 100644
index 00000000000..448f7d82eb6
--- /dev/null
+++ b/tests/Tests/ORM/Functional/Ticket/GH11149/EagerProduct.php
@@ -0,0 +1,41 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Doctrine\Tests\ORM\Functional\Ticket\GH11149;
+
+use Doctrine\Common\Collections\ArrayCollection;
+use Doctrine\ORM\Mapping as ORM;
+
+/**
+ * @ORM\Entity
+ * @ORM\Table("gh11149_eager_product")
+ */
+class EagerProduct
+{
+    /**
+     * @ORM\Id
+     * @ORM\Column(type="integer")
+     *
+     * @var int
+     */
+    public $id;
+
+    /**
+     * @ORM\OneToMany(
+     *     targetEntity=EagerProductTranslation::class,
+     *     mappedBy="product",
+     *     fetch="EAGER",
+     *     indexBy="locale_code"
+     * )
+     *
+     * @var Collection<string, EagerProductTranslation>
+     */
+    public $translations;
+
+    public function __construct(int $id)
+    {
+        $this->id           = $id;
+        $this->translations = new ArrayCollection();
+    }
+}
diff --git a/tests/Tests/ORM/Functional/Ticket/GH11149/EagerProductTranslation.php b/tests/Tests/ORM/Functional/Ticket/GH11149/EagerProductTranslation.php
new file mode 100644
index 00000000000..32c501868ec
--- /dev/null
+++ b/tests/Tests/ORM/Functional/Ticket/GH11149/EagerProductTranslation.php
@@ -0,0 +1,45 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Doctrine\Tests\ORM\Functional\Ticket\GH11149;
+
+use Doctrine\ORM\Mapping as ORM;
+
+/**
+ * @ORM\Entity
+ * @ORM\Table("gh11149_eager_product_translation")
+ */
+class EagerProductTranslation
+{
+    /**
+     * @ORM\Id
+     * @ORM\Column(type="integer")
+     *
+     * @var int
+     */
+    private $id;
+
+    /**
+     * @ORM\ManyToOne(targetEntity=EagerProduct::class, inversedBy="translations")
+     * @ORM\JoinColumn(nullable=false)
+     *
+     * @var EagerProduct
+     */
+    public $product;
+
+    /**
+     * @ORM\ManyToOne(targetEntity=Locale::class)
+     * @ORM\JoinColumn(name="locale_code", referencedColumnName="code", nullable=false)
+     *
+     * @var Locale
+     */
+    public $locale;
+
+    public function __construct($id, EagerProduct $product, Locale $locale)
+    {
+        $this->id      = $id;
+        $this->product = $product;
+        $this->locale  = $locale;
+    }
+}
diff --git a/tests/Tests/ORM/Functional/Ticket/GH11149/GH11149Test.php b/tests/Tests/ORM/Functional/Ticket/GH11149/GH11149Test.php
new file mode 100644
index 00000000000..28bab541b90
--- /dev/null
+++ b/tests/Tests/ORM/Functional/Ticket/GH11149/GH11149Test.php
@@ -0,0 +1,47 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Doctrine\Tests\ORM\Functional\Ticket\GH11149;
+
+use Doctrine\ORM\PersistentCollection;
+use Doctrine\Persistence\Proxy;
+use Doctrine\Tests\OrmFunctionalTestCase;
+
+class GH11149Test extends OrmFunctionalTestCase
+{
+    protected function setUp(): void
+    {
+        parent::setUp();
+
+        $this->setUpEntitySchema([
+            Locale::class,
+            EagerProduct::class,
+            EagerProductTranslation::class,
+        ]);
+    }
+
+    public function testFetchEagerModeWithIndexBy(): void
+    {
+        // Load entities into database
+        $this->_em->persist($product = new EagerProduct(11149));
+        $this->_em->persist($locale = new Locale('fr_FR'));
+        $this->_em->persist(new EagerProductTranslation(11149, $product, $locale));
+        $this->_em->flush();
+        $this->_em->clear();
+
+        // Fetch entity from database
+        $product = $this->_em->find(EagerProduct::class, 11149);
+
+        // Assert associated entity is loaded eagerly
+        static::assertInstanceOf(EagerProduct::class, $product);
+        static::assertInstanceOf(PersistentCollection::class, $product->translations);
+        static::assertTrue($product->translations->isInitialized());
+        static::assertCount(1, $product->translations);
+
+        // Assert associated entity is indexed by given property
+        $translation = $product->translations->get('fr_FR');
+        static::assertInstanceOf(EagerProductTranslation::class, $translation);
+        static::assertNotInstanceOf(Proxy::class, $translation);
+    }
+}
diff --git a/tests/Tests/ORM/Functional/Ticket/GH11149/Locale.php b/tests/Tests/ORM/Functional/Ticket/GH11149/Locale.php
new file mode 100644
index 00000000000..d54eda636ff
--- /dev/null
+++ b/tests/Tests/ORM/Functional/Ticket/GH11149/Locale.php
@@ -0,0 +1,27 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Doctrine\Tests\ORM\Functional\Ticket\GH11149;
+
+use Doctrine\ORM\Mapping as ORM;
+
+/**
+ * @ORM\Entity
+ * @ORM\Table("gh11149_locale")
+ */
+class Locale
+{
+    /**
+     * @ORM\Id
+     * @ORM\Column(type="string")
+     *
+     * @var string
+     */
+    public $code;
+
+    public function __construct(string $code)
+    {
+        $this->code = $code;
+    }
+}