diff --git a/modules/openapi-generator/src/main/resources/php/api.mustache b/modules/openapi-generator/src/main/resources/php/api.mustache index 77bc8165e59..41c22daee04 100644 --- 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 index 4c2e112ac28..57003607d8a 100644 --- 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 @@ class AnotherFakeApi } switch($statusCode) { + case 200: if ('\OpenAPI\Client\Model\Client' === '\SplFileObject') { $content = $response->getBody(); //stream goes to serializer @@ -198,6 +199,7 @@ class AnotherFakeApi $response->getStatusCode(), $response->getHeaders() ]; + } $returnType = '\OpenAPI\Client\Model\Client'; @@ -218,6 +220,7 @@ class AnotherFakeApi } catch (ApiException $e) { switch ($e->getCode()) { + case 200: $data = ObjectSerializer::deserialize( $e->getResponseBody(), @@ -226,6 +229,7 @@ class AnotherFakeApi ); $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 index 07d81b1bf10..e9df004f1c5 100644 --- 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 @@ class DefaultApi } switch($statusCode) { + default: if ('\OpenAPI\Client\Model\FooGetDefaultResponse' === '\SplFileObject') { $content = $response->getBody(); //stream goes to serializer @@ -192,6 +193,7 @@ class DefaultApi $response->getStatusCode(), $response->getHeaders() ]; + } $returnType = '\OpenAPI\Client\Model\FooGetDefaultResponse'; @@ -212,6 +214,7 @@ class DefaultApi } catch (ApiException $e) { switch ($e->getCode()) { + default: $data = ObjectSerializer::deserialize( $e->getResponseBody(), @@ -220,6 +223,7 @@ class DefaultApi ); $e->setResponseObject($data); break; + } throw $e; } diff --git a/samples/client/petstore/php/OpenAPIClient-php/lib/Api/FakeApi.php b/samples/client/petstore/php/OpenAPIClient-php/lib/Api/FakeApi.php index 521674d1927..1f5573275da 100644 --- a/samples/client/petstore/php/OpenAPIClient-php/lib/Api/FakeApi.php +++ b/samples/client/petstore/php/OpenAPIClient-php/lib/Api/FakeApi.php @@ -181,6 +181,7 @@ class FakeApi } switch($statusCode) { + case 200: if ('\OpenAPI\Client\Model\HealthCheckResult' === '\SplFileObject') { $content = $response->getBody(); //stream goes to serializer @@ -196,6 +197,7 @@ class FakeApi $response->getStatusCode(), $response->getHeaders() ]; + } $returnType = '\OpenAPI\Client\Model\HealthCheckResult'; @@ -216,6 +218,7 @@ class FakeApi } catch (ApiException $e) { switch ($e->getCode()) { + case 200: $data = ObjectSerializer::deserialize( $e->getResponseBody(), @@ -224,6 +227,7 @@ class FakeApi ); $e->setResponseObject($data); break; + } throw $e; } @@ -451,6 +455,7 @@ class FakeApi } catch (ApiException $e) { switch ($e->getCode()) { + } throw $e; } @@ -692,6 +697,7 @@ class FakeApi } switch($statusCode) { + case 200: if ('bool' === '\SplFileObject') { $content = $response->getBody(); //stream goes to serializer @@ -707,6 +713,7 @@ class FakeApi $response->getStatusCode(), $response->getHeaders() ]; + } $returnType = 'bool'; @@ -727,6 +734,7 @@ class FakeApi } catch (ApiException $e) { switch ($e->getCode()) { + case 200: $data = ObjectSerializer::deserialize( $e->getResponseBody(), @@ -735,6 +743,7 @@ class FakeApi ); $e->setResponseObject($data); break; + } throw $e; } @@ -958,6 +967,7 @@ class FakeApi } switch($statusCode) { + case 200: if ('\OpenAPI\Client\Model\OuterComposite' === '\SplFileObject') { $content = $response->getBody(); //stream goes to serializer @@ -973,6 +983,7 @@ class FakeApi $response->getStatusCode(), $response->getHeaders() ]; + } $returnType = '\OpenAPI\Client\Model\OuterComposite'; @@ -993,6 +1004,7 @@ class FakeApi } catch (ApiException $e) { switch ($e->getCode()) { + case 200: $data = ObjectSerializer::deserialize( $e->getResponseBody(), @@ -1001,6 +1013,7 @@ class FakeApi ); $e->setResponseObject($data); break; + } throw $e; } @@ -1224,6 +1237,7 @@ class FakeApi } switch($statusCode) { + case 200: if ('float' === '\SplFileObject') { $content = $response->getBody(); //stream goes to serializer @@ -1239,6 +1253,7 @@ class FakeApi $response->getStatusCode(), $response->getHeaders() ]; + } $returnType = 'float'; @@ -1259,6 +1274,7 @@ class FakeApi } catch (ApiException $e) { switch ($e->getCode()) { + case 200: $data = ObjectSerializer::deserialize( $e->getResponseBody(), @@ -1267,6 +1283,7 @@ class FakeApi ); $e->setResponseObject($data); break; + } throw $e; } @@ -1490,6 +1507,7 @@ class FakeApi } switch($statusCode) { + case 200: if ('string' === '\SplFileObject') { $content = $response->getBody(); //stream goes to serializer @@ -1505,6 +1523,7 @@ class FakeApi $response->getStatusCode(), $response->getHeaders() ]; + } $returnType = 'string'; @@ -1525,6 +1544,7 @@ class FakeApi } catch (ApiException $e) { switch ($e->getCode()) { + case 200: $data = ObjectSerializer::deserialize( $e->getResponseBody(), @@ -1533,6 +1553,7 @@ class FakeApi ); $e->setResponseObject($data); break; + } throw $e; } @@ -1756,6 +1777,7 @@ class FakeApi } switch($statusCode) { + case 200: if ('\OpenAPI\Client\Model\OuterObjectWithEnumProperty' === '\SplFileObject') { $content = $response->getBody(); //stream goes to serializer @@ -1771,6 +1793,7 @@ class FakeApi $response->getStatusCode(), $response->getHeaders() ]; + } $returnType = '\OpenAPI\Client\Model\OuterObjectWithEnumProperty'; @@ -1791,6 +1814,7 @@ class FakeApi } catch (ApiException $e) { switch ($e->getCode()) { + case 200: $data = ObjectSerializer::deserialize( $e->getResponseBody(), @@ -1799,6 +1823,7 @@ class FakeApi ); $e->setResponseObject($data); break; + } throw $e; } @@ -2030,6 +2055,7 @@ class FakeApi } catch (ApiException $e) { switch ($e->getCode()) { + } throw $e; } @@ -2248,6 +2274,7 @@ class FakeApi } catch (ApiException $e) { switch ($e->getCode()) { + } throw $e; } @@ -2468,6 +2495,7 @@ class FakeApi } catch (ApiException $e) { switch ($e->getCode()) { + } throw $e; } @@ -2707,6 +2735,7 @@ class FakeApi } switch($statusCode) { + case 200: if ('\OpenAPI\Client\Model\Client' === '\SplFileObject') { $content = $response->getBody(); //stream goes to serializer @@ -2722,6 +2751,7 @@ class FakeApi $response->getStatusCode(), $response->getHeaders() ]; + } $returnType = '\OpenAPI\Client\Model\Client'; @@ -2742,6 +2772,7 @@ class FakeApi } catch (ApiException $e) { switch ($e->getCode()) { + case 200: $data = ObjectSerializer::deserialize( $e->getResponseBody(), @@ -2750,6 +2781,7 @@ class FakeApi ); $e->setResponseObject($data); break; + } throw $e; } @@ -3015,6 +3047,8 @@ class FakeApi } catch (ApiException $e) { switch ($e->getCode()) { + + } throw $e; } @@ -3436,6 +3470,8 @@ class FakeApi } catch (ApiException $e) { switch ($e->getCode()) { + + } throw $e; } @@ -3760,6 +3796,7 @@ class FakeApi } catch (ApiException $e) { switch ($e->getCode()) { + } throw $e; } @@ -4073,6 +4110,7 @@ class FakeApi } catch (ApiException $e) { switch ($e->getCode()) { + } throw $e; } @@ -4301,6 +4339,7 @@ class FakeApi } catch (ApiException $e) { switch ($e->getCode()) { + } throw $e; } @@ -4547,6 +4586,7 @@ class FakeApi } catch (ApiException $e) { switch ($e->getCode()) { + } throw $e; } diff --git a/samples/client/petstore/php/OpenAPIClient-php/lib/Api/FakeClassnameTags123Api.php b/samples/client/petstore/php/OpenAPIClient-php/lib/Api/FakeClassnameTags123Api.php index 8e1510c08ab..ab2ae289fc4 100644 --- a/samples/client/petstore/php/OpenAPIClient-php/lib/Api/FakeClassnameTags123Api.php +++ b/samples/client/petstore/php/OpenAPIClient-php/lib/Api/FakeClassnameTags123Api.php @@ -183,6 +183,7 @@ class FakeClassnameTags123Api } switch($statusCode) { + case 200: if ('\OpenAPI\Client\Model\Client' === '\SplFileObject') { $content = $response->getBody(); //stream goes to serializer @@ -198,6 +199,7 @@ class FakeClassnameTags123Api $response->getStatusCode(), $response->getHeaders() ]; + } $returnType = '\OpenAPI\Client\Model\Client'; @@ -218,6 +220,7 @@ class FakeClassnameTags123Api } catch (ApiException $e) { switch ($e->getCode()) { + case 200: $data = ObjectSerializer::deserialize( $e->getResponseBody(), @@ -226,6 +229,7 @@ class FakeClassnameTags123Api ); $e->setResponseObject($data); break; + } throw $e; } diff --git a/samples/client/petstore/php/OpenAPIClient-php/lib/Api/PetApi.php b/samples/client/petstore/php/OpenAPIClient-php/lib/Api/PetApi.php index 52a5b0e9ec8..17b571c1197 100644 --- a/samples/client/petstore/php/OpenAPIClient-php/lib/Api/PetApi.php +++ b/samples/client/petstore/php/OpenAPIClient-php/lib/Api/PetApi.php @@ -221,6 +221,8 @@ class PetApi } catch (ApiException $e) { switch ($e->getCode()) { + + } throw $e; } @@ -559,6 +561,8 @@ class PetApi } catch (ApiException $e) { switch ($e->getCode()) { + + } throw $e; } @@ -797,6 +801,7 @@ class PetApi } switch($statusCode) { + case 200: if ('\OpenAPI\Client\Model\Pet[]' === '\SplFileObject') { $content = $response->getBody(); //stream goes to serializer @@ -812,6 +817,8 @@ class PetApi $response->getStatusCode(), $response->getHeaders() ]; + + } $returnType = '\OpenAPI\Client\Model\Pet[]'; @@ -832,6 +839,7 @@ class PetApi } catch (ApiException $e) { switch ($e->getCode()) { + case 200: $data = ObjectSerializer::deserialize( $e->getResponseBody(), @@ -840,6 +848,8 @@ class PetApi ); $e->setResponseObject($data); break; + + } throw $e; } @@ -1086,6 +1096,7 @@ class PetApi } switch($statusCode) { + case 200: if ('\OpenAPI\Client\Model\Pet[]' === '\SplFileObject') { $content = $response->getBody(); //stream goes to serializer @@ -1101,6 +1112,8 @@ class PetApi $response->getStatusCode(), $response->getHeaders() ]; + + } $returnType = '\OpenAPI\Client\Model\Pet[]'; @@ -1121,6 +1134,7 @@ class PetApi } catch (ApiException $e) { switch ($e->getCode()) { + case 200: $data = ObjectSerializer::deserialize( $e->getResponseBody(), @@ -1129,6 +1143,8 @@ class PetApi ); $e->setResponseObject($data); break; + + } throw $e; } @@ -1377,6 +1393,7 @@ class PetApi } switch($statusCode) { + case 200: if ('\OpenAPI\Client\Model\Pet' === '\SplFileObject') { $content = $response->getBody(); //stream goes to serializer @@ -1392,6 +1409,9 @@ class PetApi $response->getStatusCode(), $response->getHeaders() ]; + + + } $returnType = '\OpenAPI\Client\Model\Pet'; @@ -1412,6 +1432,7 @@ class PetApi } catch (ApiException $e) { switch ($e->getCode()) { + case 200: $data = ObjectSerializer::deserialize( $e->getResponseBody(), @@ -1420,6 +1441,9 @@ class PetApi ); $e->setResponseObject($data); break; + + + } throw $e; } @@ -1702,6 +1726,10 @@ class PetApi } catch (ApiException $e) { switch ($e->getCode()) { + + + + } throw $e; } @@ -2042,6 +2070,8 @@ class PetApi } catch (ApiException $e) { switch ($e->getCode()) { + + } throw $e; } @@ -2292,6 +2322,7 @@ class PetApi } switch($statusCode) { + case 200: if ('\OpenAPI\Client\Model\ApiResponse' === '\SplFileObject') { $content = $response->getBody(); //stream goes to serializer @@ -2307,6 +2338,7 @@ class PetApi $response->getStatusCode(), $response->getHeaders() ]; + } $returnType = '\OpenAPI\Client\Model\ApiResponse'; @@ -2327,6 +2359,7 @@ class PetApi } catch (ApiException $e) { switch ($e->getCode()) { + case 200: $data = ObjectSerializer::deserialize( $e->getResponseBody(), @@ -2335,6 +2368,7 @@ class PetApi ); $e->setResponseObject($data); break; + } throw $e; } @@ -2606,6 +2640,7 @@ class PetApi } switch($statusCode) { + case 200: if ('\OpenAPI\Client\Model\ApiResponse' === '\SplFileObject') { $content = $response->getBody(); //stream goes to serializer @@ -2621,6 +2656,7 @@ class PetApi $response->getStatusCode(), $response->getHeaders() ]; + } $returnType = '\OpenAPI\Client\Model\ApiResponse'; @@ -2641,6 +2677,7 @@ class PetApi } catch (ApiException $e) { switch ($e->getCode()) { + case 200: $data = ObjectSerializer::deserialize( $e->getResponseBody(), @@ -2649,6 +2686,7 @@ class PetApi ); $e->setResponseObject($data); break; + } throw $e; } diff --git a/samples/client/petstore/php/OpenAPIClient-php/lib/Api/StoreApi.php b/samples/client/petstore/php/OpenAPIClient-php/lib/Api/StoreApi.php index db7719c3db8..e86694a1157 100644 --- a/samples/client/petstore/php/OpenAPIClient-php/lib/Api/StoreApi.php +++ b/samples/client/petstore/php/OpenAPIClient-php/lib/Api/StoreApi.php @@ -185,6 +185,8 @@ class StoreApi } catch (ApiException $e) { switch ($e->getCode()) { + + } throw $e; } @@ -409,6 +411,7 @@ class StoreApi } switch($statusCode) { + case 200: if ('array' === '\SplFileObject') { $content = $response->getBody(); //stream goes to serializer @@ -424,6 +427,7 @@ class StoreApi $response->getStatusCode(), $response->getHeaders() ]; + } $returnType = 'array'; @@ -444,6 +448,7 @@ class StoreApi } catch (ApiException $e) { switch ($e->getCode()) { + case 200: $data = ObjectSerializer::deserialize( $e->getResponseBody(), @@ -452,6 +457,7 @@ class StoreApi ); $e->setResponseObject($data); break; + } throw $e; } @@ -678,6 +684,7 @@ class StoreApi } switch($statusCode) { + case 200: if ('\OpenAPI\Client\Model\Order' === '\SplFileObject') { $content = $response->getBody(); //stream goes to serializer @@ -693,6 +700,9 @@ class StoreApi $response->getStatusCode(), $response->getHeaders() ]; + + + } $returnType = '\OpenAPI\Client\Model\Order'; @@ -713,6 +723,7 @@ class StoreApi } catch (ApiException $e) { switch ($e->getCode()) { + case 200: $data = ObjectSerializer::deserialize( $e->getResponseBody(), @@ -721,6 +732,9 @@ class StoreApi ); $e->setResponseObject($data); break; + + + } throw $e; } @@ -967,6 +981,7 @@ class StoreApi } switch($statusCode) { + case 200: if ('\OpenAPI\Client\Model\Order' === '\SplFileObject') { $content = $response->getBody(); //stream goes to serializer @@ -982,6 +997,8 @@ class StoreApi $response->getStatusCode(), $response->getHeaders() ]; + + } $returnType = '\OpenAPI\Client\Model\Order'; @@ -1002,6 +1019,7 @@ class StoreApi } catch (ApiException $e) { switch ($e->getCode()) { + case 200: $data = ObjectSerializer::deserialize( $e->getResponseBody(), @@ -1010,6 +1028,8 @@ class StoreApi ); $e->setResponseObject($data); break; + + } throw $e; } diff --git a/samples/client/petstore/php/OpenAPIClient-php/lib/Api/UserApi.php b/samples/client/petstore/php/OpenAPIClient-php/lib/Api/UserApi.php index 0165621a4f7..2a6b3be9840 100644 --- a/samples/client/petstore/php/OpenAPIClient-php/lib/Api/UserApi.php +++ b/samples/client/petstore/php/OpenAPIClient-php/lib/Api/UserApi.php @@ -185,6 +185,7 @@ class UserApi } catch (ApiException $e) { switch ($e->getCode()) { + } throw $e; } @@ -411,6 +412,7 @@ class UserApi } catch (ApiException $e) { switch ($e->getCode()) { + } throw $e; } @@ -637,6 +639,7 @@ class UserApi } catch (ApiException $e) { switch ($e->getCode()) { + } throw $e; } @@ -863,6 +866,8 @@ class UserApi } catch (ApiException $e) { switch ($e->getCode()) { + + } throw $e; } @@ -1089,6 +1094,7 @@ class UserApi } switch($statusCode) { + case 200: if ('\OpenAPI\Client\Model\User' === '\SplFileObject') { $content = $response->getBody(); //stream goes to serializer @@ -1104,6 +1110,9 @@ class UserApi $response->getStatusCode(), $response->getHeaders() ]; + + + } $returnType = '\OpenAPI\Client\Model\User'; @@ -1124,6 +1133,7 @@ class UserApi } catch (ApiException $e) { switch ($e->getCode()) { + case 200: $data = ObjectSerializer::deserialize( $e->getResponseBody(), @@ -1132,6 +1142,9 @@ class UserApi ); $e->setResponseObject($data); break; + + + } throw $e; } @@ -1373,6 +1386,7 @@ class UserApi } switch($statusCode) { + case 200: if ('string' === '\SplFileObject') { $content = $response->getBody(); //stream goes to serializer @@ -1388,6 +1402,8 @@ class UserApi $response->getStatusCode(), $response->getHeaders() ]; + + } $returnType = 'string'; @@ -1408,6 +1424,7 @@ class UserApi } catch (ApiException $e) { switch ($e->getCode()) { + case 200: $data = ObjectSerializer::deserialize( $e->getResponseBody(), @@ -1416,6 +1433,8 @@ class UserApi ); $e->setResponseObject($data); break; + + } throw $e; } @@ -1675,6 +1694,7 @@ class UserApi } catch (ApiException $e) { switch ($e->getCode()) { + } throw $e; } @@ -1887,6 +1907,8 @@ class UserApi } catch (ApiException $e) { switch ($e->getCode()) { + + } throw $e; }