diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/PhpSlim4ServerCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/PhpSlim4ServerCodegen.java index 2eefb7de347..1a8f20529fa 100644 --- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/PhpSlim4ServerCodegen.java +++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/PhpSlim4ServerCodegen.java @@ -16,23 +16,15 @@ package org.openapitools.codegen.languages; -import io.swagger.v3.oas.models.Operation; -import io.swagger.v3.oas.models.security.SecurityScheme; -import io.swagger.v3.oas.models.servers.Server; -import org.apache.commons.lang3.StringEscapeUtils; -import org.apache.commons.lang3.StringUtils; -import org.openapitools.codegen.*; +import org.openapitools.codegen.CliOption; +import org.openapitools.codegen.CodegenConstants; +import org.openapitools.codegen.SupportingFile; import org.openapitools.codegen.meta.GeneratorMetadata; import org.openapitools.codegen.meta.Stability; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import java.io.File; -import java.io.UnsupportedEncodingException; -import java.net.URLEncoder; -import java.util.*; - -import static org.openapitools.codegen.utils.StringUtils.*; public class PhpSlim4ServerCodegen extends PhpSlimServerCodegen { private static final Logger LOGGER = LoggerFactory.getLogger(PhpSlim4ServerCodegen.class); diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/PhpSlimServerCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/PhpSlimServerCodegen.java index a7b6267394e..02ebea31b03 100644 --- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/PhpSlimServerCodegen.java +++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/PhpSlimServerCodegen.java @@ -34,7 +34,7 @@ import java.io.UnsupportedEncodingException; import java.net.URLEncoder; import java.util.*; -import static org.openapitools.codegen.utils.StringUtils.*; +import static org.openapitools.codegen.utils.StringUtils.camelize; public class PhpSlimServerCodegen extends AbstractPhpCodegen { private static final Logger LOGGER = LoggerFactory.getLogger(PhpSlimServerCodegen.class); @@ -241,7 +241,7 @@ public class PhpSlimServerCodegen extends AbstractPhpCodegen { .replace("\\/", "/")) .replaceAll("[\\t\\n\\r]", " ") .replace("\\", "\\\\")); - // .replace("\"", "\\\"")); + // .replace("\"", "\\\"")); // from AbstractPhpCodegen.java // Trim the string to avoid leading and trailing spaces. diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/PhpSymfonyServerCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/PhpSymfonyServerCodegen.java index 8db491a1564..d0756dacc2a 100644 --- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/PhpSymfonyServerCodegen.java +++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/PhpSymfonyServerCodegen.java @@ -96,7 +96,7 @@ public class PhpSymfonyServerCodegen extends AbstractPhpCodegen implements Codeg SchemaSupportFeature.Polymorphism ) ); - + // clear import mapping (from default generator) as php does not use it // at the moment importMapping.clear(); diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/PhpZendExpressivePathHandlerServerCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/PhpZendExpressivePathHandlerServerCodegen.java index 2189189121d..39732835cf9 100644 --- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/PhpZendExpressivePathHandlerServerCodegen.java +++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/PhpZendExpressivePathHandlerServerCodegen.java @@ -337,7 +337,7 @@ public class PhpZendExpressivePathHandlerServerCodegen extends AbstractPhpCodege op.httpMethod = httpMethodDeclaration; //Producing content with media type "*/*" is not supported if (op.produces != null) { - for (Map p: op.produces) { + for (Map p : op.produces) { if (p.replace("mediaType", "*/*", "n/a")) { LOGGER.warn("Media type range '*/*' is not supported, using 'n/a' for code generation instead"); } diff --git a/modules/openapi-generator/src/main/resources/php/ObjectSerializer.mustache b/modules/openapi-generator/src/main/resources/php/ObjectSerializer.mustache index cb56402db1a..c6d80ce1fdd 100644 --- a/modules/openapi-generator/src/main/resources/php/ObjectSerializer.mustache +++ b/modules/openapi-generator/src/main/resources/php/ObjectSerializer.mustache @@ -203,7 +203,7 @@ 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 * @@ -211,7 +211,7 @@ class ObjectSerializer */ 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, '', '&')); diff --git a/samples/client/petstore/php/OpenAPIClient-php/lib/Api/FakeApi.php b/samples/client/petstore/php/OpenAPIClient-php/lib/Api/FakeApi.php index e8be7d98afa..5dacb7f3108 100644 --- a/samples/client/petstore/php/OpenAPIClient-php/lib/Api/FakeApi.php +++ b/samples/client/petstore/php/OpenAPIClient-php/lib/Api/FakeApi.php @@ -2677,7 +2677,7 @@ class FakeApi // query params if (is_array($enum_query_string_array)) { - $enum_query_string_array = ObjectSerializer::serializeCollection($enum_query_string_array, 'csv', true); + $enum_query_string_array = ObjectSerializer::serializeCollection($enum_query_string_array, 'form', true); } if ($enum_query_string_array !== null) { $queryParams['enum_query_string_array'] = $enum_query_string_array; @@ -3761,7 +3761,7 @@ class FakeApi // query params if (is_array($pipe)) { - $pipe = ObjectSerializer::serializeCollection($pipe, 'csv', true); + $pipe = ObjectSerializer::serializeCollection($pipe, 'form', true); } if ($pipe !== null) { $queryParams['pipe'] = $pipe; @@ -3779,7 +3779,7 @@ class FakeApi // query params if (is_array($http)) { - $http = ObjectSerializer::serializeCollection($http, 'space', true); + $http = ObjectSerializer::serializeCollection($http, 'spaceDelimited', true); } if ($http !== null) { $queryParams['http'] = $http; @@ -3788,7 +3788,7 @@ class FakeApi // query params if (is_array($url)) { - $url = ObjectSerializer::serializeCollection($url, 'csv', true); + $url = ObjectSerializer::serializeCollection($url, 'form', true); } if ($url !== null) { $queryParams['url'] = $url; diff --git a/samples/client/petstore/php/OpenAPIClient-php/lib/Api/PetApi.php b/samples/client/petstore/php/OpenAPIClient-php/lib/Api/PetApi.php index 2038687c457..f949d0acb66 100644 --- a/samples/client/petstore/php/OpenAPIClient-php/lib/Api/PetApi.php +++ b/samples/client/petstore/php/OpenAPIClient-php/lib/Api/PetApi.php @@ -778,7 +778,7 @@ 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'] = $status; @@ -1056,7 +1056,7 @@ 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'] = $tags; diff --git a/samples/client/petstore/php/OpenAPIClient-php/lib/ObjectSerializer.php b/samples/client/petstore/php/OpenAPIClient-php/lib/ObjectSerializer.php index 00cd2bbb70a..cf1941addbc 100644 --- a/samples/client/petstore/php/OpenAPIClient-php/lib/ObjectSerializer.php +++ b/samples/client/petstore/php/OpenAPIClient-php/lib/ObjectSerializer.php @@ -213,7 +213,7 @@ 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 * @@ -221,7 +221,7 @@ class ObjectSerializer */ 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, '', '&')); diff --git a/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Api/FakeApi.php b/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Api/FakeApi.php index fa9305cfbb4..e2a83116f44 100644 --- a/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Api/FakeApi.php +++ b/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Api/FakeApi.php @@ -3778,7 +3778,7 @@ class FakeApi // query params if (is_array($ioutil)) { - $ioutil = ObjectSerializer::serializeCollection($ioutil, 'csv', true); + $ioutil = ObjectSerializer::serializeCollection($ioutil, 'form', true); } if ($ioutil !== null) { $queryParams['ioutil'] = $ioutil; @@ -3787,7 +3787,7 @@ class FakeApi // query params if (is_array($http)) { - $http = ObjectSerializer::serializeCollection($http, 'space', true); + $http = ObjectSerializer::serializeCollection($http, 'spaceDelimited', true); } if ($http !== null) { $queryParams['http'] = $http; @@ -3796,7 +3796,7 @@ class FakeApi // query params if (is_array($url)) { - $url = ObjectSerializer::serializeCollection($url, 'csv', true); + $url = ObjectSerializer::serializeCollection($url, 'form', true); } if ($url !== null) { $queryParams['url'] = $url; diff --git a/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Api/PetApi.php b/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Api/PetApi.php index 37b798c0417..993e951e1bb 100644 --- a/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Api/PetApi.php +++ b/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Api/PetApi.php @@ -804,7 +804,7 @@ 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'] = $status; @@ -1082,7 +1082,7 @@ 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'] = $tags; diff --git a/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/ObjectSerializer.php b/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/ObjectSerializer.php index 00cd2bbb70a..cf1941addbc 100644 --- a/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/ObjectSerializer.php +++ b/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/ObjectSerializer.php @@ -213,7 +213,7 @@ 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 * @@ -221,7 +221,7 @@ class ObjectSerializer */ 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, '', '&'));