Fixes #595

Author: ezimuel

src/Elasticsearch/Helper/Iterators/SearchResponseIterator.php

@@ -130,15 +130,11 @@ public function rewind()
      */
     public function next()
     {
-        if ($this->current_key !== 0) {
-            $this->current_scrolled_response = $this->client->scroll(
-                array(
-                    'scroll_id' => $this->scroll_id,
-                    'scroll'    => $this->scroll_ttl
-                )
-            );
-            $this->scroll_id = $this->current_scrolled_response['_scroll_id'];
-        }
+        $this->current_scrolled_response = $this->client->scroll([
+            'scroll_id' => $this->scroll_id,
+            'scroll'    => $this->scroll_ttl
+        ]);
+        $this->scroll_id = $this->current_scrolled_response['_scroll_id'];
         $this->current_key++;
     }
 

tests/Elasticsearch/Tests/Helper/Iterators/SearchResponseIteratorTest.php

@@ -165,7 +165,12 @@ public function testWithHits()
             ->withAnyArgs();
 
         $responses = new SearchResponseIterator($mock_client, $search_params);
-
-        $this->assertCount(4, $responses);
+        $count = 0;
+        $i = 0;
+        foreach ($responses as $response) {
+            $count += count($response['hits']['hits']);
+            $this->assertEquals($response['_scroll_id'], sprintf("scroll_id_%02d", ++$i));
+        }
+        $this->assertEquals(3, $count);
     }
 }