Merge pull request #320 from GrahamCampbell/2.1-fixes

Fixed the logic to move to the saved array
thephpleague · Sep 7, 2014 · af343d5 · af343d5
2 parents f756075 + bd0beef
commit af343d5
Show file tree

Hide file tree

Showing 2 changed files with 22 additions and 5 deletions.
diff --git a/src/Arr.php b/src/Arr.php
@@ -65,8 +65,24 @@ public static function add(&$array, $object)
      */
     public static function remove(&$array, $object)
     {
-        if (in_array($object, $array, true)) {
-            unset($array[spl_object_hash($object)]);
-        }
+        unset($array[spl_object_hash($object)]);
+    }
+
+    /**
+     * Move an object to another array.
+     *
+     * @param array  $old
+     * @param array  $new
+     * @param object $object
+     *
+     * @return void
+     */
+    public static function move(&$old, &$new, $object)
+    {
+        $hash = spl_object_hash($object);
+
+        unset($old[$hash]);
+
+        $new[$hash] = $object;
     }
 }
diff --git a/src/Factory.php b/src/Factory.php
@@ -284,8 +284,9 @@ private function persist($object)
             throw new SaveFailedException(get_class($object));
         }
 
-        Arr::add($this->saved, $object);
-        Arr::remove($this->pending, $object);
+        if (!$this->isSaved($object)) {
+            Arr::move($this->pending, $this->saved, $object);
+        }
     }
 
     /**