Merge pull request #461 from HubSpot/feature/codegenMarketingForms

Codegen: Marketing Forms

Author: ksvirkou-hubspot

codegen/Marketing/Forms/Api/FormsApi.php

@@ -16,7 +16,7 @@
  *
  * 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()
     {

codegen/Marketing/Forms/ApiException.php

@@ -16,7 +16,7 @@
  *
  * 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 = [];

codegen/Marketing/Forms/Configuration.php

@@ -16,7 +16,7 @@
  *
  * 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
     *

codegen/Marketing/Forms/HeaderSelector.php

@@ -17,7 +17,7 @@
  *
  * 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('paging', $data ?? [], null);
         $this->setIfExists('results', $data ?? [], null);

codegen/Marketing/Forms/Model/CollectionResponseFormDefinitionBaseForwardPaging.php

@@ -17,7 +17,7 @@
  *
  * The version of the OpenAPI document: v3
  * Generated by: https://openapi-generator.tech
- * OpenAPI Generator version: 7.3.0
+ * Generator version: 7.12.0
  */
 
 /**
@@ -312,10 +312,10 @@ public function getFormTypeAllowableValues()
     /**
      * 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('form_type', $data ?? [], 'hubspot');
         $this->setIfExists('id', $data ?? [], null);