Merge pull request #53 from vbcodeplicity/feature/match_all-should-use-curly-instead-of-square-brackets

match_all should use curly instead of square brackets

Author: ivankoni

src/Engine/Elasticsearch/ElasticsearchSelectionFactory.php

@@ -77,7 +77,7 @@ public function sort()
     public function where()
     {
         if ($this->identity->isVoid()) {
-            return $this->addConsistentRandomKey(['bool' => ['must' => ['match_all' => []]]]);
+            return $this->addConsistentRandomKey(['bool' => ['must' => ['match_all' => new \stdClass()]]]);
         }
 
         $comparisons = [];
@@ -103,7 +103,7 @@ public function where()
         }
 
         if (empty($comparisons)) {
-            $comparisons =  ['must' => ['match_all' => []]];
+            $comparisons =  ['must' => ['match_all' => new \stdClass()]];
         }
 
         $comparisons['filter'] = $geodistFormatter->format();

tests/unit/src/Engine/Elasticsearch/ElasticsearchSelectionFactoryTest.php

@@ -232,7 +232,10 @@ public function testWhereIfIdentityIsVoid()
             ->method('isVoid')
             ->willReturn(true);
 
-        $this->assertEquals(['bool' => ['must' => ['match_all' => []]]], $this->selectionFactory->where());
+        $result = $this->selectionFactory->where();
+
+        $this->assertEquals(['bool' => ['must' => ['match_all' => new \stdClass()]]], $result);
+        $this->assertEquals('{"bool":{"must":{"match_all":{}}}}', json_encode($result));
     }
 
     public function testGetGeodistParameters()
@@ -255,7 +258,7 @@ public function testGetGeodistParameters()
         $expectedArray = [
             'bool' => [
                 'must'   => [
-                    'match_all' => []
+                    'match_all' => new \stdClass()
                 ],
                 'filter' => [
                     'geo_distance' => [
@@ -269,7 +272,10 @@ public function testGetGeodistParameters()
             ],
         ];
 
-        $this->assertEquals($expectedArray, $this->selectionFactory->where());
+        $result = $this->selectionFactory->where();
+
+        $this->assertEquals($expectedArray, $result);
+        $this->assertEquals('{"bool":{"must":{"match_all":{}},"filter":{"geo_distance":{"distance":"100km","location":{"lon":10,"lat":15}}}}}', json_encode($result));
     }
 
     public function testWhereWithRandom()