Add new setter/getter for supporting script_fields and stored_fields

src/Search/Search.php

@@ -6,6 +6,7 @@
 
 class Search
 {
+
     /**
      * @var string
      */
@@ -26,6 +27,16 @@ class Search
      */
     private $source;
 
+    /**
+     * @var array
+     */
+    private $scriptFields;
+
+    /**
+     * @var array
+     */
+    private $storedFields;
+
     /**
      * @var Sort
      */
@@ -51,7 +62,6 @@ class Search
      */
     private $page = 1;
 
-
     /**
      * Constructor.
      */
@@ -60,18 +70,18 @@ public function __construct()
         $this->aggregations = new AggregationCollection();
     }
 
-
     /**
      * @param string $index
+     *
      * @return Search
      */
     public function setIndex(string $index)
     {
         $this->index = $index;
+
         return $this;
     }
 
-
     /**
      * @return string
      */
@@ -80,18 +90,18 @@ public function getIndex()
         return $this->index;
     }
 
-
     /**
      * @param string $type
+     *
      * @return Search
      */
     public function setType(string $type)
     {
         $this->type = $type;
+
         return $this;
     }
 
-
     /**
      * @return string
      */
@@ -100,18 +110,18 @@ public function getType()
         return $this->type;
     }
 
-
     /**
      * @param QueryDSL $query
+     *
      * @return Search
      */
     public function setQuery(QueryDSL $query)
     {
         $this->query = $query;
+
         return $this;
     }
 
-
     /**
      * @return QueryDSL
      */
@@ -120,18 +130,18 @@ public function getQuery()
         return $this->query;
     }
 
-
     /**
      * @param Sort $sort
+     *
      * @return Search
      */
     public function setSort(Sort $sort)
     {
         $this->sort = $sort;
+
         return $this;
     }
 
-
     /**
      * @return Sort
      */
@@ -148,6 +158,7 @@ public function getSort()
     public function setSource(array $source)
     {
         $this->source = $source;
+
         return $this;
     }
 
@@ -159,6 +170,46 @@ public function getSource()
         return $this->source;
     }
 
+    /**
+     * @return array|null
+     */
+    public function getScriptFields(): ?array
+    {
+        return $this->scriptFields;
+    }
+
+    /**
+     * @param array $scriptFields
+     *
+     * @return Search
+     */
+    public function setScriptFields(array $scriptFields): Search
+    {
+        $this->scriptFields = $scriptFields;
+
+        return $this;
+    }
+
+    /**
+     * @return array|null
+     */
+    public function getStoredFields(): ?array
+    {
+        return $this->storedFields;
+    }
+
+    /**
+     * @param array $storedFields
+     *
+     * @return Search
+     */
+    public function setStoredFields(array $storedFields): Search
+    {
+        $this->storedFields = $storedFields;
+
+        return $this;
+    }
+
     /**
      * @return AggregationCollection
      */
@@ -167,20 +218,21 @@ public function getAggregations()
         return $this->aggregations;
     }
 
-
     /**
      * @param Aggregation $aggregation
+     *
      * @return Search
      */
     public function addAggregation(Aggregation $aggregation)
     {
         $this->aggregations->add($aggregation);
+
         return $this;
     }
 
-
     /**
      * @param array $aggregations
+     *
      * @return Search
      */
     public function addAggregations(array $aggregations)
@@ -190,17 +242,19 @@ public function addAggregations(array $aggregations)
                 $this->addAggregation($aggregation);
             }
         }
+
         return $this;
     }
 
-
     /**
      * @param int $page
+     *
      * @return Search
      */
-    public function setPage(int $page)
+    public function setPage($page)
     {
-        $this->page = $page;
+        $this->page = (int)$page;
+
         return $this;
     }
 
@@ -217,14 +271,13 @@ public function getFrom()
      *
      * @return Search
      */
-    public function setFrom(int $from)
+    public function setFrom($from)
     {
         $this->from = $from;
 
         return $this;
     }
 
-
     /**
      * @return int
      */
@@ -233,18 +286,18 @@ public function getSize()
         return $this->size;
     }
 
-
     /**
      * @param int $size
+     *
      * @return Search
      */
-    public function setSize(int $size)
+    public function setSize($size)
     {
-        $this->size = $size;
+        $this->size = (int)$size;
+
         return $this;
     }
 
-
     /**
      * @return int
      */
@@ -253,25 +306,24 @@ public function getPage()
         return $this->page;
     }
 
-
     /**
      * @return array
      */
     public function buildBody()
     {
         $body = [];
         $query = $this->getQuery();
-            
+
         if ($query !== null) {
             $body['query'] = $query->toArray();
         }
-            
+
         if (empty($body['query'])) {
             $body['query'] = ['match_all' => new \stdClass()];
         }
 
         $sort = $this->getSort();
-            
+
         if ($sort !== null) {
             $body['sort'] = $sort->toArray();
         }
@@ -280,6 +332,14 @@ public function buildBody()
             $body['_source'] = $this->getSource();
         }
 
+        if (!empty($this->getScriptFields())) {
+            $body['script_fields'] = $this->getScriptFields();
+        }
+
+        if (!empty($this->getStoredFields())) {
+            $body['stored_fields'] = $this->getStoredFields();
+        }
+
         $aggregations = $this->getAggregations();
         if ($aggregations->count() > 0) {
             $body['aggs'] = $aggregations->toArray();
@@ -297,9 +357,7 @@ public function buildBody()
             $from = ($this->getPage() - 1) * $this->getSize();
         }
 
-        if ($from > 0) {
-            $body['from'] = $from;
-        }
+        $body['from'] = $from;
 
         return $body;
     }