Address review feedback: simplify setHint calls, format loadProxies

Author: JanTvrdik

src/EntityPreloader.php

@@ -65,27 +65,21 @@ public function preload(
         }
 
         $maxFetchJoinSameFieldCount ??= 1;
-        $sourceEntities = $this->loadProxies($sourceClassMetadata, $sourceEntities, $batchSize ?? self::PRELOAD_ENTITY_DEFAULT_BATCH_SIZE, $maxFetchJoinSameFieldCount, $readOnly);
+        $sourceEntities = $this->loadProxies(
+            $sourceClassMetadata,
+            $sourceEntities,
+            $batchSize ?? self::PRELOAD_ENTITY_DEFAULT_BATCH_SIZE,
+            $maxFetchJoinSameFieldCount,
+            $readOnly,
+        );
 
         $preloader = match ($associationMapping['type']) {
             ClassMetadata::ONE_TO_ONE, ClassMetadata::MANY_TO_ONE => $this->preloadToOne(...),
             ClassMetadata::ONE_TO_MANY, ClassMetadata::MANY_TO_MANY => $this->preloadToMany(...),
             default => throw new LogicException("Unsupported association mapping type {$associationMapping['type']}"),
         };
 
-        $result = $preloader($sourceEntities, $sourceClassMetadata, $sourcePropertyName, $targetClassMetadata, $batchSize, $maxFetchJoinSameFieldCount, $readOnly);
-
-        if ($readOnly) {
-            $unitOfWork = $this->entityManager->getUnitOfWork();
-
-            foreach ($result as $entity) {
-                if (!$unitOfWork->isReadOnly($entity)) {
-                    $unitOfWork->markReadOnly($entity);
-                }
-            }
-        }
-
-        return $result;
+        return $preloader($sourceEntities, $sourceClassMetadata, $sourcePropertyName, $targetClassMetadata, $batchSize, $maxFetchJoinSameFieldCount, $readOnly);
     }
 
     /**
@@ -328,7 +322,7 @@ private function preloadManyToManyInner(
 
         $sourceIdentifierType = $this->getIdentifierFieldType($sourceClassMetadata);
 
-        $manyToManyQuery = $this->entityManager->createQueryBuilder()
+        $manyToManyRows = $this->entityManager->createQueryBuilder()
             ->select("source.{$sourceIdentifierName} AS sourceId", "target.{$targetIdentifierName} AS targetId")
             ->from($sourceClassMetadata->getName(), 'source')
             ->join("source.{$sourcePropertyName}", 'target')
@@ -338,13 +332,9 @@ private function preloadManyToManyInner(
                 $this->convertFieldValuesToDatabaseValues($sourceIdentifierType, $uninitializedSourceEntityIdsChunk),
                 $this->deduceArrayParameterType($sourceIdentifierType),
             )
-            ->getQuery();
-
-        if ($readOnly) {
-            $manyToManyQuery->setHint(Query::HINT_READ_ONLY, true);
-        }
-
-        $manyToManyRows = $manyToManyQuery->getResult();
+            ->getQuery()
+            ->setHint(Query::HINT_READ_ONLY, $readOnly)
+            ->getResult();
 
         $targetEntities = [];
         $uninitializedTargetEntityIds = [];
@@ -459,13 +449,10 @@ private function loadEntitiesBy(
             $queryBuilder->addOrderBy("{$rootLevelAlias}.{$field}", $direction);
         }
 
-        $query = $queryBuilder->getQuery();
-
-        if ($readOnly) {
-            $query->setHint(Query::HINT_READ_ONLY, true);
-        }
-
-        return $query->getResult();
+        return $queryBuilder
+            ->getQuery()
+            ->setHint(Query::HINT_READ_ONLY, $readOnly)
+            ->getResult();
     }
 
     private function deduceArrayParameterType(Type $dbalType): ArrayParameterType|int|null // @phpstan-ignore return.unusedType (old dbal compat)

tests/EntityPreloadBlogManyHasManyTest.php

@@ -125,12 +125,6 @@ public function testManyHasManyWithPreloadReadOnly(DbalType $primaryKey): void
 
         self::assertCount(25, $tags);
 
-        // Verify that preloaded tags are marked as read-only
-        $unitOfWork = $this->getEntityManager()->getUnitOfWork();
-        foreach ($tags as $tag) {
-            self::assertTrue($unitOfWork->isReadOnly($tag), 'Tag should be marked as read-only');
-        }
-
         self::assertAggregatedQueries([
             ['count' => 1, 'query' => 'SELECT * FROM article t0'],
             ['count' => 1, 'query' => 'SELECT * FROM article a0_ INNER JOIN article_tag a2_ ON a0_.id = a2_.article_id INNER JOIN tag t1_ ON t1_.id = a2_.tag_id WHERE a0_.id IN (?, ?, ?, ?, ?)'],

tests/EntityPreloadBlogManyHasOneTest.php

@@ -128,12 +128,6 @@ public function testManyHasOneWithPreloadReadOnly(DbalType $primaryKey): void
 
         self::assertCount(5, $categories);
 
-        // Verify that preloaded categories are marked as read-only
-        $unitOfWork = $this->getEntityManager()->getUnitOfWork();
-        foreach ($categories as $category) {
-            self::assertTrue($unitOfWork->isReadOnly($category), 'Category should be marked as read-only');
-        }
-
         self::assertAggregatedQueries([
             ['count' => 1, 'query' => 'SELECT * FROM article t0'],
             ['count' => 1, 'query' => 'SELECT * FROM category c0_ WHERE c0_.id IN (?, ?, ?, ?, ?)'],

tests/EntityPreloadBlogOneHasManyTest.php

@@ -149,12 +149,6 @@ public function testOneHasManyWithPreloadReadOnly(DbalType $primaryKey): void
 
         self::assertCount(25, $articles);
 
-        // Verify that preloaded articles are marked as read-only
-        $unitOfWork = $this->getEntityManager()->getUnitOfWork();
-        foreach ($articles as $article) {
-            self::assertTrue($unitOfWork->isReadOnly($article), 'Article should be marked as read-only');
-        }
-
         self::assertAggregatedQueries([
             ['count' => 1, 'query' => 'SELECT * FROM category t0'],
             ['count' => 1, 'query' => 'SELECT * FROM article a0_ WHERE a0_.category_id IN (?, ?, ?, ?, ?)'],