Fixed #14

Swader · Jun 15, 2015 · 09cd568 · 09cd568
1 parent 0ada55f
commit 09cd568
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 3 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,6 +1,10 @@
 #Changelog
 All notable changes will be documented in this file
 
+## 0.4.2
+
+- [Internal] Fixed issue #14 - EntityIterator cursor bug
+
 ## 0.4.1
 
 - [Internal] Added ArrayAccess to EntityIterator

diff --git a/src/Entity/EntityIterator.php b/src/Entity/EntityIterator.php
@@ -52,6 +52,9 @@ public function key()
 
     public function current()
     {
+        while(!$this->offsetExists($this->cursor)) {
+            $this->next();
+        }
         return $this->data[$this->cursor];
     }
 
@@ -159,8 +162,6 @@ public function offsetSet($offset, $value)
      */
     public function offsetUnset($offset)
     {
-        if ($this->offsetExists($offset)) {
-            unset($this->data[$offset]);
-        }
+        unset($this->data[$offset]);
     }
 }