Fix issue with empty function_score query (#109)

* Fix issue with empty function_score query. "match_all": [] should be "match_all": {} * Add unit test for empty function score query
digiaonline · Jun 18, 2018 · e9bfa0a · e9bfa0a
1 parent bd3a32e
commit e9bfa0a
Show file tree

Hide file tree

Showing 2 changed files with 22 additions and 5 deletions.
diff --git a/src/Search/Query/Compound/FunctionScoreQuery.php b/src/Search/Query/Compound/FunctionScoreQuery.php
@@ -59,7 +59,7 @@ public function toArray()
             if (!empty($queryArray)) {
                 $array['query'] = $queryArray;
             } else {
-                $array['query'] = ['match_all' => []];
+                $array['query'] = ['match_all' => new \stdClass()];
             }
         }
 

diff --git a/tests/Search/Query/Compound/FunctionScoreQueryTest.php b/tests/Search/Query/Compound/FunctionScoreQueryTest.php
@@ -59,11 +59,11 @@ public function testToArray()
                         ]
                     ]
                 ],
-                'weight'     => 34.12,
-                'boost'      => 5.1,
-                'max_boost'  => 14.3,
+                'weight' => 34.12,
+                'boost' => 5.1,
+                'max_boost' => 14.3,
                 'boost_mode' => 'multiply',
-                'min_score'  => 1,
+                'min_score' => 1,
             ]
         ];
 
@@ -99,4 +99,21 @@ public function testToArrayMinimumFields()
 
         $this->assertEquals($expectedArray, $functionScoreQuery->toArray());
     }
+
+    public function testEmptyQuery()
+    {
+        $functionScoreQuery = new FunctionScoreQuery();
+
+        $functionScoreQuery->setQuery(new BoolQuery());
+
+        $expectedArray = [
+            'function_score' => [
+                'query' => [
+                    'match_all' => new \stdClass()
+                ],
+            ],
+        ];
+
+        $this->assertEquals($expectedArray, $functionScoreQuery->toArray());
+    }
 }