diff --git a/codegen/CommunicationPreferences/Api/DefinitionApi.php b/codegen/CommunicationPreferences/Api/DefinitionApi.php
index b7fa68f95..d55dda402 100644
--- a/codegen/CommunicationPreferences/Api/DefinitionApi.php
+++ b/codegen/CommunicationPreferences/Api/DefinitionApi.php
@@ -10,13 +10,13 @@
  */
 
 /**
- * Communication Preferences Subscriptions
+ * Subscriptions
  *
  * No description provided (generated by Openapi Generator https://github.com/openapitools/openapi-generator)
  *
  * The version of the OpenAPI document: v3
  * Generated by: https://openapi-generator.tech
- * OpenAPI Generator version: 7.3.0
+ * Generator version: 7.12.0
  */
 
 /**
@@ -83,13 +83,13 @@ class DefinitionApi
      * @param int             $hostIndex (Optional) host index to select the list of hosts if defined in the OpenAPI spec
      */
     public function __construct(
-        ClientInterface $client = null,
-        Configuration $config = null,
-        HeaderSelector $selector = null,
-        $hostIndex = 0
+        ?ClientInterface $client = null,
+        ?Configuration $config = null,
+        ?HeaderSelector $selector = null,
+        int $hostIndex = 0
     ) {
         $this->client = $client ?: new Client();
-        $this->config = $config ?: new Configuration();
+        $this->config = $config ?: Configuration::getDefaultConfiguration();
         $this->headerSelector = $selector ?: new HeaderSelector();
         $this->hostIndex = $hostIndex;
     }
@@ -176,18 +176,6 @@ public function getPageWithHttpInfo(string $contentType = self::contentTypes['ge
 
             $statusCode = $response->getStatusCode();
 
-            if ($statusCode < 200 || $statusCode > 299) {
-                throw new ApiException(
-                    sprintf(
-                        '[%d] Error connecting to the API (%s)',
-                        $statusCode,
-                        (string) $request->getUri()
-                    ),
-                    $statusCode,
-                    $response->getHeaders(),
-                    (string) $response->getBody()
-                );
-            }
 
             switch($statusCode) {
                 case 200:
@@ -246,6 +234,19 @@ public function getPageWithHttpInfo(string $contentType = self::contentTypes['ge
                     ];
             }
 
+            if ($statusCode < 200 || $statusCode > 299) {
+                throw new ApiException(
+                    sprintf(
+                        '[%d] Error connecting to the API (%s)',
+                        $statusCode,
+                        (string) $request->getUri()
+                    ),
+                    $statusCode,
+                    $response->getHeaders(),
+                    (string) $response->getBody()
+                );
+            }
+
             $returnType = '\HubSpot\Client\CommunicationPreferences\Model\SubscriptionDefinitionsResponse';
             if ($returnType === '\SplFileObject') {
                 $content = $response->getBody(); //stream goes to serializer
diff --git a/codegen/CommunicationPreferences/Api/StatusApi.php b/codegen/CommunicationPreferences/Api/StatusApi.php
index eba75989f..9a708ca30 100644
--- a/codegen/CommunicationPreferences/Api/StatusApi.php
+++ b/codegen/CommunicationPreferences/Api/StatusApi.php
@@ -10,13 +10,13 @@
  */
 
 /**
- * Communication Preferences Subscriptions
+ * Subscriptions
  *
  * No description provided (generated by Openapi Generator https://github.com/openapitools/openapi-generator)
  *
  * The version of the OpenAPI document: v3
  * Generated by: https://openapi-generator.tech
- * OpenAPI Generator version: 7.3.0
+ * Generator version: 7.12.0
  */
 
 /**
@@ -89,13 +89,13 @@ class StatusApi
      * @param int             $hostIndex (Optional) host index to select the list of hosts if defined in the OpenAPI spec
      */
     public function __construct(
-        ClientInterface $client = null,
-        Configuration $config = null,
-        HeaderSelector $selector = null,
-        $hostIndex = 0
+        ?ClientInterface $client = null,
+        ?Configuration $config = null,
+        ?HeaderSelector $selector = null,
+        int $hostIndex = 0
     ) {
         $this->client = $client ?: new Client();
-        $this->config = $config ?: new Configuration();
+        $this->config = $config ?: Configuration::getDefaultConfiguration();
         $this->headerSelector = $selector ?: new HeaderSelector();
         $this->hostIndex = $hostIndex;
     }
@@ -184,18 +184,6 @@ public function getEmailStatusWithHttpInfo($email_address, string $contentType =
 
             $statusCode = $response->getStatusCode();
 
-            if ($statusCode < 200 || $statusCode > 299) {
-                throw new ApiException(
-                    sprintf(
-                        '[%d] Error connecting to the API (%s)',
-                        $statusCode,
-                        (string) $request->getUri()
-                    ),
-                    $statusCode,
-                    $response->getHeaders(),
-                    (string) $response->getBody()
-                );
-            }
 
             switch($statusCode) {
                 case 200:
@@ -254,6 +242,19 @@ public function getEmailStatusWithHttpInfo($email_address, string $contentType =
                     ];
             }
 
+            if ($statusCode < 200 || $statusCode > 299) {
+                throw new ApiException(
+                    sprintf(
+                        '[%d] Error connecting to the API (%s)',
+                        $statusCode,
+                        (string) $request->getUri()
+                    ),
+                    $statusCode,
+                    $response->getHeaders(),
+                    (string) $response->getBody()
+                );
+            }
+
             $returnType = '\HubSpot\Client\CommunicationPreferences\Model\PublicSubscriptionStatusesResponse';
             if ($returnType === '\SplFileObject') {
                 $content = $response->getBody(); //stream goes to serializer
@@ -530,18 +531,6 @@ public function subscribeWithHttpInfo($public_update_subscription_status_request
 
             $statusCode = $response->getStatusCode();
 
-            if ($statusCode < 200 || $statusCode > 299) {
-                throw new ApiException(
-                    sprintf(
-                        '[%d] Error connecting to the API (%s)',
-                        $statusCode,
-                        (string) $request->getUri()
-                    ),
-                    $statusCode,
-                    $response->getHeaders(),
-                    (string) $response->getBody()
-                );
-            }
 
             switch($statusCode) {
                 case 200:
@@ -600,6 +589,19 @@ public function subscribeWithHttpInfo($public_update_subscription_status_request
                     ];
             }
 
+            if ($statusCode < 200 || $statusCode > 299) {
+                throw new ApiException(
+                    sprintf(
+                        '[%d] Error connecting to the API (%s)',
+                        $statusCode,
+                        (string) $request->getUri()
+                    ),
+                    $statusCode,
+                    $response->getHeaders(),
+                    (string) $response->getBody()
+                );
+            }
+
             $returnType = '\HubSpot\Client\CommunicationPreferences\Model\PublicSubscriptionStatus';
             if ($returnType === '\SplFileObject') {
                 $content = $response->getBody(); //stream goes to serializer
@@ -875,18 +877,6 @@ public function unsubscribeWithHttpInfo($public_update_subscription_status_reque
 
             $statusCode = $response->getStatusCode();
 
-            if ($statusCode < 200 || $statusCode > 299) {
-                throw new ApiException(
-                    sprintf(
-                        '[%d] Error connecting to the API (%s)',
-                        $statusCode,
-                        (string) $request->getUri()
-                    ),
-                    $statusCode,
-                    $response->getHeaders(),
-                    (string) $response->getBody()
-                );
-            }
 
             switch($statusCode) {
                 case 200:
@@ -945,6 +935,19 @@ public function unsubscribeWithHttpInfo($public_update_subscription_status_reque
                     ];
             }
 
+            if ($statusCode < 200 || $statusCode > 299) {
+                throw new ApiException(
+                    sprintf(
+                        '[%d] Error connecting to the API (%s)',
+                        $statusCode,
+                        (string) $request->getUri()
+                    ),
+                    $statusCode,
+                    $response->getHeaders(),
+                    (string) $response->getBody()
+                );
+            }
+
             $returnType = '\HubSpot\Client\CommunicationPreferences\Model\PublicSubscriptionStatus';
             if ($returnType === '\SplFileObject') {
                 $content = $response->getBody(); //stream goes to serializer
diff --git a/codegen/CommunicationPreferences/ApiException.php b/codegen/CommunicationPreferences/ApiException.php
index d93772511..55d2bcee3 100644
--- a/codegen/CommunicationPreferences/ApiException.php
+++ b/codegen/CommunicationPreferences/ApiException.php
@@ -10,13 +10,13 @@
  */
 
 /**
- * Communication Preferences Subscriptions
+ * Subscriptions
  *
  * No description provided (generated by Openapi Generator https://github.com/openapitools/openapi-generator)
  *
  * The version of the OpenAPI document: v3
  * Generated by: https://openapi-generator.tech
- * OpenAPI Generator version: 7.3.0
+ * Generator version: 7.12.0
  */
 
 /**
@@ -49,7 +49,7 @@ class ApiException extends Exception
     /**
      * The HTTP header of the server response.
      *
-     * @var string[]|null
+     * @var string[][]|null
      */
     protected $responseHeaders;
 
@@ -65,7 +65,7 @@ class ApiException extends Exception
      *
      * @param string                $message         Error message
      * @param int                   $code            HTTP status code
-     * @param string[]|null         $responseHeaders HTTP response header
+     * @param string[][]|null       $responseHeaders HTTP response header
      * @param \stdClass|string|null $responseBody    HTTP decoded body of the server response either as \stdClass or string
      */
     public function __construct($message = "", $code = 0, $responseHeaders = [], $responseBody = null)
@@ -78,7 +78,7 @@ public function __construct($message = "", $code = 0, $responseHeaders = [], $re
     /**
      * Gets the HTTP response header
      *
-     * @return string[]|null HTTP response header
+     * @return string[][]|null HTTP response header
      */
     public function getResponseHeaders()
     {
diff --git a/codegen/CommunicationPreferences/Configuration.php b/codegen/CommunicationPreferences/Configuration.php
index 124d2a26d..84beb3eca 100644
--- a/codegen/CommunicationPreferences/Configuration.php
+++ b/codegen/CommunicationPreferences/Configuration.php
@@ -10,13 +10,13 @@
  */
 
 /**
- * Communication Preferences Subscriptions
+ * Subscriptions
  *
  * No description provided (generated by Openapi Generator https://github.com/openapitools/openapi-generator)
  *
  * The version of the OpenAPI document: v3
  * Generated by: https://openapi-generator.tech
- * OpenAPI Generator version: 7.3.0
+ * Generator version: 7.12.0
  */
 
 /**
@@ -486,7 +486,7 @@ public function getHostSettings()
     * @param array|null $variables    hash of variable and the corresponding value (optional)
     * @return string URL based on host settings
     */
-    public static function getHostString(array $hostSettings, $hostIndex, array $variables = null)
+    public static function getHostString(array $hostSettings, $hostIndex, ?array $variables = null)
     {
         if (null === $variables) {
             $variables = [];
diff --git a/codegen/CommunicationPreferences/HeaderSelector.php b/codegen/CommunicationPreferences/HeaderSelector.php
index 84e6b54b0..8a3caaa4b 100644
--- a/codegen/CommunicationPreferences/HeaderSelector.php
+++ b/codegen/CommunicationPreferences/HeaderSelector.php
@@ -10,13 +10,13 @@
  */
 
 /**
- * Communication Preferences Subscriptions
+ * Subscriptions
  *
  * No description provided (generated by Openapi Generator https://github.com/openapitools/openapi-generator)
  *
  * The version of the OpenAPI document: v3
  * Generated by: https://openapi-generator.tech
- * OpenAPI Generator version: 7.3.0
+ * Generator version: 7.12.0
  */
 
 /**
@@ -85,7 +85,7 @@ private function selectAcceptHeader(array $accept): ?string
         }
 
         # If none of the available Accept headers is of type "json", then just use all them
-        $headersWithJson = preg_grep('~(?i)^(application/json|[^;/ \t]+/[^;/ \t]+[+]json)[ \t]*(;.*)?$~', $accept);
+        $headersWithJson = $this->selectJsonMimeList($accept);
         if (count($headersWithJson) === 0) {
             return implode(',', $accept);
         }
@@ -95,6 +95,34 @@ private function selectAcceptHeader(array $accept): ?string
         return $this->getAcceptHeaderWithAdjustedWeight($accept, $headersWithJson);
     }
 
+    /**
+    * Detects whether a string contains a valid JSON mime type
+    *
+    * @param string $searchString
+    * @return bool
+    */
+    public function isJsonMime(string $searchString): bool
+    {
+        return preg_match('~^application/(json|[\w!#$&.+-^_]+\+json)\s*(;|$)~', $searchString) === 1;
+    }
+    
+    /**
+    * Select all items from a list containing a JSON mime type
+    *
+    * @param array $mimeList
+    * @return array
+    */
+    private function selectJsonMimeList(array $mimeList): array {
+        $jsonMimeList = [];
+        foreach ($mimeList as $mime) {
+            if($this->isJsonMime($mime)) {
+                $jsonMimeList[] = $mime;
+            }
+        }
+        return $jsonMimeList;
+    }
+
+
     /**
     * Create an Accept header string from the given "Accept" headers array, recalculating all weights
     *
diff --git a/codegen/CommunicationPreferences/Model/Error.php b/codegen/CommunicationPreferences/Model/Error.php
index 0f292a873..08bcc87b4 100644
--- a/codegen/CommunicationPreferences/Model/Error.php
+++ b/codegen/CommunicationPreferences/Model/Error.php
@@ -11,13 +11,13 @@
  */
 
 /**
- * Communication Preferences Subscriptions
+ * Subscriptions
  *
  * No description provided (generated by Openapi Generator https://github.com/openapitools/openapi-generator)
  *
  * The version of the OpenAPI document: v3
  * Generated by: https://openapi-generator.tech
- * OpenAPI Generator version: 7.3.0
+ * Generator version: 7.12.0
  */
 
 /**
@@ -275,10 +275,10 @@ public function getModelName()
     /**
      * Constructor
      *
-     * @param mixed[] $data Associated array of property values
+     * @param mixed[]|null $data Associated array of property values
      *                      initializing the model
      */
-    public function __construct(array $data = null)
+    public function __construct(?array $data = null)
     {
         $this->setIfExists('sub_category', $data ?? [], null);
         $this->setIfExists('context', $data ?? [], null);
diff --git a/codegen/CommunicationPreferences/Model/ErrorDetail.php b/codegen/CommunicationPreferences/Model/ErrorDetail.php
index 228fc4e86..de4b450e2 100644
--- a/codegen/CommunicationPreferences/Model/ErrorDetail.php
+++ b/codegen/CommunicationPreferences/Model/ErrorDetail.php
@@ -11,13 +11,13 @@
  */
 
 /**
- * Communication Preferences Subscriptions
+ * Subscriptions
  *
  * No description provided (generated by Openapi Generator https://github.com/openapitools/openapi-generator)
  *
  * The version of the OpenAPI document: v3
  * Generated by: https://openapi-generator.tech
- * OpenAPI Generator version: 7.3.0
+ * Generator version: 7.12.0
  */
 
 /**
@@ -263,10 +263,10 @@ public function getModelName()
     /**
      * Constructor
      *
-     * @param mixed[] $data Associated array of property values
+     * @param mixed[]|null $data Associated array of property values
      *                      initializing the model
      */
-    public function __construct(array $data = null)
+    public function __construct(?array $data = null)
     {
         $this->setIfExists('sub_category', $data ?? [], null);
         $this->setIfExists('code', $data ?? [], null);
diff --git a/codegen/CommunicationPreferences/Model/ModelInterface.php b/codegen/CommunicationPreferences/Model/ModelInterface.php
index de8a84a1d..c80bc030c 100644
--- a/codegen/CommunicationPreferences/Model/ModelInterface.php
+++ b/codegen/CommunicationPreferences/Model/ModelInterface.php
@@ -11,13 +11,13 @@
  */
 
 /**
- * Communication Preferences Subscriptions
+ * Subscriptions
  *
  * No description provided (generated by Openapi Generator https://github.com/openapitools/openapi-generator)
  *
  * The version of the OpenAPI document: v3
  * Generated by: https://openapi-generator.tech
- * OpenAPI Generator version: 7.3.0
+ * Generator version: 7.12.0
  */
 
 /**
diff --git a/codegen/CommunicationPreferences/Model/PublicSubscriptionStatus.php b/codegen/CommunicationPreferences/Model/PublicSubscriptionStatus.php
index 4b976f829..595312462 100644
--- a/codegen/CommunicationPreferences/Model/PublicSubscriptionStatus.php
+++ b/codegen/CommunicationPreferences/Model/PublicSubscriptionStatus.php
@@ -11,13 +11,13 @@
  */
 
 /**
- * Communication Preferences Subscriptions
+ * Subscriptions
  *
  * No description provided (generated by Openapi Generator https://github.com/openapitools/openapi-generator)
  *
  * The version of the OpenAPI document: v3
  * Generated by: https://openapi-generator.tech
- * OpenAPI Generator version: 7.3.0
+ * Generator version: 7.12.0
  */
 
 /**
@@ -344,10 +344,10 @@ public function getSourceOfStatusAllowableValues()
     /**
      * Constructor
      *
-     * @param mixed[] $data Associated array of property values
+     * @param mixed[]|null $data Associated array of property values
      *                      initializing the model
      */
-    public function __construct(array $data = null)
+    public function __construct(?array $data = null)
     {
         $this->setIfExists('brand_id', $data ?? [], null);
         $this->setIfExists('name', $data ?? [], null);
diff --git a/codegen/CommunicationPreferences/Model/PublicSubscriptionStatusesResponse.php b/codegen/CommunicationPreferences/Model/PublicSubscriptionStatusesResponse.php
index 7ab1094e3..e707071cb 100644
--- a/codegen/CommunicationPreferences/Model/PublicSubscriptionStatusesResponse.php
+++ b/codegen/CommunicationPreferences/Model/PublicSubscriptionStatusesResponse.php
@@ -11,13 +11,13 @@
  */
 
 /**
- * Communication Preferences Subscriptions
+ * Subscriptions
  *
  * No description provided (generated by Openapi Generator https://github.com/openapitools/openapi-generator)
  *
  * The version of the OpenAPI document: v3
  * Generated by: https://openapi-generator.tech
- * OpenAPI Generator version: 7.3.0
+ * Generator version: 7.12.0
  */
 
 /**
@@ -245,10 +245,10 @@ public function getModelName()
     /**
      * Constructor
      *
-     * @param mixed[] $data Associated array of property values
+     * @param mixed[]|null $data Associated array of property values
      *                      initializing the model
      */
-    public function __construct(array $data = null)
+    public function __construct(?array $data = null)
     {
         $this->setIfExists('recipient', $data ?? [], null);
         $this->setIfExists('subscription_statuses', $data ?? [], null);
diff --git a/codegen/CommunicationPreferences/Model/PublicUpdateSubscriptionStatusRequest.php b/codegen/CommunicationPreferences/Model/PublicUpdateSubscriptionStatusRequest.php
index 15385cc8a..7b2da3beb 100644
--- a/codegen/CommunicationPreferences/Model/PublicUpdateSubscriptionStatusRequest.php
+++ b/codegen/CommunicationPreferences/Model/PublicUpdateSubscriptionStatusRequest.php
@@ -11,13 +11,13 @@
  */
 
 /**
- * Communication Preferences Subscriptions
+ * Subscriptions
  *
  * No description provided (generated by Openapi Generator https://github.com/openapitools/openapi-generator)
  *
  * The version of the OpenAPI document: v3
  * Generated by: https://openapi-generator.tech
- * OpenAPI Generator version: 7.3.0
+ * Generator version: 7.12.0
  */
 
 /**
@@ -282,10 +282,10 @@ public function getLegalBasisAllowableValues()
     /**
      * Constructor
      *
-     * @param mixed[] $data Associated array of property values
+     * @param mixed[]|null $data Associated array of property values
      *                      initializing the model
      */
-    public function __construct(array $data = null)
+    public function __construct(?array $data = null)
     {
         $this->setIfExists('email_address', $data ?? [], null);
         $this->setIfExists('legal_basis', $data ?? [], null);
diff --git a/codegen/CommunicationPreferences/Model/SubscriptionDefinition.php b/codegen/CommunicationPreferences/Model/SubscriptionDefinition.php
index 51ce5daf9..8e74c23fd 100644
--- a/codegen/CommunicationPreferences/Model/SubscriptionDefinition.php
+++ b/codegen/CommunicationPreferences/Model/SubscriptionDefinition.php
@@ -11,13 +11,13 @@
  */
 
 /**
- * Communication Preferences Subscriptions
+ * Subscriptions
  *
  * No description provided (generated by Openapi Generator https://github.com/openapitools/openapi-generator)
  *
  * The version of the OpenAPI document: v3
  * Generated by: https://openapi-generator.tech
- * OpenAPI Generator version: 7.3.0
+ * Generator version: 7.12.0
  */
 
 /**
@@ -299,10 +299,10 @@ public function getModelName()
     /**
      * Constructor
      *
-     * @param mixed[] $data Associated array of property values
+     * @param mixed[]|null $data Associated array of property values
      *                      initializing the model
      */
-    public function __construct(array $data = null)
+    public function __construct(?array $data = null)
     {
         $this->setIfExists('is_internal', $data ?? [], null);
         $this->setIfExists('created_at', $data ?? [], null);
diff --git a/codegen/CommunicationPreferences/Model/SubscriptionDefinitionsResponse.php b/codegen/CommunicationPreferences/Model/SubscriptionDefinitionsResponse.php
index 22ea1b656..7ee533f9b 100644
--- a/codegen/CommunicationPreferences/Model/SubscriptionDefinitionsResponse.php
+++ b/codegen/CommunicationPreferences/Model/SubscriptionDefinitionsResponse.php
@@ -11,13 +11,13 @@
  */
 
 /**
- * Communication Preferences Subscriptions
+ * Subscriptions
  *
  * No description provided (generated by Openapi Generator https://github.com/openapitools/openapi-generator)
  *
  * The version of the OpenAPI document: v3
  * Generated by: https://openapi-generator.tech
- * OpenAPI Generator version: 7.3.0
+ * Generator version: 7.12.0
  */
 
 /**
@@ -239,10 +239,10 @@ public function getModelName()
     /**
      * Constructor
      *
-     * @param mixed[] $data Associated array of property values
+     * @param mixed[]|null $data Associated array of property values
      *                      initializing the model
      */
-    public function __construct(array $data = null)
+    public function __construct(?array $data = null)
     {
         $this->setIfExists('subscription_definitions', $data ?? [], null);
     }
diff --git a/codegen/CommunicationPreferences/ObjectSerializer.php b/codegen/CommunicationPreferences/ObjectSerializer.php
index a10b3c894..9ca6f157c 100644
--- a/codegen/CommunicationPreferences/ObjectSerializer.php
+++ b/codegen/CommunicationPreferences/ObjectSerializer.php
@@ -11,13 +11,13 @@
  */
 
 /**
- * Communication Preferences Subscriptions
+ * Subscriptions
  *
  * No description provided (generated by Openapi Generator https://github.com/openapitools/openapi-generator)
  *
  * The version of the OpenAPI document: v3
  * Generated by: https://openapi-generator.tech
- * OpenAPI Generator version: 7.3.0
+ * Generator version: 7.12.0
  */
 
 /**
@@ -58,8 +58,8 @@ public static function setDateTimeFormat($format)
      * Serialize data
      *
      * @param mixed  $data   the data to serialize
-     * @param string $type   the OpenAPIToolsType of the data
-     * @param string $format the format of the OpenAPITools type of the data
+     * @param string|null $type   the OpenAPIToolsType of the data
+     * @param string|null $format the format of the OpenAPITools type of the data
      *
      * @return scalar|object|array|null serialized form of $data
      */
@@ -194,6 +194,10 @@ private static function isEmptyValue($value, string $openApiType): bool
             case 'boolean':
                 return !in_array($value, [false, 0], true);
 
+            # For string values, '' is considered empty.
+            case 'string':
+                return $value === '';
+
             # For all the other types, any value at this point can be considered empty.
             default:
                 return true;
@@ -265,6 +269,11 @@ public static function toQueryValue(
 
         $value = $flattenArray($value, $paramName);
 
+        // https://github.com/OAI/OpenAPI-Specification/blob/main/versions/3.1.0.md#style-values
+        if ($openApiType === 'array' && $style === 'deepObject' && $explode) {
+            return $value;
+        }
+
         if ($openApiType === 'object' && ($style === 'deepObject' || $explode)) {
             return $value;
         }
@@ -338,7 +347,7 @@ public static function toFormValue($value)
      * If it's a datetime object, format it in ISO8601
      * If it's a boolean, convert it to "true" or "false".
      *
-     * @param string|bool|\DateTime $value the value of the parameter
+     * @param float|int|bool|\DateTime $value the value of the parameter
      *
      * @return string the header string
      */
@@ -395,8 +404,7 @@ public static function serializeCollection(array $collection, $style, $allowColl
      *
      * @param mixed    $data          object or primitive to be deserialized
      * @param string   $class         class name is passed as a string
-     * @param string[] $httpHeaders   HTTP headers
-     * @param string   $discriminator discriminator if polymorphism is used
+     * @param string[]|null $httpHeaders   HTTP headers
      *
      * @return object|array|null a single or an array of $class instances
      */
@@ -473,7 +481,7 @@ public static function deserialize($data, $class, $httpHeaders = null)
             // determine file name
             if (
                 is_array($httpHeaders)
-                && array_key_exists('Content-Disposition', $httpHeaders) 
+                && array_key_exists('Content-Disposition', $httpHeaders)
                 && preg_match('/inline; filename=[\'"]?([^\'"\s]+)[\'"]?$/i', $httpHeaders['Content-Disposition'], $match)
             ) {
                 $filename = Configuration::getDefaultConfiguration()->getTempFolderPath() . DIRECTORY_SEPARATOR . self::sanitizeFilename($match[1]);
@@ -546,22 +554,64 @@ public static function deserialize($data, $class, $httpHeaders = null)
     }
 
     /**
-     * Native `http_build_query` wrapper.
-     * @see https://www.php.net/manual/en/function.http-build-query
-     *
-     * @param array|object $data           May be an array or object containing properties.
-     * @param string       $numeric_prefix If numeric indices are used in the base array and this parameter is provided, it will be prepended to the numeric index for elements in the base array only.
-     * @param string|null  $arg_separator  arg_separator.output is used to separate arguments but may be overridden by specifying this parameter.
-     * @param int          $encoding_type  Encoding type. By default, PHP_QUERY_RFC1738.
-     *
-     * @return string
-     */
-    public static function buildQuery(
-        $data,
-        string $numeric_prefix = '',
-        ?string $arg_separator = null,
-        int $encoding_type = \PHP_QUERY_RFC3986
-    ): string {
-        return \GuzzleHttp\Psr7\Query::build($data, $encoding_type);
+    * Build a query string from an array of key value pairs.
+    *
+    * This function can use the return value of `parse()` to build a query
+    * string. This function does not modify the provided keys when an array is
+    * encountered (like `http_build_query()` would).
+    *
+    * The function is copied from https://github.com/guzzle/psr7/blob/a243f80a1ca7fe8ceed4deee17f12c1930efe662/src/Query.php#L59-L112
+    * with a modification which is described in https://github.com/guzzle/psr7/pull/603
+    *
+    * @param array     $params              Query string parameters.
+    * @param int|false $encoding            Set to false to not encode, PHP_QUERY_RFC3986
+    *                                       to encode using RFC3986, or PHP_QUERY_RFC1738
+    *                                       to encode using RFC1738.
+    */
+    public static function buildQuery(array $params, $encoding = PHP_QUERY_RFC3986): string
+    {
+        if (!$params) {
+            return '';
+        }
+
+        if ($encoding === false) {
+            $encoder = function (string $str): string {
+                return $str;
+            };
+        } elseif ($encoding === PHP_QUERY_RFC3986) {
+            $encoder = 'rawurlencode';
+        } elseif ($encoding === PHP_QUERY_RFC1738) {
+            $encoder = 'urlencode';
+        } else {
+            throw new \InvalidArgumentException('Invalid type');
+        }
+
+        $castBool = Configuration::BOOLEAN_FORMAT_INT == Configuration::getDefaultConfiguration()->getBooleanFormatForQueryString()
+            ? function ($v) { return (int) $v; }
+            : function ($v) { return $v ? 'true' : 'false'; };
+
+        $qs = '';
+        foreach ($params as $k => $v) {
+            $k = $encoder((string) $k);
+            if (!is_array($v)) {
+                $qs .= $k;
+                $v = is_bool($v) ? $castBool($v) : $v;
+                if ($v !== null) {
+                    $qs .= '='.$encoder((string) $v);
+                }
+                $qs .= '&';
+            } else {
+                foreach ($v as $vv) {
+                    $qs .= $k;
+                    $vv = is_bool($vv) ? $castBool($vv) : $vv;
+                    if ($vv !== null) {
+                        $qs .= '='.$encoder((string) $vv);
+                    }
+                    $qs .= '&';
+                }
+            }
+        }
+
+        return $qs ? (string) substr($qs, 0, -1) : '';
     }
 }