Merge pull request #92 from apisearch-io/fix/fixed-subqueries

Fixed subqueries

Author: mmoreram

Query/Query.php

@@ -1469,11 +1469,9 @@ public function toArray(): array
                 ? $this->user->toArray()
                 : null,
             'metadata' => $this->metadata,
-            'subqueries' => array_filter(
-                array_map(function (Query $query) {
-                    return $query->toArray();
-                }, $this->subqueries)
-            ),
+            'subqueries' => array_map(function (Query $query) {
+                return $query->toArray();
+            }, $this->subqueries),
             'items_promoted' => array_filter(
                 array_map(function (ItemUUID $itemUUID) {
                     return $itemUUID->toArray();

Tests/Query/QueryTest.php

@@ -175,18 +175,21 @@ public function testSubqueries()
         $query->addSubQuery('sub1', Query::create('sub1'));
         $query->addSubQuery('sub2', Query::create('sub2'));
         $query->addSubQuery('sub3', Query::create('sub3'));
-        $this->assertCount(3, $query->getSubqueries());
+        $query->addSubQuery('sub4', Query::createMatchAll());
+        $this->assertCount(4, $query->getSubqueries());
         $subqueries = HttpHelper::emulateHttpTransport($query)->getSubqueries();
         $this->assertEquals('sub1', $subqueries['sub1']->getQueryText());
         $this->assertEquals('sub2', $subqueries['sub2']->getQueryText());
         $this->assertEquals('sub3', $subqueries['sub3']->getQueryText());
+        $this->assertEquals('', $subqueries['sub4']->getQueryText());
 
         $query = Query::createMultiquery([
             'sub1' => Query::create('sub1'),
             'sub2' => Query::create('sub2'),
             'sub3' => Query::create('sub3'),
+            'sub4' => Query::createMatchAll(),
         ]);
-        $this->assertCount(3, $query->getSubqueries());
+        $this->assertCount(4, $query->getSubqueries());
     }
 
     /**