From 08060edf53208e05ae1c535f845c699fd343f296 Mon Sep 17 00:00:00 2001
From: Damien Couchez <damien.couchez@gmail.com>
Date: Thu, 5 May 2022 17:06:37 +0200
Subject: [PATCH 1/8] php(feat): Add tests of query params

---
 .../RequestOptions/RequestOptionsFactory.php  |  20 ++-
 templates/php/api.mustache                    |  23 ++--
 .../methods/requests/search/assignUserId.json |   3 -
 .../requests/search/batchAssignUserIds.json   |   3 -
 .../requests/templates/php/requests.mustache  |   9 +-
 .../src/methods/requests/AbtestingTest.php    |  30 ++++-
 .../src/methods/requests/AnalyticsTest.php    | 114 ++++++++++++------
 .../php/src/methods/requests/InsightsTest.php |  27 ++++-
 .../methods/requests/PersonalizationTest.php  |  27 ++++-
 .../methods/requests/QuerySuggestionsTest.php |  27 ++++-
 .../src/methods/requests/RecommendTest.php    |  27 ++++-
 .../php/src/methods/requests/SearchTest.php   |  67 ++++++----
 12 files changed, 266 insertions(+), 111 deletions(-)

diff --git a/clients/algoliasearch-client-php/lib/RequestOptions/RequestOptionsFactory.php b/clients/algoliasearch-client-php/lib/RequestOptions/RequestOptionsFactory.php
index 434b70631e..e116499509 100644
--- a/clients/algoliasearch-client-php/lib/RequestOptions/RequestOptionsFactory.php
+++ b/clients/algoliasearch-client-php/lib/RequestOptions/RequestOptionsFactory.php
@@ -9,14 +9,7 @@ final class RequestOptionsFactory
 {
     private $config;
 
-    private $validQueryParameters = [
-        'forwardToReplicas',
-        'replaceExistingSynonyms',
-        'clearExistingRules',
-        'getVersion',
-    ];
-
-    private $validHeaders = ['Content-type', 'User-Agent', 'createIfNotExists'];
+    private $validHeaders = ['Content-type', 'User-Agent'];
 
     public function __construct(Configuration $config)
     {
@@ -100,7 +93,7 @@ private function normalize($options)
     private function format($options)
     {
         foreach ($options as $name => $value) {
-            if (in_array($name, ['attributesToRetrieve', 'type'], true)) {
+            if (in_array($name, self::getAttributesToFormat(), true)) {
                 if (is_array($value)) {
                     $options[$name] = implode(',', $value);
                 }
@@ -114,8 +107,6 @@ private function getOptionType($optionName)
     {
         if ($this->isValidHeaderName($optionName)) {
             return 'headers';
-        } elseif (in_array($optionName, $this->validQueryParameters, true)) {
-            return 'query';
         } elseif (
             in_array(
                 $optionName,
@@ -126,7 +117,7 @@ private function getOptionType($optionName)
             return $optionName;
         }
 
-        return 'body';
+        return 'query';
     }
 
     private function isValidHeaderName($name)
@@ -141,4 +132,9 @@ private function isValidHeaderName($name)
 
         return false;
     }
+
+    public static function getAttributesToFormat()
+    {
+        return ['attributesToRetrieve', 'type'];
+    }
 }
diff --git a/templates/php/api.mustache b/templates/php/api.mustache
index 72a5f7c968..883dbb1504 100644
--- a/templates/php/api.mustache
+++ b/templates/php/api.mustache
@@ -2,15 +2,11 @@
 
 namespace {{apiPackage}};
 
-use GuzzleHttp\Exception\RequestException;
-use GuzzleHttp\Exception\ConnectException;
-use GuzzleHttp\Psr7\MultipartStream;
-use GuzzleHttp\RequestOptions;
-use GuzzleHttp\Utils;
 use {{invokerPackage}}\Algolia;
 use {{invokerPackage}}\ApiException;
 use {{invokerPackage}}\Configuration\{{configClassname}};
 use {{invokerPackage}}\ObjectSerializer;
+use {{invokerPackage}}\RequestOptions\RequestOptionsFactory;
 use {{invokerPackage}}\RetryStrategy\ApiWrapper;
 use {{invokerPackage}}\RetryStrategy\ApiWrapperInterface;
 use {{invokerPackage}}\RetryStrategy\ClusterHosts;
@@ -143,13 +139,14 @@ use {{invokerPackage}}\RetryStrategy\ClusterHosts;
      * @see {{{dataType}}}
 {{/isModel}}
 {{/allParams}}
+     * @param array $requestOptions Request Options
      *
      * @return {{#returnType}}{{#responses}}{{#dataType}}{{#-first}}array<string, mixed>|{{{dataType}}}{{/-first}}{{/dataType}}{{/responses}}{{/returnType}}{{^returnType}}void{{/returnType}}
   {{#isDeprecated}}
      * @deprecated
   {{/isDeprecated}}
      */
-    public function {{operationId}}({{^vendorExtensions.x-group-parameters}}{{#allParams}}${{paramName}}{{^required}} = {{{defaultValue}}}{{^defaultValue}}null{{/defaultValue}}{{/required}}{{^-last}}, {{/-last}}{{/allParams}}{{/vendorExtensions.x-group-parameters}}{{#vendorExtensions.x-group-parameters}}$associative_array{{/vendorExtensions.x-group-parameters}})
+    public function {{operationId}}({{^vendorExtensions.x-group-parameters}}{{#allParams}}${{paramName}}{{^required}} = null{{/required}}, {{/allParams}}{{/vendorExtensions.x-group-parameters}}{{#vendorExtensions.x-group-parameters}}$associative_array{{/vendorExtensions.x-group-parameters}} $requestOptions = [])
     {
         {{#vendorExtensions.x-group-parameters}}
         // unbox the parameters from the associative array
@@ -215,7 +212,7 @@ use {{invokerPackage}}\RetryStrategy\ClusterHosts;
         {{#isExplode}}
         if (${{paramName}} !== null) {
         {{#style}}
-            if('form' === '{{style}}' && is_array(${{paramName}})) {
+            if(is_array(${{paramName}}) && ! in_array('{{paramName}}', RequestOptionsFactory::getAttributesToFormat())) {
                 foreach(${{paramName}} as $key => $value) {
                     $queryParams[$key] = $value;
                 }
@@ -269,25 +266,29 @@ use {{invokerPackage}}\RetryStrategy\ClusterHosts;
 
         {{/servers.0}}
 
-        return $this->sendRequest('{{httpMethod}}', $resourcePath, $queryParams, $httpBody);
+        $requestOptions += $queryParams;
+
+        return $this->sendRequest('{{httpMethod}}', $resourcePath, $queryParams, $httpBody, $requestOptions);
     }
 
     {{/operation}}
 
-    private function sendRequest($method, $resourcePath, $queryParams, $httpBody)
+    private function sendRequest($method, $resourcePath, $queryParams, $httpBody, $requestOptions)
     {
         $query = \GuzzleHttp\Psr7\Query::build($queryParams);
 
         if($method == 'GET') {
             $request = $this->api->read(
                 $method,
-                $resourcePath . ($query ? "?{$query}" : '')
+                $resourcePath . ($query ? "?{$query}" : ''),
+                $requestOptions
             );
         } else {
             $request = $this->api->write(
                 $method,
                 $resourcePath . ($query ? "?{$query}" : ''),
-                $httpBody
+                $httpBody,
+                $requestOptions
             );
         }
 
diff --git a/tests/CTS/methods/requests/search/assignUserId.json b/tests/CTS/methods/requests/search/assignUserId.json
index 5698b18b21..6c90be0f53 100644
--- a/tests/CTS/methods/requests/search/assignUserId.json
+++ b/tests/CTS/methods/requests/search/assignUserId.json
@@ -11,9 +11,6 @@
       "method": "POST",
       "body": {
         "cluster": "theCluster"
-      },
-      "queryParameters": {
-        "X-Algolia-User-ID": "userID"
       }
     }
   }
diff --git a/tests/CTS/methods/requests/search/batchAssignUserIds.json b/tests/CTS/methods/requests/search/batchAssignUserIds.json
index b19ace6ea5..c524f8266f 100644
--- a/tests/CTS/methods/requests/search/batchAssignUserIds.json
+++ b/tests/CTS/methods/requests/search/batchAssignUserIds.json
@@ -19,9 +19,6 @@
           "user1",
           "user2"
         ]
-      },
-      "queryParameters": {
-        "X-Algolia-User-ID": "userID"
       }
     }
   }
diff --git a/tests/CTS/methods/requests/templates/php/requests.mustache b/tests/CTS/methods/requests/templates/php/requests.mustache
index e8d94974a6..e351acc2dd 100644
--- a/tests/CTS/methods/requests/templates/php/requests.mustache
+++ b/tests/CTS/methods/requests/templates/php/requests.mustache
@@ -42,6 +42,13 @@ class {{clientPrefix}}Test extends TestCase implements HttpClientInterface
                     $recordedRequest->getBody()->getContents()
                 );
             }
+
+            if (isset($request['queryParameters'])) {
+                $this->assertEquals(
+                    \GuzzleHttp\Psr7\Query::build($request['queryParameters']),
+                    $recordedRequest->getUri()->getQuery()
+                );
+            }
         }
     }
 
@@ -82,7 +89,7 @@ class {{clientPrefix}}Test extends TestCase implements HttpClientInterface
                 "body" => json_decode("{{#lambda.escapequotes}}{{{request.body}}}{{/lambda.escapequotes}}"),
                 {{/request.body}}
                 {{#request.queryParameters}}
-                "queryParameters" => json_decode("{{#lambda.escapequotes}}{{{request.queryParameters}}}{{/lambda.escapequotes}}"),
+                "queryParameters" => json_decode("{{#lambda.escapequotes}}{{{request.queryParameters}}}{{/lambda.escapequotes}}", true),
                 {{/request.queryParameters}}
             ],
         ]);
diff --git a/tests/output/php/src/methods/requests/AbtestingTest.php b/tests/output/php/src/methods/requests/AbtestingTest.php
index 86fc484000..24c128ce2a 100644
--- a/tests/output/php/src/methods/requests/AbtestingTest.php
+++ b/tests/output/php/src/methods/requests/AbtestingTest.php
@@ -48,6 +48,13 @@ protected function assertRequests(array $requests)
                     $recordedRequest->getBody()->getContents()
                 );
             }
+
+            if (isset($request['queryParameters'])) {
+                $this->assertEquals(
+                    \GuzzleHttp\Psr7\Query::build($request['queryParameters']),
+                    $recordedRequest->getUri()->getQuery()
+                );
+            }
         }
     }
 
@@ -137,7 +144,10 @@ public function testDel1()
             [
                 'path' => '/1/test/all',
                 'method' => 'DELETE',
-                'queryParameters' => json_decode("{\"query\":\"parameters\"}"),
+                'queryParameters' => json_decode(
+                    "{\"query\":\"parameters\"}",
+                    true
+                ),
             ],
         ]);
     }
@@ -192,7 +202,10 @@ public function testGet1()
             [
                 'path' => '/1/test/all',
                 'method' => 'GET',
-                'queryParameters' => json_decode("{\"query\":\"parameters\"}"),
+                'queryParameters' => json_decode(
+                    "{\"query\":\"parameters\"}",
+                    true
+                ),
             ],
         ]);
     }
@@ -231,7 +244,8 @@ public function testListABTests0()
                 'path' => '/2/abtests',
                 'method' => 'GET',
                 'queryParameters' => json_decode(
-                    "{\"offset\":\"42\",\"limit\":\"21\"}"
+                    "{\"offset\":\"42\",\"limit\":\"21\"}",
+                    true
                 ),
             ],
         ]);
@@ -272,7 +286,10 @@ public function testPost1()
                 'path' => '/1/test/all',
                 'method' => 'POST',
                 'body' => json_decode("{\"body\":\"parameters\"}"),
-                'queryParameters' => json_decode("{\"query\":\"parameters\"}"),
+                'queryParameters' => json_decode(
+                    "{\"query\":\"parameters\"}",
+                    true
+                ),
             ],
         ]);
     }
@@ -312,7 +329,10 @@ public function testPut1()
                 'path' => '/1/test/all',
                 'method' => 'PUT',
                 'body' => json_decode("{\"body\":\"parameters\"}"),
-                'queryParameters' => json_decode("{\"query\":\"parameters\"}"),
+                'queryParameters' => json_decode(
+                    "{\"query\":\"parameters\"}",
+                    true
+                ),
             ],
         ]);
     }
diff --git a/tests/output/php/src/methods/requests/AnalyticsTest.php b/tests/output/php/src/methods/requests/AnalyticsTest.php
index 2f08524cae..bc588bb97e 100644
--- a/tests/output/php/src/methods/requests/AnalyticsTest.php
+++ b/tests/output/php/src/methods/requests/AnalyticsTest.php
@@ -48,6 +48,13 @@ protected function assertRequests(array $requests)
                     $recordedRequest->getBody()->getContents()
                 );
             }
+
+            if (isset($request['queryParameters'])) {
+                $this->assertEquals(
+                    \GuzzleHttp\Psr7\Query::build($request['queryParameters']),
+                    $recordedRequest->getUri()->getQuery()
+                );
+            }
         }
     }
 
@@ -109,7 +116,10 @@ public function testDel1()
             [
                 'path' => '/1/test/all',
                 'method' => 'DELETE',
-                'queryParameters' => json_decode("{\"query\":\"parameters\"}"),
+                'queryParameters' => json_decode(
+                    "{\"query\":\"parameters\"}",
+                    true
+                ),
             ],
         ]);
     }
@@ -147,7 +157,10 @@ public function testGet1()
             [
                 'path' => '/1/test/all',
                 'method' => 'GET',
-                'queryParameters' => json_decode("{\"query\":\"parameters\"}"),
+                'queryParameters' => json_decode(
+                    "{\"query\":\"parameters\"}",
+                    true
+                ),
             ],
         ]);
     }
@@ -165,7 +178,7 @@ public function testGetAverageClickPosition0()
             [
                 'path' => '/2/clicks/averageClickPosition',
                 'method' => 'GET',
-                'queryParameters' => json_decode("{\"index\":\"index\"}"),
+                'queryParameters' => json_decode("{\"index\":\"index\"}", true),
             ],
         ]);
     }
@@ -189,7 +202,8 @@ public function testGetAverageClickPosition1()
                 'path' => '/2/clicks/averageClickPosition',
                 'method' => 'GET',
                 'queryParameters' => json_decode(
-                    "{\"index\":\"index\",\"startDate\":\"1999-09-19\",\"endDate\":\"2001-01-01\",\"tags\":\"tag\"}"
+                    "{\"index\":\"index\",\"startDate\":\"1999-09-19\",\"endDate\":\"2001-01-01\",\"tags\":\"tag\"}",
+                    true
                 ),
             ],
         ]);
@@ -208,7 +222,7 @@ public function testGetClickPositions0()
             [
                 'path' => '/2/clicks/positions',
                 'method' => 'GET',
-                'queryParameters' => json_decode("{\"index\":\"index\"}"),
+                'queryParameters' => json_decode("{\"index\":\"index\"}", true),
             ],
         ]);
     }
@@ -232,7 +246,8 @@ public function testGetClickPositions1()
                 'path' => '/2/clicks/positions',
                 'method' => 'GET',
                 'queryParameters' => json_decode(
-                    "{\"index\":\"index\",\"startDate\":\"1999-09-19\",\"endDate\":\"2001-01-01\",\"tags\":\"tag\"}"
+                    "{\"index\":\"index\",\"startDate\":\"1999-09-19\",\"endDate\":\"2001-01-01\",\"tags\":\"tag\"}",
+                    true
                 ),
             ],
         ]);
@@ -251,7 +266,7 @@ public function testGetClickThroughRate0()
             [
                 'path' => '/2/clicks/clickThroughRate',
                 'method' => 'GET',
-                'queryParameters' => json_decode("{\"index\":\"index\"}"),
+                'queryParameters' => json_decode("{\"index\":\"index\"}", true),
             ],
         ]);
     }
@@ -275,7 +290,8 @@ public function testGetClickThroughRate1()
                 'path' => '/2/clicks/clickThroughRate',
                 'method' => 'GET',
                 'queryParameters' => json_decode(
-                    "{\"index\":\"index\",\"startDate\":\"1999-09-19\",\"endDate\":\"2001-01-01\",\"tags\":\"tag\"}"
+                    "{\"index\":\"index\",\"startDate\":\"1999-09-19\",\"endDate\":\"2001-01-01\",\"tags\":\"tag\"}",
+                    true
                 ),
             ],
         ]);
@@ -294,7 +310,7 @@ public function testGetConversationRate0()
             [
                 'path' => '/2/conversions/conversionRate',
                 'method' => 'GET',
-                'queryParameters' => json_decode("{\"index\":\"index\"}"),
+                'queryParameters' => json_decode("{\"index\":\"index\"}", true),
             ],
         ]);
     }
@@ -318,7 +334,8 @@ public function testGetConversationRate1()
                 'path' => '/2/conversions/conversionRate',
                 'method' => 'GET',
                 'queryParameters' => json_decode(
-                    "{\"index\":\"index\",\"startDate\":\"1999-09-19\",\"endDate\":\"2001-01-01\",\"tags\":\"tag\"}"
+                    "{\"index\":\"index\",\"startDate\":\"1999-09-19\",\"endDate\":\"2001-01-01\",\"tags\":\"tag\"}",
+                    true
                 ),
             ],
         ]);
@@ -337,7 +354,7 @@ public function testGetNoClickRate0()
             [
                 'path' => '/2/searches/noClickRate',
                 'method' => 'GET',
-                'queryParameters' => json_decode("{\"index\":\"index\"}"),
+                'queryParameters' => json_decode("{\"index\":\"index\"}", true),
             ],
         ]);
     }
@@ -361,7 +378,8 @@ public function testGetNoClickRate1()
                 'path' => '/2/searches/noClickRate',
                 'method' => 'GET',
                 'queryParameters' => json_decode(
-                    "{\"index\":\"index\",\"startDate\":\"1999-09-19\",\"endDate\":\"2001-01-01\",\"tags\":\"tag\"}"
+                    "{\"index\":\"index\",\"startDate\":\"1999-09-19\",\"endDate\":\"2001-01-01\",\"tags\":\"tag\"}",
+                    true
                 ),
             ],
         ]);
@@ -380,7 +398,7 @@ public function testGetNoResultsRate0()
             [
                 'path' => '/2/searches/noResultRate',
                 'method' => 'GET',
-                'queryParameters' => json_decode("{\"index\":\"index\"}"),
+                'queryParameters' => json_decode("{\"index\":\"index\"}", true),
             ],
         ]);
     }
@@ -404,7 +422,8 @@ public function testGetNoResultsRate1()
                 'path' => '/2/searches/noResultRate',
                 'method' => 'GET',
                 'queryParameters' => json_decode(
-                    "{\"index\":\"index\",\"startDate\":\"1999-09-19\",\"endDate\":\"2001-01-01\",\"tags\":\"tag\"}"
+                    "{\"index\":\"index\",\"startDate\":\"1999-09-19\",\"endDate\":\"2001-01-01\",\"tags\":\"tag\"}",
+                    true
                 ),
             ],
         ]);
@@ -423,7 +442,7 @@ public function testGetSearchesCount0()
             [
                 'path' => '/2/searches/count',
                 'method' => 'GET',
-                'queryParameters' => json_decode("{\"index\":\"index\"}"),
+                'queryParameters' => json_decode("{\"index\":\"index\"}", true),
             ],
         ]);
     }
@@ -447,7 +466,8 @@ public function testGetSearchesCount1()
                 'path' => '/2/searches/count',
                 'method' => 'GET',
                 'queryParameters' => json_decode(
-                    "{\"index\":\"index\",\"startDate\":\"1999-09-19\",\"endDate\":\"2001-01-01\",\"tags\":\"tag\"}"
+                    "{\"index\":\"index\",\"startDate\":\"1999-09-19\",\"endDate\":\"2001-01-01\",\"tags\":\"tag\"}",
+                    true
                 ),
             ],
         ]);
@@ -466,7 +486,7 @@ public function testGetSearchesNoClicks0()
             [
                 'path' => '/2/searches/noClicks',
                 'method' => 'GET',
-                'queryParameters' => json_decode("{\"index\":\"index\"}"),
+                'queryParameters' => json_decode("{\"index\":\"index\"}", true),
             ],
         ]);
     }
@@ -492,7 +512,8 @@ public function testGetSearchesNoClicks1()
                 'path' => '/2/searches/noClicks',
                 'method' => 'GET',
                 'queryParameters' => json_decode(
-                    "{\"index\":\"index\",\"startDate\":\"1999-09-19\",\"endDate\":\"2001-01-01\",\"limit\":\"21\",\"offset\":\"42\",\"tags\":\"tag\"}"
+                    "{\"index\":\"index\",\"startDate\":\"1999-09-19\",\"endDate\":\"2001-01-01\",\"limit\":\"21\",\"offset\":\"42\",\"tags\":\"tag\"}",
+                    true
                 ),
             ],
         ]);
@@ -511,7 +532,7 @@ public function testGetSearchesNoResults0()
             [
                 'path' => '/2/searches/noResults',
                 'method' => 'GET',
-                'queryParameters' => json_decode("{\"index\":\"index\"}"),
+                'queryParameters' => json_decode("{\"index\":\"index\"}", true),
             ],
         ]);
     }
@@ -537,7 +558,8 @@ public function testGetSearchesNoResults1()
                 'path' => '/2/searches/noResults',
                 'method' => 'GET',
                 'queryParameters' => json_decode(
-                    "{\"index\":\"index\",\"startDate\":\"1999-09-19\",\"endDate\":\"2001-01-01\",\"limit\":\"21\",\"offset\":\"42\",\"tags\":\"tag\"}"
+                    "{\"index\":\"index\",\"startDate\":\"1999-09-19\",\"endDate\":\"2001-01-01\",\"limit\":\"21\",\"offset\":\"42\",\"tags\":\"tag\"}",
+                    true
                 ),
             ],
         ]);
@@ -556,7 +578,7 @@ public function testGetStatus0()
             [
                 'path' => '/2/status',
                 'method' => 'GET',
-                'queryParameters' => json_decode("{\"index\":\"index\"}"),
+                'queryParameters' => json_decode("{\"index\":\"index\"}", true),
             ],
         ]);
     }
@@ -574,7 +596,7 @@ public function testGetTopCountries0()
             [
                 'path' => '/2/countries',
                 'method' => 'GET',
-                'queryParameters' => json_decode("{\"index\":\"index\"}"),
+                'queryParameters' => json_decode("{\"index\":\"index\"}", true),
             ],
         ]);
     }
@@ -600,7 +622,8 @@ public function testGetTopCountries1()
                 'path' => '/2/countries',
                 'method' => 'GET',
                 'queryParameters' => json_decode(
-                    "{\"index\":\"index\",\"startDate\":\"1999-09-19\",\"endDate\":\"2001-01-01\",\"limit\":\"21\",\"offset\":\"42\",\"tags\":\"tag\"}"
+                    "{\"index\":\"index\",\"startDate\":\"1999-09-19\",\"endDate\":\"2001-01-01\",\"limit\":\"21\",\"offset\":\"42\",\"tags\":\"tag\"}",
+                    true
                 ),
             ],
         ]);
@@ -619,7 +642,7 @@ public function testGetTopFilterAttributes0()
             [
                 'path' => '/2/filters',
                 'method' => 'GET',
-                'queryParameters' => json_decode("{\"index\":\"index\"}"),
+                'queryParameters' => json_decode("{\"index\":\"index\"}", true),
             ],
         ]);
     }
@@ -646,7 +669,8 @@ public function testGetTopFilterAttributes1()
                 'path' => '/2/filters',
                 'method' => 'GET',
                 'queryParameters' => json_decode(
-                    "{\"index\":\"index\",\"search\":\"mySearch\",\"startDate\":\"1999-09-19\",\"endDate\":\"2001-01-01\",\"limit\":\"21\",\"offset\":\"42\",\"tags\":\"tag\"}"
+                    "{\"index\":\"index\",\"search\":\"mySearch\",\"startDate\":\"1999-09-19\",\"endDate\":\"2001-01-01\",\"limit\":\"21\",\"offset\":\"42\",\"tags\":\"tag\"}",
+                    true
                 ),
             ],
         ]);
@@ -668,7 +692,7 @@ public function testGetTopFilterForAttribute0()
             [
                 'path' => '/2/filters/myAttribute',
                 'method' => 'GET',
-                'queryParameters' => json_decode("{\"index\":\"index\"}"),
+                'queryParameters' => json_decode("{\"index\":\"index\"}", true),
             ],
         ]);
     }
@@ -689,7 +713,7 @@ public function testGetTopFilterForAttribute1()
             [
                 'path' => '/2/filters/myAttribute1%2CmyAttribute2',
                 'method' => 'GET',
-                'queryParameters' => json_decode("{\"index\":\"index\"}"),
+                'queryParameters' => json_decode("{\"index\":\"index\"}", true),
             ],
         ]);
     }
@@ -717,7 +741,8 @@ public function testGetTopFilterForAttribute2()
                 'path' => '/2/filters/myAttribute',
                 'method' => 'GET',
                 'queryParameters' => json_decode(
-                    "{\"index\":\"index\",\"search\":\"mySearch\",\"startDate\":\"1999-09-19\",\"endDate\":\"2001-01-01\",\"limit\":\"21\",\"offset\":\"42\",\"tags\":\"tag\"}"
+                    "{\"index\":\"index\",\"search\":\"mySearch\",\"startDate\":\"1999-09-19\",\"endDate\":\"2001-01-01\",\"limit\":\"21\",\"offset\":\"42\",\"tags\":\"tag\"}",
+                    true
                 ),
             ],
         ]);
@@ -746,7 +771,8 @@ public function testGetTopFilterForAttribute3()
                 'path' => '/2/filters/myAttribute1%2CmyAttribute2',
                 'method' => 'GET',
                 'queryParameters' => json_decode(
-                    "{\"index\":\"index\",\"search\":\"mySearch\",\"startDate\":\"1999-09-19\",\"endDate\":\"2001-01-01\",\"limit\":\"21\",\"offset\":\"42\",\"tags\":\"tag\"}"
+                    "{\"index\":\"index\",\"search\":\"mySearch\",\"startDate\":\"1999-09-19\",\"endDate\":\"2001-01-01\",\"limit\":\"21\",\"offset\":\"42\",\"tags\":\"tag\"}",
+                    true
                 ),
             ],
         ]);
@@ -765,7 +791,7 @@ public function testGetTopFiltersNoResults0()
             [
                 'path' => '/2/filters/noResults',
                 'method' => 'GET',
-                'queryParameters' => json_decode("{\"index\":\"index\"}"),
+                'queryParameters' => json_decode("{\"index\":\"index\"}", true),
             ],
         ]);
     }
@@ -792,7 +818,8 @@ public function testGetTopFiltersNoResults1()
                 'path' => '/2/filters/noResults',
                 'method' => 'GET',
                 'queryParameters' => json_decode(
-                    "{\"index\":\"index\",\"search\":\"mySearch\",\"startDate\":\"1999-09-19\",\"endDate\":\"2001-01-01\",\"limit\":\"21\",\"offset\":\"42\",\"tags\":\"tag\"}"
+                    "{\"index\":\"index\",\"search\":\"mySearch\",\"startDate\":\"1999-09-19\",\"endDate\":\"2001-01-01\",\"limit\":\"21\",\"offset\":\"42\",\"tags\":\"tag\"}",
+                    true
                 ),
             ],
         ]);
@@ -811,7 +838,7 @@ public function testGetTopHits0()
             [
                 'path' => '/2/hits',
                 'method' => 'GET',
-                'queryParameters' => json_decode("{\"index\":\"index\"}"),
+                'queryParameters' => json_decode("{\"index\":\"index\"}", true),
             ],
         ]);
     }
@@ -839,7 +866,8 @@ public function testGetTopHits1()
                 'path' => '/2/hits',
                 'method' => 'GET',
                 'queryParameters' => json_decode(
-                    "{\"index\":\"index\",\"search\":\"mySearch\",\"clickAnalytics\":\"true\",\"startDate\":\"1999-09-19\",\"endDate\":\"2001-01-01\",\"limit\":\"21\",\"offset\":\"42\",\"tags\":\"tag\"}"
+                    "{\"index\":\"index\",\"search\":\"mySearch\",\"clickAnalytics\":\"true\",\"startDate\":\"1999-09-19\",\"endDate\":\"2001-01-01\",\"limit\":\"21\",\"offset\":\"42\",\"tags\":\"tag\"}",
+                    true
                 ),
             ],
         ]);
@@ -858,7 +886,7 @@ public function testGetTopSearches0()
             [
                 'path' => '/2/searches',
                 'method' => 'GET',
-                'queryParameters' => json_decode("{\"index\":\"index\"}"),
+                'queryParameters' => json_decode("{\"index\":\"index\"}", true),
             ],
         ]);
     }
@@ -887,7 +915,8 @@ public function testGetTopSearches1()
                 'path' => '/2/searches',
                 'method' => 'GET',
                 'queryParameters' => json_decode(
-                    "{\"index\":\"index\",\"clickAnalytics\":\"true\",\"startDate\":\"1999-09-19\",\"endDate\":\"2001-01-01\",\"orderBy\":\"searchCount\",\"direction\":\"asc\",\"limit\":\"21\",\"offset\":\"42\",\"tags\":\"tag\"}"
+                    "{\"index\":\"index\",\"clickAnalytics\":\"true\",\"startDate\":\"1999-09-19\",\"endDate\":\"2001-01-01\",\"orderBy\":\"searchCount\",\"direction\":\"asc\",\"limit\":\"21\",\"offset\":\"42\",\"tags\":\"tag\"}",
+                    true
                 ),
             ],
         ]);
@@ -906,7 +935,7 @@ public function testGetUsersCount0()
             [
                 'path' => '/2/users/count',
                 'method' => 'GET',
-                'queryParameters' => json_decode("{\"index\":\"index\"}"),
+                'queryParameters' => json_decode("{\"index\":\"index\"}", true),
             ],
         ]);
     }
@@ -930,7 +959,8 @@ public function testGetUsersCount1()
                 'path' => '/2/users/count',
                 'method' => 'GET',
                 'queryParameters' => json_decode(
-                    "{\"index\":\"index\",\"startDate\":\"1999-09-19\",\"endDate\":\"2001-01-01\",\"tags\":\"tag\"}"
+                    "{\"index\":\"index\",\"startDate\":\"1999-09-19\",\"endDate\":\"2001-01-01\",\"tags\":\"tag\"}",
+                    true
                 ),
             ],
         ]);
@@ -971,7 +1001,10 @@ public function testPost1()
                 'path' => '/1/test/all',
                 'method' => 'POST',
                 'body' => json_decode("{\"body\":\"parameters\"}"),
-                'queryParameters' => json_decode("{\"query\":\"parameters\"}"),
+                'queryParameters' => json_decode(
+                    "{\"query\":\"parameters\"}",
+                    true
+                ),
             ],
         ]);
     }
@@ -1011,7 +1044,10 @@ public function testPut1()
                 'path' => '/1/test/all',
                 'method' => 'PUT',
                 'body' => json_decode("{\"body\":\"parameters\"}"),
-                'queryParameters' => json_decode("{\"query\":\"parameters\"}"),
+                'queryParameters' => json_decode(
+                    "{\"query\":\"parameters\"}",
+                    true
+                ),
             ],
         ]);
     }
diff --git a/tests/output/php/src/methods/requests/InsightsTest.php b/tests/output/php/src/methods/requests/InsightsTest.php
index 902a1222a7..3dc55e4587 100644
--- a/tests/output/php/src/methods/requests/InsightsTest.php
+++ b/tests/output/php/src/methods/requests/InsightsTest.php
@@ -48,6 +48,13 @@ protected function assertRequests(array $requests)
                     $recordedRequest->getBody()->getContents()
                 );
             }
+
+            if (isset($request['queryParameters'])) {
+                $this->assertEquals(
+                    \GuzzleHttp\Psr7\Query::build($request['queryParameters']),
+                    $recordedRequest->getUri()->getQuery()
+                );
+            }
         }
     }
 
@@ -109,7 +116,10 @@ public function testDel1()
             [
                 'path' => '/1/test/all',
                 'method' => 'DELETE',
-                'queryParameters' => json_decode("{\"query\":\"parameters\"}"),
+                'queryParameters' => json_decode(
+                    "{\"query\":\"parameters\"}",
+                    true
+                ),
             ],
         ]);
     }
@@ -147,7 +157,10 @@ public function testGet1()
             [
                 'path' => '/1/test/all',
                 'method' => 'GET',
-                'queryParameters' => json_decode("{\"query\":\"parameters\"}"),
+                'queryParameters' => json_decode(
+                    "{\"query\":\"parameters\"}",
+                    true
+                ),
             ],
         ]);
     }
@@ -187,7 +200,10 @@ public function testPost1()
                 'path' => '/1/test/all',
                 'method' => 'POST',
                 'body' => json_decode("{\"body\":\"parameters\"}"),
-                'queryParameters' => json_decode("{\"query\":\"parameters\"}"),
+                'queryParameters' => json_decode(
+                    "{\"query\":\"parameters\"}",
+                    true
+                ),
             ],
         ]);
     }
@@ -279,7 +295,10 @@ public function testPut1()
                 'path' => '/1/test/all',
                 'method' => 'PUT',
                 'body' => json_decode("{\"body\":\"parameters\"}"),
-                'queryParameters' => json_decode("{\"query\":\"parameters\"}"),
+                'queryParameters' => json_decode(
+                    "{\"query\":\"parameters\"}",
+                    true
+                ),
             ],
         ]);
     }
diff --git a/tests/output/php/src/methods/requests/PersonalizationTest.php b/tests/output/php/src/methods/requests/PersonalizationTest.php
index 6d5c699a17..2ea5a95165 100644
--- a/tests/output/php/src/methods/requests/PersonalizationTest.php
+++ b/tests/output/php/src/methods/requests/PersonalizationTest.php
@@ -48,6 +48,13 @@ protected function assertRequests(array $requests)
                     $recordedRequest->getBody()->getContents()
                 );
             }
+
+            if (isset($request['queryParameters'])) {
+                $this->assertEquals(
+                    \GuzzleHttp\Psr7\Query::build($request['queryParameters']),
+                    $recordedRequest->getUri()->getQuery()
+                );
+            }
         }
     }
 
@@ -109,7 +116,10 @@ public function testDel1()
             [
                 'path' => '/1/test/all',
                 'method' => 'DELETE',
-                'queryParameters' => json_decode("{\"query\":\"parameters\"}"),
+                'queryParameters' => json_decode(
+                    "{\"query\":\"parameters\"}",
+                    true
+                ),
             ],
         ]);
     }
@@ -164,7 +174,10 @@ public function testGet1()
             [
                 'path' => '/1/test/all',
                 'method' => 'GET',
-                'queryParameters' => json_decode("{\"query\":\"parameters\"}"),
+                'queryParameters' => json_decode(
+                    "{\"query\":\"parameters\"}",
+                    true
+                ),
             ],
         ]);
     }
@@ -238,7 +251,10 @@ public function testPost1()
                 'path' => '/1/test/all',
                 'method' => 'POST',
                 'body' => json_decode("{\"body\":\"parameters\"}"),
-                'queryParameters' => json_decode("{\"query\":\"parameters\"}"),
+                'queryParameters' => json_decode(
+                    "{\"query\":\"parameters\"}",
+                    true
+                ),
             ],
         ]);
     }
@@ -278,7 +294,10 @@ public function testPut1()
                 'path' => '/1/test/all',
                 'method' => 'PUT',
                 'body' => json_decode("{\"body\":\"parameters\"}"),
-                'queryParameters' => json_decode("{\"query\":\"parameters\"}"),
+                'queryParameters' => json_decode(
+                    "{\"query\":\"parameters\"}",
+                    true
+                ),
             ],
         ]);
     }
diff --git a/tests/output/php/src/methods/requests/QuerySuggestionsTest.php b/tests/output/php/src/methods/requests/QuerySuggestionsTest.php
index fbcf126a06..8b4e792d28 100644
--- a/tests/output/php/src/methods/requests/QuerySuggestionsTest.php
+++ b/tests/output/php/src/methods/requests/QuerySuggestionsTest.php
@@ -48,6 +48,13 @@ protected function assertRequests(array $requests)
                     $recordedRequest->getBody()->getContents()
                 );
             }
+
+            if (isset($request['queryParameters'])) {
+                $this->assertEquals(
+                    \GuzzleHttp\Psr7\Query::build($request['queryParameters']),
+                    $recordedRequest->getUri()->getQuery()
+                );
+            }
         }
     }
 
@@ -140,7 +147,10 @@ public function testDel1()
             [
                 'path' => '/1/test/all',
                 'method' => 'DELETE',
-                'queryParameters' => json_decode("{\"query\":\"parameters\"}"),
+                'queryParameters' => json_decode(
+                    "{\"query\":\"parameters\"}",
+                    true
+                ),
             ],
         ]);
     }
@@ -195,7 +205,10 @@ public function testGet1()
             [
                 'path' => '/1/test/all',
                 'method' => 'GET',
-                'queryParameters' => json_decode("{\"query\":\"parameters\"}"),
+                'queryParameters' => json_decode(
+                    "{\"query\":\"parameters\"}",
+                    true
+                ),
             ],
         ]);
     }
@@ -303,7 +316,10 @@ public function testPost1()
                 'path' => '/1/test/all',
                 'method' => 'POST',
                 'body' => json_decode("{\"body\":\"parameters\"}"),
-                'queryParameters' => json_decode("{\"query\":\"parameters\"}"),
+                'queryParameters' => json_decode(
+                    "{\"query\":\"parameters\"}",
+                    true
+                ),
             ],
         ]);
     }
@@ -343,7 +359,10 @@ public function testPut1()
                 'path' => '/1/test/all',
                 'method' => 'PUT',
                 'body' => json_decode("{\"body\":\"parameters\"}"),
-                'queryParameters' => json_decode("{\"query\":\"parameters\"}"),
+                'queryParameters' => json_decode(
+                    "{\"query\":\"parameters\"}",
+                    true
+                ),
             ],
         ]);
     }
diff --git a/tests/output/php/src/methods/requests/RecommendTest.php b/tests/output/php/src/methods/requests/RecommendTest.php
index de9da5cc6e..c7bc1fbab6 100644
--- a/tests/output/php/src/methods/requests/RecommendTest.php
+++ b/tests/output/php/src/methods/requests/RecommendTest.php
@@ -48,6 +48,13 @@ protected function assertRequests(array $requests)
                     $recordedRequest->getBody()->getContents()
                 );
             }
+
+            if (isset($request['queryParameters'])) {
+                $this->assertEquals(
+                    \GuzzleHttp\Psr7\Query::build($request['queryParameters']),
+                    $recordedRequest->getUri()->getQuery()
+                );
+            }
         }
     }
 
@@ -109,7 +116,10 @@ public function testDel1()
             [
                 'path' => '/1/test/all',
                 'method' => 'DELETE',
-                'queryParameters' => json_decode("{\"query\":\"parameters\"}"),
+                'queryParameters' => json_decode(
+                    "{\"query\":\"parameters\"}",
+                    true
+                ),
             ],
         ]);
     }
@@ -147,7 +157,10 @@ public function testGet1()
             [
                 'path' => '/1/test/all',
                 'method' => 'GET',
-                'queryParameters' => json_decode("{\"query\":\"parameters\"}"),
+                'queryParameters' => json_decode(
+                    "{\"query\":\"parameters\"}",
+                    true
+                ),
             ],
         ]);
     }
@@ -440,7 +453,10 @@ public function testPost1()
                 'path' => '/1/test/all',
                 'method' => 'POST',
                 'body' => json_decode("{\"body\":\"parameters\"}"),
-                'queryParameters' => json_decode("{\"query\":\"parameters\"}"),
+                'queryParameters' => json_decode(
+                    "{\"query\":\"parameters\"}",
+                    true
+                ),
             ],
         ]);
     }
@@ -480,7 +496,10 @@ public function testPut1()
                 'path' => '/1/test/all',
                 'method' => 'PUT',
                 'body' => json_decode("{\"body\":\"parameters\"}"),
-                'queryParameters' => json_decode("{\"query\":\"parameters\"}"),
+                'queryParameters' => json_decode(
+                    "{\"query\":\"parameters\"}",
+                    true
+                ),
             ],
         ]);
     }
diff --git a/tests/output/php/src/methods/requests/SearchTest.php b/tests/output/php/src/methods/requests/SearchTest.php
index a1b06115f3..d4848c8622 100644
--- a/tests/output/php/src/methods/requests/SearchTest.php
+++ b/tests/output/php/src/methods/requests/SearchTest.php
@@ -48,6 +48,13 @@ protected function assertRequests(array $requests)
                     $recordedRequest->getBody()->getContents()
                 );
             }
+
+            if (isset($request['queryParameters'])) {
+                $this->assertEquals(
+                    \GuzzleHttp\Psr7\Query::build($request['queryParameters']),
+                    $recordedRequest->getUri()->getQuery()
+                );
+            }
         }
     }
 
@@ -164,9 +171,6 @@ public function testAssignUserId0()
                 'path' => '/1/clusters/mapping',
                 'method' => 'POST',
                 'body' => json_decode("{\"cluster\":\"theCluster\"}"),
-                'queryParameters' => json_decode(
-                    "{\"X-Algolia-User-ID\":\"userID\"}"
-                ),
             ],
         ]);
     }
@@ -217,9 +221,6 @@ public function testBatchAssignUserIds0()
                 'body' => json_decode(
                     "{\"cluster\":\"theCluster\",\"users\":[\"user1\",\"user2\"]}"
                 ),
-                'queryParameters' => json_decode(
-                    "{\"X-Algolia-User-ID\":\"userID\"}"
-                ),
             ],
         ]);
     }
@@ -349,7 +350,8 @@ public function testBatchRules0()
                     "[{\"objectID\":\"a-rule-id\",\"conditions\":[{\"pattern\":\"smartphone\",\"anchoring\":\"contains\"}],\"consequence\":{\"params\":{\"filters\":\"category:smartphone\"}}},{\"objectID\":\"a-second-rule-id\",\"conditions\":[{\"pattern\":\"apple\",\"anchoring\":\"contains\"}],\"consequence\":{\"params\":{\"filters\":\"brand:apple\"}}}]"
                 ),
                 'queryParameters' => json_decode(
-                    "{\"forwardToReplicas\":\"true\",\"clearExistingRules\":\"true\"}"
+                    "{\"forwardToReplicas\":\"true\",\"clearExistingRules\":\"true\"}",
+                    true
                 ),
             ],
         ]);
@@ -479,7 +481,10 @@ public function testDel1()
             [
                 'path' => '/1/test/all',
                 'method' => 'DELETE',
-                'queryParameters' => json_decode("{\"query\":\"parameters\"}"),
+                'queryParameters' => json_decode(
+                    "{\"query\":\"parameters\"}",
+                    true
+                ),
             ],
         ]);
     }
@@ -649,7 +654,10 @@ public function testGet1()
             [
                 'path' => '/1/test/all',
                 'method' => 'GET',
-                'queryParameters' => json_decode("{\"query\":\"parameters\"}"),
+                'queryParameters' => json_decode(
+                    "{\"query\":\"parameters\"}",
+                    true
+                ),
             ],
         ]);
     }
@@ -724,7 +732,8 @@ public function testGetLogs0()
                 'path' => '/1/logs',
                 'method' => 'GET',
                 'queryParameters' => json_decode(
-                    "{\"offset\":\"5\",\"length\":\"10\",\"indexName\":\"theIndexName\",\"type\":\"all\"}"
+                    "{\"offset\":\"5\",\"length\":\"10\",\"indexName\":\"theIndexName\",\"type\":\"all\"}",
+                    true
                 ),
             ],
         ]);
@@ -748,7 +757,8 @@ public function testGetObject0()
                 'path' => '/1/indexes/theIndexName/uniqueID',
                 'method' => 'GET',
                 'queryParameters' => json_decode(
-                    "{\"attributesToRetrieve\":\"attr1,attr2\"}"
+                    "{\"attributesToRetrieve\":\"attr1,attr2\"}",
+                    true
                 ),
             ],
         ]);
@@ -923,7 +933,10 @@ public function testHasPendingMappings0()
             [
                 'path' => '/1/clusters/mapping/pending',
                 'method' => 'GET',
-                'queryParameters' => json_decode("{\"getClusters\":\"true\"}"),
+                'queryParameters' => json_decode(
+                    "{\"getClusters\":\"true\"}",
+                    true
+                ),
             ],
         ]);
     }
@@ -975,7 +988,7 @@ public function testListIndices0()
             [
                 'path' => '/1/indexes',
                 'method' => 'GET',
-                'queryParameters' => json_decode("{\"page\":\"8\"}"),
+                'queryParameters' => json_decode("{\"page\":\"8\"}", true),
             ],
         ]);
     }
@@ -997,7 +1010,8 @@ public function testListUserIds0()
                 'path' => '/1/clusters/mapping',
                 'method' => 'GET',
                 'queryParameters' => json_decode(
-                    "{\"page\":\"8\",\"hitsPerPage\":\"100\"}"
+                    "{\"page\":\"8\",\"hitsPerPage\":\"100\"}",
+                    true
                 ),
             ],
         ]);
@@ -1146,7 +1160,8 @@ public function testPartialUpdateObject0()
                     "[{\"id1\":\"test\",\"id2\":{\"_operation\":\"AddUnique\",\"value\":\"test2\"}}]"
                 ),
                 'queryParameters' => json_decode(
-                    "{\"createIfNotExists\":\"true\"}"
+                    "{\"createIfNotExists\":\"true\"}",
+                    true
                 ),
             ],
         ]);
@@ -1187,7 +1202,10 @@ public function testPost1()
                 'path' => '/1/test/all',
                 'method' => 'POST',
                 'body' => json_decode("{\"body\":\"parameters\"}"),
-                'queryParameters' => json_decode("{\"query\":\"parameters\"}"),
+                'queryParameters' => json_decode(
+                    "{\"query\":\"parameters\"}",
+                    true
+                ),
             ],
         ]);
     }
@@ -1227,7 +1245,10 @@ public function testPut1()
                 'path' => '/1/test/all',
                 'method' => 'PUT',
                 'body' => json_decode("{\"body\":\"parameters\"}"),
-                'queryParameters' => json_decode("{\"query\":\"parameters\"}"),
+                'queryParameters' => json_decode(
+                    "{\"query\":\"parameters\"}",
+                    true
+                ),
             ],
         ]);
     }
@@ -1337,7 +1358,8 @@ public function testSaveRule0()
                     "{\"objectID\":\"id1\",\"conditions\":[{\"pattern\":\"apple\",\"anchoring\":\"contains\"}],\"consequence\":{\"params\":{\"filters\":\"brand:apple\"}}}"
                 ),
                 'queryParameters' => json_decode(
-                    "{\"forwardToReplicas\":\"true\"}"
+                    "{\"forwardToReplicas\":\"true\"}",
+                    true
                 ),
             ],
         ]);
@@ -1369,7 +1391,8 @@ public function testSaveSynonym0()
                     "{\"objectID\":\"id1\",\"type\":\"synonym\",\"synonyms\":[\"car\",\"vehicule\",\"auto\"]}"
                 ),
                 'queryParameters' => json_decode(
-                    "{\"forwardToReplicas\":\"true\"}"
+                    "{\"forwardToReplicas\":\"true\"}",
+                    true
                 ),
             ],
         ]);
@@ -1410,7 +1433,8 @@ public function testSaveSynonyms0()
                     "[{\"objectID\":\"id1\",\"type\":\"synonym\",\"synonyms\":[\"car\",\"vehicule\",\"auto\"]},{\"objectID\":\"id2\",\"type\":\"onewaysynonym\",\"input\":\"iphone\",\"synonyms\":[\"ephone\",\"aphone\",\"yphone\"]}]"
                 ),
                 'queryParameters' => json_decode(
-                    "{\"forwardToReplicas\":\"true\",\"replaceExistingSynonyms\":\"false\"}"
+                    "{\"forwardToReplicas\":\"true\",\"replaceExistingSynonyms\":\"false\"}",
+                    true
                 ),
             ],
         ]);
@@ -1689,7 +1713,8 @@ public function testSetSettings0()
                 'method' => 'PUT',
                 'body' => json_decode("{\"paginationLimitedTo\":10}"),
                 'queryParameters' => json_decode(
-                    "{\"forwardToReplicas\":\"true\"}"
+                    "{\"forwardToReplicas\":\"true\"}",
+                    true
                 ),
             ],
         ]);

From 5b4661bb42e61b8eb1be736e773048cb66ce0632 Mon Sep 17 00:00:00 2001
From: Damien Couchez <damien.couchez@gmail.com>
Date: Fri, 6 May 2022 16:03:01 +0200
Subject: [PATCH 2/8] feat(php): change user-id param type to header

---
 specs/search/common/parameters.yml                      | 5 +++--
 specs/search/paths/multiclusters/batchAssignUserIds.yml | 2 +-
 specs/search/paths/multiclusters/userIds.yml            | 2 +-
 templates/php/api.mustache                              | 5 +++--
 4 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/specs/search/common/parameters.yml b/specs/search/common/parameters.yml
index c86539a4d0..85d5dacbc0 100644
--- a/specs/search/common/parameters.yml
+++ b/specs/search/common/parameters.yml
@@ -8,10 +8,11 @@ HitsPerPage:
     description: Number of hits per page.
     default: 20
 
-UserIDInQuery:
+# headers
+UserIDInHeader:
   name: X-Algolia-User-ID
   description: userID to assign.
-  in: query
+  in: header
   required: true
   schema:
     type: string
diff --git a/specs/search/paths/multiclusters/batchAssignUserIds.yml b/specs/search/paths/multiclusters/batchAssignUserIds.yml
index 5137965c15..9264861c50 100644
--- a/specs/search/paths/multiclusters/batchAssignUserIds.yml
+++ b/specs/search/paths/multiclusters/batchAssignUserIds.yml
@@ -10,7 +10,7 @@ post:
 
     A successful response indicates that the operation has been taken into account, and the userIDs are directly usable.
   parameters:
-    - $ref: '../../common/parameters.yml#/UserIDInQuery'
+    - $ref: '../../common/parameters.yml#/UserIDInHeader'
   requestBody:
     required: true
     content:
diff --git a/specs/search/paths/multiclusters/userIds.yml b/specs/search/paths/multiclusters/userIds.yml
index 144d71a146..179d2527b6 100644
--- a/specs/search/paths/multiclusters/userIds.yml
+++ b/specs/search/paths/multiclusters/userIds.yml
@@ -12,7 +12,7 @@ post:
 
     A successful response indicates that the operation has been taken into account, and the userID is directly usable.
   parameters:
-    - $ref: '../../common/parameters.yml#/UserIDInQuery'
+    - $ref: '../../common/parameters.yml#/UserIDInHeader'
   requestBody:
     required: true
     content:
diff --git a/templates/php/api.mustache b/templates/php/api.mustache
index 883dbb1504..8eafa287cd 100644
--- a/templates/php/api.mustache
+++ b/templates/php/api.mustache
@@ -256,7 +256,9 @@ use {{invokerPackage}}\RetryStrategy\ClusterHosts;
             $httpBody = ${{paramName}};
         } 
         {{/bodyParams}}
-
+        {{#headerParams}}
+            $queryParams['{{baseName}}'] = ${{paramName}};
+        {{/headerParams}}
         {{#servers.0}}
         $operationHosts = [{{#servers}}"{{{url}}}"{{^-last}}, {{/-last}}{{/servers}}];
         if ($this->hostIndex < 0 || $this->hostIndex >= sizeof($operationHosts)) {
@@ -265,7 +267,6 @@ use {{invokerPackage}}\RetryStrategy\ClusterHosts;
         $operationHost = $operationHosts[$this->hostIndex];
 
         {{/servers.0}}
-
         $requestOptions += $queryParams;
 
         return $this->sendRequest('{{httpMethod}}', $resourcePath, $queryParams, $httpBody, $requestOptions);

From d2d7017b36d8df96393463603ccc90497b18f5d1 Mon Sep 17 00:00:00 2001
From: Damien Couchez <damien.couchez@gmail.com>
Date: Fri, 6 May 2022 16:22:30 +0200
Subject: [PATCH 3/8] feat(cts): update java and javascript tests

---
 tests/output/javascript/src/methods/requests/search.test.ts | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/tests/output/javascript/src/methods/requests/search.test.ts b/tests/output/javascript/src/methods/requests/search.test.ts
index adc19503f4..a69515836e 100644
--- a/tests/output/javascript/src/methods/requests/search.test.ts
+++ b/tests/output/javascript/src/methods/requests/search.test.ts
@@ -72,7 +72,7 @@ describe('assignUserId', () => {
     expect(req.path).toEqual('/1/clusters/mapping');
     expect(req.method).toEqual('POST');
     expect(req.data).toEqual({ cluster: 'theCluster' });
-    expect(req.searchParams).toStrictEqual({ 'X-Algolia-User-ID': 'userID' });
+    expect(req.searchParams).toStrictEqual(undefined);
   });
 });
 
@@ -110,7 +110,7 @@ describe('batchAssignUserIds', () => {
       cluster: 'theCluster',
       users: ['user1', 'user2'],
     });
-    expect(req.searchParams).toStrictEqual({ 'X-Algolia-User-ID': 'userID' });
+    expect(req.searchParams).toStrictEqual(undefined);
   });
 });
 

From 3797c21f9818bc007fa0ae1d052e9adea1c8bd71 Mon Sep 17 00:00:00 2001
From: Damien Couchez <damien.couchez@gmail.com>
Date: Mon, 9 May 2022 14:11:08 +0200
Subject: [PATCH 4/8] feat(js): add condition for headers

---
 templates/javascript/api-single.mustache | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/templates/javascript/api-single.mustache b/templates/javascript/api-single.mustache
index dc627909d1..84c6e0b2c5 100644
--- a/templates/javascript/api-single.mustache
+++ b/templates/javascript/api-single.mustache
@@ -175,7 +175,9 @@ export function create{{capitalizedApiName}}(options: CreateClientOptions{{#hasR
       {{/queryParams}}{{/vendorExtensions.x-is-custom-request}}
 
       {{#headerParams}}
-      headers['{{baseName}}'] = {{paramName}};
+      if ({{paramName}} !== undefined) {
+        headers['{{baseName}}'] = {{paramName}};
+      }
       {{/headerParams}}
 
       const request: Request = {

From 1ca1d34dd6305ba1894131b91aa6c235777f3c63 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Cl=C3=A9ment=20Vannicatte?= <vannicattec@gmail.com>
Date: Tue, 10 May 2022 16:46:07 +0200
Subject: [PATCH 5/8] regen to make sure

---
 .../algolia/methods/requests/search.test.java | 20 -------------------
 1 file changed, 20 deletions(-)

diff --git a/tests/output/java/src/test/java/com/algolia/methods/requests/search.test.java b/tests/output/java/src/test/java/com/algolia/methods/requests/search.test.java
index 73d688edd7..5ce92e0976 100644
--- a/tests/output/java/src/test/java/com/algolia/methods/requests/search.test.java
+++ b/tests/output/java/src/test/java/com/algolia/methods/requests/search.test.java
@@ -148,16 +148,6 @@ void assignUserIdTest0() {
         JSONCompareMode.STRICT_ORDER
       );
     });
-
-    Map<String, String> expectedQuery = JSON.deserialize(
-      "{\"X-Algolia-User-ID\":\"userID\"}",
-      new TypeToken<HashMap<String, String>>() {}.getType()
-    );
-    Map<String, String> actualQuery = req.getQueryParams();
-    assertEquals(expectedQuery.size(), actualQuery.size());
-    for (Map.Entry<String, String> p : actualQuery.entrySet()) {
-      assertEquals(expectedQuery.get(p.getKey()), p.getValue());
-    }
   }
 
   @Test
@@ -237,16 +227,6 @@ void batchAssignUserIdsTest0() {
         JSONCompareMode.STRICT_ORDER
       );
     });
-
-    Map<String, String> expectedQuery = JSON.deserialize(
-      "{\"X-Algolia-User-ID\":\"userID\"}",
-      new TypeToken<HashMap<String, String>>() {}.getType()
-    );
-    Map<String, String> actualQuery = req.getQueryParams();
-    assertEquals(expectedQuery.size(), actualQuery.size());
-    for (Map.Entry<String, String> p : actualQuery.entrySet()) {
-      assertEquals(expectedQuery.get(p.getKey()), p.getValue());
-    }
   }
 
   @Test

From 2bac951ad0aea148b27b1ea0ee0c6a122bb20fd4 Mon Sep 17 00:00:00 2001
From: Damien Couchez <damien.couchez@gmail.com>
Date: Wed, 11 May 2022 10:01:34 +0200
Subject: [PATCH 6/8] feat(php): Pierre's review

---
 templates/javascript/api-single.mustache                       | 2 +-
 tests/CTS/methods/requests/templates/php/requests.mustache     | 3 ++-
 tests/output/php/src/methods/requests/AbtestingTest.php        | 3 ++-
 tests/output/php/src/methods/requests/AnalyticsTest.php        | 3 ++-
 tests/output/php/src/methods/requests/InsightsTest.php         | 3 ++-
 tests/output/php/src/methods/requests/PersonalizationTest.php  | 3 ++-
 tests/output/php/src/methods/requests/QuerySuggestionsTest.php | 3 ++-
 tests/output/php/src/methods/requests/RecommendTest.php        | 3 ++-
 tests/output/php/src/methods/requests/SearchTest.php           | 3 ++-
 9 files changed, 17 insertions(+), 9 deletions(-)

diff --git a/templates/javascript/api-single.mustache b/templates/javascript/api-single.mustache
index 84c6e0b2c5..0f88aaa4f4 100644
--- a/templates/javascript/api-single.mustache
+++ b/templates/javascript/api-single.mustache
@@ -176,7 +176,7 @@ export function create{{capitalizedApiName}}(options: CreateClientOptions{{#hasR
 
       {{#headerParams}}
       if ({{paramName}} !== undefined) {
-        headers['{{baseName}}'] = {{paramName}};
+        headers['{{baseName}}'] = {{paramName}}.toString();
       }
       {{/headerParams}}
 
diff --git a/tests/CTS/methods/requests/templates/php/requests.mustache b/tests/CTS/methods/requests/templates/php/requests.mustache
index e351acc2dd..dae33e5d14 100644
--- a/tests/CTS/methods/requests/templates/php/requests.mustache
+++ b/tests/CTS/methods/requests/templates/php/requests.mustache
@@ -8,6 +8,7 @@ use Algolia\AlgoliaSearch\Http\HttpClientInterface;
 use Algolia\AlgoliaSearch\Http\Psr7\Response;
 use Algolia\AlgoliaSearch\RetryStrategy\ApiWrapper;
 use Algolia\AlgoliaSearch\RetryStrategy\ClusterHosts;
+use GuzzleHttp\Psr7\Query;
 use PHPUnit\Framework\TestCase;
 use Psr\Http\Message\RequestInterface;
 
@@ -45,7 +46,7 @@ class {{clientPrefix}}Test extends TestCase implements HttpClientInterface
 
             if (isset($request['queryParameters'])) {
                 $this->assertEquals(
-                    \GuzzleHttp\Psr7\Query::build($request['queryParameters']),
+                    Query::build($request['queryParameters']),
                     $recordedRequest->getUri()->getQuery()
                 );
             }
diff --git a/tests/output/php/src/methods/requests/AbtestingTest.php b/tests/output/php/src/methods/requests/AbtestingTest.php
index 24c128ce2a..78c4fadbf0 100644
--- a/tests/output/php/src/methods/requests/AbtestingTest.php
+++ b/tests/output/php/src/methods/requests/AbtestingTest.php
@@ -8,6 +8,7 @@
 use Algolia\AlgoliaSearch\Http\Psr7\Response;
 use Algolia\AlgoliaSearch\RetryStrategy\ApiWrapper;
 use Algolia\AlgoliaSearch\RetryStrategy\ClusterHosts;
+use GuzzleHttp\Psr7\Query;
 use PHPUnit\Framework\TestCase;
 use Psr\Http\Message\RequestInterface;
 
@@ -51,7 +52,7 @@ protected function assertRequests(array $requests)
 
             if (isset($request['queryParameters'])) {
                 $this->assertEquals(
-                    \GuzzleHttp\Psr7\Query::build($request['queryParameters']),
+                    Query::build($request['queryParameters']),
                     $recordedRequest->getUri()->getQuery()
                 );
             }
diff --git a/tests/output/php/src/methods/requests/AnalyticsTest.php b/tests/output/php/src/methods/requests/AnalyticsTest.php
index bc588bb97e..d53962d271 100644
--- a/tests/output/php/src/methods/requests/AnalyticsTest.php
+++ b/tests/output/php/src/methods/requests/AnalyticsTest.php
@@ -8,6 +8,7 @@
 use Algolia\AlgoliaSearch\Http\Psr7\Response;
 use Algolia\AlgoliaSearch\RetryStrategy\ApiWrapper;
 use Algolia\AlgoliaSearch\RetryStrategy\ClusterHosts;
+use GuzzleHttp\Psr7\Query;
 use PHPUnit\Framework\TestCase;
 use Psr\Http\Message\RequestInterface;
 
@@ -51,7 +52,7 @@ protected function assertRequests(array $requests)
 
             if (isset($request['queryParameters'])) {
                 $this->assertEquals(
-                    \GuzzleHttp\Psr7\Query::build($request['queryParameters']),
+                    Query::build($request['queryParameters']),
                     $recordedRequest->getUri()->getQuery()
                 );
             }
diff --git a/tests/output/php/src/methods/requests/InsightsTest.php b/tests/output/php/src/methods/requests/InsightsTest.php
index 3dc55e4587..2f7e2f5db6 100644
--- a/tests/output/php/src/methods/requests/InsightsTest.php
+++ b/tests/output/php/src/methods/requests/InsightsTest.php
@@ -8,6 +8,7 @@
 use Algolia\AlgoliaSearch\Http\Psr7\Response;
 use Algolia\AlgoliaSearch\RetryStrategy\ApiWrapper;
 use Algolia\AlgoliaSearch\RetryStrategy\ClusterHosts;
+use GuzzleHttp\Psr7\Query;
 use PHPUnit\Framework\TestCase;
 use Psr\Http\Message\RequestInterface;
 
@@ -51,7 +52,7 @@ protected function assertRequests(array $requests)
 
             if (isset($request['queryParameters'])) {
                 $this->assertEquals(
-                    \GuzzleHttp\Psr7\Query::build($request['queryParameters']),
+                    Query::build($request['queryParameters']),
                     $recordedRequest->getUri()->getQuery()
                 );
             }
diff --git a/tests/output/php/src/methods/requests/PersonalizationTest.php b/tests/output/php/src/methods/requests/PersonalizationTest.php
index 2ea5a95165..35a31c340d 100644
--- a/tests/output/php/src/methods/requests/PersonalizationTest.php
+++ b/tests/output/php/src/methods/requests/PersonalizationTest.php
@@ -8,6 +8,7 @@
 use Algolia\AlgoliaSearch\Http\Psr7\Response;
 use Algolia\AlgoliaSearch\RetryStrategy\ApiWrapper;
 use Algolia\AlgoliaSearch\RetryStrategy\ClusterHosts;
+use GuzzleHttp\Psr7\Query;
 use PHPUnit\Framework\TestCase;
 use Psr\Http\Message\RequestInterface;
 
@@ -51,7 +52,7 @@ protected function assertRequests(array $requests)
 
             if (isset($request['queryParameters'])) {
                 $this->assertEquals(
-                    \GuzzleHttp\Psr7\Query::build($request['queryParameters']),
+                    Query::build($request['queryParameters']),
                     $recordedRequest->getUri()->getQuery()
                 );
             }
diff --git a/tests/output/php/src/methods/requests/QuerySuggestionsTest.php b/tests/output/php/src/methods/requests/QuerySuggestionsTest.php
index 8b4e792d28..5cb5350a26 100644
--- a/tests/output/php/src/methods/requests/QuerySuggestionsTest.php
+++ b/tests/output/php/src/methods/requests/QuerySuggestionsTest.php
@@ -8,6 +8,7 @@
 use Algolia\AlgoliaSearch\Http\Psr7\Response;
 use Algolia\AlgoliaSearch\RetryStrategy\ApiWrapper;
 use Algolia\AlgoliaSearch\RetryStrategy\ClusterHosts;
+use GuzzleHttp\Psr7\Query;
 use PHPUnit\Framework\TestCase;
 use Psr\Http\Message\RequestInterface;
 
@@ -51,7 +52,7 @@ protected function assertRequests(array $requests)
 
             if (isset($request['queryParameters'])) {
                 $this->assertEquals(
-                    \GuzzleHttp\Psr7\Query::build($request['queryParameters']),
+                    Query::build($request['queryParameters']),
                     $recordedRequest->getUri()->getQuery()
                 );
             }
diff --git a/tests/output/php/src/methods/requests/RecommendTest.php b/tests/output/php/src/methods/requests/RecommendTest.php
index c7bc1fbab6..c3f6d96116 100644
--- a/tests/output/php/src/methods/requests/RecommendTest.php
+++ b/tests/output/php/src/methods/requests/RecommendTest.php
@@ -8,6 +8,7 @@
 use Algolia\AlgoliaSearch\Http\Psr7\Response;
 use Algolia\AlgoliaSearch\RetryStrategy\ApiWrapper;
 use Algolia\AlgoliaSearch\RetryStrategy\ClusterHosts;
+use GuzzleHttp\Psr7\Query;
 use PHPUnit\Framework\TestCase;
 use Psr\Http\Message\RequestInterface;
 
@@ -51,7 +52,7 @@ protected function assertRequests(array $requests)
 
             if (isset($request['queryParameters'])) {
                 $this->assertEquals(
-                    \GuzzleHttp\Psr7\Query::build($request['queryParameters']),
+                    Query::build($request['queryParameters']),
                     $recordedRequest->getUri()->getQuery()
                 );
             }
diff --git a/tests/output/php/src/methods/requests/SearchTest.php b/tests/output/php/src/methods/requests/SearchTest.php
index d4848c8622..1e63919d93 100644
--- a/tests/output/php/src/methods/requests/SearchTest.php
+++ b/tests/output/php/src/methods/requests/SearchTest.php
@@ -8,6 +8,7 @@
 use Algolia\AlgoliaSearch\Http\Psr7\Response;
 use Algolia\AlgoliaSearch\RetryStrategy\ApiWrapper;
 use Algolia\AlgoliaSearch\RetryStrategy\ClusterHosts;
+use GuzzleHttp\Psr7\Query;
 use PHPUnit\Framework\TestCase;
 use Psr\Http\Message\RequestInterface;
 
@@ -51,7 +52,7 @@ protected function assertRequests(array $requests)
 
             if (isset($request['queryParameters'])) {
                 $this->assertEquals(
-                    \GuzzleHttp\Psr7\Query::build($request['queryParameters']),
+                    Query::build($request['queryParameters']),
                     $recordedRequest->getUri()->getQuery()
                 );
             }

From 2a798daae2141ce0f6954855cb66b7333e974c0a Mon Sep 17 00:00:00 2001
From: Damien Couchez <damien.couchez@gmail.com>
Date: Wed, 11 May 2022 11:35:36 +0200
Subject: [PATCH 7/8] restore


From 350a33eb4951ad06f2b9e3371fb02f15ef80fe2b Mon Sep 17 00:00:00 2001
From: Damien Couchez <damien.couchez@gmail.com>
Date: Wed, 11 May 2022 11:36:03 +0200
Subject: [PATCH 8/8] restore

---
 .../src/methods/requests/search.test.ts       |   4 +-
 .../src/methods/requests/AbtestingTest.php    |  31 +----
 .../src/methods/requests/AnalyticsTest.php    | 115 ++++++------------
 .../php/src/methods/requests/InsightsTest.php |  28 +----
 .../methods/requests/PersonalizationTest.php  |  28 +----
 .../methods/requests/QuerySuggestionsTest.php |  28 +----
 .../src/methods/requests/RecommendTest.php    |  28 +----
 .../php/src/methods/requests/SearchTest.php   |  68 ++++-------
 8 files changed, 83 insertions(+), 247 deletions(-)

diff --git a/tests/output/javascript/src/methods/requests/search.test.ts b/tests/output/javascript/src/methods/requests/search.test.ts
index a69515836e..adc19503f4 100644
--- a/tests/output/javascript/src/methods/requests/search.test.ts
+++ b/tests/output/javascript/src/methods/requests/search.test.ts
@@ -72,7 +72,7 @@ describe('assignUserId', () => {
     expect(req.path).toEqual('/1/clusters/mapping');
     expect(req.method).toEqual('POST');
     expect(req.data).toEqual({ cluster: 'theCluster' });
-    expect(req.searchParams).toStrictEqual(undefined);
+    expect(req.searchParams).toStrictEqual({ 'X-Algolia-User-ID': 'userID' });
   });
 });
 
@@ -110,7 +110,7 @@ describe('batchAssignUserIds', () => {
       cluster: 'theCluster',
       users: ['user1', 'user2'],
     });
-    expect(req.searchParams).toStrictEqual(undefined);
+    expect(req.searchParams).toStrictEqual({ 'X-Algolia-User-ID': 'userID' });
   });
 });
 
diff --git a/tests/output/php/src/methods/requests/AbtestingTest.php b/tests/output/php/src/methods/requests/AbtestingTest.php
index 78c4fadbf0..86fc484000 100644
--- a/tests/output/php/src/methods/requests/AbtestingTest.php
+++ b/tests/output/php/src/methods/requests/AbtestingTest.php
@@ -8,7 +8,6 @@
 use Algolia\AlgoliaSearch\Http\Psr7\Response;
 use Algolia\AlgoliaSearch\RetryStrategy\ApiWrapper;
 use Algolia\AlgoliaSearch\RetryStrategy\ClusterHosts;
-use GuzzleHttp\Psr7\Query;
 use PHPUnit\Framework\TestCase;
 use Psr\Http\Message\RequestInterface;
 
@@ -49,13 +48,6 @@ protected function assertRequests(array $requests)
                     $recordedRequest->getBody()->getContents()
                 );
             }
-
-            if (isset($request['queryParameters'])) {
-                $this->assertEquals(
-                    Query::build($request['queryParameters']),
-                    $recordedRequest->getUri()->getQuery()
-                );
-            }
         }
     }
 
@@ -145,10 +137,7 @@ public function testDel1()
             [
                 'path' => '/1/test/all',
                 'method' => 'DELETE',
-                'queryParameters' => json_decode(
-                    "{\"query\":\"parameters\"}",
-                    true
-                ),
+                'queryParameters' => json_decode("{\"query\":\"parameters\"}"),
             ],
         ]);
     }
@@ -203,10 +192,7 @@ public function testGet1()
             [
                 'path' => '/1/test/all',
                 'method' => 'GET',
-                'queryParameters' => json_decode(
-                    "{\"query\":\"parameters\"}",
-                    true
-                ),
+                'queryParameters' => json_decode("{\"query\":\"parameters\"}"),
             ],
         ]);
     }
@@ -245,8 +231,7 @@ public function testListABTests0()
                 'path' => '/2/abtests',
                 'method' => 'GET',
                 'queryParameters' => json_decode(
-                    "{\"offset\":\"42\",\"limit\":\"21\"}",
-                    true
+                    "{\"offset\":\"42\",\"limit\":\"21\"}"
                 ),
             ],
         ]);
@@ -287,10 +272,7 @@ public function testPost1()
                 'path' => '/1/test/all',
                 'method' => 'POST',
                 'body' => json_decode("{\"body\":\"parameters\"}"),
-                'queryParameters' => json_decode(
-                    "{\"query\":\"parameters\"}",
-                    true
-                ),
+                'queryParameters' => json_decode("{\"query\":\"parameters\"}"),
             ],
         ]);
     }
@@ -330,10 +312,7 @@ public function testPut1()
                 'path' => '/1/test/all',
                 'method' => 'PUT',
                 'body' => json_decode("{\"body\":\"parameters\"}"),
-                'queryParameters' => json_decode(
-                    "{\"query\":\"parameters\"}",
-                    true
-                ),
+                'queryParameters' => json_decode("{\"query\":\"parameters\"}"),
             ],
         ]);
     }
diff --git a/tests/output/php/src/methods/requests/AnalyticsTest.php b/tests/output/php/src/methods/requests/AnalyticsTest.php
index d53962d271..2f08524cae 100644
--- a/tests/output/php/src/methods/requests/AnalyticsTest.php
+++ b/tests/output/php/src/methods/requests/AnalyticsTest.php
@@ -8,7 +8,6 @@
 use Algolia\AlgoliaSearch\Http\Psr7\Response;
 use Algolia\AlgoliaSearch\RetryStrategy\ApiWrapper;
 use Algolia\AlgoliaSearch\RetryStrategy\ClusterHosts;
-use GuzzleHttp\Psr7\Query;
 use PHPUnit\Framework\TestCase;
 use Psr\Http\Message\RequestInterface;
 
@@ -49,13 +48,6 @@ protected function assertRequests(array $requests)
                     $recordedRequest->getBody()->getContents()
                 );
             }
-
-            if (isset($request['queryParameters'])) {
-                $this->assertEquals(
-                    Query::build($request['queryParameters']),
-                    $recordedRequest->getUri()->getQuery()
-                );
-            }
         }
     }
 
@@ -117,10 +109,7 @@ public function testDel1()
             [
                 'path' => '/1/test/all',
                 'method' => 'DELETE',
-                'queryParameters' => json_decode(
-                    "{\"query\":\"parameters\"}",
-                    true
-                ),
+                'queryParameters' => json_decode("{\"query\":\"parameters\"}"),
             ],
         ]);
     }
@@ -158,10 +147,7 @@ public function testGet1()
             [
                 'path' => '/1/test/all',
                 'method' => 'GET',
-                'queryParameters' => json_decode(
-                    "{\"query\":\"parameters\"}",
-                    true
-                ),
+                'queryParameters' => json_decode("{\"query\":\"parameters\"}"),
             ],
         ]);
     }
@@ -179,7 +165,7 @@ public function testGetAverageClickPosition0()
             [
                 'path' => '/2/clicks/averageClickPosition',
                 'method' => 'GET',
-                'queryParameters' => json_decode("{\"index\":\"index\"}", true),
+                'queryParameters' => json_decode("{\"index\":\"index\"}"),
             ],
         ]);
     }
@@ -203,8 +189,7 @@ public function testGetAverageClickPosition1()
                 'path' => '/2/clicks/averageClickPosition',
                 'method' => 'GET',
                 'queryParameters' => json_decode(
-                    "{\"index\":\"index\",\"startDate\":\"1999-09-19\",\"endDate\":\"2001-01-01\",\"tags\":\"tag\"}",
-                    true
+                    "{\"index\":\"index\",\"startDate\":\"1999-09-19\",\"endDate\":\"2001-01-01\",\"tags\":\"tag\"}"
                 ),
             ],
         ]);
@@ -223,7 +208,7 @@ public function testGetClickPositions0()
             [
                 'path' => '/2/clicks/positions',
                 'method' => 'GET',
-                'queryParameters' => json_decode("{\"index\":\"index\"}", true),
+                'queryParameters' => json_decode("{\"index\":\"index\"}"),
             ],
         ]);
     }
@@ -247,8 +232,7 @@ public function testGetClickPositions1()
                 'path' => '/2/clicks/positions',
                 'method' => 'GET',
                 'queryParameters' => json_decode(
-                    "{\"index\":\"index\",\"startDate\":\"1999-09-19\",\"endDate\":\"2001-01-01\",\"tags\":\"tag\"}",
-                    true
+                    "{\"index\":\"index\",\"startDate\":\"1999-09-19\",\"endDate\":\"2001-01-01\",\"tags\":\"tag\"}"
                 ),
             ],
         ]);
@@ -267,7 +251,7 @@ public function testGetClickThroughRate0()
             [
                 'path' => '/2/clicks/clickThroughRate',
                 'method' => 'GET',
-                'queryParameters' => json_decode("{\"index\":\"index\"}", true),
+                'queryParameters' => json_decode("{\"index\":\"index\"}"),
             ],
         ]);
     }
@@ -291,8 +275,7 @@ public function testGetClickThroughRate1()
                 'path' => '/2/clicks/clickThroughRate',
                 'method' => 'GET',
                 'queryParameters' => json_decode(
-                    "{\"index\":\"index\",\"startDate\":\"1999-09-19\",\"endDate\":\"2001-01-01\",\"tags\":\"tag\"}",
-                    true
+                    "{\"index\":\"index\",\"startDate\":\"1999-09-19\",\"endDate\":\"2001-01-01\",\"tags\":\"tag\"}"
                 ),
             ],
         ]);
@@ -311,7 +294,7 @@ public function testGetConversationRate0()
             [
                 'path' => '/2/conversions/conversionRate',
                 'method' => 'GET',
-                'queryParameters' => json_decode("{\"index\":\"index\"}", true),
+                'queryParameters' => json_decode("{\"index\":\"index\"}"),
             ],
         ]);
     }
@@ -335,8 +318,7 @@ public function testGetConversationRate1()
                 'path' => '/2/conversions/conversionRate',
                 'method' => 'GET',
                 'queryParameters' => json_decode(
-                    "{\"index\":\"index\",\"startDate\":\"1999-09-19\",\"endDate\":\"2001-01-01\",\"tags\":\"tag\"}",
-                    true
+                    "{\"index\":\"index\",\"startDate\":\"1999-09-19\",\"endDate\":\"2001-01-01\",\"tags\":\"tag\"}"
                 ),
             ],
         ]);
@@ -355,7 +337,7 @@ public function testGetNoClickRate0()
             [
                 'path' => '/2/searches/noClickRate',
                 'method' => 'GET',
-                'queryParameters' => json_decode("{\"index\":\"index\"}", true),
+                'queryParameters' => json_decode("{\"index\":\"index\"}"),
             ],
         ]);
     }
@@ -379,8 +361,7 @@ public function testGetNoClickRate1()
                 'path' => '/2/searches/noClickRate',
                 'method' => 'GET',
                 'queryParameters' => json_decode(
-                    "{\"index\":\"index\",\"startDate\":\"1999-09-19\",\"endDate\":\"2001-01-01\",\"tags\":\"tag\"}",
-                    true
+                    "{\"index\":\"index\",\"startDate\":\"1999-09-19\",\"endDate\":\"2001-01-01\",\"tags\":\"tag\"}"
                 ),
             ],
         ]);
@@ -399,7 +380,7 @@ public function testGetNoResultsRate0()
             [
                 'path' => '/2/searches/noResultRate',
                 'method' => 'GET',
-                'queryParameters' => json_decode("{\"index\":\"index\"}", true),
+                'queryParameters' => json_decode("{\"index\":\"index\"}"),
             ],
         ]);
     }
@@ -423,8 +404,7 @@ public function testGetNoResultsRate1()
                 'path' => '/2/searches/noResultRate',
                 'method' => 'GET',
                 'queryParameters' => json_decode(
-                    "{\"index\":\"index\",\"startDate\":\"1999-09-19\",\"endDate\":\"2001-01-01\",\"tags\":\"tag\"}",
-                    true
+                    "{\"index\":\"index\",\"startDate\":\"1999-09-19\",\"endDate\":\"2001-01-01\",\"tags\":\"tag\"}"
                 ),
             ],
         ]);
@@ -443,7 +423,7 @@ public function testGetSearchesCount0()
             [
                 'path' => '/2/searches/count',
                 'method' => 'GET',
-                'queryParameters' => json_decode("{\"index\":\"index\"}", true),
+                'queryParameters' => json_decode("{\"index\":\"index\"}"),
             ],
         ]);
     }
@@ -467,8 +447,7 @@ public function testGetSearchesCount1()
                 'path' => '/2/searches/count',
                 'method' => 'GET',
                 'queryParameters' => json_decode(
-                    "{\"index\":\"index\",\"startDate\":\"1999-09-19\",\"endDate\":\"2001-01-01\",\"tags\":\"tag\"}",
-                    true
+                    "{\"index\":\"index\",\"startDate\":\"1999-09-19\",\"endDate\":\"2001-01-01\",\"tags\":\"tag\"}"
                 ),
             ],
         ]);
@@ -487,7 +466,7 @@ public function testGetSearchesNoClicks0()
             [
                 'path' => '/2/searches/noClicks',
                 'method' => 'GET',
-                'queryParameters' => json_decode("{\"index\":\"index\"}", true),
+                'queryParameters' => json_decode("{\"index\":\"index\"}"),
             ],
         ]);
     }
@@ -513,8 +492,7 @@ public function testGetSearchesNoClicks1()
                 'path' => '/2/searches/noClicks',
                 'method' => 'GET',
                 'queryParameters' => json_decode(
-                    "{\"index\":\"index\",\"startDate\":\"1999-09-19\",\"endDate\":\"2001-01-01\",\"limit\":\"21\",\"offset\":\"42\",\"tags\":\"tag\"}",
-                    true
+                    "{\"index\":\"index\",\"startDate\":\"1999-09-19\",\"endDate\":\"2001-01-01\",\"limit\":\"21\",\"offset\":\"42\",\"tags\":\"tag\"}"
                 ),
             ],
         ]);
@@ -533,7 +511,7 @@ public function testGetSearchesNoResults0()
             [
                 'path' => '/2/searches/noResults',
                 'method' => 'GET',
-                'queryParameters' => json_decode("{\"index\":\"index\"}", true),
+                'queryParameters' => json_decode("{\"index\":\"index\"}"),
             ],
         ]);
     }
@@ -559,8 +537,7 @@ public function testGetSearchesNoResults1()
                 'path' => '/2/searches/noResults',
                 'method' => 'GET',
                 'queryParameters' => json_decode(
-                    "{\"index\":\"index\",\"startDate\":\"1999-09-19\",\"endDate\":\"2001-01-01\",\"limit\":\"21\",\"offset\":\"42\",\"tags\":\"tag\"}",
-                    true
+                    "{\"index\":\"index\",\"startDate\":\"1999-09-19\",\"endDate\":\"2001-01-01\",\"limit\":\"21\",\"offset\":\"42\",\"tags\":\"tag\"}"
                 ),
             ],
         ]);
@@ -579,7 +556,7 @@ public function testGetStatus0()
             [
                 'path' => '/2/status',
                 'method' => 'GET',
-                'queryParameters' => json_decode("{\"index\":\"index\"}", true),
+                'queryParameters' => json_decode("{\"index\":\"index\"}"),
             ],
         ]);
     }
@@ -597,7 +574,7 @@ public function testGetTopCountries0()
             [
                 'path' => '/2/countries',
                 'method' => 'GET',
-                'queryParameters' => json_decode("{\"index\":\"index\"}", true),
+                'queryParameters' => json_decode("{\"index\":\"index\"}"),
             ],
         ]);
     }
@@ -623,8 +600,7 @@ public function testGetTopCountries1()
                 'path' => '/2/countries',
                 'method' => 'GET',
                 'queryParameters' => json_decode(
-                    "{\"index\":\"index\",\"startDate\":\"1999-09-19\",\"endDate\":\"2001-01-01\",\"limit\":\"21\",\"offset\":\"42\",\"tags\":\"tag\"}",
-                    true
+                    "{\"index\":\"index\",\"startDate\":\"1999-09-19\",\"endDate\":\"2001-01-01\",\"limit\":\"21\",\"offset\":\"42\",\"tags\":\"tag\"}"
                 ),
             ],
         ]);
@@ -643,7 +619,7 @@ public function testGetTopFilterAttributes0()
             [
                 'path' => '/2/filters',
                 'method' => 'GET',
-                'queryParameters' => json_decode("{\"index\":\"index\"}", true),
+                'queryParameters' => json_decode("{\"index\":\"index\"}"),
             ],
         ]);
     }
@@ -670,8 +646,7 @@ public function testGetTopFilterAttributes1()
                 'path' => '/2/filters',
                 'method' => 'GET',
                 'queryParameters' => json_decode(
-                    "{\"index\":\"index\",\"search\":\"mySearch\",\"startDate\":\"1999-09-19\",\"endDate\":\"2001-01-01\",\"limit\":\"21\",\"offset\":\"42\",\"tags\":\"tag\"}",
-                    true
+                    "{\"index\":\"index\",\"search\":\"mySearch\",\"startDate\":\"1999-09-19\",\"endDate\":\"2001-01-01\",\"limit\":\"21\",\"offset\":\"42\",\"tags\":\"tag\"}"
                 ),
             ],
         ]);
@@ -693,7 +668,7 @@ public function testGetTopFilterForAttribute0()
             [
                 'path' => '/2/filters/myAttribute',
                 'method' => 'GET',
-                'queryParameters' => json_decode("{\"index\":\"index\"}", true),
+                'queryParameters' => json_decode("{\"index\":\"index\"}"),
             ],
         ]);
     }
@@ -714,7 +689,7 @@ public function testGetTopFilterForAttribute1()
             [
                 'path' => '/2/filters/myAttribute1%2CmyAttribute2',
                 'method' => 'GET',
-                'queryParameters' => json_decode("{\"index\":\"index\"}", true),
+                'queryParameters' => json_decode("{\"index\":\"index\"}"),
             ],
         ]);
     }
@@ -742,8 +717,7 @@ public function testGetTopFilterForAttribute2()
                 'path' => '/2/filters/myAttribute',
                 'method' => 'GET',
                 'queryParameters' => json_decode(
-                    "{\"index\":\"index\",\"search\":\"mySearch\",\"startDate\":\"1999-09-19\",\"endDate\":\"2001-01-01\",\"limit\":\"21\",\"offset\":\"42\",\"tags\":\"tag\"}",
-                    true
+                    "{\"index\":\"index\",\"search\":\"mySearch\",\"startDate\":\"1999-09-19\",\"endDate\":\"2001-01-01\",\"limit\":\"21\",\"offset\":\"42\",\"tags\":\"tag\"}"
                 ),
             ],
         ]);
@@ -772,8 +746,7 @@ public function testGetTopFilterForAttribute3()
                 'path' => '/2/filters/myAttribute1%2CmyAttribute2',
                 'method' => 'GET',
                 'queryParameters' => json_decode(
-                    "{\"index\":\"index\",\"search\":\"mySearch\",\"startDate\":\"1999-09-19\",\"endDate\":\"2001-01-01\",\"limit\":\"21\",\"offset\":\"42\",\"tags\":\"tag\"}",
-                    true
+                    "{\"index\":\"index\",\"search\":\"mySearch\",\"startDate\":\"1999-09-19\",\"endDate\":\"2001-01-01\",\"limit\":\"21\",\"offset\":\"42\",\"tags\":\"tag\"}"
                 ),
             ],
         ]);
@@ -792,7 +765,7 @@ public function testGetTopFiltersNoResults0()
             [
                 'path' => '/2/filters/noResults',
                 'method' => 'GET',
-                'queryParameters' => json_decode("{\"index\":\"index\"}", true),
+                'queryParameters' => json_decode("{\"index\":\"index\"}"),
             ],
         ]);
     }
@@ -819,8 +792,7 @@ public function testGetTopFiltersNoResults1()
                 'path' => '/2/filters/noResults',
                 'method' => 'GET',
                 'queryParameters' => json_decode(
-                    "{\"index\":\"index\",\"search\":\"mySearch\",\"startDate\":\"1999-09-19\",\"endDate\":\"2001-01-01\",\"limit\":\"21\",\"offset\":\"42\",\"tags\":\"tag\"}",
-                    true
+                    "{\"index\":\"index\",\"search\":\"mySearch\",\"startDate\":\"1999-09-19\",\"endDate\":\"2001-01-01\",\"limit\":\"21\",\"offset\":\"42\",\"tags\":\"tag\"}"
                 ),
             ],
         ]);
@@ -839,7 +811,7 @@ public function testGetTopHits0()
             [
                 'path' => '/2/hits',
                 'method' => 'GET',
-                'queryParameters' => json_decode("{\"index\":\"index\"}", true),
+                'queryParameters' => json_decode("{\"index\":\"index\"}"),
             ],
         ]);
     }
@@ -867,8 +839,7 @@ public function testGetTopHits1()
                 'path' => '/2/hits',
                 'method' => 'GET',
                 'queryParameters' => json_decode(
-                    "{\"index\":\"index\",\"search\":\"mySearch\",\"clickAnalytics\":\"true\",\"startDate\":\"1999-09-19\",\"endDate\":\"2001-01-01\",\"limit\":\"21\",\"offset\":\"42\",\"tags\":\"tag\"}",
-                    true
+                    "{\"index\":\"index\",\"search\":\"mySearch\",\"clickAnalytics\":\"true\",\"startDate\":\"1999-09-19\",\"endDate\":\"2001-01-01\",\"limit\":\"21\",\"offset\":\"42\",\"tags\":\"tag\"}"
                 ),
             ],
         ]);
@@ -887,7 +858,7 @@ public function testGetTopSearches0()
             [
                 'path' => '/2/searches',
                 'method' => 'GET',
-                'queryParameters' => json_decode("{\"index\":\"index\"}", true),
+                'queryParameters' => json_decode("{\"index\":\"index\"}"),
             ],
         ]);
     }
@@ -916,8 +887,7 @@ public function testGetTopSearches1()
                 'path' => '/2/searches',
                 'method' => 'GET',
                 'queryParameters' => json_decode(
-                    "{\"index\":\"index\",\"clickAnalytics\":\"true\",\"startDate\":\"1999-09-19\",\"endDate\":\"2001-01-01\",\"orderBy\":\"searchCount\",\"direction\":\"asc\",\"limit\":\"21\",\"offset\":\"42\",\"tags\":\"tag\"}",
-                    true
+                    "{\"index\":\"index\",\"clickAnalytics\":\"true\",\"startDate\":\"1999-09-19\",\"endDate\":\"2001-01-01\",\"orderBy\":\"searchCount\",\"direction\":\"asc\",\"limit\":\"21\",\"offset\":\"42\",\"tags\":\"tag\"}"
                 ),
             ],
         ]);
@@ -936,7 +906,7 @@ public function testGetUsersCount0()
             [
                 'path' => '/2/users/count',
                 'method' => 'GET',
-                'queryParameters' => json_decode("{\"index\":\"index\"}", true),
+                'queryParameters' => json_decode("{\"index\":\"index\"}"),
             ],
         ]);
     }
@@ -960,8 +930,7 @@ public function testGetUsersCount1()
                 'path' => '/2/users/count',
                 'method' => 'GET',
                 'queryParameters' => json_decode(
-                    "{\"index\":\"index\",\"startDate\":\"1999-09-19\",\"endDate\":\"2001-01-01\",\"tags\":\"tag\"}",
-                    true
+                    "{\"index\":\"index\",\"startDate\":\"1999-09-19\",\"endDate\":\"2001-01-01\",\"tags\":\"tag\"}"
                 ),
             ],
         ]);
@@ -1002,10 +971,7 @@ public function testPost1()
                 'path' => '/1/test/all',
                 'method' => 'POST',
                 'body' => json_decode("{\"body\":\"parameters\"}"),
-                'queryParameters' => json_decode(
-                    "{\"query\":\"parameters\"}",
-                    true
-                ),
+                'queryParameters' => json_decode("{\"query\":\"parameters\"}"),
             ],
         ]);
     }
@@ -1045,10 +1011,7 @@ public function testPut1()
                 'path' => '/1/test/all',
                 'method' => 'PUT',
                 'body' => json_decode("{\"body\":\"parameters\"}"),
-                'queryParameters' => json_decode(
-                    "{\"query\":\"parameters\"}",
-                    true
-                ),
+                'queryParameters' => json_decode("{\"query\":\"parameters\"}"),
             ],
         ]);
     }
diff --git a/tests/output/php/src/methods/requests/InsightsTest.php b/tests/output/php/src/methods/requests/InsightsTest.php
index 2f7e2f5db6..902a1222a7 100644
--- a/tests/output/php/src/methods/requests/InsightsTest.php
+++ b/tests/output/php/src/methods/requests/InsightsTest.php
@@ -8,7 +8,6 @@
 use Algolia\AlgoliaSearch\Http\Psr7\Response;
 use Algolia\AlgoliaSearch\RetryStrategy\ApiWrapper;
 use Algolia\AlgoliaSearch\RetryStrategy\ClusterHosts;
-use GuzzleHttp\Psr7\Query;
 use PHPUnit\Framework\TestCase;
 use Psr\Http\Message\RequestInterface;
 
@@ -49,13 +48,6 @@ protected function assertRequests(array $requests)
                     $recordedRequest->getBody()->getContents()
                 );
             }
-
-            if (isset($request['queryParameters'])) {
-                $this->assertEquals(
-                    Query::build($request['queryParameters']),
-                    $recordedRequest->getUri()->getQuery()
-                );
-            }
         }
     }
 
@@ -117,10 +109,7 @@ public function testDel1()
             [
                 'path' => '/1/test/all',
                 'method' => 'DELETE',
-                'queryParameters' => json_decode(
-                    "{\"query\":\"parameters\"}",
-                    true
-                ),
+                'queryParameters' => json_decode("{\"query\":\"parameters\"}"),
             ],
         ]);
     }
@@ -158,10 +147,7 @@ public function testGet1()
             [
                 'path' => '/1/test/all',
                 'method' => 'GET',
-                'queryParameters' => json_decode(
-                    "{\"query\":\"parameters\"}",
-                    true
-                ),
+                'queryParameters' => json_decode("{\"query\":\"parameters\"}"),
             ],
         ]);
     }
@@ -201,10 +187,7 @@ public function testPost1()
                 'path' => '/1/test/all',
                 'method' => 'POST',
                 'body' => json_decode("{\"body\":\"parameters\"}"),
-                'queryParameters' => json_decode(
-                    "{\"query\":\"parameters\"}",
-                    true
-                ),
+                'queryParameters' => json_decode("{\"query\":\"parameters\"}"),
             ],
         ]);
     }
@@ -296,10 +279,7 @@ public function testPut1()
                 'path' => '/1/test/all',
                 'method' => 'PUT',
                 'body' => json_decode("{\"body\":\"parameters\"}"),
-                'queryParameters' => json_decode(
-                    "{\"query\":\"parameters\"}",
-                    true
-                ),
+                'queryParameters' => json_decode("{\"query\":\"parameters\"}"),
             ],
         ]);
     }
diff --git a/tests/output/php/src/methods/requests/PersonalizationTest.php b/tests/output/php/src/methods/requests/PersonalizationTest.php
index 35a31c340d..6d5c699a17 100644
--- a/tests/output/php/src/methods/requests/PersonalizationTest.php
+++ b/tests/output/php/src/methods/requests/PersonalizationTest.php
@@ -8,7 +8,6 @@
 use Algolia\AlgoliaSearch\Http\Psr7\Response;
 use Algolia\AlgoliaSearch\RetryStrategy\ApiWrapper;
 use Algolia\AlgoliaSearch\RetryStrategy\ClusterHosts;
-use GuzzleHttp\Psr7\Query;
 use PHPUnit\Framework\TestCase;
 use Psr\Http\Message\RequestInterface;
 
@@ -49,13 +48,6 @@ protected function assertRequests(array $requests)
                     $recordedRequest->getBody()->getContents()
                 );
             }
-
-            if (isset($request['queryParameters'])) {
-                $this->assertEquals(
-                    Query::build($request['queryParameters']),
-                    $recordedRequest->getUri()->getQuery()
-                );
-            }
         }
     }
 
@@ -117,10 +109,7 @@ public function testDel1()
             [
                 'path' => '/1/test/all',
                 'method' => 'DELETE',
-                'queryParameters' => json_decode(
-                    "{\"query\":\"parameters\"}",
-                    true
-                ),
+                'queryParameters' => json_decode("{\"query\":\"parameters\"}"),
             ],
         ]);
     }
@@ -175,10 +164,7 @@ public function testGet1()
             [
                 'path' => '/1/test/all',
                 'method' => 'GET',
-                'queryParameters' => json_decode(
-                    "{\"query\":\"parameters\"}",
-                    true
-                ),
+                'queryParameters' => json_decode("{\"query\":\"parameters\"}"),
             ],
         ]);
     }
@@ -252,10 +238,7 @@ public function testPost1()
                 'path' => '/1/test/all',
                 'method' => 'POST',
                 'body' => json_decode("{\"body\":\"parameters\"}"),
-                'queryParameters' => json_decode(
-                    "{\"query\":\"parameters\"}",
-                    true
-                ),
+                'queryParameters' => json_decode("{\"query\":\"parameters\"}"),
             ],
         ]);
     }
@@ -295,10 +278,7 @@ public function testPut1()
                 'path' => '/1/test/all',
                 'method' => 'PUT',
                 'body' => json_decode("{\"body\":\"parameters\"}"),
-                'queryParameters' => json_decode(
-                    "{\"query\":\"parameters\"}",
-                    true
-                ),
+                'queryParameters' => json_decode("{\"query\":\"parameters\"}"),
             ],
         ]);
     }
diff --git a/tests/output/php/src/methods/requests/QuerySuggestionsTest.php b/tests/output/php/src/methods/requests/QuerySuggestionsTest.php
index 5cb5350a26..fbcf126a06 100644
--- a/tests/output/php/src/methods/requests/QuerySuggestionsTest.php
+++ b/tests/output/php/src/methods/requests/QuerySuggestionsTest.php
@@ -8,7 +8,6 @@
 use Algolia\AlgoliaSearch\Http\Psr7\Response;
 use Algolia\AlgoliaSearch\RetryStrategy\ApiWrapper;
 use Algolia\AlgoliaSearch\RetryStrategy\ClusterHosts;
-use GuzzleHttp\Psr7\Query;
 use PHPUnit\Framework\TestCase;
 use Psr\Http\Message\RequestInterface;
 
@@ -49,13 +48,6 @@ protected function assertRequests(array $requests)
                     $recordedRequest->getBody()->getContents()
                 );
             }
-
-            if (isset($request['queryParameters'])) {
-                $this->assertEquals(
-                    Query::build($request['queryParameters']),
-                    $recordedRequest->getUri()->getQuery()
-                );
-            }
         }
     }
 
@@ -148,10 +140,7 @@ public function testDel1()
             [
                 'path' => '/1/test/all',
                 'method' => 'DELETE',
-                'queryParameters' => json_decode(
-                    "{\"query\":\"parameters\"}",
-                    true
-                ),
+                'queryParameters' => json_decode("{\"query\":\"parameters\"}"),
             ],
         ]);
     }
@@ -206,10 +195,7 @@ public function testGet1()
             [
                 'path' => '/1/test/all',
                 'method' => 'GET',
-                'queryParameters' => json_decode(
-                    "{\"query\":\"parameters\"}",
-                    true
-                ),
+                'queryParameters' => json_decode("{\"query\":\"parameters\"}"),
             ],
         ]);
     }
@@ -317,10 +303,7 @@ public function testPost1()
                 'path' => '/1/test/all',
                 'method' => 'POST',
                 'body' => json_decode("{\"body\":\"parameters\"}"),
-                'queryParameters' => json_decode(
-                    "{\"query\":\"parameters\"}",
-                    true
-                ),
+                'queryParameters' => json_decode("{\"query\":\"parameters\"}"),
             ],
         ]);
     }
@@ -360,10 +343,7 @@ public function testPut1()
                 'path' => '/1/test/all',
                 'method' => 'PUT',
                 'body' => json_decode("{\"body\":\"parameters\"}"),
-                'queryParameters' => json_decode(
-                    "{\"query\":\"parameters\"}",
-                    true
-                ),
+                'queryParameters' => json_decode("{\"query\":\"parameters\"}"),
             ],
         ]);
     }
diff --git a/tests/output/php/src/methods/requests/RecommendTest.php b/tests/output/php/src/methods/requests/RecommendTest.php
index c3f6d96116..de9da5cc6e 100644
--- a/tests/output/php/src/methods/requests/RecommendTest.php
+++ b/tests/output/php/src/methods/requests/RecommendTest.php
@@ -8,7 +8,6 @@
 use Algolia\AlgoliaSearch\Http\Psr7\Response;
 use Algolia\AlgoliaSearch\RetryStrategy\ApiWrapper;
 use Algolia\AlgoliaSearch\RetryStrategy\ClusterHosts;
-use GuzzleHttp\Psr7\Query;
 use PHPUnit\Framework\TestCase;
 use Psr\Http\Message\RequestInterface;
 
@@ -49,13 +48,6 @@ protected function assertRequests(array $requests)
                     $recordedRequest->getBody()->getContents()
                 );
             }
-
-            if (isset($request['queryParameters'])) {
-                $this->assertEquals(
-                    Query::build($request['queryParameters']),
-                    $recordedRequest->getUri()->getQuery()
-                );
-            }
         }
     }
 
@@ -117,10 +109,7 @@ public function testDel1()
             [
                 'path' => '/1/test/all',
                 'method' => 'DELETE',
-                'queryParameters' => json_decode(
-                    "{\"query\":\"parameters\"}",
-                    true
-                ),
+                'queryParameters' => json_decode("{\"query\":\"parameters\"}"),
             ],
         ]);
     }
@@ -158,10 +147,7 @@ public function testGet1()
             [
                 'path' => '/1/test/all',
                 'method' => 'GET',
-                'queryParameters' => json_decode(
-                    "{\"query\":\"parameters\"}",
-                    true
-                ),
+                'queryParameters' => json_decode("{\"query\":\"parameters\"}"),
             ],
         ]);
     }
@@ -454,10 +440,7 @@ public function testPost1()
                 'path' => '/1/test/all',
                 'method' => 'POST',
                 'body' => json_decode("{\"body\":\"parameters\"}"),
-                'queryParameters' => json_decode(
-                    "{\"query\":\"parameters\"}",
-                    true
-                ),
+                'queryParameters' => json_decode("{\"query\":\"parameters\"}"),
             ],
         ]);
     }
@@ -497,10 +480,7 @@ public function testPut1()
                 'path' => '/1/test/all',
                 'method' => 'PUT',
                 'body' => json_decode("{\"body\":\"parameters\"}"),
-                'queryParameters' => json_decode(
-                    "{\"query\":\"parameters\"}",
-                    true
-                ),
+                'queryParameters' => json_decode("{\"query\":\"parameters\"}"),
             ],
         ]);
     }
diff --git a/tests/output/php/src/methods/requests/SearchTest.php b/tests/output/php/src/methods/requests/SearchTest.php
index 1e63919d93..a1b06115f3 100644
--- a/tests/output/php/src/methods/requests/SearchTest.php
+++ b/tests/output/php/src/methods/requests/SearchTest.php
@@ -8,7 +8,6 @@
 use Algolia\AlgoliaSearch\Http\Psr7\Response;
 use Algolia\AlgoliaSearch\RetryStrategy\ApiWrapper;
 use Algolia\AlgoliaSearch\RetryStrategy\ClusterHosts;
-use GuzzleHttp\Psr7\Query;
 use PHPUnit\Framework\TestCase;
 use Psr\Http\Message\RequestInterface;
 
@@ -49,13 +48,6 @@ protected function assertRequests(array $requests)
                     $recordedRequest->getBody()->getContents()
                 );
             }
-
-            if (isset($request['queryParameters'])) {
-                $this->assertEquals(
-                    Query::build($request['queryParameters']),
-                    $recordedRequest->getUri()->getQuery()
-                );
-            }
         }
     }
 
@@ -172,6 +164,9 @@ public function testAssignUserId0()
                 'path' => '/1/clusters/mapping',
                 'method' => 'POST',
                 'body' => json_decode("{\"cluster\":\"theCluster\"}"),
+                'queryParameters' => json_decode(
+                    "{\"X-Algolia-User-ID\":\"userID\"}"
+                ),
             ],
         ]);
     }
@@ -222,6 +217,9 @@ public function testBatchAssignUserIds0()
                 'body' => json_decode(
                     "{\"cluster\":\"theCluster\",\"users\":[\"user1\",\"user2\"]}"
                 ),
+                'queryParameters' => json_decode(
+                    "{\"X-Algolia-User-ID\":\"userID\"}"
+                ),
             ],
         ]);
     }
@@ -351,8 +349,7 @@ public function testBatchRules0()
                     "[{\"objectID\":\"a-rule-id\",\"conditions\":[{\"pattern\":\"smartphone\",\"anchoring\":\"contains\"}],\"consequence\":{\"params\":{\"filters\":\"category:smartphone\"}}},{\"objectID\":\"a-second-rule-id\",\"conditions\":[{\"pattern\":\"apple\",\"anchoring\":\"contains\"}],\"consequence\":{\"params\":{\"filters\":\"brand:apple\"}}}]"
                 ),
                 'queryParameters' => json_decode(
-                    "{\"forwardToReplicas\":\"true\",\"clearExistingRules\":\"true\"}",
-                    true
+                    "{\"forwardToReplicas\":\"true\",\"clearExistingRules\":\"true\"}"
                 ),
             ],
         ]);
@@ -482,10 +479,7 @@ public function testDel1()
             [
                 'path' => '/1/test/all',
                 'method' => 'DELETE',
-                'queryParameters' => json_decode(
-                    "{\"query\":\"parameters\"}",
-                    true
-                ),
+                'queryParameters' => json_decode("{\"query\":\"parameters\"}"),
             ],
         ]);
     }
@@ -655,10 +649,7 @@ public function testGet1()
             [
                 'path' => '/1/test/all',
                 'method' => 'GET',
-                'queryParameters' => json_decode(
-                    "{\"query\":\"parameters\"}",
-                    true
-                ),
+                'queryParameters' => json_decode("{\"query\":\"parameters\"}"),
             ],
         ]);
     }
@@ -733,8 +724,7 @@ public function testGetLogs0()
                 'path' => '/1/logs',
                 'method' => 'GET',
                 'queryParameters' => json_decode(
-                    "{\"offset\":\"5\",\"length\":\"10\",\"indexName\":\"theIndexName\",\"type\":\"all\"}",
-                    true
+                    "{\"offset\":\"5\",\"length\":\"10\",\"indexName\":\"theIndexName\",\"type\":\"all\"}"
                 ),
             ],
         ]);
@@ -758,8 +748,7 @@ public function testGetObject0()
                 'path' => '/1/indexes/theIndexName/uniqueID',
                 'method' => 'GET',
                 'queryParameters' => json_decode(
-                    "{\"attributesToRetrieve\":\"attr1,attr2\"}",
-                    true
+                    "{\"attributesToRetrieve\":\"attr1,attr2\"}"
                 ),
             ],
         ]);
@@ -934,10 +923,7 @@ public function testHasPendingMappings0()
             [
                 'path' => '/1/clusters/mapping/pending',
                 'method' => 'GET',
-                'queryParameters' => json_decode(
-                    "{\"getClusters\":\"true\"}",
-                    true
-                ),
+                'queryParameters' => json_decode("{\"getClusters\":\"true\"}"),
             ],
         ]);
     }
@@ -989,7 +975,7 @@ public function testListIndices0()
             [
                 'path' => '/1/indexes',
                 'method' => 'GET',
-                'queryParameters' => json_decode("{\"page\":\"8\"}", true),
+                'queryParameters' => json_decode("{\"page\":\"8\"}"),
             ],
         ]);
     }
@@ -1011,8 +997,7 @@ public function testListUserIds0()
                 'path' => '/1/clusters/mapping',
                 'method' => 'GET',
                 'queryParameters' => json_decode(
-                    "{\"page\":\"8\",\"hitsPerPage\":\"100\"}",
-                    true
+                    "{\"page\":\"8\",\"hitsPerPage\":\"100\"}"
                 ),
             ],
         ]);
@@ -1161,8 +1146,7 @@ public function testPartialUpdateObject0()
                     "[{\"id1\":\"test\",\"id2\":{\"_operation\":\"AddUnique\",\"value\":\"test2\"}}]"
                 ),
                 'queryParameters' => json_decode(
-                    "{\"createIfNotExists\":\"true\"}",
-                    true
+                    "{\"createIfNotExists\":\"true\"}"
                 ),
             ],
         ]);
@@ -1203,10 +1187,7 @@ public function testPost1()
                 'path' => '/1/test/all',
                 'method' => 'POST',
                 'body' => json_decode("{\"body\":\"parameters\"}"),
-                'queryParameters' => json_decode(
-                    "{\"query\":\"parameters\"}",
-                    true
-                ),
+                'queryParameters' => json_decode("{\"query\":\"parameters\"}"),
             ],
         ]);
     }
@@ -1246,10 +1227,7 @@ public function testPut1()
                 'path' => '/1/test/all',
                 'method' => 'PUT',
                 'body' => json_decode("{\"body\":\"parameters\"}"),
-                'queryParameters' => json_decode(
-                    "{\"query\":\"parameters\"}",
-                    true
-                ),
+                'queryParameters' => json_decode("{\"query\":\"parameters\"}"),
             ],
         ]);
     }
@@ -1359,8 +1337,7 @@ public function testSaveRule0()
                     "{\"objectID\":\"id1\",\"conditions\":[{\"pattern\":\"apple\",\"anchoring\":\"contains\"}],\"consequence\":{\"params\":{\"filters\":\"brand:apple\"}}}"
                 ),
                 'queryParameters' => json_decode(
-                    "{\"forwardToReplicas\":\"true\"}",
-                    true
+                    "{\"forwardToReplicas\":\"true\"}"
                 ),
             ],
         ]);
@@ -1392,8 +1369,7 @@ public function testSaveSynonym0()
                     "{\"objectID\":\"id1\",\"type\":\"synonym\",\"synonyms\":[\"car\",\"vehicule\",\"auto\"]}"
                 ),
                 'queryParameters' => json_decode(
-                    "{\"forwardToReplicas\":\"true\"}",
-                    true
+                    "{\"forwardToReplicas\":\"true\"}"
                 ),
             ],
         ]);
@@ -1434,8 +1410,7 @@ public function testSaveSynonyms0()
                     "[{\"objectID\":\"id1\",\"type\":\"synonym\",\"synonyms\":[\"car\",\"vehicule\",\"auto\"]},{\"objectID\":\"id2\",\"type\":\"onewaysynonym\",\"input\":\"iphone\",\"synonyms\":[\"ephone\",\"aphone\",\"yphone\"]}]"
                 ),
                 'queryParameters' => json_decode(
-                    "{\"forwardToReplicas\":\"true\",\"replaceExistingSynonyms\":\"false\"}",
-                    true
+                    "{\"forwardToReplicas\":\"true\",\"replaceExistingSynonyms\":\"false\"}"
                 ),
             ],
         ]);
@@ -1714,8 +1689,7 @@ public function testSetSettings0()
                 'method' => 'PUT',
                 'body' => json_decode("{\"paginationLimitedTo\":10}"),
                 'queryParameters' => json_decode(
-                    "{\"forwardToReplicas\":\"true\"}",
-                    true
+                    "{\"forwardToReplicas\":\"true\"}"
                 ),
             ],
         ]);