Merge branch 'github/pr/182'

2026-08-20 10:21:49 +00:00 · 2014-07-07 10:52:58 +02:00
parent 4db00173f3 2d53db7b9b
commit 45da0fca55
1 changed files with 11 additions and 9 deletions
@@ -165,16 +165,18 @@ abstract class CursorBasedIterator implements Iterator
     */
    public function next()
    {
-        if (!$this->elements && $this->fetchmore) {
-            $this->fetch();
-        }
+        tryFetch: {
+            if (!$this->elements && $this->fetchmore) {
+                $this->fetch();
+            }

-        if ($this->elements) {
-            $this->extractNext();
-        } elseif ($this->cursor) {
-            $this->next();
-        } else {
-            $this->valid = false;
+            if ($this->elements) {
+                $this->extractNext();
+            } elseif ($this->cursor) {
+                goto tryFetch;
+            } else {
+                $this->valid = false;
+            }
        }
    }