Merge pull request #1452 from dpfaffenbauer/issue/1437

[EntityMerger] reset state of newData
coreshop · Jul 24, 2020 · 710b8c0 · 710b8c0
2 parents 66ab468 + 9fd6022
commit 710b8c0
Showing 1 changed file with 3 additions and 0 deletions.
diff --git a/src/CoreShop/Bundle/ResourceBundle/Doctrine/ORM/EntityMerger.php b/src/CoreShop/Bundle/ResourceBundle/Doctrine/ORM/EntityMerger.php
@@ -136,6 +136,9 @@ private function checkAssociations($entity, $managedCopy, array &$visited)
             if ($assoc['type'] === ClassMetadata::MANY_TO_MANY) {
                 $newCollection = $origData;
 
+                //Reset new Data, for some reason the line above resets newData
+                $newData = $class->reflFields[$assoc['fieldName']]->getValue($entity);
+
                 $this->mergeCollection($origData, $newData, $assoc, static function ($foundEntry) use ($newCollection) {
                     $newCollection->removeElement($foundEntry);
                 }, $visited);