From 0f3a300895dba3a8669062d6612c4324200d7947 Mon Sep 17 00:00:00 2001 From: Thijs Kuilman Date: Fri, 4 Oct 2024 10:01:43 +0200 Subject: [PATCH 1/3] Cast federation payload explicilty to an object --- src/Endpoints/Delegates/HandlesMultiSearch.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Endpoints/Delegates/HandlesMultiSearch.php b/src/Endpoints/Delegates/HandlesMultiSearch.php index 4cd84f9b..c6e76123 100644 --- a/src/Endpoints/Delegates/HandlesMultiSearch.php +++ b/src/Endpoints/Delegates/HandlesMultiSearch.php @@ -25,7 +25,7 @@ public function multiSearch(array $queries = [], ?MultiSearchFederation $federat $payload = ['queries' => $body]; if (null !== $federation) { - $payload['federation'] = $federation->toArray(); + $payload['federation'] = (object) $federation->toArray(); } return $this->http->post('/multi-search', $payload); From d666c0b9eca69c8e51d8f32fc1a81a08f99a3b9e Mon Sep 17 00:00:00 2001 From: Thijs Kuilman Date: Fri, 11 Oct 2024 10:43:31 +0200 Subject: [PATCH 2/3] Added HandlesMultiSearchTest and test that no exceptions are thrown when you pass an empty MultiSearchFederation to the multiSearch function --- tests/Endpoints/HandlesMultiSearchTest.php | 35 ++++++++++++++++++++++ 1 file changed, 35 insertions(+) create mode 100644 tests/Endpoints/HandlesMultiSearchTest.php diff --git a/tests/Endpoints/HandlesMultiSearchTest.php b/tests/Endpoints/HandlesMultiSearchTest.php new file mode 100644 index 00000000..189f0120 --- /dev/null +++ b/tests/Endpoints/HandlesMultiSearchTest.php @@ -0,0 +1,35 @@ +firstIndex = $this->createEmptyIndex($this->safeIndexName()); + $this->secondIndex = $this->createEmptyIndex($this->safeIndexName()); + } + + public function test_passing_empty_multi_search_federation_does_not_cause_exception(): void + { + $this->expectNotToPerformAssertions(); + + $this->client->multiSearch([ + (new SearchQuery())->setIndexUid($this->firstIndex->getUid()), + (new SearchQuery())->setIndexUid($this->secondIndex->getUid()) + ], + (new MultiSearchFederation()) + ); + } +} From a5fe717716d0d7d631cbfaa8720024106af35404 Mon Sep 17 00:00:00 2001 From: Thijs Kuilman Date: Fri, 11 Oct 2024 10:50:04 +0200 Subject: [PATCH 3/3] Added HandlesMultiSearchTest and test that no exceptions are thrown when you pass an empty MultiSearchFederation to the multiSearch function --- tests/Endpoints/HandlesMultiSearchTest.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/tests/Endpoints/HandlesMultiSearchTest.php b/tests/Endpoints/HandlesMultiSearchTest.php index 189f0120..e0a1344a 100644 --- a/tests/Endpoints/HandlesMultiSearchTest.php +++ b/tests/Endpoints/HandlesMultiSearchTest.php @@ -21,15 +21,15 @@ protected function setUp(): void $this->secondIndex = $this->createEmptyIndex($this->safeIndexName()); } - public function test_passing_empty_multi_search_federation_does_not_cause_exception(): void + public function testPassingEmptyMultiSearchFederationDoesNotCauseException(): void { $this->expectNotToPerformAssertions(); $this->client->multiSearch([ (new SearchQuery())->setIndexUid($this->firstIndex->getUid()), - (new SearchQuery())->setIndexUid($this->secondIndex->getUid()) + (new SearchQuery())->setIndexUid($this->secondIndex->getUid()), ], - (new MultiSearchFederation()) + new MultiSearchFederation() ); } }