Merge remote-tracking branch 'origin/master' into 5.0-sync-master

2020-04-17 15:51:00 +08:00
parent c3837ca331 896867b5e7
commit faf6f197be
4730 changed files with 208746 additions and 53119 deletions
--- a/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Api/AnotherFakeApi.php
+++ b/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Api/AnotherFakeApi.php
@@ -17,7 +17,11 @@
 * The version of the OpenAPI document: 1.0.0
 * 
 * Generated by: https://openapi-generator.tech
+<<<<<<< HEAD
 * OpenAPI Generator version: 5.0.0-SNAPSHOT
+=======
+ * OpenAPI Generator version: 4.3.1-SNAPSHOT
+>>>>>>> origin/master
 */

 /**
@@ -315,6 +319,7 @@ class AnotherFakeApi



+
        // body params
        $_tempBody = null;
        if (isset($client)) {
--- a/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Api/DefaultApi.php
+++ b/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Api/DefaultApi.php
@@ -17,7 +17,11 @@
 * The version of the OpenAPI document: 1.0.0
 * 
 * Generated by: https://openapi-generator.tech
+<<<<<<< HEAD
 * OpenAPI Generator version: 5.0.0-SNAPSHOT
+=======
+ * OpenAPI Generator version: 4.3.1-SNAPSHOT
+>>>>>>> origin/master
 */

 /**
@@ -300,6 +304,7 @@ class DefaultApi



+
        // body params
        $_tempBody = null;

--- a/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Api/FakeApi.php
+++ b/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Api/FakeApi.php
@@ -17,7 +17,11 @@
 * The version of the OpenAPI document: 1.0.0
 * 
 * Generated by: https://openapi-generator.tech
+<<<<<<< HEAD
 * OpenAPI Generator version: 5.0.0-SNAPSHOT
+=======
+ * OpenAPI Generator version: 4.3.1-SNAPSHOT
+>>>>>>> origin/master
 */

 /**
@@ -304,6 +308,7 @@ class FakeApi



+
        // body params
        $_tempBody = null;

@@ -558,6 +563,7 @@ class FakeApi



+
        // body params
        $_tempBody = null;
        if (isset($body)) {
@@ -815,6 +821,7 @@ class FakeApi



+
        // body params
        $_tempBody = null;
        if (isset($outer_composite)) {
@@ -1072,6 +1079,7 @@ class FakeApi



+
        // body params
        $_tempBody = null;
        if (isset($body)) {
@@ -1329,6 +1337,7 @@ class FakeApi



+
        // body params
        $_tempBody = null;
        if (isset($body)) {
@@ -1544,6 +1553,7 @@ class FakeApi



+
        // body params
        $_tempBody = null;
        if (isset($file_schema_test_class)) {
@@ -1770,10 +1780,18 @@ class FakeApi

        // query params
        if ($query !== null) {
-            $queryParams['query'] = ObjectSerializer::toQueryValue($query);
+            if('form' === 'form' && is_array($query)) {
+                foreach($query as $key => $value) {
+                    $queryParams[$key] = $value;
+                }
+            }
+            else {
+                $queryParams['query'] = $query;
+            }
        }


+
        // body params
        $_tempBody = null;
        if (isset($user)) {
@@ -2041,6 +2059,7 @@ class FakeApi



+
        // body params
        $_tempBody = null;
        if (isset($client)) {
@@ -2390,6 +2409,7 @@ class FakeApi



+
        // form params
        if ($integer !== null) {
            $formParams['integer'] = ObjectSerializer::toFormValue($integer);
@@ -2695,24 +2715,50 @@ class FakeApi
        $multipart = false;

        // query params
-        if (is_array($enum_query_string_array)) {
-            $enum_query_string_array = ObjectSerializer::serializeCollection($enum_query_string_array, 'multi', true);
-        }
        if ($enum_query_string_array !== null) {
-            $queryParams['enum_query_string_array'] = ObjectSerializer::toQueryValue($enum_query_string_array);
+            if('form' === 'form' && is_array($enum_query_string_array)) {
+                foreach($enum_query_string_array as $key => $value) {
+                    $queryParams[$key] = $value;
+                }
+            }
+            else {
+                $queryParams['enum_query_string_array'] = $enum_query_string_array;
+            }
        }
        // query params
        if ($enum_query_string !== null) {
-            $queryParams['enum_query_string'] = ObjectSerializer::toQueryValue($enum_query_string);
+            if('form' === 'form' && is_array($enum_query_string)) {
+                foreach($enum_query_string as $key => $value) {
+                    $queryParams[$key] = $value;
+                }
+            }
+            else {
+                $queryParams['enum_query_string'] = $enum_query_string;
+            }
        }
        // query params
        if ($enum_query_integer !== null) {
-            $queryParams['enum_query_integer'] = ObjectSerializer::toQueryValue($enum_query_integer);
+            if('form' === 'form' && is_array($enum_query_integer)) {
+                foreach($enum_query_integer as $key => $value) {
+                    $queryParams[$key] = $value;
+                }
+            }
+            else {
+                $queryParams['enum_query_integer'] = $enum_query_integer;
+            }
        }
        // query params
        if ($enum_query_double !== null) {
-            $queryParams['enum_query_double'] = ObjectSerializer::toQueryValue($enum_query_double);
+            if('form' === 'form' && is_array($enum_query_double)) {
+                foreach($enum_query_double as $key => $value) {
+                    $queryParams[$key] = $value;
+                }
+            }
+            else {
+                $queryParams['enum_query_double'] = $enum_query_double;
+            }
        }
+
        // header params
        if (is_array($enum_header_string_array)) {
            $enum_header_string_array = ObjectSerializer::serializeCollection($enum_header_string_array, 'csv');
@@ -3005,20 +3051,49 @@ class FakeApi

        // query params
        if ($required_string_group !== null) {
-            $queryParams['required_string_group'] = ObjectSerializer::toQueryValue($required_string_group);
+            if('form' === 'form' && is_array($required_string_group)) {
+                foreach($required_string_group as $key => $value) {
+                    $queryParams[$key] = $value;
+                }
+            }
+            else {
+                $queryParams['required_string_group'] = $required_string_group;
+            }
        }
        // query params
        if ($required_int64_group !== null) {
-            $queryParams['required_int64_group'] = ObjectSerializer::toQueryValue($required_int64_group);
+            if('form' === 'form' && is_array($required_int64_group)) {
+                foreach($required_int64_group as $key => $value) {
+                    $queryParams[$key] = $value;
+                }
+            }
+            else {
+                $queryParams['required_int64_group'] = $required_int64_group;
+            }
        }
        // query params
        if ($string_group !== null) {
-            $queryParams['string_group'] = ObjectSerializer::toQueryValue($string_group);
+            if('form' === 'form' && is_array($string_group)) {
+                foreach($string_group as $key => $value) {
+                    $queryParams[$key] = $value;
+                }
+            }
+            else {
+                $queryParams['string_group'] = $string_group;
+            }
        }
        // query params
        if ($int64_group !== null) {
-            $queryParams['int64_group'] = ObjectSerializer::toQueryValue($int64_group);
+            if('form' === 'form' && is_array($int64_group)) {
+                foreach($int64_group as $key => $value) {
+                    $queryParams[$key] = $value;
+                }
+            }
+            else {
+                $queryParams['int64_group'] = $int64_group;
+            }
        }
+
        // header params
        if ($required_boolean_group !== null) {
            $headerParams['required_boolean_group'] = ObjectSerializer::toHeaderValue($required_boolean_group);
@@ -3249,6 +3324,7 @@ class FakeApi



+
        // body params
        $_tempBody = null;
        if (isset($request_body)) {
@@ -3479,6 +3555,7 @@ class FakeApi



+
        // form params
        if ($param !== null) {
            $formParams['param'] = ObjectSerializer::toFormValue($param);
@@ -3742,42 +3819,51 @@ class FakeApi
        $multipart = false;

        // query params
-        if (is_array($pipe)) {
-            $pipe = ObjectSerializer::serializeCollection($pipe, 'multi', true);
-        }
        if ($pipe !== null) {
-            $queryParams['pipe'] = ObjectSerializer::toQueryValue($pipe);
+            if('form' === 'form' && is_array($pipe)) {
+                foreach($pipe as $key => $value) {
+                    $queryParams[$key] = $value;
+                }
+            }
+            else {
+                $queryParams['pipe'] = $pipe;
+            }
        }
        // query params
        if (is_array($ioutil)) {
-            $ioutil = ObjectSerializer::serializeCollection($ioutil, 'csv', true);
+            $ioutil = ObjectSerializer::serializeCollection($ioutil, 'form', true);
        }
        if ($ioutil !== null) {
-            $queryParams['ioutil'] = ObjectSerializer::toQueryValue($ioutil);
+            $queryParams['ioutil'] = $ioutil;
        }
        // query params
        if (is_array($http)) {
-            $http = ObjectSerializer::serializeCollection($http, 'space', true);
+            $http = ObjectSerializer::serializeCollection($http, 'spaceDelimited', true);
        }
        if ($http !== null) {
-            $queryParams['http'] = ObjectSerializer::toQueryValue($http);
+            $queryParams['http'] = $http;
        }
        // query params
        if (is_array($url)) {
-            $url = ObjectSerializer::serializeCollection($url, 'csv', true);
+            $url = ObjectSerializer::serializeCollection($url, 'form', true);
        }
        if ($url !== null) {
-            $queryParams['url'] = ObjectSerializer::toQueryValue($url);
+            $queryParams['url'] = $url;
        }
        // query params
-        if (is_array($context)) {
-            $context = ObjectSerializer::serializeCollection($context, 'multi', true);
-        }
        if ($context !== null) {
-            $queryParams['context'] = ObjectSerializer::toQueryValue($context);
+            if('form' === 'form' && is_array($context)) {
+                foreach($context as $key => $value) {
+                    $queryParams[$key] = $value;
+                }
+            }
+            else {
+                $queryParams['context'] = $context;
+            }
        }


+
        // body params
        $_tempBody = null;

--- a/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Api/FakeClassnameTags123Api.php
+++ b/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Api/FakeClassnameTags123Api.php
@@ -17,7 +17,11 @@
 * The version of the OpenAPI document: 1.0.0
 * 
 * Generated by: https://openapi-generator.tech
+<<<<<<< HEAD
 * OpenAPI Generator version: 5.0.0-SNAPSHOT
+=======
+ * OpenAPI Generator version: 4.3.1-SNAPSHOT
+>>>>>>> origin/master
 */

 /**
@@ -315,6 +319,7 @@ class FakeClassnameTags123Api



+
        // body params
        $_tempBody = null;
        if (isset($client)) {
--- a/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Api/PetApi.php
+++ b/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Api/PetApi.php
@@ -17,7 +17,11 @@
 * The version of the OpenAPI document: 1.0.0
 * 
 * Generated by: https://openapi-generator.tech
+<<<<<<< HEAD
 * OpenAPI Generator version: 5.0.0-SNAPSHOT
+=======
+ * OpenAPI Generator version: 4.3.1-SNAPSHOT
+>>>>>>> origin/master
 */

 /**
@@ -287,6 +291,7 @@ class PetApi



+
        // body params
        $_tempBody = null;
        if (isset($pet)) {
@@ -519,6 +524,7 @@ class PetApi
        $httpBody = '';
        $multipart = false;

+
        // header params
        if ($api_key !== null) {
            $headerParams['api_key'] = ObjectSerializer::toHeaderValue($api_key);
@@ -801,13 +807,14 @@ class PetApi

        // query params
        if (is_array($status)) {
-            $status = ObjectSerializer::serializeCollection($status, 'csv', true);
+            $status = ObjectSerializer::serializeCollection($status, 'form', true);
        }
        if ($status !== null) {
-            $queryParams['status'] = ObjectSerializer::toQueryValue($status);
+            $queryParams['status'] = $status;
        }


+
        // body params
        $_tempBody = null;

@@ -1076,13 +1083,14 @@ class PetApi

        // query params
        if (is_array($tags)) {
-            $tags = ObjectSerializer::serializeCollection($tags, 'csv', true);
+            $tags = ObjectSerializer::serializeCollection($tags, 'form', true);
        }
        if ($tags !== null) {
-            $queryParams['tags'] = ObjectSerializer::toQueryValue($tags);
+            $queryParams['tags'] = $tags;
        }


+
        // body params
        $_tempBody = null;

@@ -1350,6 +1358,7 @@ class PetApi
        $multipart = false;


+
        // path params
        if ($pet_id !== null) {
            $resourcePath = str_replace(
@@ -1600,6 +1609,7 @@ class PetApi



+
        // body params
        $_tempBody = null;
        if (isset($pet)) {
@@ -1838,6 +1848,7 @@ class PetApi
        $multipart = false;


+
        // path params
        if ($pet_id !== null) {
            $resourcePath = str_replace(
@@ -2132,6 +2143,7 @@ class PetApi
        $multipart = false;


+
        // path params
        if ($pet_id !== null) {
            $resourcePath = str_replace(
@@ -2433,6 +2445,7 @@ class PetApi
        $multipart = false;


+
        // path params
        if ($pet_id !== null) {
            $resourcePath = str_replace(
--- a/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Api/StoreApi.php
+++ b/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Api/StoreApi.php
@@ -17,7 +17,11 @@
 * The version of the OpenAPI document: 1.0.0
 * 
 * Generated by: https://openapi-generator.tech
+<<<<<<< HEAD
 * OpenAPI Generator version: 5.0.0-SNAPSHOT
+=======
+ * OpenAPI Generator version: 4.3.1-SNAPSHOT
+>>>>>>> origin/master
 */

 /**
@@ -266,6 +270,7 @@ class StoreApi
        $multipart = false;


+
        // path params
        if ($order_id !== null) {
            $resourcePath = str_replace(
@@ -528,6 +533,7 @@ class StoreApi



+
        // body params
        $_tempBody = null;

@@ -803,6 +809,7 @@ class StoreApi
        $multipart = false;


+
        // path params
        if ($order_id !== null) {
            $resourcePath = str_replace(
@@ -1076,6 +1083,7 @@ class StoreApi



+
        // body params
        $_tempBody = null;
        if (isset($order)) {
--- a/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Api/UserApi.php
+++ b/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Api/UserApi.php
@@ -17,7 +17,11 @@
 * The version of the OpenAPI document: 1.0.0
 * 
 * Generated by: https://openapi-generator.tech
+<<<<<<< HEAD
 * OpenAPI Generator version: 5.0.0-SNAPSHOT
+=======
+ * OpenAPI Generator version: 4.3.1-SNAPSHOT
+>>>>>>> origin/master
 */

 /**
@@ -267,6 +271,7 @@ class UserApi



+
        // body params
        $_tempBody = null;
        if (isset($user)) {
@@ -486,6 +491,7 @@ class UserApi



+
        // body params
        $_tempBody = null;
        if (isset($user)) {
@@ -705,6 +711,7 @@ class UserApi



+
        // body params
        $_tempBody = null;
        if (isset($user)) {
@@ -923,6 +930,7 @@ class UserApi
        $multipart = false;


+
        // path params
        if ($username !== null) {
            $resourcePath = str_replace(
@@ -1195,6 +1203,7 @@ class UserApi
        $multipart = false;


+
        // path params
        if ($username !== null) {
            $resourcePath = str_replace(
@@ -1479,14 +1488,29 @@ class UserApi

        // query params
        if ($username !== null) {
-            $queryParams['username'] = ObjectSerializer::toQueryValue($username);
+            if('form' === 'form' && is_array($username)) {
+                foreach($username as $key => $value) {
+                    $queryParams[$key] = $value;
+                }
+            }
+            else {
+                $queryParams['username'] = $username;
+            }
        }
        // query params
        if ($password !== null) {
-            $queryParams['password'] = ObjectSerializer::toQueryValue($password);
+            if('form' === 'form' && is_array($password)) {
+                foreach($password as $key => $value) {
+                    $queryParams[$key] = $value;
+                }
+            }
+            else {
+                $queryParams['password'] = $password;
+            }
        }


+
        // body params
        $_tempBody = null;

@@ -1692,6 +1716,7 @@ class UserApi



+
        // body params
        $_tempBody = null;

@@ -1918,6 +1943,7 @@ class UserApi
        $multipart = false;


+
        // path params
        if ($username !== null) {
            $resourcePath = str_replace(
--- a/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/ApiException.php
+++ b/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/ApiException.php
@@ -17,7 +17,11 @@
 * The version of the OpenAPI document: 1.0.0
 * 
 * Generated by: https://openapi-generator.tech
+<<<<<<< HEAD
 * OpenAPI Generator version: 5.0.0-SNAPSHOT
+=======
+ * OpenAPI Generator version: 4.3.1-SNAPSHOT
+>>>>>>> origin/master
 */

 /**
--- a/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Configuration.php
+++ b/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Configuration.php
@@ -17,7 +17,11 @@
 * The version of the OpenAPI document: 1.0.0
 * 
 * Generated by: https://openapi-generator.tech
+<<<<<<< HEAD
 * OpenAPI Generator version: 5.0.0-SNAPSHOT
+=======
+ * OpenAPI Generator version: 4.3.1-SNAPSHOT
+>>>>>>> origin/master
 */

 /**
--- a/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/HeaderSelector.php
+++ b/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/HeaderSelector.php
@@ -17,7 +17,11 @@
 * The version of the OpenAPI document: 1.0.0
 * 
 * Generated by: https://openapi-generator.tech
+<<<<<<< HEAD
 * OpenAPI Generator version: 5.0.0-SNAPSHOT
+=======
+ * OpenAPI Generator version: 4.3.1-SNAPSHOT
+>>>>>>> origin/master
 */

 /**
--- a/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Model/AdditionalPropertiesClass.php
+++ b/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Model/AdditionalPropertiesClass.php
@@ -18,7 +18,11 @@
 * The version of the OpenAPI document: 1.0.0
 * 
 * Generated by: https://openapi-generator.tech
+<<<<<<< HEAD
 * OpenAPI Generator version: 5.0.0-SNAPSHOT
+=======
+ * OpenAPI Generator version: 4.3.1-SNAPSHOT
+>>>>>>> origin/master
 */

 /**
--- a/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Model/Animal.php
+++ b/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Model/Animal.php
@@ -18,7 +18,11 @@
 * The version of the OpenAPI document: 1.0.0
 * 
 * Generated by: https://openapi-generator.tech
+<<<<<<< HEAD
 * OpenAPI Generator version: 5.0.0-SNAPSHOT
+=======
+ * OpenAPI Generator version: 4.3.1-SNAPSHOT
+>>>>>>> origin/master
 */

 /**
--- a/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Model/ApiResponse.php
+++ b/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Model/ApiResponse.php
@@ -18,7 +18,11 @@
 * The version of the OpenAPI document: 1.0.0
 * 
 * Generated by: https://openapi-generator.tech
+<<<<<<< HEAD
 * OpenAPI Generator version: 5.0.0-SNAPSHOT
+=======
+ * OpenAPI Generator version: 4.3.1-SNAPSHOT
+>>>>>>> origin/master
 */

 /**
--- a/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Model/ArrayOfArrayOfNumberOnly.php
+++ b/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Model/ArrayOfArrayOfNumberOnly.php
@@ -18,7 +18,11 @@
 * The version of the OpenAPI document: 1.0.0
 * 
 * Generated by: https://openapi-generator.tech
+<<<<<<< HEAD
 * OpenAPI Generator version: 5.0.0-SNAPSHOT
+=======
+ * OpenAPI Generator version: 4.3.1-SNAPSHOT
+>>>>>>> origin/master
 */

 /**
--- a/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Model/ArrayOfNumberOnly.php
+++ b/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Model/ArrayOfNumberOnly.php
@@ -18,7 +18,11 @@
 * The version of the OpenAPI document: 1.0.0
 * 
 * Generated by: https://openapi-generator.tech
+<<<<<<< HEAD
 * OpenAPI Generator version: 5.0.0-SNAPSHOT
+=======
+ * OpenAPI Generator version: 4.3.1-SNAPSHOT
+>>>>>>> origin/master
 */

 /**
--- a/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Model/ArrayTest.php
+++ b/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Model/ArrayTest.php
@@ -18,7 +18,11 @@
 * The version of the OpenAPI document: 1.0.0
 * 
 * Generated by: https://openapi-generator.tech
+<<<<<<< HEAD
 * OpenAPI Generator version: 5.0.0-SNAPSHOT
+=======
+ * OpenAPI Generator version: 4.3.1-SNAPSHOT
+>>>>>>> origin/master
 */

 /**
--- a/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Model/Capitalization.php
+++ b/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Model/Capitalization.php
@@ -18,7 +18,11 @@
 * The version of the OpenAPI document: 1.0.0
 * 
 * Generated by: https://openapi-generator.tech
+<<<<<<< HEAD
 * OpenAPI Generator version: 5.0.0-SNAPSHOT
+=======
+ * OpenAPI Generator version: 4.3.1-SNAPSHOT
+>>>>>>> origin/master
 */

 /**
--- a/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Model/Cat.php
+++ b/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Model/Cat.php
@@ -18,7 +18,11 @@
 * The version of the OpenAPI document: 1.0.0
 * 
 * Generated by: https://openapi-generator.tech
+<<<<<<< HEAD
 * OpenAPI Generator version: 5.0.0-SNAPSHOT
+=======
+ * OpenAPI Generator version: 4.3.1-SNAPSHOT
+>>>>>>> origin/master
 */

 /**
--- a/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Model/CatAllOf.php
+++ b/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Model/CatAllOf.php
@@ -18,7 +18,11 @@
 * The version of the OpenAPI document: 1.0.0
 * 
 * Generated by: https://openapi-generator.tech
+<<<<<<< HEAD
 * OpenAPI Generator version: 5.0.0-SNAPSHOT
+=======
+ * OpenAPI Generator version: 4.3.1-SNAPSHOT
+>>>>>>> origin/master
 */

 /**
--- a/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Model/Category.php
+++ b/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Model/Category.php
@@ -18,7 +18,11 @@
 * The version of the OpenAPI document: 1.0.0
 * 
 * Generated by: https://openapi-generator.tech
+<<<<<<< HEAD
 * OpenAPI Generator version: 5.0.0-SNAPSHOT
+=======
+ * OpenAPI Generator version: 4.3.1-SNAPSHOT
+>>>>>>> origin/master
 */

 /**
--- a/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Model/ClassModel.php
+++ b/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Model/ClassModel.php
@@ -18,7 +18,11 @@
 * The version of the OpenAPI document: 1.0.0
 * 
 * Generated by: https://openapi-generator.tech
+<<<<<<< HEAD
 * OpenAPI Generator version: 5.0.0-SNAPSHOT
+=======
+ * OpenAPI Generator version: 4.3.1-SNAPSHOT
+>>>>>>> origin/master
 */

 /**
--- a/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Model/Client.php
+++ b/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Model/Client.php
@@ -18,7 +18,11 @@
 * The version of the OpenAPI document: 1.0.0
 * 
 * Generated by: https://openapi-generator.tech
+<<<<<<< HEAD
 * OpenAPI Generator version: 5.0.0-SNAPSHOT
+=======
+ * OpenAPI Generator version: 4.3.1-SNAPSHOT
+>>>>>>> origin/master
 */

 /**
--- a/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Model/Dog.php
+++ b/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Model/Dog.php
@@ -18,7 +18,11 @@
 * The version of the OpenAPI document: 1.0.0
 * 
 * Generated by: https://openapi-generator.tech
+<<<<<<< HEAD
 * OpenAPI Generator version: 5.0.0-SNAPSHOT
+=======
+ * OpenAPI Generator version: 4.3.1-SNAPSHOT
+>>>>>>> origin/master
 */

 /**
--- a/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Model/DogAllOf.php
+++ b/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Model/DogAllOf.php
@@ -18,7 +18,11 @@
 * The version of the OpenAPI document: 1.0.0
 * 
 * Generated by: https://openapi-generator.tech
+<<<<<<< HEAD
 * OpenAPI Generator version: 5.0.0-SNAPSHOT
+=======
+ * OpenAPI Generator version: 4.3.1-SNAPSHOT
+>>>>>>> origin/master
 */

 /**
--- a/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Model/EnumArrays.php
+++ b/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Model/EnumArrays.php
@@ -18,7 +18,11 @@
 * The version of the OpenAPI document: 1.0.0
 * 
 * Generated by: https://openapi-generator.tech
+<<<<<<< HEAD
 * OpenAPI Generator version: 5.0.0-SNAPSHOT
+=======
+ * OpenAPI Generator version: 4.3.1-SNAPSHOT
+>>>>>>> origin/master
 */

 /**
--- a/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Model/EnumClass.php
+++ b/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Model/EnumClass.php
@@ -18,7 +18,11 @@
 * The version of the OpenAPI document: 1.0.0
 * 
 * Generated by: https://openapi-generator.tech
+<<<<<<< HEAD
 * OpenAPI Generator version: 5.0.0-SNAPSHOT
+=======
+ * OpenAPI Generator version: 4.3.1-SNAPSHOT
+>>>>>>> origin/master
 */

 /**
--- a/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Model/EnumTest.php
+++ b/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Model/EnumTest.php
@@ -18,7 +18,11 @@
 * The version of the OpenAPI document: 1.0.0
 * 
 * Generated by: https://openapi-generator.tech
+<<<<<<< HEAD
 * OpenAPI Generator version: 5.0.0-SNAPSHOT
+=======
+ * OpenAPI Generator version: 4.3.1-SNAPSHOT
+>>>>>>> origin/master
 */

 /**
--- a/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Model/File.php
+++ b/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Model/File.php
@@ -18,7 +18,11 @@
 * The version of the OpenAPI document: 1.0.0
 * 
 * Generated by: https://openapi-generator.tech
+<<<<<<< HEAD
 * OpenAPI Generator version: 5.0.0-SNAPSHOT
+=======
+ * OpenAPI Generator version: 4.3.1-SNAPSHOT
+>>>>>>> origin/master
 */

 /**
--- a/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Model/FileSchemaTestClass.php
+++ b/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Model/FileSchemaTestClass.php
@@ -18,7 +18,11 @@
 * The version of the OpenAPI document: 1.0.0
 * 
 * Generated by: https://openapi-generator.tech
+<<<<<<< HEAD
 * OpenAPI Generator version: 5.0.0-SNAPSHOT
+=======
+ * OpenAPI Generator version: 4.3.1-SNAPSHOT
+>>>>>>> origin/master
 */

 /**
--- a/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Model/Foo.php
+++ b/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Model/Foo.php
@@ -18,7 +18,11 @@
 * The version of the OpenAPI document: 1.0.0
 * 
 * Generated by: https://openapi-generator.tech
+<<<<<<< HEAD
 * OpenAPI Generator version: 5.0.0-SNAPSHOT
+=======
+ * OpenAPI Generator version: 4.3.1-SNAPSHOT
+>>>>>>> origin/master
 */

 /**
--- a/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Model/FormatTest.php
+++ b/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Model/FormatTest.php
@@ -18,7 +18,11 @@
 * The version of the OpenAPI document: 1.0.0
 * 
 * Generated by: https://openapi-generator.tech
+<<<<<<< HEAD
 * OpenAPI Generator version: 5.0.0-SNAPSHOT
+=======
+ * OpenAPI Generator version: 4.3.1-SNAPSHOT
+>>>>>>> origin/master
 */

 /**
--- a/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Model/HasOnlyReadOnly.php
+++ b/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Model/HasOnlyReadOnly.php
@@ -18,7 +18,11 @@
 * The version of the OpenAPI document: 1.0.0
 * 
 * Generated by: https://openapi-generator.tech
+<<<<<<< HEAD
 * OpenAPI Generator version: 5.0.0-SNAPSHOT
+=======
+ * OpenAPI Generator version: 4.3.1-SNAPSHOT
+>>>>>>> origin/master
 */

 /**
--- a/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Model/HealthCheckResult.php
+++ b/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Model/HealthCheckResult.php
@@ -18,7 +18,11 @@
 * The version of the OpenAPI document: 1.0.0
 * 
 * Generated by: https://openapi-generator.tech
+<<<<<<< HEAD
 * OpenAPI Generator version: 5.0.0-SNAPSHOT
+=======
+ * OpenAPI Generator version: 4.3.1-SNAPSHOT
+>>>>>>> origin/master
 */

 /**
--- a/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Model/InlineObject.php
+++ b/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Model/InlineObject.php
@@ -18,7 +18,11 @@
 * The version of the OpenAPI document: 1.0.0
 * 
 * Generated by: https://openapi-generator.tech
+<<<<<<< HEAD
 * OpenAPI Generator version: 5.0.0-SNAPSHOT
+=======
+ * OpenAPI Generator version: 4.3.1-SNAPSHOT
+>>>>>>> origin/master
 */

 /**
--- a/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Model/InlineObject1.php
+++ b/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Model/InlineObject1.php
@@ -18,7 +18,11 @@
 * The version of the OpenAPI document: 1.0.0
 * 
 * Generated by: https://openapi-generator.tech
+<<<<<<< HEAD
 * OpenAPI Generator version: 5.0.0-SNAPSHOT
+=======
+ * OpenAPI Generator version: 4.3.1-SNAPSHOT
+>>>>>>> origin/master
 */

 /**
--- a/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Model/InlineObject2.php
+++ b/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Model/InlineObject2.php
@@ -18,7 +18,11 @@
 * The version of the OpenAPI document: 1.0.0
 * 
 * Generated by: https://openapi-generator.tech
+<<<<<<< HEAD
 * OpenAPI Generator version: 5.0.0-SNAPSHOT
+=======
+ * OpenAPI Generator version: 4.3.1-SNAPSHOT
+>>>>>>> origin/master
 */

 /**
--- a/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Model/InlineObject3.php
+++ b/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Model/InlineObject3.php
@@ -18,7 +18,11 @@
 * The version of the OpenAPI document: 1.0.0
 * 
 * Generated by: https://openapi-generator.tech
+<<<<<<< HEAD
 * OpenAPI Generator version: 5.0.0-SNAPSHOT
+=======
+ * OpenAPI Generator version: 4.3.1-SNAPSHOT
+>>>>>>> origin/master
 */

 /**
--- a/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Model/InlineObject4.php
+++ b/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Model/InlineObject4.php
@@ -18,7 +18,11 @@
 * The version of the OpenAPI document: 1.0.0
 * 
 * Generated by: https://openapi-generator.tech
+<<<<<<< HEAD
 * OpenAPI Generator version: 5.0.0-SNAPSHOT
+=======
+ * OpenAPI Generator version: 4.3.1-SNAPSHOT
+>>>>>>> origin/master
 */

 /**
--- a/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Model/InlineObject5.php
+++ b/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Model/InlineObject5.php
@@ -18,7 +18,11 @@
 * The version of the OpenAPI document: 1.0.0
 * 
 * Generated by: https://openapi-generator.tech
+<<<<<<< HEAD
 * OpenAPI Generator version: 5.0.0-SNAPSHOT
+=======
+ * OpenAPI Generator version: 4.3.1-SNAPSHOT
+>>>>>>> origin/master
 */

 /**
--- a/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Model/InlineResponseDefault.php
+++ b/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Model/InlineResponseDefault.php
@@ -18,7 +18,11 @@
 * The version of the OpenAPI document: 1.0.0
 * 
 * Generated by: https://openapi-generator.tech
+<<<<<<< HEAD
 * OpenAPI Generator version: 5.0.0-SNAPSHOT
+=======
+ * OpenAPI Generator version: 4.3.1-SNAPSHOT
+>>>>>>> origin/master
 */

 /**
--- a/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Model/MapTest.php
+++ b/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Model/MapTest.php
@@ -18,7 +18,11 @@
 * The version of the OpenAPI document: 1.0.0
 * 
 * Generated by: https://openapi-generator.tech
+<<<<<<< HEAD
 * OpenAPI Generator version: 5.0.0-SNAPSHOT
+=======
+ * OpenAPI Generator version: 4.3.1-SNAPSHOT
+>>>>>>> origin/master
 */

 /**
--- a/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Model/MixedPropertiesAndAdditionalPropertiesClass.php
+++ b/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Model/MixedPropertiesAndAdditionalPropertiesClass.php
@@ -18,7 +18,11 @@
 * The version of the OpenAPI document: 1.0.0
 * 
 * Generated by: https://openapi-generator.tech
+<<<<<<< HEAD
 * OpenAPI Generator version: 5.0.0-SNAPSHOT
+=======
+ * OpenAPI Generator version: 4.3.1-SNAPSHOT
+>>>>>>> origin/master
 */

 /**
--- a/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Model/Model200Response.php
+++ b/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Model/Model200Response.php
@@ -18,7 +18,11 @@
 * The version of the OpenAPI document: 1.0.0
 * 
 * Generated by: https://openapi-generator.tech
+<<<<<<< HEAD
 * OpenAPI Generator version: 5.0.0-SNAPSHOT
+=======
+ * OpenAPI Generator version: 4.3.1-SNAPSHOT
+>>>>>>> origin/master
 */

 /**
--- a/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Model/ModelInterface.php
+++ b/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Model/ModelInterface.php
@@ -18,7 +18,11 @@
 * The version of the OpenAPI document: 1.0.0
 * 
 * Generated by: https://openapi-generator.tech
+<<<<<<< HEAD
 * OpenAPI Generator version: 5.0.0-SNAPSHOT
+=======
+ * OpenAPI Generator version: 4.3.1-SNAPSHOT
+>>>>>>> origin/master
 */

 /**
--- a/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Model/ModelList.php
+++ b/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Model/ModelList.php
@@ -18,7 +18,11 @@
 * The version of the OpenAPI document: 1.0.0
 * 
 * Generated by: https://openapi-generator.tech
+<<<<<<< HEAD
 * OpenAPI Generator version: 5.0.0-SNAPSHOT
+=======
+ * OpenAPI Generator version: 4.3.1-SNAPSHOT
+>>>>>>> origin/master
 */

 /**
--- a/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Model/ModelReturn.php
+++ b/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Model/ModelReturn.php
@@ -18,7 +18,11 @@
 * The version of the OpenAPI document: 1.0.0
 * 
 * Generated by: https://openapi-generator.tech
+<<<<<<< HEAD
 * OpenAPI Generator version: 5.0.0-SNAPSHOT
+=======
+ * OpenAPI Generator version: 4.3.1-SNAPSHOT
+>>>>>>> origin/master
 */

 /**
--- a/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Model/Name.php
+++ b/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Model/Name.php
@@ -18,7 +18,11 @@
 * The version of the OpenAPI document: 1.0.0
 * 
 * Generated by: https://openapi-generator.tech
+<<<<<<< HEAD
 * OpenAPI Generator version: 5.0.0-SNAPSHOT
+=======
+ * OpenAPI Generator version: 4.3.1-SNAPSHOT
+>>>>>>> origin/master
 */

 /**
--- a/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Model/NullableClass.php
+++ b/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Model/NullableClass.php
@@ -18,7 +18,11 @@
 * The version of the OpenAPI document: 1.0.0
 * 
 * Generated by: https://openapi-generator.tech
+<<<<<<< HEAD
 * OpenAPI Generator version: 5.0.0-SNAPSHOT
+=======
+ * OpenAPI Generator version: 4.3.1-SNAPSHOT
+>>>>>>> origin/master
 */

 /**
--- a/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Model/NumberOnly.php
+++ b/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Model/NumberOnly.php
@@ -18,7 +18,11 @@
 * The version of the OpenAPI document: 1.0.0
 * 
 * Generated by: https://openapi-generator.tech
+<<<<<<< HEAD
 * OpenAPI Generator version: 5.0.0-SNAPSHOT
+=======
+ * OpenAPI Generator version: 4.3.1-SNAPSHOT
+>>>>>>> origin/master
 */

 /**
--- a/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Model/Order.php
+++ b/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Model/Order.php
@@ -18,7 +18,11 @@
 * The version of the OpenAPI document: 1.0.0
 * 
 * Generated by: https://openapi-generator.tech
+<<<<<<< HEAD
 * OpenAPI Generator version: 5.0.0-SNAPSHOT
+=======
+ * OpenAPI Generator version: 4.3.1-SNAPSHOT
+>>>>>>> origin/master
 */

 /**
--- a/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Model/OuterComposite.php
+++ b/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Model/OuterComposite.php
@@ -18,7 +18,11 @@
 * The version of the OpenAPI document: 1.0.0
 * 
 * Generated by: https://openapi-generator.tech
+<<<<<<< HEAD
 * OpenAPI Generator version: 5.0.0-SNAPSHOT
+=======
+ * OpenAPI Generator version: 4.3.1-SNAPSHOT
+>>>>>>> origin/master
 */

 /**
--- a/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Model/OuterEnum.php
+++ b/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Model/OuterEnum.php
@@ -18,7 +18,11 @@
 * The version of the OpenAPI document: 1.0.0
 * 
 * Generated by: https://openapi-generator.tech
+<<<<<<< HEAD
 * OpenAPI Generator version: 5.0.0-SNAPSHOT
+=======
+ * OpenAPI Generator version: 4.3.1-SNAPSHOT
+>>>>>>> origin/master
 */

 /**
--- a/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Model/OuterEnumDefaultValue.php
+++ b/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Model/OuterEnumDefaultValue.php
@@ -18,7 +18,11 @@
 * The version of the OpenAPI document: 1.0.0
 * 
 * Generated by: https://openapi-generator.tech
+<<<<<<< HEAD
 * OpenAPI Generator version: 5.0.0-SNAPSHOT
+=======
+ * OpenAPI Generator version: 4.3.1-SNAPSHOT
+>>>>>>> origin/master
 */

 /**
--- a/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Model/OuterEnumInteger.php
+++ b/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Model/OuterEnumInteger.php
@@ -18,7 +18,11 @@
 * The version of the OpenAPI document: 1.0.0
 * 
 * Generated by: https://openapi-generator.tech
+<<<<<<< HEAD
 * OpenAPI Generator version: 5.0.0-SNAPSHOT
+=======
+ * OpenAPI Generator version: 4.3.1-SNAPSHOT
+>>>>>>> origin/master
 */

 /**
--- a/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Model/OuterEnumIntegerDefaultValue.php
+++ b/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Model/OuterEnumIntegerDefaultValue.php
@@ -18,7 +18,11 @@
 * The version of the OpenAPI document: 1.0.0
 * 
 * Generated by: https://openapi-generator.tech
+<<<<<<< HEAD
 * OpenAPI Generator version: 5.0.0-SNAPSHOT
+=======
+ * OpenAPI Generator version: 4.3.1-SNAPSHOT
+>>>>>>> origin/master
 */

 /**
--- a/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Model/Pet.php
+++ b/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Model/Pet.php
@@ -18,7 +18,11 @@
 * The version of the OpenAPI document: 1.0.0
 * 
 * Generated by: https://openapi-generator.tech
+<<<<<<< HEAD
 * OpenAPI Generator version: 5.0.0-SNAPSHOT
+=======
+ * OpenAPI Generator version: 4.3.1-SNAPSHOT
+>>>>>>> origin/master
 */

 /**
--- a/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Model/ReadOnlyFirst.php
+++ b/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Model/ReadOnlyFirst.php
@@ -18,7 +18,11 @@
 * The version of the OpenAPI document: 1.0.0
 * 
 * Generated by: https://openapi-generator.tech
+<<<<<<< HEAD
 * OpenAPI Generator version: 5.0.0-SNAPSHOT
+=======
+ * OpenAPI Generator version: 4.3.1-SNAPSHOT
+>>>>>>> origin/master
 */

 /**
--- a/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Model/SpecialModelName.php
+++ b/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Model/SpecialModelName.php
@@ -18,7 +18,11 @@
 * The version of the OpenAPI document: 1.0.0
 * 
 * Generated by: https://openapi-generator.tech
+<<<<<<< HEAD
 * OpenAPI Generator version: 5.0.0-SNAPSHOT
+=======
+ * OpenAPI Generator version: 4.3.1-SNAPSHOT
+>>>>>>> origin/master
 */

 /**
--- a/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Model/Tag.php
+++ b/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Model/Tag.php
@@ -18,7 +18,11 @@
 * The version of the OpenAPI document: 1.0.0
 * 
 * Generated by: https://openapi-generator.tech
+<<<<<<< HEAD
 * OpenAPI Generator version: 5.0.0-SNAPSHOT
+=======
+ * OpenAPI Generator version: 4.3.1-SNAPSHOT
+>>>>>>> origin/master
 */

 /**
--- a/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Model/User.php
+++ b/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Model/User.php
@@ -18,7 +18,11 @@
 * The version of the OpenAPI document: 1.0.0
 * 
 * Generated by: https://openapi-generator.tech
+<<<<<<< HEAD
 * OpenAPI Generator version: 5.0.0-SNAPSHOT
+=======
+ * OpenAPI Generator version: 4.3.1-SNAPSHOT
+>>>>>>> origin/master
 */

 /**
--- a/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/ObjectSerializer.php
+++ b/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/ObjectSerializer.php
@@ -18,7 +18,11 @@
 * The version of the OpenAPI document: 1.0.0
 * 
 * Generated by: https://openapi-generator.tech
+<<<<<<< HEAD
 * OpenAPI Generator version: 5.0.0-SNAPSHOT
+=======
+ * OpenAPI Generator version: 4.3.1-SNAPSHOT
+>>>>>>> origin/master
 */

 /**
@@ -213,29 +217,32 @@ class ObjectSerializer
     * Serialize an array to a string.
     *
     * @param array  $collection                 collection to serialize to a string
-     * @param string $collectionFormat           the format use for serialization (csv,
+     * @param string $style                      the format use for serialization (csv,
     * ssv, tsv, pipes, multi)
     * @param bool   $allowCollectionFormatMulti allow collection format to be a multidimensional array
     *
     * @return string
     */
-    public static function serializeCollection(array $collection, $collectionFormat, $allowCollectionFormatMulti = false)
+    public static function serializeCollection(array $collection, $style, $allowCollectionFormatMulti = false)
    {
-        if ($allowCollectionFormatMulti && ('multi' === $collectionFormat)) {
+        if ($allowCollectionFormatMulti && ('multi' === $style)) {
            // http_build_query() almost does the job for us. We just
            // need to fix the result of multidimensional arrays.
            return preg_replace('/%5B[0-9]+%5D=/', '=', http_build_query($collection, '', '&'));
        }
-        switch ($collectionFormat) {
+        switch ($style) {
+            case 'pipeDelimited':
            case 'pipes':
                return implode('|', $collection);

            case 'tsv':
                return implode("\t", $collection);

+            case 'spaceDelimited':
            case 'ssv':
                return implode(' ', $collection);

+            case 'simple':
            case 'csv':
                // Deliberate fall through. CSV is default format.
            default: