Fix Scroll and ClearScroll syntax

Author: polyfractal

src/Elasticsearch/Client.php

@@ -985,13 +985,15 @@ public function scroll($params = array())
     {
         $scrollID = $this->extractArgument($params, 'scroll_id');
         $body = $this->extractArgument($params, 'body');
+        $scroll = $this->extractArgument($params, 'scroll');
 
         /** @var callback $endpointBuilder */
         $endpointBuilder = $this->endpoints;
 
         /** @var \Elasticsearch\Endpoints\Scroll $endpoint */
         $endpoint = $endpointBuilder('Scroll');
         $endpoint->setScrollID($scrollID)
+                 ->setScroll($scroll)
                  ->setBody($body);
         $endpoint->setParams($params);
 
@@ -1015,11 +1017,10 @@ public function clearScroll($params = array())
         /** @var callback $endpointBuilder */
         $endpointBuilder = $this->endpoints;
 
-        /** @var \Elasticsearch\Endpoints\Scroll $endpoint */
-        $endpoint = $endpointBuilder('Scroll');
+        /** @var \Elasticsearch\Endpoints\ClearScroll $endpoint */
+        $endpoint = $endpointBuilder('ClearScroll');
         $endpoint->setScrollID($scrollID)
-                 ->setBody($body)
-                 ->setClearScroll(true);
+                 ->setBody($body);
         $endpoint->setParams($params);
 
         return $this->performRequest($endpoint);

src/Elasticsearch/Endpoints/ClearScroll.php

@@ -16,20 +16,20 @@
 class ClearScroll extends AbstractEndpoint
 {
     // A comma-separated list of scroll IDs to clear
-    private $scroll_id;
+    private $scrollId;
 
     /**
      * @param $scroll_id
      *
      * @return $this
      */
-    public function setScroll_Id($scroll_id)
+    public function setScrollId($scrollId)
     {
-        if (isset($scroll_id) !== true) {
+        if (isset($scrollId) !== true) {
             return $this;
         }
 
-        $this->scroll_id = $scroll_id;
+        $this->scrollId = $scrollId;
 
         return $this;
     }
@@ -40,19 +40,38 @@ public function setScroll_Id($scroll_id)
      */
     public function getURI()
     {
-        if (isset($this->scroll_id) !== true) {
-            throw new Exceptions\RuntimeException(
-                'scroll_id is required for Clearscroll'
-            );
-        }
-        $scroll_id = $this->scroll_id;
-        $uri   = "/_search/scroll/$scroll_id";
+        return "/_search/scroll/";
+    }
 
-        if (isset($scroll_id) === true) {
-            $uri = "/_search/scroll/$scroll_id";
+    /**
+     * @param array $body
+     *
+     * @throws \Elasticsearch\Common\Exceptions\InvalidArgumentException
+     * @return $this
+     */
+    public function setBody($body)
+    {
+        if (isset($body) !== true) {
+            return $this;
         }
 
-        return $uri;
+        $this->body = $body;
+
+        return $this;
+    }
+
+    /**
+     * @return array
+     */
+    public function getBody()
+    {
+        if (isset($this->body)) {
+            return $this->body;
+        }
+        if (is_array($this->scrollId)) {
+            return ['scroll_id' => $this->scrollId];
+        }
+        return ['scroll_id' => [$this->scrollId]];
     }
 
     /**

src/Elasticsearch/Endpoints/Scroll.php

@@ -15,7 +15,6 @@
  */
 class Scroll extends AbstractEndpoint
 {
-    private $clear = false;
 
     /**
      * @param array $body
@@ -42,9 +41,18 @@ public function getBody()
         return $this->body;
     }
 
-    public function setClearScroll($clear)
+    /**
+     * @param $scroll
+     *
+     * @return $this
+     */
+    public function setScroll($scroll)
     {
-        $this->clear = $clear;
+        if (isset($scroll) !== true) {
+            return $this;
+        }
+
+        $this->body['scroll'] = $scroll;
 
         return $this;
     }
@@ -60,7 +68,7 @@ public function setScrollId($scroll_id)
             return $this;
         }
 
-        $this->body = $scroll_id;
+        $this->body['scroll_id'] = $scroll_id;
 
         return $this;
     }
@@ -89,10 +97,6 @@ public function getParamWhitelist()
      */
     public function getMethod()
     {
-        if ($this->clear == true) {
-            return 'DELETE';
-        }
-
         return 'GET';
     }
 }