Fixed by decrementing the iterator index when unset is called inside …

…DocumentArray and Collection.
joedevon · Oct 25, 2011 · 394ae79 · 394ae79
1 parent 0b1afc5
commit 394ae79
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 2 deletions.
diff --git a/data/collection/DocumentArray.php b/data/collection/DocumentArray.php
@@ -96,6 +96,7 @@ public function __isset($name) {
 	 */
 	public function __unset($name) {
 		unset($this->_data[$name]);
+		prev($this->_data);
 	}
 
 	/**

diff --git a/tests/cases/data/collection/DocumentArrayTest.php b/tests/cases/data/collection/DocumentArrayTest.php
@@ -55,7 +55,7 @@ public function testUnsetInForeach() {
 			}
 		}
 
-		$expected = array('Hello', 'Hello again!');
+		$expected = array(0 => 'Hello', 6 => 'Hello again!');
 		$this->assertIdentical($expected, $doc->data());
 	}
 }

diff --git a/tests/cases/util/CollectionTest.php b/tests/cases/util/CollectionTest.php
@@ -328,7 +328,7 @@ public function testUnsetInForeach() {
 			}
 		}
 
-		$expected = array('Hello', 'Hello again!');
+		$expected = array(0 => 'Hello', 6 => 'Hello again!');
 		$results = $collection->to('array');
 		$this->assertIdentical($expected, $results);
 	}

diff --git a/util/Collection.php b/util/Collection.php
@@ -413,6 +413,7 @@ public function offsetSet($offset, $value) {
 	 */
 	public function offsetUnset($offset) {
 		unset($this->_data[$offset]);
+		prev($this->_data);
 	}
 
 	/**