Fix failed merge (#11464)

derrabus · web-flow · commit 11270425e5f0 · 2024-05-21T12:30:56.000+02:00
diff --git a/src/UnitOfWork.php b/src/UnitOfWork.php
@@ -2653,7 +2653,7 @@ private function eagerLoadCollections(array $collections, ToManyInverseSideMappi
                 $entities[] = $collection->getOwner();
             }
 
-            $found = $this->getEntityPersister($targetEntity)->loadAll([$mappedBy => $entities], $mapping['orderBy'] ?? null);
+            $found = $this->getEntityPersister($targetEntity)->loadAll([$mappedBy => $entities], $mapping->orderBy);
 
             $targetClass    = $this->em->getClassMetadata($targetEntity);
             $targetProperty = $targetClass->getReflectionProperty($mappedBy);

Original file line number	Diff line number	Diff line change
`@@ -2653,7 +2653,7 @@ private function eagerLoadCollections(array $collections, ToManyInverseSideMappi`
`2653`	`2653`	`$entities[] = $collection->getOwner();`
`2654`	`2654`	`}`
`2655`	`2655`
`2656`		`- $found = $this->getEntityPersister($targetEntity)->loadAll([$mappedBy => $entities], $mapping['orderBy'] ?? null);`
	`2656`	`+ $found = $this->getEntityPersister($targetEntity)->loadAll([$mappedBy => $entities], $mapping->orderBy);`
`2657`	`2657`
`2658`	`2658`	`$targetClass = $this->em->getClassMetadata($targetEntity);`
`2659`	`2659`	`$targetProperty = $targetClass->getReflectionProperty($mappedBy);`