Merge branch 'release/2.2.1'

digiaonline · Nov 2, 2017 · 49ed2d0 · 49ed2d0
2 parents 5288a54 + 07bb6c8
commit 49ed2d0
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 7 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -2,6 +2,10 @@
 
 All notable changes to this project will be documented in this file.
 
+## [2.2.1] - 2017-11-02
+### Fixed
+- Fixed an issue with empty match_all queries
+
 ## [2.2.0] - 2017-11-01
 ### Added
 - Support for terms aggregation

diff --git a/src/Search/Search.php b/src/Search/Search.php
@@ -244,7 +244,7 @@ public function buildBody()
             }
         }
         if (empty($body['query'])) {
-            $body['query'] = ['match_all' => []];
+            $body['query'] = ['match_all' => new \stdClass()];
         }
 
         if (($sort = $this->getSort())) {

diff --git a/tests/Search/SearchTest.php b/tests/Search/SearchTest.php
@@ -100,7 +100,7 @@ public function testToArray()
         $this->search->setSize(100);
 
         $this->assertEquals([
-            'query' => ['match_all' => []],
+            'query' => ['match_all' => new \stdClass()],
             'size'  => 100,
             'from'  => 0,
         ], $this->search->buildBody());
@@ -110,7 +110,7 @@ public function testToArray()
         $this->search->setSize(100);
 
         $this->assertEquals([
-            'query' => ['match_all' => []],
+            'query' => ['match_all' => new \stdClass()],
             'size'  => 100,
             'from'  => 100,
         ], $this->search->buildBody());
@@ -120,7 +120,7 @@ public function testToArray()
         $this->search->setSize(10);
 
         $this->assertEquals([
-            'query' => ['match_all' => []],
+            'query' => ['match_all' => new \stdClass()],
             'from'  => 10,
             'size'  => 10,
         ], $this->search->buildBody());
@@ -148,7 +148,7 @@ public function testToArray()
         $this->search->setSort($this->sort);
 
         $this->assertEquals([
-            'query' => ['match_all' => []],
+            'query' => ['match_all' => new \stdClass()],
             'sort'  => ['_score'],
             'size'  => 100,
             'from'  => 0,
@@ -158,7 +158,7 @@ public function testToArray()
         $this->search->addAggregation($this->aggregation);
 
         $this->assertEquals([
-            'query' => ['match_all' => []],
+            'query' => ['match_all' => new \stdClass()],
             'aggs'  => [
                 'global_name' => [
                     'global' => new \stdClass(),
@@ -192,7 +192,7 @@ public function testAddAggregations()
         $this->assertInstanceOf(AggregationCollection::class, $this->search->getAggregations());
 
         $this->assertEquals([
-            'query' => ['match_all' => []],
+            'query' => ['match_all' => new \stdClass()],
             'aggs'  => [
                 'name1' => [
                     'terms' => [