PHP: fix ranged status codes (#13012)

* PHP: fix ranged status codes * PHP: update samples
OpenAPITools · Sep 20, 2022 · 6a7567e · 6a7567e
1 parent e6dd608
commit 6a7567e
Show file tree

Hide file tree

Showing 8 changed files with 136 additions and 4 deletions.
diff --git a/modules/openapi-generator/src/main/resources/php/api.mustache b/modules/openapi-generator/src/main/resources/php/api.mustache
@@ -261,7 +261,7 @@ use {{invokerPackage}}\ObjectSerializer;
 
             switch($statusCode) {
             {{/-first}}
-            {{#dataType}}
+            {{#dataType}}{{^isRange}}
                 {{^isWildcard}}case {{code}}:{{/isWildcard}}{{#isWildcard}}default:{{/isWildcard}}
                     if ('{{{dataType}}}' === '\SplFileObject') {
                         $content = $response->getBody(); //stream goes to serializer
@@ -277,7 +277,7 @@ use {{invokerPackage}}\ObjectSerializer;
                         $response->getStatusCode(),
                         $response->getHeaders()
                     ];
-            {{/dataType}}
+            {{/isRange}}{{/dataType}}
             {{#-last}}
             }
             {{/-last}}
@@ -307,7 +307,7 @@ use {{invokerPackage}}\ObjectSerializer;
         } catch (ApiException $e) {
             switch ($e->getCode()) {
         {{#responses}}
-            {{#dataType}}
+            {{#dataType}}{{^isRange}}
                 {{^isWildcard}}case {{code}}:{{/isWildcard}}{{#isWildcard}}default:{{/isWildcard}}
                     $data = ObjectSerializer::deserialize(
                         $e->getResponseBody(),
@@ -316,7 +316,7 @@ use {{invokerPackage}}\ObjectSerializer;
                     );
                     $e->setResponseObject($data);
                     break;
-            {{/dataType}}
+            {{/isRange}}{{/dataType}}
         {{/responses}}
             }
             throw $e;

diff --git a/samples/client/petstore/php/OpenAPIClient-php/lib/Api/AnotherFakeApi.php b/samples/client/petstore/php/OpenAPIClient-php/lib/Api/AnotherFakeApi.php
@@ -183,6 +183,7 @@ public function call123TestSpecialTagsWithHttpInfo($client)
             }
 
             switch($statusCode) {
+
                 case 200:
                     if ('\OpenAPI\Client\Model\Client' === '\SplFileObject') {
                         $content = $response->getBody(); //stream goes to serializer
@@ -198,6 +199,7 @@ public function call123TestSpecialTagsWithHttpInfo($client)
                         $response->getStatusCode(),
                         $response->getHeaders()
                     ];
+
             }
 
             $returnType = '\OpenAPI\Client\Model\Client';
@@ -218,6 +220,7 @@ public function call123TestSpecialTagsWithHttpInfo($client)
 
         } catch (ApiException $e) {
             switch ($e->getCode()) {
+
                 case 200:
                     $data = ObjectSerializer::deserialize(
                         $e->getResponseBody(),
@@ -226,6 +229,7 @@ public function call123TestSpecialTagsWithHttpInfo($client)
                     );
                     $e->setResponseObject($data);
                     break;
+
             }
             throw $e;
         }

diff --git a/samples/client/petstore/php/OpenAPIClient-php/lib/Api/DefaultApi.php b/samples/client/petstore/php/OpenAPIClient-php/lib/Api/DefaultApi.php
@@ -177,6 +177,7 @@ public function fooGetWithHttpInfo()
             }
 
             switch($statusCode) {
+
                 default:
                     if ('\OpenAPI\Client\Model\FooGetDefaultResponse' === '\SplFileObject') {
                         $content = $response->getBody(); //stream goes to serializer
@@ -192,6 +193,7 @@ public function fooGetWithHttpInfo()
                         $response->getStatusCode(),
                         $response->getHeaders()
                     ];
+
             }
 
             $returnType = '\OpenAPI\Client\Model\FooGetDefaultResponse';
@@ -212,6 +214,7 @@ public function fooGetWithHttpInfo()
 
         } catch (ApiException $e) {
             switch ($e->getCode()) {
+
                 default:
                     $data = ObjectSerializer::deserialize(
                         $e->getResponseBody(),
@@ -220,6 +223,7 @@ public function fooGetWithHttpInfo()
                     );
                     $e->setResponseObject($data);
                     break;
+
             }
             throw $e;
         }