Allow getSourceItem to return non array values + make root filter opt…

…ional
pionl · Apr 16, 2020 · 7abacad · 7abacad
1 parent 30edf51
commit 7abacad
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 3 deletions.
diff --git a/src/Search/Query/AbstractBuilder.php b/src/Search/Query/AbstractBuilder.php
@@ -47,7 +47,6 @@ public function __construct()
 
         // Prepare the underlying query builder
         $this->query = new QueryBuilder();
-        $this->query->addFilter($this->filter);
     }
 
     abstract protected function createIndex(): AbstractElasticIndex;
@@ -74,6 +73,11 @@ public function paginate()
             $this->query->setSource($this->select);
         }
 
+        // Add filter only if it contains any filters.
+        if (false === $this->filter->isEmpty()) {
+            $this->query->addFilter($this->filter);
+        }
+
         // Build the query and improve it
         $query = $this->query->getQuery();
 

diff --git a/src/Search/Query/Traits/ParseResultsFromHits.php b/src/Search/Query/Traits/ParseResultsFromHits.php
@@ -23,9 +23,9 @@ protected function getResultsFromHits(array $hits): array
      *
      * @param array $result
      *
-     * @return array
+     * @return array|mixed
      */
-    protected function getSourceItem(array $result): array
+    protected function getSourceItem(array $result)
     {
         return $result['_source'];
     }