[ResourceBundle] EntityMerger, check if entity is already loaded by UoW

coreshop · Apr 27, 2024 · a1c4998 · a1c4998
1 parent e9b9498
commit a1c4998
Showing 1 changed file with 11 additions and 2 deletions.
diff --git a/src/CoreShop/Bundle/ResourceBundle/Doctrine/ORM/EntityMerger.php b/src/CoreShop/Bundle/ResourceBundle/Doctrine/ORM/EntityMerger.php
@@ -60,12 +60,21 @@ private function doMerge($entity, array &$visited): void
         }
 
         $visited[$oid] = $entity; // mark visited
+        $class = $this->em->getClassMetadata($entity::class);
 
         if ($entity instanceof Proxy && !$entity->__isInitialized()) {
-            $entity->__load();
+            $id = $class->getIdentifierValues($entity);
+
+            $uwEntity = $this->em->getUnitOfWork()->tryGetById($id, $class->getName());
+
+            if ($uwEntity) {
+                $entity = $uwEntity;
+            }
+            else {
+                $entity->__load();
+            }
         }
 
-        $class = $this->em->getClassMetadata($entity::class);
 
         if ($this->em->getUnitOfWork()->getEntityState($entity, UnitOfWork::STATE_DETACHED) !== UnitOfWork::STATE_MANAGED) {
             $id = $class->getIdentifierValues($entity);