loafle/openapi-generator
3
0
Fork 0
forked from loafle/openapi-generator-original
Code Pull Requests Activity

Fix broken map

Browse Source
This commit is contained in:
akihito.nakano 2018-03-29 20:46:22 +09:00
parent dd3d798f02
commit 75e354ed71
11 changed files with 35 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/PhpClientCodegen.java
View File

@ -371,7 +371,7 @@ public class PhpClientCodegen extends DefaultCodegen implements CodegenConfig {
ArraySchema ap = (ArraySchema) p; ArraySchema ap = (ArraySchema) p;
Schema inner = ap.getItems(); Schema inner = ap.getItems();
return getTypeDeclaration(inner) + "[]"; return getTypeDeclaration(inner) + "[]";
} else if (p instanceof MapSchema) { } else if (p.getAdditionalProperties() != null) {
Schema inner = (Schema) p.getAdditionalProperties(); Schema inner = (Schema) p.getAdditionalProperties();
return getSchemaType(p) + "[string," + getTypeDeclaration(inner) + "]"; return getSchemaType(p) + "[string," + getTypeDeclaration(inner) + "]";
} else if (StringUtils.isNotBlank(p.get$ref())) { } else if (StringUtils.isNotBlank(p.get$ref())) {

4
samples/openapi3/client/petstore/php/SwaggerClient-php/docs/Api/FakeApi.md
View File

@ -382,7 +382,7 @@ $apiInstance = new Swagger\Client\Api\FakeApi(
// This is optional, `GuzzleHttp\Client` will be used as default. // This is optional, `GuzzleHttp\Client` will be used as default.
new GuzzleHttp\Client() new GuzzleHttp\Client()
); );
$UNKNOWN_PARAM_NAME = new \Swagger\Client\Model\map(); // map | request body $UNKNOWN_PARAM_NAME = new \Swagger\Client\Model\map(); // map[string,string] | request body
try { try {
$apiInstance->testInlineAdditionalProperties($UNKNOWN_PARAM_NAME); $apiInstance->testInlineAdditionalProperties($UNKNOWN_PARAM_NAME);
@ -396,7 +396,7 @@ try {
Name | Type | Description | Notes Name | Type | Description | Notes
------------- | ------------- | ------------- | ------------- ------------- | ------------- | ------------- | -------------
**UNKNOWN_PARAM_NAME** | [**map**](../Model/map.md)| request body | **UNKNOWN_PARAM_NAME** | [**map[string,string]**](../Model/map.md)| request body |
### Return type ### Return type

4
samples/openapi3/client/petstore/php/SwaggerClient-php/docs/Api/StoreApi.md
View File

@ -59,7 +59,7 @@ No authorization required
[[Back to top]](#) [[Back to API list]](../../README.md#documentation-for-api-endpoints) [[Back to Model list]](../../README.md#documentation-for-models) [[Back to README]](../../README.md) [[Back to top]](#) [[Back to API list]](../../README.md#documentation-for-api-endpoints) [[Back to Model list]](../../README.md#documentation-for-models) [[Back to README]](../../README.md)
# **getInventory** # **getInventory**
> map getInventory() > map[string,int] getInventory()
Returns pet inventories by status Returns pet inventories by status
@ -96,7 +96,7 @@ This endpoint does not need any parameter.
### Return type ### Return type
[**map**](../Model/map.md) [**map[string,int]**](../Model/map.md)
### Authorization ### Authorization

4
samples/openapi3/client/petstore/php/SwaggerClient-php/docs/Model/AdditionalPropertiesClass.md
View File

@ -3,8 +3,8 @@
## Properties ## Properties
Name | Type | Description | Notes Name | Type | Description | Notes
------------ | ------------- | ------------- | ------------- ------------ | ------------- | ------------- | -------------
**map_property** | **map** | | [optional] **map_property** | **map[string,string]** | | [optional]
**map_of_map_property** | [**map**](map.md) | | [optional] **map_of_map_property** | [**map[string,map[string,string]]**](map.md) | | [optional]
[[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md) [[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)

4
samples/openapi3/client/petstore/php/SwaggerClient-php/docs/Model/MapTest.md
View File

@ -3,8 +3,8 @@
## Properties ## Properties
Name | Type | Description | Notes Name | Type | Description | Notes
------------ | ------------- | ------------- | ------------- ------------ | ------------- | ------------- | -------------
**map_map_of_string** | [**map**](map.md) | | [optional] **map_map_of_string** | [**map[string,map[string,string]]**](map.md) | | [optional]
**map_of_enum_string** | **map** | | [optional] **map_of_enum_string** | **map[string,string]** | | [optional]
[[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md) [[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)

2
samples/openapi3/client/petstore/php/SwaggerClient-php/docs/Model/MixedPropertiesAndAdditionalPropertiesClass.md
View File

@ -5,7 +5,7 @@ Name | Type | Description | Notes
------------ | ------------- | ------------- | ------------- ------------ | ------------- | ------------- | -------------
**uuid** | **string** | | [optional] **uuid** | **string** | | [optional]
**date_time** | [**\DateTime**](\DateTime.md) | | [optional] **date_time** | [**\DateTime**](\DateTime.md) | | [optional]
**map** | [**map**](Animal.md) | | [optional] **map** | [**map[string,\Swagger\Client\Model\Animal]**](Animal.md) | | [optional]
[[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md) [[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)

10
samples/openapi3/client/petstore/php/SwaggerClient-php/lib/Api/FakeApi.php
View File

@ -1801,7 +1801,7 @@ class FakeApi
* *
* test inline additionalProperties * test inline additionalProperties
* *
* @param map $UNKNOWN_PARAM_NAME request body (required) * @param map[string,string] $UNKNOWN_PARAM_NAME request body (required)
* *
* @throws \Swagger\Client\ApiException on non-2xx response * @throws \Swagger\Client\ApiException on non-2xx response
* @throws \InvalidArgumentException * @throws \InvalidArgumentException
@ -1817,7 +1817,7 @@ class FakeApi
* *
* test inline additionalProperties * test inline additionalProperties
* *
* @param map $UNKNOWN_PARAM_NAME request body (required) * @param map[string,string] $UNKNOWN_PARAM_NAME request body (required)
* *
* @throws \Swagger\Client\ApiException on non-2xx response * @throws \Swagger\Client\ApiException on non-2xx response
* @throws \InvalidArgumentException * @throws \InvalidArgumentException
@ -1870,7 +1870,7 @@ class FakeApi
* *
* test inline additionalProperties * test inline additionalProperties
* *
* @param map $UNKNOWN_PARAM_NAME request body (required) * @param map[string,string] $UNKNOWN_PARAM_NAME request body (required)
* *
* @throws \InvalidArgumentException * @throws \InvalidArgumentException
* @return \GuzzleHttp\Promise\PromiseInterface * @return \GuzzleHttp\Promise\PromiseInterface
@ -1890,7 +1890,7 @@ class FakeApi
* *
* test inline additionalProperties * test inline additionalProperties
* *
* @param map $UNKNOWN_PARAM_NAME request body (required) * @param map[string,string] $UNKNOWN_PARAM_NAME request body (required)
* *
* @throws \InvalidArgumentException * @throws \InvalidArgumentException
* @return \GuzzleHttp\Promise\PromiseInterface * @return \GuzzleHttp\Promise\PromiseInterface
@ -1926,7 +1926,7 @@ class FakeApi
/** /**
* Create request for operation 'testInlineAdditionalProperties' * Create request for operation 'testInlineAdditionalProperties'
* *
* @param map $UNKNOWN_PARAM_NAME request body (required) * @param map[string,string] $UNKNOWN_PARAM_NAME request body (required)
* *
* @throws \InvalidArgumentException * @throws \InvalidArgumentException
* @return \GuzzleHttp\Psr7\Request * @return \GuzzleHttp\Psr7\Request

10
samples/openapi3/client/petstore/php/SwaggerClient-php/lib/Api/StoreApi.php
View File

@ -320,7 +320,7 @@ class StoreApi
* *
* @throws \Swagger\Client\ApiException on non-2xx response * @throws \Swagger\Client\ApiException on non-2xx response
* @throws \InvalidArgumentException * @throws \InvalidArgumentException
* @return map * @return map[string,int]
*/ */
public function getInventory() public function getInventory()
{ {
@ -336,11 +336,11 @@ class StoreApi
* *
* @throws \Swagger\Client\ApiException on non-2xx response * @throws \Swagger\Client\ApiException on non-2xx response
* @throws \InvalidArgumentException * @throws \InvalidArgumentException
* @return array of map, HTTP status code, HTTP response headers (array of strings) * @return array of map[string,int], HTTP status code, HTTP response headers (array of strings)
*/ */
public function getInventoryWithHttpInfo() public function getInventoryWithHttpInfo()
{ {
$returnType = 'map'; $returnType = 'map[string,int]';
$request = $this->getInventoryRequest(); $request = $this->getInventoryRequest();
try { try {
@ -392,7 +392,7 @@ class StoreApi
case 200: case 200:
$data = ObjectSerializer::deserialize( $data = ObjectSerializer::deserialize(
$e->getResponseBody(), $e->getResponseBody(),
'map', 'map[string,int]',
$e->getResponseHeaders() $e->getResponseHeaders()
); );
$e->setResponseObject($data); $e->setResponseObject($data);
@ -432,7 +432,7 @@ class StoreApi
*/ */
public function getInventoryAsyncWithHttpInfo() public function getInventoryAsyncWithHttpInfo()
{ {
$returnType = 'map'; $returnType = 'map[string,int]';
$request = $this->getInventoryRequest(); $request = $this->getInventoryRequest();
return $this->client return $this->client

12
samples/openapi3/client/petstore/php/SwaggerClient-php/lib/Model/AdditionalPropertiesClass.php
View File

@ -57,8 +57,8 @@ class AdditionalPropertiesClass implements ModelInterface, ArrayAccess
* @var string[] * @var string[]
*/ */
protected static $swaggerTypes = [ protected static $swaggerTypes = [
'map_property' => 'map', 'map_property' => 'map[string,string]',
'map_of_map_property' => 'map' 'map_of_map_property' => 'map[string,map[string,string]]'
]; ];
/** /**
@ -214,7 +214,7 @@ class AdditionalPropertiesClass implements ModelInterface, ArrayAccess
/** /**
* Gets map_property * Gets map_property
* *
* @return map * @return map[string,string]
*/ */
public function getMapProperty() public function getMapProperty()
{ {
@ -224,7 +224,7 @@ class AdditionalPropertiesClass implements ModelInterface, ArrayAccess
/** /**
* Sets map_property * Sets map_property
* *
* @param map $map_property map_property * @param map[string,string] $map_property map_property
* *
* @return $this * @return $this
*/ */
@ -238,7 +238,7 @@ class AdditionalPropertiesClass implements ModelInterface, ArrayAccess
/** /**
* Gets map_of_map_property * Gets map_of_map_property
* *
* @return map * @return map[string,map[string,string]]
*/ */
public function getMapOfMapProperty() public function getMapOfMapProperty()
{ {
@ -248,7 +248,7 @@ class AdditionalPropertiesClass implements ModelInterface, ArrayAccess
/** /**
* Sets map_of_map_property * Sets map_of_map_property
* *
* @param map $map_of_map_property map_of_map_property * @param map[string,map[string,string]] $map_of_map_property map_of_map_property
* *
* @return $this * @return $this
*/ */

12
samples/openapi3/client/petstore/php/SwaggerClient-php/lib/Model/MapTest.php
View File

@ -57,8 +57,8 @@ class MapTest implements ModelInterface, ArrayAccess
* @var string[] * @var string[]
*/ */
protected static $swaggerTypes = [ protected static $swaggerTypes = [
'map_map_of_string' => 'map', 'map_map_of_string' => 'map[string,map[string,string]]',
'map_of_enum_string' => 'map' 'map_of_enum_string' => 'map[string,string]'
]; ];
/** /**
@ -229,7 +229,7 @@ class MapTest implements ModelInterface, ArrayAccess
/** /**
* Gets map_map_of_string * Gets map_map_of_string
* *
* @return map * @return map[string,map[string,string]]
*/ */
public function getMapMapOfString() public function getMapMapOfString()
{ {
@ -239,7 +239,7 @@ class MapTest implements ModelInterface, ArrayAccess
/** /**
* Sets map_map_of_string * Sets map_map_of_string
* *
* @param map $map_map_of_string map_map_of_string * @param map[string,map[string,string]] $map_map_of_string map_map_of_string
* *
* @return $this * @return $this
*/ */
@ -253,7 +253,7 @@ class MapTest implements ModelInterface, ArrayAccess
/** /**
* Gets map_of_enum_string * Gets map_of_enum_string
* *
* @return map * @return map[string,string]
*/ */
public function getMapOfEnumString() public function getMapOfEnumString()
{ {
@ -263,7 +263,7 @@ class MapTest implements ModelInterface, ArrayAccess
/** /**
* Sets map_of_enum_string * Sets map_of_enum_string
* *
* @param map $map_of_enum_string map_of_enum_string * @param map[string,string] $map_of_enum_string map_of_enum_string
* *
* @return $this * @return $this
*/ */

6
samples/openapi3/client/petstore/php/SwaggerClient-php/lib/Model/MixedPropertiesAndAdditionalPropertiesClass.php
View File

@ -59,7 +59,7 @@ class MixedPropertiesAndAdditionalPropertiesClass implements ModelInterface, Arr
protected static $swaggerTypes = [ protected static $swaggerTypes = [
'uuid' => 'string', 'uuid' => 'string',
'date_time' => '\DateTime', 'date_time' => '\DateTime',
'map' => 'map' 'map' => 'map[string,\Swagger\Client\Model\Animal]'
]; ];
/** /**
@ -268,7 +268,7 @@ class MixedPropertiesAndAdditionalPropertiesClass implements ModelInterface, Arr
/** /**
* Gets map * Gets map
* *
* @return map * @return map[string,\Swagger\Client\Model\Animal]
*/ */
public function getMap() public function getMap()
{ {
@ -278,7 +278,7 @@ class MixedPropertiesAndAdditionalPropertiesClass implements ModelInterface, Arr
/** /**
* Sets map * Sets map
* *
* @param map $map map * @param map[string,\Swagger\Client\Model\Animal] $map map
* *
* @return $this * @return $this
*/ */