From 281ca498e0ec6f176523de07068e73bd35e56ed0 Mon Sep 17 00:00:00 2001 From: Julian Vennen Date: Wed, 8 Jan 2025 17:22:17 +0100 Subject: [PATCH] Use conditional access for enumref query params --- .../src/main/resources/php-nextgen/api.mustache | 2 +- .../client/echo_api/php-nextgen-streaming/src/Api/QueryApi.php | 2 +- samples/client/echo_api/php-nextgen/src/Api/QueryApi.php | 2 +- .../petstore/php-nextgen/OpenAPIClient-php/src/Api/FakeApi.php | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/modules/openapi-generator/src/main/resources/php-nextgen/api.mustache b/modules/openapi-generator/src/main/resources/php-nextgen/api.mustache index 757c79827c25..bdbe28f85c5c 100644 --- a/modules/openapi-generator/src/main/resources/php-nextgen/api.mustache +++ b/modules/openapi-generator/src/main/resources/php-nextgen/api.mustache @@ -711,7 +711,7 @@ use {{invokerPackage}}\ObjectSerializer; {{#queryParams}} // query params $queryParams = array_merge($queryParams, ObjectSerializer::toQueryValue( - ${{paramName}}{{#isEnumRef}}->value{{/isEnumRef}}, + ${{paramName}}{{#isEnumRef}}?->value{{/isEnumRef}}, '{{baseName}}', // param base name '{{#schema}}{{openApiType}}{{/schema}}', // openApiType '{{style}}', // style diff --git a/samples/client/echo_api/php-nextgen-streaming/src/Api/QueryApi.php b/samples/client/echo_api/php-nextgen-streaming/src/Api/QueryApi.php index f0e76da188be..674bdd46d7eb 100644 --- a/samples/client/echo_api/php-nextgen-streaming/src/Api/QueryApi.php +++ b/samples/client/echo_api/php-nextgen-streaming/src/Api/QueryApi.php @@ -424,7 +424,7 @@ public function testEnumRefStringRequest( ) ?? []); // query params $queryParams = array_merge($queryParams, ObjectSerializer::toQueryValue( - $enum_ref_string_query->value, + $enum_ref_string_query?->value, 'enum_ref_string_query', // param base name 'StringEnumRef', // openApiType 'form', // style diff --git a/samples/client/echo_api/php-nextgen/src/Api/QueryApi.php b/samples/client/echo_api/php-nextgen/src/Api/QueryApi.php index f0e76da188be..674bdd46d7eb 100644 --- a/samples/client/echo_api/php-nextgen/src/Api/QueryApi.php +++ b/samples/client/echo_api/php-nextgen/src/Api/QueryApi.php @@ -424,7 +424,7 @@ public function testEnumRefStringRequest( ) ?? []); // query params $queryParams = array_merge($queryParams, ObjectSerializer::toQueryValue( - $enum_ref_string_query->value, + $enum_ref_string_query?->value, 'enum_ref_string_query', // param base name 'StringEnumRef', // openApiType 'form', // style diff --git a/samples/client/petstore/php-nextgen/OpenAPIClient-php/src/Api/FakeApi.php b/samples/client/petstore/php-nextgen/OpenAPIClient-php/src/Api/FakeApi.php index e489439ba148..56833392f958 100644 --- a/samples/client/petstore/php-nextgen/OpenAPIClient-php/src/Api/FakeApi.php +++ b/samples/client/petstore/php-nextgen/OpenAPIClient-php/src/Api/FakeApi.php @@ -773,7 +773,7 @@ public function fakeEnumEndpointRequest( // query params $queryParams = array_merge($queryParams, ObjectSerializer::toQueryValue( - $enum_class->value, + $enum_class?->value, 'enum-class', // param base name 'EnumClass', // openApiType 'form', // style