loafle/openapi-generator-original
3
0
Fork 1
mirror of https://github.com/OpenAPITools/openapi-generator.git synced 2025-06-03 23:40:58 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix handling with enums in object serializer (#16741)

Browse Source
This commit is contained in:
Maddin 2023-10-07 16:56:31 +02:00 committed by GitHub
parent 893154d766
commit f5680019b2
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 51 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
modules/openapi-generator/src/main/resources/php-nextgen/ObjectSerializer.mustache vendored
View File

@ -68,6 +68,10 @@ class ObjectSerializer
return ($format === 'date') ? $data->format('Y-m-d') : $data->format(self::$dateTimeFormat); return ($format === 'date') ? $data->format('Y-m-d') : $data->format(self::$dateTimeFormat);
} }
if ($data instanceof \BackedEnum) {
return $data->value;
}
if (is_array($data)) { if (is_array($data)) {
foreach ($data as $property => $value) { foreach ($data as $property => $value) {
$data[$property] = self::sanitizeForSerialization($value); $data[$property] = self::sanitizeForSerialization($value);
@ -84,10 +88,18 @@ class ObjectSerializer
$value = $data->$getter(); $value = $data->$getter();
if ($value !== null && !in_array($openAPIType, [{{&primitives}}], true)) { if ($value !== null && !in_array($openAPIType, [{{&primitives}}], true)) {
if (is_subclass_of($openAPIType, '\BackedEnum')) { if (is_subclass_of($openAPIType, '\BackedEnum')) {
$data = $openAPIType::tryFrom($data); if (is_scalar($value)) {
if ($data === null) { $value = $openAPIType::tryFrom($value);
$imploded = implode("', '", array_map(fn($case) => $case->value, $openAPIType::cases())); if ($value === null) {
throw new \InvalidArgumentException("Invalid value for enum '$openAPIType', must be one of: '$imploded'"); $imploded = implode("', '", array_map(fn($case) => $case->value, $openAPIType::cases()));
throw new \InvalidArgumentException(
sprintf(
"Invalid value for enum '%s', must be one of: '%s'",
$openAPIType::class,
$imploded
)
);
}
} }
} }
} }
@ -444,7 +456,7 @@ class ObjectSerializer
// determine file name // determine file name
if ( if (
is_array($httpHeaders) 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) && preg_match('/inline; filename=[\'"]?([^\'"\s]+)[\'"]?$/i', $httpHeaders['Content-Disposition'], $match)
) { ) {
$filename = Configuration::getDefaultConfiguration()->getTempFolderPath() . DIRECTORY_SEPARATOR . self::sanitizeFilename($match[1]); $filename = Configuration::getDefaultConfiguration()->getTempFolderPath() . DIRECTORY_SEPARATOR . self::sanitizeFilename($match[1]);

22
samples/client/echo_api/php-nextgen/src/ObjectSerializer.php
View File

@ -78,6 +78,10 @@ class ObjectSerializer
return ($format === 'date') ? $data->format('Y-m-d') : $data->format(self::$dateTimeFormat); return ($format === 'date') ? $data->format('Y-m-d') : $data->format(self::$dateTimeFormat);
} }
if ($data instanceof \BackedEnum) {
return $data->value;
}
if (is_array($data)) { if (is_array($data)) {
foreach ($data as $property => $value) { foreach ($data as $property => $value) {
$data[$property] = self::sanitizeForSerialization($value); $data[$property] = self::sanitizeForSerialization($value);
@ -94,10 +98,18 @@ class ObjectSerializer
$value = $data->$getter(); $value = $data->$getter();
if ($value !== null && !in_array($openAPIType, ['\DateTime', '\SplFileObject', 'array', 'bool', 'boolean', 'byte', 'float', 'int', 'integer', 'mixed', 'number', 'object', 'string', 'void'], true)) { if ($value !== null && !in_array($openAPIType, ['\DateTime', '\SplFileObject', 'array', 'bool', 'boolean', 'byte', 'float', 'int', 'integer', 'mixed', 'number', 'object', 'string', 'void'], true)) {
if (is_subclass_of($openAPIType, '\BackedEnum')) { if (is_subclass_of($openAPIType, '\BackedEnum')) {
$data = $openAPIType::tryFrom($data); if (is_scalar($value)) {
if ($data === null) { $value = $openAPIType::tryFrom($value);
$imploded = implode("', '", array_map(fn($case) => $case->value, $openAPIType::cases())); if ($value === null) {
throw new \InvalidArgumentException("Invalid value for enum '$openAPIType', must be one of: '$imploded'"); $imploded = implode("', '", array_map(fn($case) => $case->value, $openAPIType::cases()));
throw new \InvalidArgumentException(
sprintf(
"Invalid value for enum '%s', must be one of: '%s'",
$openAPIType::class,
$imploded
)
);
}
} }
} }
} }
@ -454,7 +466,7 @@ class ObjectSerializer
// determine file name // determine file name
if ( if (
is_array($httpHeaders) 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) && preg_match('/inline; filename=[\'"]?([^\'"\s]+)[\'"]?$/i', $httpHeaders['Content-Disposition'], $match)
) { ) {
$filename = Configuration::getDefaultConfiguration()->getTempFolderPath() . DIRECTORY_SEPARATOR . self::sanitizeFilename($match[1]); $filename = Configuration::getDefaultConfiguration()->getTempFolderPath() . DIRECTORY_SEPARATOR . self::sanitizeFilename($match[1]);

22
samples/client/petstore/php-nextgen/OpenAPIClient-php/src/ObjectSerializer.php
View File

@ -77,6 +77,10 @@ class ObjectSerializer
return ($format === 'date') ? $data->format('Y-m-d') : $data->format(self::$dateTimeFormat); return ($format === 'date') ? $data->format('Y-m-d') : $data->format(self::$dateTimeFormat);
} }
if ($data instanceof \BackedEnum) {
return $data->value;
}
if (is_array($data)) { if (is_array($data)) {
foreach ($data as $property => $value) { foreach ($data as $property => $value) {
$data[$property] = self::sanitizeForSerialization($value); $data[$property] = self::sanitizeForSerialization($value);
@ -93,10 +97,18 @@ class ObjectSerializer
$value = $data->$getter(); $value = $data->$getter();
if ($value !== null && !in_array($openAPIType, ['\DateTime', '\SplFileObject', 'array', 'bool', 'boolean', 'byte', 'float', 'int', 'integer', 'mixed', 'number', 'object', 'string', 'void'], true)) { if ($value !== null && !in_array($openAPIType, ['\DateTime', '\SplFileObject', 'array', 'bool', 'boolean', 'byte', 'float', 'int', 'integer', 'mixed', 'number', 'object', 'string', 'void'], true)) {
if (is_subclass_of($openAPIType, '\BackedEnum')) { if (is_subclass_of($openAPIType, '\BackedEnum')) {
$data = $openAPIType::tryFrom($data); if (is_scalar($value)) {
if ($data === null) { $value = $openAPIType::tryFrom($value);
$imploded = implode("', '", array_map(fn($case) => $case->value, $openAPIType::cases())); if ($value === null) {
throw new \InvalidArgumentException("Invalid value for enum '$openAPIType', must be one of: '$imploded'"); $imploded = implode("', '", array_map(fn($case) => $case->value, $openAPIType::cases()));
throw new \InvalidArgumentException(
sprintf(
"Invalid value for enum '%s', must be one of: '%s'",
$openAPIType::class,
$imploded
)
);
}
} }
} }
} }
@ -453,7 +465,7 @@ class ObjectSerializer
// determine file name // determine file name
if ( if (
is_array($httpHeaders) 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) && preg_match('/inline; filename=[\'"]?([^\'"\s]+)[\'"]?$/i', $httpHeaders['Content-Disposition'], $match)
) { ) {
$filename = Configuration::getDefaultConfiguration()->getTempFolderPath() . DIRECTORY_SEPARATOR . self::sanitizeFilename($match[1]); $filename = Configuration::getDefaultConfiguration()->getTempFolderPath() . DIRECTORY_SEPARATOR . self::sanitizeFilename($match[1]);