From 545110b7fd3787d650318acb0b49b808449fd04f Mon Sep 17 00:00:00 2001 From: Marc Morera Date: Mon, 1 Apr 2019 16:43:25 +0200 Subject: [PATCH] Fixed subqueries --- Query/Query.php | 8 +++----- Tests/Query/QueryTest.php | 7 +++++-- 2 files changed, 8 insertions(+), 7 deletions(-) diff --git a/Query/Query.php b/Query/Query.php index 6440c7f..1a547c4 100644 --- a/Query/Query.php +++ b/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(); diff --git a/Tests/Query/QueryTest.php b/Tests/Query/QueryTest.php index c4cab02..2a55687 100644 --- a/Tests/Query/QueryTest.php +++ b/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()); } /**