Fixed bug on associations removal

pierrerolland · Sep 11, 2018 · 9770924 · 9770924
1 parent a37421b
commit 9770924
Showing 1 changed file with 8 additions and 3 deletions.
diff --git a/Builder/EntityBuilder.php b/Builder/EntityBuilder.php
@@ -231,12 +231,17 @@ private function mergeCollection(
      */
     private function removeItemsNotInRequest($entityValues, array $requestValues)
     {
-        if (!$entityValues) {
+        if (!$entityValues || ($entityValues instanceof Collection && $entityValues->count() === 0)) {
             return null;
         }
 
-        $entityClass = $entityValues instanceof Collection ? get_class($entityValues->current()) :
-            is_array($entityValues) ? get_class(current($entityValues)) : null;
+        if ($entityValues instanceof Collection) {
+            $entityClass = get_class($entityValues->first());
+        } elseif (is_array($entityValues)) {
+            $entityClass = get_class($entityValues[0]);
+        } else {
+            $entityClass = null;
+        }
 
         if (!$entityClass) {
             return null;