Merge branch '5.x' into 6.x

# Conflicts:
#	composer.json

Author: saimaz

docs/Query/Compound/FunctionScore.md

@@ -105,7 +105,7 @@ $queryArray = $search->toArray();
 ```php
 $functionScoreQuery = new FunctionScoreQuery(new MatchAllQuery());
 $existsQuery = new ExistsQuery('price');
-$functionScoreQuery->addFieldValueFactorFunction('price', 0.5, 'ln', $existsQuery);
+$functionScoreQuery->addFieldValueFactorFunction('price', 0.5, 'ln', $existsQuery, 0);
 
 $search = new Search();
 $search->addQuery($functionScoreQuery);

src/Query/Compound/FunctionScoreQuery.php

@@ -60,18 +60,21 @@ public function getQuery()
      * @param float            $factor
      * @param string           $modifier
      * @param BuilderInterface $query
-     *
+     * @param mixed            $missing
      * @return $this
      */
-    public function addFieldValueFactorFunction($field, $factor, $modifier = 'none', BuilderInterface $query = null)
+    public function addFieldValueFactorFunction($field, $factor, $modifier = 'none', BuilderInterface $query = null, $missing = null)
     {
-        $function = [
+        $function = array_filter([
             'field_value_factor' => [
                 'field' => $field,
                 'factor' => $factor,
                 'modifier' => $modifier,
+                'missing' => $missing
             ],
-        ];
+        ], function ($item) {
+            return $item !== null;
+        });
 
         $this->applyFilter($function, $query);
 

src/Search.php

@@ -247,7 +247,7 @@ private function getEndpoint($type)
     /**
      * Returns queries inside BoolQuery instance.
      *
-     * @return BuilderInterface
+     * @return BoolQuery
      */
     public function getQueries()
     {
@@ -311,7 +311,7 @@ public function addPostFilter(BuilderInterface $filter, $boolType = BoolQuery::M
     /**
      * Returns queries inside BoolFilter instance.
      *
-     * @return BuilderInterface
+     * @return BoolQuery
      */
     public function getPostFilters()
     {

src/SearchEndpoint/SearchEndpointInterface.php

@@ -12,6 +12,7 @@
 namespace ONGR\ElasticsearchDSL\SearchEndpoint;
 
 use ONGR\ElasticsearchDSL\BuilderInterface;
+use ONGR\ElasticsearchDSL\Query\Compound\BoolQuery;
 use Symfony\Component\Serializer\Normalizer\NormalizableInterface;
 
 /**
@@ -71,7 +72,7 @@ public function getAll($boolType = null);
     /**
      * Returns Bool filter or query instance with all builder objects inside.
      *
-     * @return BuilderInterface
+     * @return BoolQuery
      */
     public function getBool();
 }