Merge branch 'php-fix-array-handling-2' of https://github.com/arnested/swagger-codegen into arnested-php-fix-array-handling-2

Conflicts:
	modules/swagger-codegen/src/main/resources/php/model.mustache
	samples/client/petstore/php/SwaggerClient-php/README.md
	samples/client/petstore/php/SwaggerClient-php/lib/Model/Animal.php
	samples/client/petstore/php/SwaggerClient-php/lib/Model/AnimalFarm.php
	samples/client/petstore/php/SwaggerClient-php/lib/Model/ApiResponse.php
	samples/client/petstore/php/SwaggerClient-php/lib/Model/Cat.php
	samples/client/petstore/php/SwaggerClient-php/lib/Model/Category.php
	samples/client/petstore/php/SwaggerClient-php/lib/Model/Dog.php
	samples/client/petstore/php/SwaggerClient-php/lib/Model/EnumClass.php
	samples/client/petstore/php/SwaggerClient-php/lib/Model/EnumTest.php
	samples/client/petstore/php/SwaggerClient-php/lib/Model/FormatTest.php
	samples/client/petstore/php/SwaggerClient-php/lib/Model/Model200Response.php
	samples/client/petstore/php/SwaggerClient-php/lib/Model/ModelReturn.php
	samples/client/petstore/php/SwaggerClient-php/lib/Model/Name.php
	samples/client/petstore/php/SwaggerClient-php/lib/Model/Order.php
	samples/client/petstore/php/SwaggerClient-php/lib/Model/Pet.php
	samples/client/petstore/php/SwaggerClient-php/lib/Model/SpecialModelName.php
	samples/client/petstore/php/SwaggerClient-php/lib/Model/Tag.php
	samples/client/petstore/php/SwaggerClient-php/lib/Model/User.php
This commit is contained in:
wing328
2016-05-10 00:29:13 +08:00
9 changed files with 35 additions and 491 deletions

View File

@@ -1,10 +0,0 @@
# 200Response
## Properties
Name | Type | Description | Notes
------------ | ------------- | ------------- | -------------
**name** | **int** | | [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)

View File

@@ -4,6 +4,7 @@
Name | Type | Description | Notes
------------ | ------------- | ------------- | -------------
**class_name** | **string** | |
**color** | **string** | | [optional] [default to 'red']
[[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)

View File

@@ -1,15 +0,0 @@
# InlineResponse200
## Properties
Name | Type | Description | Notes
------------ | ------------- | ------------- | -------------
**tags** | [**\Swagger\Client\Model\Tag[]**](Tag.md) | | [optional]
**id** | **int** | |
**category** | **object** | | [optional]
**status** | **string** | pet status in the store | [optional]
**name** | **string** | | [optional]
**photo_urls** | **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)