chore: backport federated search fix (#789)

* Update repository config for v2 (#787)

* Update CI workflows

* Update contributors

* Update empty string comparison

* lint

* Cast federation payload explicilty to an object (#757)

* Cast federation payload explicilty to an object

* Add unit test for multisearch federation array to object casting

---------

Co-authored-by: Thijs Kuilman <thijs.kuilman@gmail.com>
Co-authored-by: Laurent Cazanove <lau.cazanove@gmail.com>

---------

Co-authored-by: Tomas Norkūnas <norkunas.tom@gmail.com>
Co-authored-by: Thijs Kuilman <thijs.kuilman@gmail.com>

Author: 3 people

.github/workflows/release-drafter.yml

@@ -4,6 +4,7 @@ on:
   push:
     branches:
       - main
+      - v1.x
 
 jobs:
   update_release_draft:

.github/workflows/tests.yml

@@ -9,6 +9,7 @@ on:
       - staging
       - main
       - feature/**
+      - v1.x
 
 jobs:
   yaml-lint:

composer.json

@@ -13,8 +13,20 @@
     "license": "MIT",
     "authors": [
         {
-            "name": "Clementine",
+            "name": "Clémentine Urquizar",
             "email": "clementine@meilisearch.com"
+        },
+        {
+            "name": "Bruno Casali",
+            "email": "bruno@meilisearch.com"
+        },
+        {
+            "name": "Laurent Cazanove",
+            "email": "lau.cazanove@gmail.com"
+        },
+        {
+            "name": "Tomas Norkūnas",
+            "email": "norkunas.tom@gmail.com"
         }
     ],
     "minimum-stability": "stable",
@@ -58,7 +70,9 @@
             "./vendor/bin/php-cs-fixer fix --verbose --config=.php-cs-fixer.dist.php --using-cache=no  --diff"
         ],
         "phpstan": "./vendor/bin/phpstan",
-        "test": ["sh scripts/tests.sh"]
+        "test": [
+            "sh scripts/tests.sh"
+        ]
     },
     "config": {
         "allow-plugins": {

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);

src/Exceptions/ApiException.php

@@ -33,7 +33,7 @@ public function __toString()
     {
         $base = 'Meilisearch ApiException: Http Status: '.$this->httpStatus;
 
-        if (!\is_null($this->message)) {
+        if ('' !== $this->message) {
             $base .= ' - Message: '.$this->message;
         }
 

src/Exceptions/InvalidResponseBodyException.php

@@ -25,7 +25,7 @@ public function __toString()
     {
         $base = 'Meilisearch InvalidResponseBodyException: Http Status: '.$this->httpStatus;
 
-        if ($this->message) {
+        if ('' !== $this->message) {
             $base .= ' - Message: '.$this->message;
         }
 

src/Exceptions/TimeOutException.php

@@ -20,7 +20,7 @@ public function __construct(?string $message = null, ?int $code = null, ?\Throwa
     public function __toString()
     {
         $base = 'Meilisearch TimeOutException: Code: '.$this->code;
-        if ($this->message) {
+        if ('' !== $this->message) {
             return $base.' - Message: '.$this->message;
         } else {
             return $base;

tests/Endpoints/MultiSearchTest.php

@@ -4,10 +4,14 @@
 
 namespace Tests\Endpoints;
 
+use Meilisearch\Client;
 use Meilisearch\Contracts\FederationOptions;
 use Meilisearch\Contracts\MultiSearchFederation;
 use Meilisearch\Contracts\SearchQuery;
 use Meilisearch\Endpoints\Indexes;
+use Symfony\Component\HttpClient\MockHttpClient;
+use Symfony\Component\HttpClient\Psr18Client;
+use Symfony\Component\HttpClient\Response\MockResponse;
 use Tests\TestCase;
 
 final class MultiSearchTest extends TestCase
@@ -159,4 +163,26 @@ public function testMultiSearchWithDistinctAttribute(): void
         self::assertCount(1, $response['results'][1]['hits']);
         self::assertSame('fantasy', $response['results'][1]['hits'][0]['genre']);
     }
+
+    public function testMultiSearchFederationCastingToObject(): void
+    {
+        $httpClient = new MockHttpClient(static function (string $method, string $url, array $options): MockResponse {
+            self::assertSame('POST', $method);
+            self::assertSame('http://meilisearch/multi-search', $url);
+            self::assertSame('{"queries":[{"indexUid":"first"},{"indexUid":"second"}],"federation":{}}', $options['body']);
+
+            return new MockResponse(
+                json_encode(['results' => []], \JSON_THROW_ON_ERROR),
+                ['response_headers' => ['content-type' => 'application/json']],
+            );
+        });
+
+        $client = new Client('http://meilisearch', 'apikey', new Psr18Client($httpClient));
+        $client->multiSearch([
+            (new SearchQuery())->setIndexUid('first'),
+            (new SearchQuery())->setIndexUid('second'),
+        ],
+            new MultiSearchFederation()
+        );
+    }
 }