fix(php-nextgen): always return if not void

simPod · simPod · commit dd423fde594c · 2025-04-22T12:33:18.000+02:00
diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/PhpNextgenClientCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/PhpNextgenClientCodegen.java
@@ -203,9 +203,11 @@ public OperationsMap postProcessOperationsWithModels(OperationsMap objs, List<Mo
             }
 
             if (phpReturnTypeOptions.isEmpty()) {
+                operation.vendorExtensions.putIfAbsent("x-php-return-type-is-void", true);
                 operation.vendorExtensions.putIfAbsent("x-php-return-type", "void");
                 operation.vendorExtensions.putIfAbsent("x-php-doc-return-type", "void");
             } else {
+                operation.vendorExtensions.putIfAbsent("x-php-return-type-is-void", false);
                 operation.vendorExtensions.putIfAbsent("x-php-return-type", String.join("|", phpReturnTypeOptions));
                 operation.vendorExtensions.putIfAbsent("x-php-doc-return-type", String.join("|", docReturnTypeOptions));
             }
diff --git a/modules/openapi-generator/src/main/resources/php-nextgen/api.mustache b/modules/openapi-generator/src/main/resources/php-nextgen/api.mustache
@@ -189,8 +189,8 @@ use {{invokerPackage}}\ObjectSerializer;
     {{/vendorExtensions.x-group-parameters}}
     ): {{{vendorExtensions.x-php-return-type}}}
     {
-        {{#returnType}}list($response) = {{/returnType}}$this->{{operationId}}WithHttpInfo({{^vendorExtensions.x-group-parameters}}{{#allParams}}${{paramName}}, {{/allParams}}{{#servers}}{{#-first}}$hostIndex, $variables, {{/-first}}{{/servers}}$contentType{{/vendorExtensions.x-group-parameters}}{{#vendorExtensions.x-group-parameters}}$associative_array{{/vendorExtensions.x-group-parameters}});{{#returnType}}
-        return $response;{{/returnType}}
+        {{^vendorExtensions.x-php-return-type-is-void}}list($response) = {{/vendorExtensions.x-php-return-type-is-void}}$this->{{operationId}}WithHttpInfo({{^vendorExtensions.x-group-parameters}}{{#allParams}}${{paramName}}, {{/allParams}}{{#servers}}{{#-first}}$hostIndex, $variables, {{/-first}}{{/servers}}$contentType{{/vendorExtensions.x-group-parameters}}{{#vendorExtensions.x-group-parameters}}$associative_array{{/vendorExtensions.x-group-parameters}});{{^vendorExtensions.x-php-return-type-is-void}}
+        return $response;{{/vendorExtensions.x-php-return-type-is-void}}
     }
 
     /**

Original file line number	Diff line number	Diff line change
`@@ -203,9 +203,11 @@ public OperationsMap postProcessOperationsWithModels(OperationsMap objs, List<Mo`
`203`	`203`	`}`
`204`	`204`
`205`	`205`	`if (phpReturnTypeOptions.isEmpty()) {`
	`206`	`+ operation.vendorExtensions.putIfAbsent("x-php-return-type-is-void", true);`
`206`	`207`	`operation.vendorExtensions.putIfAbsent("x-php-return-type", "void");`
`207`	`208`	`operation.vendorExtensions.putIfAbsent("x-php-doc-return-type", "void");`
`208`	`209`	`} else {`
	`210`	`+ operation.vendorExtensions.putIfAbsent("x-php-return-type-is-void", false);`
`209`	`211`	`operation.vendorExtensions.putIfAbsent("x-php-return-type", String.join("\|", phpReturnTypeOptions));`
`210`	`212`	`operation.vendorExtensions.putIfAbsent("x-php-doc-return-type", String.join("\|", docReturnTypeOptions));`
`211`	`213`	`}`
Original file line number	Diff line number	Diff line change
`@@ -189,8 +189,8 @@ use {{invokerPackage}}\ObjectSerializer;`
`189`	`189`	`{{/vendorExtensions.x-group-parameters}}`
`190`	`190`	`): {{{vendorExtensions.x-php-return-type}}}`
`191`	`191`	`{`
`192`		`- {{#returnType}}list($response) = {{/returnType}}$this->{{operationId}}WithHttpInfo({{^vendorExtensions.x-group-parameters}}{{#allParams}}${{paramName}}, {{/allParams}}{{#servers}}{{#-first}}$hostIndex, $variables, {{/-first}}{{/servers}}$contentType{{/vendorExtensions.x-group-parameters}}{{#vendorExtensions.x-group-parameters}}$associative_array{{/vendorExtensions.x-group-parameters}});{{#returnType}}`
`193`		`- return $response;{{/returnType}}`
	`192`	+ {{^vendorExtensions.x-php-return-type-is-void}}list($response) = {{/vendorExtensions.x-php-return-type-is-void}}$this->{{operationId}}WithHttpInfo({{^vendorExtensions.x-group-parameters}}{{#allParams}}${{paramName}}, {{/allParams}}{{#servers}}{{#-first}}$hostIndex, $variables, {{/-first}}{{/servers}}$contentType{{/vendorExtensions.x-group-parameters}}{{#vendorExtensions.x-group-parameters}}$associative_array{{/vendorExtensions.x-group-parameters}});{{^vendorExtensions.x-php-return-type-is-void}}
	`193`	`+ return $response;{{/vendorExtensions.x-php-return-type-is-void}}`
`194`	`194`	`}`
`195`	`195`
`196`	`196`	`/**`