loafle/openapi-generator-original
3
0
Fork 1
mirror of https://github.com/OpenAPITools/openapi-generator.git synced 2025-12-11 17:22:44 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix php generators treating double as a native type (#13421)

Browse Source 
* Fix php generators treating double as a native type

Fixes #13335

* Remove double handling in enum

* Add missed double type removal
This commit is contained in:
James Gilliland
2022-09-15 04:16:19 -05:00
committed by GitHub
parent 0c6a951615
commit abe8c74a3a
23 changed files with 33 additions and 50 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
samples/client/petstore/php/OpenAPIClient-php/lib/Api/FakeApi.php
View File

@@ -2925,7 +2925,7 @@ class FakeApi
* Fake endpoint for testing various parameters 假端點 偽のエンドポイント 가짜 엔드 포인트
*
* @param float $number None (required)
* @param double $double None (required)
* @param float $double None (required)
* @param string $pattern_without_delimiter None (required)
* @param string $byte None (required)
* @param int $integer None (optional)
@@ -2954,7 +2954,7 @@ class FakeApi
* Fake endpoint for testing various parameters 假端點 偽のエンドポイント 가짜 엔드 포인트
*
* @param float $number None (required)
* @param double $double None (required)
* @param float $double None (required)
* @param string $pattern_without_delimiter None (required)
* @param string $byte None (required)
* @param int $integer None (optional)
@@ -3026,7 +3026,7 @@ class FakeApi
* Fake endpoint for testing various parameters 假端點 偽のエンドポイント 가짜 엔드 포인트
*
* @param float $number None (required)
* @param double $double None (required)
* @param float $double None (required)
* @param string $pattern_without_delimiter None (required)
* @param string $byte None (required)
* @param int $integer None (optional)
@@ -3059,7 +3059,7 @@ class FakeApi
* Fake endpoint for testing various parameters 假端點 偽のエンドポイント 가짜 엔드 포인트
*
* @param float $number None (required)
* @param double $double None (required)
* @param float $double None (required)
* @param string $pattern_without_delimiter None (required)
* @param string $byte None (required)
* @param int $integer None (optional)
@@ -3108,7 +3108,7 @@ class FakeApi
* Create request for operation 'testEndpointParameters'
*
* @param float $number None (required)
* @param double $double None (required)
* @param float $double None (required)
* @param string $pattern_without_delimiter None (required)
* @param string $byte None (required)
* @param int $integer None (optional)
@@ -3360,7 +3360,7 @@ class FakeApi
* @param string[] $enum_query_string_array Query parameter enum test (string array) (optional)
* @param string $enum_query_string Query parameter enum test (string) (optional, default to '-efg')
* @param int $enum_query_integer Query parameter enum test (double) (optional)
* @param double $enum_query_double Query parameter enum test (double) (optional)
* @param float $enum_query_double Query parameter enum test (double) (optional)
* @param \OpenAPI\Client\Model\EnumClass[] $enum_query_model_array enum_query_model_array (optional)
* @param string[] $enum_form_string_array Form parameter enum test (string array) (optional, default to '$')
* @param string $enum_form_string Form parameter enum test (string) (optional, default to '-efg')
@@ -3384,7 +3384,7 @@ class FakeApi
* @param string[] $enum_query_string_array Query parameter enum test (string array) (optional)
* @param string $enum_query_string Query parameter enum test (string) (optional, default to '-efg')
* @param int $enum_query_integer Query parameter enum test (double) (optional)
* @param double $enum_query_double Query parameter enum test (double) (optional)
* @param float $enum_query_double Query parameter enum test (double) (optional)
* @param \OpenAPI\Client\Model\EnumClass[] $enum_query_model_array (optional)
* @param string[] $enum_form_string_array Form parameter enum test (string array) (optional, default to '$')
* @param string $enum_form_string Form parameter enum test (string) (optional, default to '-efg')
@@ -3451,7 +3451,7 @@ class FakeApi
* @param string[] $enum_query_string_array Query parameter enum test (string array) (optional)
* @param string $enum_query_string Query parameter enum test (string) (optional, default to '-efg')
* @param int $enum_query_integer Query parameter enum test (double) (optional)
* @param double $enum_query_double Query parameter enum test (double) (optional)
* @param float $enum_query_double Query parameter enum test (double) (optional)
* @param \OpenAPI\Client\Model\EnumClass[] $enum_query_model_array (optional)
* @param string[] $enum_form_string_array Form parameter enum test (string array) (optional, default to '$')
* @param string $enum_form_string Form parameter enum test (string) (optional, default to '-efg')
@@ -3479,7 +3479,7 @@ class FakeApi
* @param string[] $enum_query_string_array Query parameter enum test (string array) (optional)
* @param string $enum_query_string Query parameter enum test (string) (optional, default to '-efg')
* @param int $enum_query_integer Query parameter enum test (double) (optional)
* @param double $enum_query_double Query parameter enum test (double) (optional)
* @param float $enum_query_double Query parameter enum test (double) (optional)
* @param \OpenAPI\Client\Model\EnumClass[] $enum_query_model_array (optional)
* @param string[] $enum_form_string_array Form parameter enum test (string array) (optional, default to '$')
* @param string $enum_form_string Form parameter enum test (string) (optional, default to '-efg')
@@ -3523,7 +3523,7 @@ class FakeApi
* @param string[] $enum_query_string_array Query parameter enum test (string array) (optional)
* @param string $enum_query_string Query parameter enum test (string) (optional, default to '-efg')
* @param int $enum_query_integer Query parameter enum test (double) (optional)
* @param double $enum_query_double Query parameter enum test (double) (optional)
* @param float $enum_query_double Query parameter enum test (double) (optional)
* @param \OpenAPI\Client\Model\EnumClass[] $enum_query_model_array (optional)
* @param string[] $enum_form_string_array Form parameter enum test (string array) (optional, default to '$')
* @param string $enum_form_string Form parameter enum test (string) (optional, default to '-efg')

6
samples/client/petstore/php/OpenAPIClient-php/lib/Model/EnumTest.php
View File

@@ -60,7 +60,7 @@ class EnumTest implements ModelInterface, ArrayAccess, \JsonSerializable
'enum_string' => 'string',
'enum_string_required' => 'string',
'enum_integer' => 'int',
'enum_number' => 'double',
'enum_number' => 'float',
'outer_enum' => '\OpenAPI\Client\Model\OuterEnum',
'outer_enum_integer' => '\OpenAPI\Client\Model\OuterEnumInteger',
'outer_enum_default_value' => '\OpenAPI\Client\Model\OuterEnumDefaultValue',
@@ -551,7 +551,7 @@ class EnumTest implements ModelInterface, ArrayAccess, \JsonSerializable
/**
* Gets enum_number
*
* @return double|null
* @return float|null
*/
public function getEnumNumber()
{
@@ -561,7 +561,7 @@ class EnumTest implements ModelInterface, ArrayAccess, \JsonSerializable
/**
* Sets enum_number
*
* @param double|null $enum_number enum_number
* @param float|null $enum_number enum_number
*
* @return self
*/

6
samples/client/petstore/php/OpenAPIClient-php/lib/Model/FormatTest.php
View File

@@ -62,7 +62,7 @@ class FormatTest implements ModelInterface, ArrayAccess, \JsonSerializable
'int64' => 'int',
'number' => 'float',
'float' => 'float',
'double' => 'double',
'double' => 'float',
'decimal' => 'float',
'string' => 'string',
'byte' => 'string',
@@ -636,7 +636,7 @@ class FormatTest implements ModelInterface, ArrayAccess, \JsonSerializable
/**
* Gets double
*
* @return double|null
* @return float|null
*/
public function getDouble()
{
@@ -646,7 +646,7 @@ class FormatTest implements ModelInterface, ArrayAccess, \JsonSerializable
/**
* Sets double
*
* @param double|null $double double
* @param float|null $double double
*
* @return self
*/

4
samples/client/petstore/php/OpenAPIClient-php/lib/ObjectSerializer.php
View File

@@ -87,7 +87,7 @@ class ObjectSerializer
foreach ($data::openAPITypes() as $property => $openAPIType) {
$getter = $data::getters()[$property];
$value = $data->$getter();
if ($value !== null && !in_array($openAPIType, ['\DateTime', '\SplFileObject', 'array', 'bool', 'boolean', 'byte', 'double', '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)) {
$callable = [$openAPIType, 'getAllowableEnumValues'];
if (is_callable($callable)) {
/** array $callable */
@@ -441,7 +441,7 @@ class ObjectSerializer
}
/** @psalm-suppress ParadoxicalCondition */
if (in_array($class, ['\DateTime', '\SplFileObject', 'array', 'bool', 'boolean', 'byte', 'double', 'float', 'int', 'integer', 'mixed', 'number', 'object', 'string', 'void'], true)) {
if (in_array($class, ['\DateTime', '\SplFileObject', 'array', 'bool', 'boolean', 'byte', 'float', 'int', 'integer', 'mixed', 'number', 'object', 'string', 'void'], true)) {
settype($data, $class);
return $data;
}