[CoreBundle] restore managed entities of no merge is defined

coreshop · May 6, 2024 · b4e1ab3 · b4e1ab3
1 parent 6ca7def
commit b4e1ab3
Showing 1 changed file with 3 additions and 1 deletion.
diff --git a/src/CoreShop/Bundle/ResourceBundle/Doctrine/ORM/EntityMerger.php b/src/CoreShop/Bundle/ResourceBundle/Doctrine/ORM/EntityMerger.php
@@ -330,7 +330,9 @@ static function ($assoc) {
                 $id = $relatedEntityClass->getIdentifierValues($relatedEntities);
                 $uwEntity = $this->em->getUnitOfWork()->tryGetById($id, $relatedEntityClass->getName());
 
-                $class->reflFields[$assoc['fieldName']]->setValue($entity, $uwEntity);
+                if ($uwEntity) {
+                    $class->reflFields[$assoc['fieldName']]->setValue($entity, $uwEntity);
+                }
             }
         }