Merge remote-tracking branch 'remotes/upstream/5.x'

.travis.yml

@@ -26,4 +26,4 @@ script:
   - vendor/bin/phpunit --coverage-clover=coverage.clover
   - vendor/bin/phpcs -p --standard=PSR2 --ignore=vendor/ ./
 after_script:
-  - vendor/bin/coveralls
+  - travis_retry php vendor/bin/coveralls

src/Search.php

@@ -640,6 +640,9 @@ class Search
     public function setScroll($scroll = '5m')
     {
         $this->scroll = $scroll;
+
+        $this->addUriParam('scroll', $this->scroll);
+
         return $this;
     }
 
@@ -668,6 +671,7 @@ class Search
             'from',
             'size',
             'search_type',
+            'scroll',
         ])) {
             $this->uriParams[$name] = $value;
         } else {

tests/Unit/SearchTest.php

@@ -29,4 +29,12 @@ class SearchTest extends \PHPUnit_Framework_TestCase
     {
         $this->assertInstanceOf('ONGR\ElasticsearchDSL\Search', new Search());
     }
+
+    public function testScrollUriParameter()
+    {
+        $search = new Search();
+        $search->setScroll('5m');
+
+        $this->assertArrayHasKey('scroll', $search->getUriParams());
+    }
 }