diff --git a/samples/client/petstore-security-test/php/.swagger-codegen/VERSION b/samples/client/petstore-security-test/php/.swagger-codegen/VERSION
index f9f7450d135..855ff9501eb 100644
--- a/samples/client/petstore-security-test/php/.swagger-codegen/VERSION
+++ b/samples/client/petstore-security-test/php/.swagger-codegen/VERSION
@@ -1 +1 @@
-2.3.0-SNAPSHOT
\ No newline at end of file
+2.4.0-SNAPSHOT
\ No newline at end of file
diff --git a/samples/client/petstore-security-test/php/SwaggerClient-php/lib/Api/FakeApi.php b/samples/client/petstore-security-test/php/SwaggerClient-php/lib/Api/FakeApi.php
index cd3f4ab623f..cb09e58e2b2 100644
--- a/samples/client/petstore-security-test/php/SwaggerClient-php/lib/Api/FakeApi.php
+++ b/samples/client/petstore-security-test/php/SwaggerClient-php/lib/Api/FakeApi.php
@@ -17,7 +17,7 @@
  * OpenAPI spec version: 1.0.0 *_/ ' \" =end -- \\r\\n \\n \\r
  * Contact: apiteam@swagger.io *_/ ' \" =end -- \\r\\n \\n \\r
  * Generated by: https://github.com/swagger-api/swagger-codegen.git
- * Swagger Codegen version: 2.3.0-SNAPSHOT
+ * Swagger Codegen version: 2.4.0-SNAPSHOT
  */
 
 /**
diff --git a/samples/client/petstore-security-test/php/SwaggerClient-php/lib/ApiException.php b/samples/client/petstore-security-test/php/SwaggerClient-php/lib/ApiException.php
index 108ad687c60..9ed326a3c6f 100644
--- a/samples/client/petstore-security-test/php/SwaggerClient-php/lib/ApiException.php
+++ b/samples/client/petstore-security-test/php/SwaggerClient-php/lib/ApiException.php
@@ -17,7 +17,7 @@
  * OpenAPI spec version: 1.0.0 *_/ ' \" =end -- \\r\\n \\n \\r
  * Contact: apiteam@swagger.io *_/ ' \" =end -- \\r\\n \\n \\r
  * Generated by: https://github.com/swagger-api/swagger-codegen.git
- * Swagger Codegen version: 2.3.0-SNAPSHOT
+ * Swagger Codegen version: 2.4.0-SNAPSHOT
  */
 
 /**
diff --git a/samples/client/petstore-security-test/php/SwaggerClient-php/lib/Configuration.php b/samples/client/petstore-security-test/php/SwaggerClient-php/lib/Configuration.php
index 0d34cfd15a4..192e8b2c6c7 100644
--- a/samples/client/petstore-security-test/php/SwaggerClient-php/lib/Configuration.php
+++ b/samples/client/petstore-security-test/php/SwaggerClient-php/lib/Configuration.php
@@ -17,7 +17,7 @@
  * OpenAPI spec version: 1.0.0 *_/ ' \" =end -- \\r\\n \\n \\r
  * Contact: apiteam@swagger.io *_/ ' \" =end -- \\r\\n \\n \\r
  * Generated by: https://github.com/swagger-api/swagger-codegen.git
- * Swagger Codegen version: 2.3.0-SNAPSHOT
+ * Swagger Codegen version: 2.4.0-SNAPSHOT
  */
 
 /**
diff --git a/samples/client/petstore-security-test/php/SwaggerClient-php/lib/HeaderSelector.php b/samples/client/petstore-security-test/php/SwaggerClient-php/lib/HeaderSelector.php
index 5252eb2b99b..676173de468 100644
--- a/samples/client/petstore-security-test/php/SwaggerClient-php/lib/HeaderSelector.php
+++ b/samples/client/petstore-security-test/php/SwaggerClient-php/lib/HeaderSelector.php
@@ -17,7 +17,7 @@
  * OpenAPI spec version: 1.0.0 *_/ ' \" =end -- \\r\\n \\n \\r
  * Contact: apiteam@swagger.io *_/ ' \" =end -- \\r\\n \\n \\r
  * Generated by: https://github.com/swagger-api/swagger-codegen.git
- * Swagger Codegen version: 2.3.0-SNAPSHOT
+ * Swagger Codegen version: 2.4.0-SNAPSHOT
  */
 
 /**
diff --git a/samples/client/petstore-security-test/php/SwaggerClient-php/lib/Model/ModelInterface.php b/samples/client/petstore-security-test/php/SwaggerClient-php/lib/Model/ModelInterface.php
index e9f2f391535..6013c8cf977 100644
--- a/samples/client/petstore-security-test/php/SwaggerClient-php/lib/Model/ModelInterface.php
+++ b/samples/client/petstore-security-test/php/SwaggerClient-php/lib/Model/ModelInterface.php
@@ -18,7 +18,7 @@
  * OpenAPI spec version: 1.0.0 *_/ ' \" =end -- \\r\\n \\n \\r
  * Contact: apiteam@swagger.io *_/ ' \" =end -- \\r\\n \\n \\r
  * Generated by: https://github.com/swagger-api/swagger-codegen.git
- * Swagger Codegen version: 2.3.0-SNAPSHOT
+ * Swagger Codegen version: 2.4.0-SNAPSHOT
  */
 
 /**
diff --git a/samples/client/petstore-security-test/php/SwaggerClient-php/lib/Model/ModelReturn.php b/samples/client/petstore-security-test/php/SwaggerClient-php/lib/Model/ModelReturn.php
index 04844965614..a570a938c79 100644
--- a/samples/client/petstore-security-test/php/SwaggerClient-php/lib/Model/ModelReturn.php
+++ b/samples/client/petstore-security-test/php/SwaggerClient-php/lib/Model/ModelReturn.php
@@ -18,7 +18,7 @@
  * OpenAPI spec version: 1.0.0 *_/ ' \" =end -- \\r\\n \\n \\r
  * Contact: apiteam@swagger.io *_/ ' \" =end -- \\r\\n \\n \\r
  * Generated by: https://github.com/swagger-api/swagger-codegen.git
- * Swagger Codegen version: 2.3.0-SNAPSHOT
+ * Swagger Codegen version: 2.4.0-SNAPSHOT
  */
 
 /**
diff --git a/samples/client/petstore-security-test/php/SwaggerClient-php/lib/ObjectSerializer.php b/samples/client/petstore-security-test/php/SwaggerClient-php/lib/ObjectSerializer.php
index 4fcf557ae5a..c3f4590bc51 100644
--- a/samples/client/petstore-security-test/php/SwaggerClient-php/lib/ObjectSerializer.php
+++ b/samples/client/petstore-security-test/php/SwaggerClient-php/lib/ObjectSerializer.php
@@ -18,7 +18,7 @@
  * OpenAPI spec version: 1.0.0 *_/ ' \" =end -- \\r\\n \\n \\r
  * Contact: apiteam@swagger.io *_/ ' \" =end -- \\r\\n \\n \\r
  * Generated by: https://github.com/swagger-api/swagger-codegen.git
- * Swagger Codegen version: 2.3.0-SNAPSHOT
+ * Swagger Codegen version: 2.4.0-SNAPSHOT
  */
 
 /**
diff --git a/samples/client/petstore/php/.swagger-codegen/VERSION b/samples/client/petstore/php/.swagger-codegen/VERSION
index f9f7450d135..855ff9501eb 100644
--- a/samples/client/petstore/php/.swagger-codegen/VERSION
+++ b/samples/client/petstore/php/.swagger-codegen/VERSION
@@ -1 +1 @@
-2.3.0-SNAPSHOT
\ No newline at end of file
+2.4.0-SNAPSHOT
\ No newline at end of file
diff --git a/samples/client/petstore/php/SwaggerClient-php/docs/Api/FakeApi.md b/samples/client/petstore/php/SwaggerClient-php/docs/Api/FakeApi.md
index da5558c386f..f1f5c8e33aa 100644
--- a/samples/client/petstore/php/SwaggerClient-php/docs/Api/FakeApi.md
+++ b/samples/client/petstore/php/SwaggerClient-php/docs/Api/FakeApi.md
@@ -379,11 +379,11 @@ try {
 
 Name | Type | Description  | Notes
 ------------- | ------------- | ------------- | -------------
- **enum_form_string_array** | [**string[]**](../Model/string.md)| Form parameter enum test (string array) | [optional]
+ **enum_form_string_array** | **string[]**| Form parameter enum test (string array) | [optional]
  **enum_form_string** | **string**| Form parameter enum test (string) | [optional] [default to -efg]
- **enum_header_string_array** | [**string[]**](../Model/string.md)| Header parameter enum test (string array) | [optional]
+ **enum_header_string_array** | **string[]**| Header parameter enum test (string array) | [optional]
  **enum_header_string** | **string**| Header parameter enum test (string) | [optional] [default to -efg]
- **enum_query_string_array** | [**string[]**](../Model/string.md)| Query parameter enum test (string array) | [optional]
+ **enum_query_string_array** | **string[]**| Query parameter enum test (string array) | [optional]
  **enum_query_string** | **string**| Query parameter enum test (string) | [optional] [default to -efg]
  **enum_query_integer** | **int**| Query parameter enum test (double) | [optional]
  **enum_query_double** | **double**| Query parameter enum test (double) | [optional]
diff --git a/samples/client/petstore/php/SwaggerClient-php/docs/Api/PetApi.md b/samples/client/petstore/php/SwaggerClient-php/docs/Api/PetApi.md
index 46e42007fac..cb35aadc8b9 100644
--- a/samples/client/petstore/php/SwaggerClient-php/docs/Api/PetApi.md
+++ b/samples/client/petstore/php/SwaggerClient-php/docs/Api/PetApi.md
@@ -156,7 +156,7 @@ try {
 
 Name | Type | Description  | Notes
 ------------- | ------------- | ------------- | -------------
- **status** | [**string[]**](../Model/string.md)| Status values that need to be considered for filter |
+ **status** | **string[]**| Status values that need to be considered for filter |
 
 ### Return type
 
@@ -209,7 +209,7 @@ try {
 
 Name | Type | Description  | Notes
 ------------- | ------------- | ------------- | -------------
- **tags** | [**string[]**](../Model/string.md)| Tags to filter by |
+ **tags** | **string[]**| Tags to filter by |
 
 ### Return type
 
diff --git a/samples/client/petstore/php/SwaggerClient-php/lib/Api/AnotherFakeApi.php b/samples/client/petstore/php/SwaggerClient-php/lib/Api/AnotherFakeApi.php
index 690831ca09e..b9a0e9b14c5 100644
--- a/samples/client/petstore/php/SwaggerClient-php/lib/Api/AnotherFakeApi.php
+++ b/samples/client/petstore/php/SwaggerClient-php/lib/Api/AnotherFakeApi.php
@@ -17,7 +17,7 @@
  * OpenAPI spec version: 1.0.0
  * Contact: apiteam@swagger.io
  * Generated by: https://github.com/swagger-api/swagger-codegen.git
- * Swagger Codegen version: 2.3.0-SNAPSHOT
+ * Swagger Codegen version: 2.4.0-SNAPSHOT
  */
 
 /**
diff --git a/samples/client/petstore/php/SwaggerClient-php/lib/Api/FakeApi.php b/samples/client/petstore/php/SwaggerClient-php/lib/Api/FakeApi.php
index 81e515b3ab4..b2e6060f9c9 100644
--- a/samples/client/petstore/php/SwaggerClient-php/lib/Api/FakeApi.php
+++ b/samples/client/petstore/php/SwaggerClient-php/lib/Api/FakeApi.php
@@ -17,7 +17,7 @@
  * OpenAPI spec version: 1.0.0
  * Contact: apiteam@swagger.io
  * Generated by: https://github.com/swagger-api/swagger-codegen.git
- * Swagger Codegen version: 2.3.0-SNAPSHOT
+ * Swagger Codegen version: 2.4.0-SNAPSHOT
  */
 
 /**
diff --git a/samples/client/petstore/php/SwaggerClient-php/lib/Api/FakeClassnameTags123Api.php b/samples/client/petstore/php/SwaggerClient-php/lib/Api/FakeClassnameTags123Api.php
index 8588d48a5e3..766ed2a2326 100644
--- a/samples/client/petstore/php/SwaggerClient-php/lib/Api/FakeClassnameTags123Api.php
+++ b/samples/client/petstore/php/SwaggerClient-php/lib/Api/FakeClassnameTags123Api.php
@@ -17,7 +17,7 @@
  * OpenAPI spec version: 1.0.0
  * Contact: apiteam@swagger.io
  * Generated by: https://github.com/swagger-api/swagger-codegen.git
- * Swagger Codegen version: 2.3.0-SNAPSHOT
+ * Swagger Codegen version: 2.4.0-SNAPSHOT
  */
 
 /**
diff --git a/samples/client/petstore/php/SwaggerClient-php/lib/Api/PetApi.php b/samples/client/petstore/php/SwaggerClient-php/lib/Api/PetApi.php
index 410d6a42913..cd582ccacbd 100644
--- a/samples/client/petstore/php/SwaggerClient-php/lib/Api/PetApi.php
+++ b/samples/client/petstore/php/SwaggerClient-php/lib/Api/PetApi.php
@@ -17,7 +17,7 @@
  * OpenAPI spec version: 1.0.0
  * Contact: apiteam@swagger.io
  * Generated by: https://github.com/swagger-api/swagger-codegen.git
- * Swagger Codegen version: 2.3.0-SNAPSHOT
+ * Swagger Codegen version: 2.4.0-SNAPSHOT
  */
 
 /**
diff --git a/samples/client/petstore/php/SwaggerClient-php/lib/Api/StoreApi.php b/samples/client/petstore/php/SwaggerClient-php/lib/Api/StoreApi.php
index 5df7f9f279b..380bd62cba8 100644
--- a/samples/client/petstore/php/SwaggerClient-php/lib/Api/StoreApi.php
+++ b/samples/client/petstore/php/SwaggerClient-php/lib/Api/StoreApi.php
@@ -17,7 +17,7 @@
  * OpenAPI spec version: 1.0.0
  * Contact: apiteam@swagger.io
  * Generated by: https://github.com/swagger-api/swagger-codegen.git
- * Swagger Codegen version: 2.3.0-SNAPSHOT
+ * Swagger Codegen version: 2.4.0-SNAPSHOT
  */
 
 /**
diff --git a/samples/client/petstore/php/SwaggerClient-php/lib/Api/UserApi.php b/samples/client/petstore/php/SwaggerClient-php/lib/Api/UserApi.php
index 58e0abec8c2..ebcd633bfc9 100644
--- a/samples/client/petstore/php/SwaggerClient-php/lib/Api/UserApi.php
+++ b/samples/client/petstore/php/SwaggerClient-php/lib/Api/UserApi.php
@@ -17,7 +17,7 @@
  * OpenAPI spec version: 1.0.0
  * Contact: apiteam@swagger.io
  * Generated by: https://github.com/swagger-api/swagger-codegen.git
- * Swagger Codegen version: 2.3.0-SNAPSHOT
+ * Swagger Codegen version: 2.4.0-SNAPSHOT
  */
 
 /**
diff --git a/samples/client/petstore/php/SwaggerClient-php/lib/ApiException.php b/samples/client/petstore/php/SwaggerClient-php/lib/ApiException.php
index b38c7188347..a79b904b363 100644
--- a/samples/client/petstore/php/SwaggerClient-php/lib/ApiException.php
+++ b/samples/client/petstore/php/SwaggerClient-php/lib/ApiException.php
@@ -17,7 +17,7 @@
  * OpenAPI spec version: 1.0.0
  * Contact: apiteam@swagger.io
  * Generated by: https://github.com/swagger-api/swagger-codegen.git
- * Swagger Codegen version: 2.3.0-SNAPSHOT
+ * Swagger Codegen version: 2.4.0-SNAPSHOT
  */
 
 /**
diff --git a/samples/client/petstore/php/SwaggerClient-php/lib/Configuration.php b/samples/client/petstore/php/SwaggerClient-php/lib/Configuration.php
index 85e7de94902..6175d7110eb 100644
--- a/samples/client/petstore/php/SwaggerClient-php/lib/Configuration.php
+++ b/samples/client/petstore/php/SwaggerClient-php/lib/Configuration.php
@@ -17,7 +17,7 @@
  * OpenAPI spec version: 1.0.0
  * Contact: apiteam@swagger.io
  * Generated by: https://github.com/swagger-api/swagger-codegen.git
- * Swagger Codegen version: 2.3.0-SNAPSHOT
+ * Swagger Codegen version: 2.4.0-SNAPSHOT
  */
 
 /**
diff --git a/samples/client/petstore/php/SwaggerClient-php/lib/HeaderSelector.php b/samples/client/petstore/php/SwaggerClient-php/lib/HeaderSelector.php
index fe78207bbca..a0e99dda06a 100644
--- a/samples/client/petstore/php/SwaggerClient-php/lib/HeaderSelector.php
+++ b/samples/client/petstore/php/SwaggerClient-php/lib/HeaderSelector.php
@@ -17,7 +17,7 @@
  * OpenAPI spec version: 1.0.0
  * Contact: apiteam@swagger.io
  * Generated by: https://github.com/swagger-api/swagger-codegen.git
- * Swagger Codegen version: 2.3.0-SNAPSHOT
+ * Swagger Codegen version: 2.4.0-SNAPSHOT
  */
 
 /**
diff --git a/samples/client/petstore/php/SwaggerClient-php/lib/Model/AdditionalPropertiesClass.php b/samples/client/petstore/php/SwaggerClient-php/lib/Model/AdditionalPropertiesClass.php
index b0e23df0103..8e21d15c4cc 100644
--- a/samples/client/petstore/php/SwaggerClient-php/lib/Model/AdditionalPropertiesClass.php
+++ b/samples/client/petstore/php/SwaggerClient-php/lib/Model/AdditionalPropertiesClass.php
@@ -18,7 +18,7 @@
  * OpenAPI spec version: 1.0.0
  * Contact: apiteam@swagger.io
  * Generated by: https://github.com/swagger-api/swagger-codegen.git
- * Swagger Codegen version: 2.3.0-SNAPSHOT
+ * Swagger Codegen version: 2.4.0-SNAPSHOT
  */
 
 /**
diff --git a/samples/client/petstore/php/SwaggerClient-php/lib/Model/Animal.php b/samples/client/petstore/php/SwaggerClient-php/lib/Model/Animal.php
index 97c264f8f44..87dc1f5e044 100644
--- a/samples/client/petstore/php/SwaggerClient-php/lib/Model/Animal.php
+++ b/samples/client/petstore/php/SwaggerClient-php/lib/Model/Animal.php
@@ -18,7 +18,7 @@
  * OpenAPI spec version: 1.0.0
  * Contact: apiteam@swagger.io
  * Generated by: https://github.com/swagger-api/swagger-codegen.git
- * Swagger Codegen version: 2.3.0-SNAPSHOT
+ * Swagger Codegen version: 2.4.0-SNAPSHOT
  */
 
 /**
diff --git a/samples/client/petstore/php/SwaggerClient-php/lib/Model/AnimalFarm.php b/samples/client/petstore/php/SwaggerClient-php/lib/Model/AnimalFarm.php
index 56c0d7ae63b..8d85c503fc8 100644
--- a/samples/client/petstore/php/SwaggerClient-php/lib/Model/AnimalFarm.php
+++ b/samples/client/petstore/php/SwaggerClient-php/lib/Model/AnimalFarm.php
@@ -18,7 +18,7 @@
  * OpenAPI spec version: 1.0.0
  * Contact: apiteam@swagger.io
  * Generated by: https://github.com/swagger-api/swagger-codegen.git
- * Swagger Codegen version: 2.3.0-SNAPSHOT
+ * Swagger Codegen version: 2.4.0-SNAPSHOT
  */
 
 /**
diff --git a/samples/client/petstore/php/SwaggerClient-php/lib/Model/ApiResponse.php b/samples/client/petstore/php/SwaggerClient-php/lib/Model/ApiResponse.php
index 4457c8de9c6..5990855d5b1 100644
--- a/samples/client/petstore/php/SwaggerClient-php/lib/Model/ApiResponse.php
+++ b/samples/client/petstore/php/SwaggerClient-php/lib/Model/ApiResponse.php
@@ -18,7 +18,7 @@
  * OpenAPI spec version: 1.0.0
  * Contact: apiteam@swagger.io
  * Generated by: https://github.com/swagger-api/swagger-codegen.git
- * Swagger Codegen version: 2.3.0-SNAPSHOT
+ * Swagger Codegen version: 2.4.0-SNAPSHOT
  */
 
 /**
diff --git a/samples/client/petstore/php/SwaggerClient-php/lib/Model/ArrayOfArrayOfNumberOnly.php b/samples/client/petstore/php/SwaggerClient-php/lib/Model/ArrayOfArrayOfNumberOnly.php
index 62f654eb196..0d057470d92 100644
--- a/samples/client/petstore/php/SwaggerClient-php/lib/Model/ArrayOfArrayOfNumberOnly.php
+++ b/samples/client/petstore/php/SwaggerClient-php/lib/Model/ArrayOfArrayOfNumberOnly.php
@@ -18,7 +18,7 @@
  * OpenAPI spec version: 1.0.0
  * Contact: apiteam@swagger.io
  * Generated by: https://github.com/swagger-api/swagger-codegen.git
- * Swagger Codegen version: 2.3.0-SNAPSHOT
+ * Swagger Codegen version: 2.4.0-SNAPSHOT
  */
 
 /**
diff --git a/samples/client/petstore/php/SwaggerClient-php/lib/Model/ArrayOfNumberOnly.php b/samples/client/petstore/php/SwaggerClient-php/lib/Model/ArrayOfNumberOnly.php
index 06c74a80f4f..dce3704329c 100644
--- a/samples/client/petstore/php/SwaggerClient-php/lib/Model/ArrayOfNumberOnly.php
+++ b/samples/client/petstore/php/SwaggerClient-php/lib/Model/ArrayOfNumberOnly.php
@@ -18,7 +18,7 @@
  * OpenAPI spec version: 1.0.0
  * Contact: apiteam@swagger.io
  * Generated by: https://github.com/swagger-api/swagger-codegen.git
- * Swagger Codegen version: 2.3.0-SNAPSHOT
+ * Swagger Codegen version: 2.4.0-SNAPSHOT
  */
 
 /**
diff --git a/samples/client/petstore/php/SwaggerClient-php/lib/Model/ArrayTest.php b/samples/client/petstore/php/SwaggerClient-php/lib/Model/ArrayTest.php
index 2d6e4f18af4..0c22a3daddb 100644
--- a/samples/client/petstore/php/SwaggerClient-php/lib/Model/ArrayTest.php
+++ b/samples/client/petstore/php/SwaggerClient-php/lib/Model/ArrayTest.php
@@ -18,7 +18,7 @@
  * OpenAPI spec version: 1.0.0
  * Contact: apiteam@swagger.io
  * Generated by: https://github.com/swagger-api/swagger-codegen.git
- * Swagger Codegen version: 2.3.0-SNAPSHOT
+ * Swagger Codegen version: 2.4.0-SNAPSHOT
  */
 
 /**
diff --git a/samples/client/petstore/php/SwaggerClient-php/lib/Model/Capitalization.php b/samples/client/petstore/php/SwaggerClient-php/lib/Model/Capitalization.php
index df5d8fbdcdd..b08068adc86 100644
--- a/samples/client/petstore/php/SwaggerClient-php/lib/Model/Capitalization.php
+++ b/samples/client/petstore/php/SwaggerClient-php/lib/Model/Capitalization.php
@@ -18,7 +18,7 @@
  * OpenAPI spec version: 1.0.0
  * Contact: apiteam@swagger.io
  * Generated by: https://github.com/swagger-api/swagger-codegen.git
- * Swagger Codegen version: 2.3.0-SNAPSHOT
+ * Swagger Codegen version: 2.4.0-SNAPSHOT
  */
 
 /**
diff --git a/samples/client/petstore/php/SwaggerClient-php/lib/Model/Cat.php b/samples/client/petstore/php/SwaggerClient-php/lib/Model/Cat.php
index 144b7f4f787..241ee15f135 100644
--- a/samples/client/petstore/php/SwaggerClient-php/lib/Model/Cat.php
+++ b/samples/client/petstore/php/SwaggerClient-php/lib/Model/Cat.php
@@ -18,7 +18,7 @@
  * OpenAPI spec version: 1.0.0
  * Contact: apiteam@swagger.io
  * Generated by: https://github.com/swagger-api/swagger-codegen.git
- * Swagger Codegen version: 2.3.0-SNAPSHOT
+ * Swagger Codegen version: 2.4.0-SNAPSHOT
  */
 
 /**
diff --git a/samples/client/petstore/php/SwaggerClient-php/lib/Model/Category.php b/samples/client/petstore/php/SwaggerClient-php/lib/Model/Category.php
index 9e3e0408ea7..6176fa427f1 100644
--- a/samples/client/petstore/php/SwaggerClient-php/lib/Model/Category.php
+++ b/samples/client/petstore/php/SwaggerClient-php/lib/Model/Category.php
@@ -18,7 +18,7 @@
  * OpenAPI spec version: 1.0.0
  * Contact: apiteam@swagger.io
  * Generated by: https://github.com/swagger-api/swagger-codegen.git
- * Swagger Codegen version: 2.3.0-SNAPSHOT
+ * Swagger Codegen version: 2.4.0-SNAPSHOT
  */
 
 /**
diff --git a/samples/client/petstore/php/SwaggerClient-php/lib/Model/ClassModel.php b/samples/client/petstore/php/SwaggerClient-php/lib/Model/ClassModel.php
index e2624c52623..b6fef51eeb0 100644
--- a/samples/client/petstore/php/SwaggerClient-php/lib/Model/ClassModel.php
+++ b/samples/client/petstore/php/SwaggerClient-php/lib/Model/ClassModel.php
@@ -18,7 +18,7 @@
  * OpenAPI spec version: 1.0.0
  * Contact: apiteam@swagger.io
  * Generated by: https://github.com/swagger-api/swagger-codegen.git
- * Swagger Codegen version: 2.3.0-SNAPSHOT
+ * Swagger Codegen version: 2.4.0-SNAPSHOT
  */
 
 /**
diff --git a/samples/client/petstore/php/SwaggerClient-php/lib/Model/Client.php b/samples/client/petstore/php/SwaggerClient-php/lib/Model/Client.php
index b2fefd61c74..72534e59b1b 100644
--- a/samples/client/petstore/php/SwaggerClient-php/lib/Model/Client.php
+++ b/samples/client/petstore/php/SwaggerClient-php/lib/Model/Client.php
@@ -18,7 +18,7 @@
  * OpenAPI spec version: 1.0.0
  * Contact: apiteam@swagger.io
  * Generated by: https://github.com/swagger-api/swagger-codegen.git
- * Swagger Codegen version: 2.3.0-SNAPSHOT
+ * Swagger Codegen version: 2.4.0-SNAPSHOT
  */
 
 /**
diff --git a/samples/client/petstore/php/SwaggerClient-php/lib/Model/Dog.php b/samples/client/petstore/php/SwaggerClient-php/lib/Model/Dog.php
index e1a06e12191..e0f2bbc47a4 100644
--- a/samples/client/petstore/php/SwaggerClient-php/lib/Model/Dog.php
+++ b/samples/client/petstore/php/SwaggerClient-php/lib/Model/Dog.php
@@ -18,7 +18,7 @@
  * OpenAPI spec version: 1.0.0
  * Contact: apiteam@swagger.io
  * Generated by: https://github.com/swagger-api/swagger-codegen.git
- * Swagger Codegen version: 2.3.0-SNAPSHOT
+ * Swagger Codegen version: 2.4.0-SNAPSHOT
  */
 
 /**
diff --git a/samples/client/petstore/php/SwaggerClient-php/lib/Model/EnumArrays.php b/samples/client/petstore/php/SwaggerClient-php/lib/Model/EnumArrays.php
index 9bdc2a52853..0d548f2ad39 100644
--- a/samples/client/petstore/php/SwaggerClient-php/lib/Model/EnumArrays.php
+++ b/samples/client/petstore/php/SwaggerClient-php/lib/Model/EnumArrays.php
@@ -18,7 +18,7 @@
  * OpenAPI spec version: 1.0.0
  * Contact: apiteam@swagger.io
  * Generated by: https://github.com/swagger-api/swagger-codegen.git
- * Swagger Codegen version: 2.3.0-SNAPSHOT
+ * Swagger Codegen version: 2.4.0-SNAPSHOT
  */
 
 /**
diff --git a/samples/client/petstore/php/SwaggerClient-php/lib/Model/EnumClass.php b/samples/client/petstore/php/SwaggerClient-php/lib/Model/EnumClass.php
index d54af35fc0d..5421b7e1bca 100644
--- a/samples/client/petstore/php/SwaggerClient-php/lib/Model/EnumClass.php
+++ b/samples/client/petstore/php/SwaggerClient-php/lib/Model/EnumClass.php
@@ -18,7 +18,7 @@
  * OpenAPI spec version: 1.0.0
  * Contact: apiteam@swagger.io
  * Generated by: https://github.com/swagger-api/swagger-codegen.git
- * Swagger Codegen version: 2.3.0-SNAPSHOT
+ * Swagger Codegen version: 2.4.0-SNAPSHOT
  */
 
 /**
diff --git a/samples/client/petstore/php/SwaggerClient-php/lib/Model/EnumTest.php b/samples/client/petstore/php/SwaggerClient-php/lib/Model/EnumTest.php
index 2ab49ca9108..87dcc3da6bd 100644
--- a/samples/client/petstore/php/SwaggerClient-php/lib/Model/EnumTest.php
+++ b/samples/client/petstore/php/SwaggerClient-php/lib/Model/EnumTest.php
@@ -18,7 +18,7 @@
  * OpenAPI spec version: 1.0.0
  * Contact: apiteam@swagger.io
  * Generated by: https://github.com/swagger-api/swagger-codegen.git
- * Swagger Codegen version: 2.3.0-SNAPSHOT
+ * Swagger Codegen version: 2.4.0-SNAPSHOT
  */
 
 /**
diff --git a/samples/client/petstore/php/SwaggerClient-php/lib/Model/FormatTest.php b/samples/client/petstore/php/SwaggerClient-php/lib/Model/FormatTest.php
index 9f2dd600f8b..a8c74e7b761 100644
--- a/samples/client/petstore/php/SwaggerClient-php/lib/Model/FormatTest.php
+++ b/samples/client/petstore/php/SwaggerClient-php/lib/Model/FormatTest.php
@@ -18,7 +18,7 @@
  * OpenAPI spec version: 1.0.0
  * Contact: apiteam@swagger.io
  * Generated by: https://github.com/swagger-api/swagger-codegen.git
- * Swagger Codegen version: 2.3.0-SNAPSHOT
+ * Swagger Codegen version: 2.4.0-SNAPSHOT
  */
 
 /**
diff --git a/samples/client/petstore/php/SwaggerClient-php/lib/Model/HasOnlyReadOnly.php b/samples/client/petstore/php/SwaggerClient-php/lib/Model/HasOnlyReadOnly.php
index 072c9775dd9..e755f7dc3c8 100644
--- a/samples/client/petstore/php/SwaggerClient-php/lib/Model/HasOnlyReadOnly.php
+++ b/samples/client/petstore/php/SwaggerClient-php/lib/Model/HasOnlyReadOnly.php
@@ -18,7 +18,7 @@
  * OpenAPI spec version: 1.0.0
  * Contact: apiteam@swagger.io
  * Generated by: https://github.com/swagger-api/swagger-codegen.git
- * Swagger Codegen version: 2.3.0-SNAPSHOT
+ * Swagger Codegen version: 2.4.0-SNAPSHOT
  */
 
 /**
diff --git a/samples/client/petstore/php/SwaggerClient-php/lib/Model/MapTest.php b/samples/client/petstore/php/SwaggerClient-php/lib/Model/MapTest.php
index f687d521b3c..1cf57a9e8fe 100644
--- a/samples/client/petstore/php/SwaggerClient-php/lib/Model/MapTest.php
+++ b/samples/client/petstore/php/SwaggerClient-php/lib/Model/MapTest.php
@@ -18,7 +18,7 @@
  * OpenAPI spec version: 1.0.0
  * Contact: apiteam@swagger.io
  * Generated by: https://github.com/swagger-api/swagger-codegen.git
- * Swagger Codegen version: 2.3.0-SNAPSHOT
+ * Swagger Codegen version: 2.4.0-SNAPSHOT
  */
 
 /**
diff --git a/samples/client/petstore/php/SwaggerClient-php/lib/Model/MixedPropertiesAndAdditionalPropertiesClass.php b/samples/client/petstore/php/SwaggerClient-php/lib/Model/MixedPropertiesAndAdditionalPropertiesClass.php
index 34154c71e62..307a5ed85ce 100644
--- a/samples/client/petstore/php/SwaggerClient-php/lib/Model/MixedPropertiesAndAdditionalPropertiesClass.php
+++ b/samples/client/petstore/php/SwaggerClient-php/lib/Model/MixedPropertiesAndAdditionalPropertiesClass.php
@@ -18,7 +18,7 @@
  * OpenAPI spec version: 1.0.0
  * Contact: apiteam@swagger.io
  * Generated by: https://github.com/swagger-api/swagger-codegen.git
- * Swagger Codegen version: 2.3.0-SNAPSHOT
+ * Swagger Codegen version: 2.4.0-SNAPSHOT
  */
 
 /**
diff --git a/samples/client/petstore/php/SwaggerClient-php/lib/Model/Model200Response.php b/samples/client/petstore/php/SwaggerClient-php/lib/Model/Model200Response.php
index 338f3649349..618a4d55737 100644
--- a/samples/client/petstore/php/SwaggerClient-php/lib/Model/Model200Response.php
+++ b/samples/client/petstore/php/SwaggerClient-php/lib/Model/Model200Response.php
@@ -18,7 +18,7 @@
  * OpenAPI spec version: 1.0.0
  * Contact: apiteam@swagger.io
  * Generated by: https://github.com/swagger-api/swagger-codegen.git
- * Swagger Codegen version: 2.3.0-SNAPSHOT
+ * Swagger Codegen version: 2.4.0-SNAPSHOT
  */
 
 /**
diff --git a/samples/client/petstore/php/SwaggerClient-php/lib/Model/ModelInterface.php b/samples/client/petstore/php/SwaggerClient-php/lib/Model/ModelInterface.php
index 0c3499a8b25..e1326fc3652 100644
--- a/samples/client/petstore/php/SwaggerClient-php/lib/Model/ModelInterface.php
+++ b/samples/client/petstore/php/SwaggerClient-php/lib/Model/ModelInterface.php
@@ -18,7 +18,7 @@
  * OpenAPI spec version: 1.0.0
  * Contact: apiteam@swagger.io
  * Generated by: https://github.com/swagger-api/swagger-codegen.git
- * Swagger Codegen version: 2.3.0-SNAPSHOT
+ * Swagger Codegen version: 2.4.0-SNAPSHOT
  */
 
 /**
diff --git a/samples/client/petstore/php/SwaggerClient-php/lib/Model/ModelList.php b/samples/client/petstore/php/SwaggerClient-php/lib/Model/ModelList.php
index 885e6c4b06a..f9b428690a8 100644
--- a/samples/client/petstore/php/SwaggerClient-php/lib/Model/ModelList.php
+++ b/samples/client/petstore/php/SwaggerClient-php/lib/Model/ModelList.php
@@ -18,7 +18,7 @@
  * OpenAPI spec version: 1.0.0
  * Contact: apiteam@swagger.io
  * Generated by: https://github.com/swagger-api/swagger-codegen.git
- * Swagger Codegen version: 2.3.0-SNAPSHOT
+ * Swagger Codegen version: 2.4.0-SNAPSHOT
  */
 
 /**
diff --git a/samples/client/petstore/php/SwaggerClient-php/lib/Model/ModelReturn.php b/samples/client/petstore/php/SwaggerClient-php/lib/Model/ModelReturn.php
index 079922e9d4c..96b9a69e459 100644
--- a/samples/client/petstore/php/SwaggerClient-php/lib/Model/ModelReturn.php
+++ b/samples/client/petstore/php/SwaggerClient-php/lib/Model/ModelReturn.php
@@ -18,7 +18,7 @@
  * OpenAPI spec version: 1.0.0
  * Contact: apiteam@swagger.io
  * Generated by: https://github.com/swagger-api/swagger-codegen.git
- * Swagger Codegen version: 2.3.0-SNAPSHOT
+ * Swagger Codegen version: 2.4.0-SNAPSHOT
  */
 
 /**
diff --git a/samples/client/petstore/php/SwaggerClient-php/lib/Model/Name.php b/samples/client/petstore/php/SwaggerClient-php/lib/Model/Name.php
index 25bfb714533..32749bdf0e9 100644
--- a/samples/client/petstore/php/SwaggerClient-php/lib/Model/Name.php
+++ b/samples/client/petstore/php/SwaggerClient-php/lib/Model/Name.php
@@ -18,7 +18,7 @@
  * OpenAPI spec version: 1.0.0
  * Contact: apiteam@swagger.io
  * Generated by: https://github.com/swagger-api/swagger-codegen.git
- * Swagger Codegen version: 2.3.0-SNAPSHOT
+ * Swagger Codegen version: 2.4.0-SNAPSHOT
  */
 
 /**
diff --git a/samples/client/petstore/php/SwaggerClient-php/lib/Model/NumberOnly.php b/samples/client/petstore/php/SwaggerClient-php/lib/Model/NumberOnly.php
index 92ba431bfe7..25a49c0f2c8 100644
--- a/samples/client/petstore/php/SwaggerClient-php/lib/Model/NumberOnly.php
+++ b/samples/client/petstore/php/SwaggerClient-php/lib/Model/NumberOnly.php
@@ -18,7 +18,7 @@
  * OpenAPI spec version: 1.0.0
  * Contact: apiteam@swagger.io
  * Generated by: https://github.com/swagger-api/swagger-codegen.git
- * Swagger Codegen version: 2.3.0-SNAPSHOT
+ * Swagger Codegen version: 2.4.0-SNAPSHOT
  */
 
 /**
diff --git a/samples/client/petstore/php/SwaggerClient-php/lib/Model/Order.php b/samples/client/petstore/php/SwaggerClient-php/lib/Model/Order.php
index 5d84ee4b890..60831bb91d6 100644
--- a/samples/client/petstore/php/SwaggerClient-php/lib/Model/Order.php
+++ b/samples/client/petstore/php/SwaggerClient-php/lib/Model/Order.php
@@ -18,7 +18,7 @@
  * OpenAPI spec version: 1.0.0
  * Contact: apiteam@swagger.io
  * Generated by: https://github.com/swagger-api/swagger-codegen.git
- * Swagger Codegen version: 2.3.0-SNAPSHOT
+ * Swagger Codegen version: 2.4.0-SNAPSHOT
  */
 
 /**
diff --git a/samples/client/petstore/php/SwaggerClient-php/lib/Model/OuterBoolean.php b/samples/client/petstore/php/SwaggerClient-php/lib/Model/OuterBoolean.php
index 77fe3c5abb1..b91839a477e 100644
--- a/samples/client/petstore/php/SwaggerClient-php/lib/Model/OuterBoolean.php
+++ b/samples/client/petstore/php/SwaggerClient-php/lib/Model/OuterBoolean.php
@@ -18,7 +18,7 @@
  * OpenAPI spec version: 1.0.0
  * Contact: apiteam@swagger.io
  * Generated by: https://github.com/swagger-api/swagger-codegen.git
- * Swagger Codegen version: 2.3.0-SNAPSHOT
+ * Swagger Codegen version: 2.4.0-SNAPSHOT
  */
 
 /**
diff --git a/samples/client/petstore/php/SwaggerClient-php/lib/Model/OuterComposite.php b/samples/client/petstore/php/SwaggerClient-php/lib/Model/OuterComposite.php
index 406df360ac5..9c3a3b7a56c 100644
--- a/samples/client/petstore/php/SwaggerClient-php/lib/Model/OuterComposite.php
+++ b/samples/client/petstore/php/SwaggerClient-php/lib/Model/OuterComposite.php
@@ -18,7 +18,7 @@
  * OpenAPI spec version: 1.0.0
  * Contact: apiteam@swagger.io
  * Generated by: https://github.com/swagger-api/swagger-codegen.git
- * Swagger Codegen version: 2.3.0-SNAPSHOT
+ * Swagger Codegen version: 2.4.0-SNAPSHOT
  */
 
 /**
diff --git a/samples/client/petstore/php/SwaggerClient-php/lib/Model/OuterEnum.php b/samples/client/petstore/php/SwaggerClient-php/lib/Model/OuterEnum.php
index eb987be2a3c..f899365e22f 100644
--- a/samples/client/petstore/php/SwaggerClient-php/lib/Model/OuterEnum.php
+++ b/samples/client/petstore/php/SwaggerClient-php/lib/Model/OuterEnum.php
@@ -18,7 +18,7 @@
  * OpenAPI spec version: 1.0.0
  * Contact: apiteam@swagger.io
  * Generated by: https://github.com/swagger-api/swagger-codegen.git
- * Swagger Codegen version: 2.3.0-SNAPSHOT
+ * Swagger Codegen version: 2.4.0-SNAPSHOT
  */
 
 /**
diff --git a/samples/client/petstore/php/SwaggerClient-php/lib/Model/OuterNumber.php b/samples/client/petstore/php/SwaggerClient-php/lib/Model/OuterNumber.php
index 28b9d87534a..bec502714e7 100644
--- a/samples/client/petstore/php/SwaggerClient-php/lib/Model/OuterNumber.php
+++ b/samples/client/petstore/php/SwaggerClient-php/lib/Model/OuterNumber.php
@@ -18,7 +18,7 @@
  * OpenAPI spec version: 1.0.0
  * Contact: apiteam@swagger.io
  * Generated by: https://github.com/swagger-api/swagger-codegen.git
- * Swagger Codegen version: 2.3.0-SNAPSHOT
+ * Swagger Codegen version: 2.4.0-SNAPSHOT
  */
 
 /**
diff --git a/samples/client/petstore/php/SwaggerClient-php/lib/Model/OuterString.php b/samples/client/petstore/php/SwaggerClient-php/lib/Model/OuterString.php
index afa5661243a..b8a15fd7a60 100644
--- a/samples/client/petstore/php/SwaggerClient-php/lib/Model/OuterString.php
+++ b/samples/client/petstore/php/SwaggerClient-php/lib/Model/OuterString.php
@@ -18,7 +18,7 @@
  * OpenAPI spec version: 1.0.0
  * Contact: apiteam@swagger.io
  * Generated by: https://github.com/swagger-api/swagger-codegen.git
- * Swagger Codegen version: 2.3.0-SNAPSHOT
+ * Swagger Codegen version: 2.4.0-SNAPSHOT
  */
 
 /**
diff --git a/samples/client/petstore/php/SwaggerClient-php/lib/Model/Pet.php b/samples/client/petstore/php/SwaggerClient-php/lib/Model/Pet.php
index dacbe59d3a4..5369903fbfa 100644
--- a/samples/client/petstore/php/SwaggerClient-php/lib/Model/Pet.php
+++ b/samples/client/petstore/php/SwaggerClient-php/lib/Model/Pet.php
@@ -18,7 +18,7 @@
  * OpenAPI spec version: 1.0.0
  * Contact: apiteam@swagger.io
  * Generated by: https://github.com/swagger-api/swagger-codegen.git
- * Swagger Codegen version: 2.3.0-SNAPSHOT
+ * Swagger Codegen version: 2.4.0-SNAPSHOT
  */
 
 /**
diff --git a/samples/client/petstore/php/SwaggerClient-php/lib/Model/ReadOnlyFirst.php b/samples/client/petstore/php/SwaggerClient-php/lib/Model/ReadOnlyFirst.php
index bf186ac7759..32bbedbeca1 100644
--- a/samples/client/petstore/php/SwaggerClient-php/lib/Model/ReadOnlyFirst.php
+++ b/samples/client/petstore/php/SwaggerClient-php/lib/Model/ReadOnlyFirst.php
@@ -18,7 +18,7 @@
  * OpenAPI spec version: 1.0.0
  * Contact: apiteam@swagger.io
  * Generated by: https://github.com/swagger-api/swagger-codegen.git
- * Swagger Codegen version: 2.3.0-SNAPSHOT
+ * Swagger Codegen version: 2.4.0-SNAPSHOT
  */
 
 /**
diff --git a/samples/client/petstore/php/SwaggerClient-php/lib/Model/SpecialModelName.php b/samples/client/petstore/php/SwaggerClient-php/lib/Model/SpecialModelName.php
index 9ee9d1484a6..5610494dd77 100644
--- a/samples/client/petstore/php/SwaggerClient-php/lib/Model/SpecialModelName.php
+++ b/samples/client/petstore/php/SwaggerClient-php/lib/Model/SpecialModelName.php
@@ -18,7 +18,7 @@
  * OpenAPI spec version: 1.0.0
  * Contact: apiteam@swagger.io
  * Generated by: https://github.com/swagger-api/swagger-codegen.git
- * Swagger Codegen version: 2.3.0-SNAPSHOT
+ * Swagger Codegen version: 2.4.0-SNAPSHOT
  */
 
 /**
diff --git a/samples/client/petstore/php/SwaggerClient-php/lib/Model/Tag.php b/samples/client/petstore/php/SwaggerClient-php/lib/Model/Tag.php
index b3512323216..44537a44564 100644
--- a/samples/client/petstore/php/SwaggerClient-php/lib/Model/Tag.php
+++ b/samples/client/petstore/php/SwaggerClient-php/lib/Model/Tag.php
@@ -18,7 +18,7 @@
  * OpenAPI spec version: 1.0.0
  * Contact: apiteam@swagger.io
  * Generated by: https://github.com/swagger-api/swagger-codegen.git
- * Swagger Codegen version: 2.3.0-SNAPSHOT
+ * Swagger Codegen version: 2.4.0-SNAPSHOT
  */
 
 /**
diff --git a/samples/client/petstore/php/SwaggerClient-php/lib/Model/User.php b/samples/client/petstore/php/SwaggerClient-php/lib/Model/User.php
index 606ced51279..054cb339ac0 100644
--- a/samples/client/petstore/php/SwaggerClient-php/lib/Model/User.php
+++ b/samples/client/petstore/php/SwaggerClient-php/lib/Model/User.php
@@ -18,7 +18,7 @@
  * OpenAPI spec version: 1.0.0
  * Contact: apiteam@swagger.io
  * Generated by: https://github.com/swagger-api/swagger-codegen.git
- * Swagger Codegen version: 2.3.0-SNAPSHOT
+ * Swagger Codegen version: 2.4.0-SNAPSHOT
  */
 
 /**
diff --git a/samples/client/petstore/php/SwaggerClient-php/lib/ObjectSerializer.php b/samples/client/petstore/php/SwaggerClient-php/lib/ObjectSerializer.php
index 22ab6d01226..1f7e3f3d614 100644
--- a/samples/client/petstore/php/SwaggerClient-php/lib/ObjectSerializer.php
+++ b/samples/client/petstore/php/SwaggerClient-php/lib/ObjectSerializer.php
@@ -18,7 +18,7 @@
  * OpenAPI spec version: 1.0.0
  * Contact: apiteam@swagger.io
  * Generated by: https://github.com/swagger-api/swagger-codegen.git
- * Swagger Codegen version: 2.3.0-SNAPSHOT
+ * Swagger Codegen version: 2.4.0-SNAPSHOT
  */
 
 /**
diff --git a/samples/client/petstore/php/SwaggerClient-php/test/Api/UserApiTest.php b/samples/client/petstore/php/SwaggerClient-php/test/Api/UserApiTest.php
index aa312ed6e9f..3f843a54779 100644
--- a/samples/client/petstore/php/SwaggerClient-php/test/Api/UserApiTest.php
+++ b/samples/client/petstore/php/SwaggerClient-php/test/Api/UserApiTest.php
@@ -5,8 +5,7 @@
  *
  * @category Class
  * @package  Swagger\Client
- * @author   http://github.com/swagger-api/swagger-codegen
- * @license  http://www.apache.org/licenses/LICENSE-2.0 Apache License v2
+ * @author   Swagger Codegen team
  * @link     https://github.com/swagger-api/swagger-codegen
  */
 
@@ -18,18 +17,7 @@
  * OpenAPI spec version: 1.0.0
  * Contact: apiteam@swagger.io
  * Generated by: https://github.com/swagger-api/swagger-codegen.git
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Swagger Codegen version: 2.4.0-SNAPSHOT
  */
 
 /**
@@ -38,10 +26,9 @@
  * Please update the test case below to test the endpoint.
  */
 
-namespace Swagger\Client\Api;
+namespace Swagger\Client;
 
 use \Swagger\Client\Configuration;
-use \Swagger\Client\ApiClient;
 use \Swagger\Client\ApiException;
 use \Swagger\Client\ObjectSerializer;
 
@@ -50,27 +37,38 @@ use \Swagger\Client\ObjectSerializer;
  *
  * @category Class
  * @package  Swagger\Client
- * @author   http://github.com/swagger-api/swagger-codegen
- * @license  http://www.apache.org/licenses/LICENSE-2.0 Apache License v2
+ * @author   Swagger Codegen team
  * @link     https://github.com/swagger-api/swagger-codegen
  */
 class UserApiTest extends \PHPUnit_Framework_TestCase
 {
 
     /**
-     * Setup before running each test case
+     * Setup before running any test cases
      */
     public static function setUpBeforeClass()
     {
+    }
 
+    /**
+     * Setup before running each test case
+     */
+    public function setUp()
+    {
     }
 
     /**
      * Clean up after running each test case
      */
+    public function tearDown()
+    {
+    }
+
+    /**
+     * Clean up after running all test cases
+     */
     public static function tearDownAfterClass()
     {
-
     }
 
     /**
@@ -81,7 +79,6 @@ class UserApiTest extends \PHPUnit_Framework_TestCase
      */
     public function testCreateUser()
     {
-
     }
 
     /**
@@ -92,7 +89,6 @@ class UserApiTest extends \PHPUnit_Framework_TestCase
      */
     public function testCreateUsersWithArrayInput()
     {
-
     }
 
     /**
@@ -103,7 +99,6 @@ class UserApiTest extends \PHPUnit_Framework_TestCase
      */
     public function testCreateUsersWithListInput()
     {
-
     }
 
     /**
@@ -114,7 +109,6 @@ class UserApiTest extends \PHPUnit_Framework_TestCase
      */
     public function testDeleteUser()
     {
-
     }
 
     /**
@@ -125,7 +119,6 @@ class UserApiTest extends \PHPUnit_Framework_TestCase
      */
     public function testGetUserByName()
     {
-
     }
 
     /**
@@ -136,16 +129,6 @@ class UserApiTest extends \PHPUnit_Framework_TestCase
      */
     public function testLoginUser()
     {
-        $user_api = new UserApi();
-        // login
-        $response = $user_api->loginUser("xxxxx", "yyyyyyyy");
-        
-        $this->assertInternalType("string", $response);
-        $this->assertRegExp(
-            "/^logged in user session/",
-            $response,
-            "response string starts with 'logged in user session'"
-        );
     }
 
     /**
@@ -156,7 +139,6 @@ class UserApiTest extends \PHPUnit_Framework_TestCase
      */
     public function testLogoutUser()
     {
-
     }
 
     /**
@@ -167,7 +149,5 @@ class UserApiTest extends \PHPUnit_Framework_TestCase
      */
     public function testUpdateUser()
     {
-
     }
-
 }
diff --git a/samples/client/petstore/php/SwaggerClient-php/test/Client/ObjectSerializerTest.php b/samples/client/petstore/php/SwaggerClient-php/test/Client/ObjectSerializerTest.php
deleted file mode 100644
index 1b008fbb62a..00000000000
--- a/samples/client/petstore/php/SwaggerClient-php/test/Client/ObjectSerializerTest.php
+++ /dev/null
@@ -1,87 +0,0 @@
-<?php
-/**
- * ObjectSerializerTest
- * PHP version 5
- *
- * @category Class
- * @package  Swagger\Client
- * @author   http://github.com/swagger-api/swagger-codegen
- * @license  http://www.apache.org/licenses/LICENSE-2.0 Apache License v2
- * @link     https://github.com/swagger-api/swagger-codegen
- */
-/**
- *  Copyright 2016 SmartBear Software
- *
- *  Licensed under the Apache License, Version 2.0 (the "License");
- *  you may not use this file except in compliance with the License.
- *  You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- *  Unless required by applicable law or agreed to in writing, software
- *  distributed under the License is distributed on an "AS IS" BASIS,
- *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *  See the License for the specific language governing permissions and
- *  limitations under the License.
- */
-
-/**
- * NOTE: This class is auto generated by the swagger code generator program.
- * https://github.com/swagger-api/swagger-codegen
- * Please update the test case below to test the endpoint.
- */
-
-namespace Swagger\Client\Api;
-
-use \Swagger\Client\Configuration;
-use \Swagger\Client\ApiClient;
-use \Swagger\Client\ApiException;
-use \Swagger\Client\ObjectSerializer;
-
-/**
- * ObjectSerializerTest Class Doc Comment
- *
- * @category Class
- * @package  Swagger\Client
- * @author   http://github.com/swagger-api/swagger-codegen
- * @license  http://www.apache.org/licenses/LICENSE-2.0 Apache License v2
- * @link     https://github.com/swagger-api/swagger-codegen
- */
-class ObjectSerializerTest extends \PHPUnit_Framework_TestCase
-{
-
-    /**
-     * Setup before running each test case
-     */
-    public static function setUpBeforeClass()
-    {
-
-    }
-
-    /**
-     * Clean up after running each test case
-     */
-    public static function tearDownAfterClass()
-    {
-
-    }
-
-    // test sanitizeFilename
-    public function testSanitizeFilename()
-    {
-        // initialize the API client
-        $s = new ObjectSerializer();
-
-        $this->assertSame("sun.gif", $s->sanitizeFilename("sun.gif"));
-        $this->assertSame("sun.gif", $s->sanitizeFilename("../sun.gif"));
-        $this->assertSame("sun.gif", $s->sanitizeFilename("/var/tmp/sun.gif"));
-        $this->assertSame("sun.gif", $s->sanitizeFilename("./sun.gif"));
-
-        $this->assertSame("sun", $s->sanitizeFilename("sun"));
-        $this->assertSame("sun.gif", $s->sanitizeFilename("..\sun.gif"));
-        $this->assertSame("sun.gif", $s->sanitizeFilename("\var\tmp\sun.gif"));
-        $this->assertSame("sun.gif", $s->sanitizeFilename("c:\var\tmp\sun.gif"));
-        $this->assertSame("sun.gif", $s->sanitizeFilename(".\sun.gif"));
-    }
-
-}