diff --git a/modules/swagger-codegen/src/main/resources/php/api.mustache b/modules/swagger-codegen/src/main/resources/php/api.mustache
index 8066b67db3a..6c133e34b94 100644
--- a/modules/swagger-codegen/src/main/resources/php/api.mustache
+++ b/modules/swagger-codegen/src/main/resources/php/api.mustache
@@ -49,6 +49,11 @@ use {{invokerPackage}}\ObjectSerializer;
      */
     protected $config;
 
+    /**
+     * @var HeaderSelector
+     */
+    protected $headerSelector;
+
     /**
      * @param ClientInterface $client
      * @param Configuration   $config
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 cb09e58e2b2..c590d545773 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
@@ -59,6 +59,11 @@ class FakeApi
      */
     protected $config;
 
+    /**
+     * @var HeaderSelector
+     */
+    protected $headerSelector;
+
     /**
      * @param ClientInterface $client
      * @param Configuration   $config
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 f1f5c8e33aa..da5558c386f 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[]**| Form parameter enum test (string array) | [optional]
+ **enum_form_string_array** | [**string[]**](../Model/string.md)| 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[]**| Header parameter enum test (string array) | [optional]
+ **enum_header_string_array** | [**string[]**](../Model/string.md)| 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[]**| Query parameter enum test (string array) | [optional]
+ **enum_query_string_array** | [**string[]**](../Model/string.md)| 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 cb35aadc8b9..46e42007fac 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[]**| Status values that need to be considered for filter |
+ **status** | [**string[]**](../Model/string.md)| Status values that need to be considered for filter |
 
 ### Return type
 
@@ -209,7 +209,7 @@ try {
 
 Name | Type | Description  | Notes
 ------------- | ------------- | ------------- | -------------
- **tags** | **string[]**| Tags to filter by |
+ **tags** | [**string[]**](../Model/string.md)| 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 b9a0e9b14c5..1eb93f1cf6d 100644
--- a/samples/client/petstore/php/SwaggerClient-php/lib/Api/AnotherFakeApi.php
+++ b/samples/client/petstore/php/SwaggerClient-php/lib/Api/AnotherFakeApi.php
@@ -59,6 +59,11 @@ class AnotherFakeApi
      */
     protected $config;
 
+    /**
+     * @var HeaderSelector
+     */
+    protected $headerSelector;
+
     /**
      * @param ClientInterface $client
      * @param Configuration   $config
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 b2e6060f9c9..babfa68ef04 100644
--- a/samples/client/petstore/php/SwaggerClient-php/lib/Api/FakeApi.php
+++ b/samples/client/petstore/php/SwaggerClient-php/lib/Api/FakeApi.php
@@ -59,6 +59,11 @@ class FakeApi
      */
     protected $config;
 
+    /**
+     * @var HeaderSelector
+     */
+    protected $headerSelector;
+
     /**
      * @param ClientInterface $client
      * @param Configuration   $config
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 766ed2a2326..58718e9bb2f 100644
--- a/samples/client/petstore/php/SwaggerClient-php/lib/Api/FakeClassnameTags123Api.php
+++ b/samples/client/petstore/php/SwaggerClient-php/lib/Api/FakeClassnameTags123Api.php
@@ -59,6 +59,11 @@ class FakeClassnameTags123Api
      */
     protected $config;
 
+    /**
+     * @var HeaderSelector
+     */
+    protected $headerSelector;
+
     /**
      * @param ClientInterface $client
      * @param Configuration   $config
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 cd582ccacbd..98860618184 100644
--- a/samples/client/petstore/php/SwaggerClient-php/lib/Api/PetApi.php
+++ b/samples/client/petstore/php/SwaggerClient-php/lib/Api/PetApi.php
@@ -59,6 +59,11 @@ class PetApi
      */
     protected $config;
 
+    /**
+     * @var HeaderSelector
+     */
+    protected $headerSelector;
+
     /**
      * @param ClientInterface $client
      * @param Configuration   $config
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 380bd62cba8..279ba063b08 100644
--- a/samples/client/petstore/php/SwaggerClient-php/lib/Api/StoreApi.php
+++ b/samples/client/petstore/php/SwaggerClient-php/lib/Api/StoreApi.php
@@ -59,6 +59,11 @@ class StoreApi
      */
     protected $config;
 
+    /**
+     * @var HeaderSelector
+     */
+    protected $headerSelector;
+
     /**
      * @param ClientInterface $client
      * @param Configuration   $config
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 ebcd633bfc9..93a5136045c 100644
--- a/samples/client/petstore/php/SwaggerClient-php/lib/Api/UserApi.php
+++ b/samples/client/petstore/php/SwaggerClient-php/lib/Api/UserApi.php
@@ -59,6 +59,11 @@ class UserApi
      */
     protected $config;
 
+    /**
+     * @var HeaderSelector
+     */
+    protected $headerSelector;
+
     /**
      * @param ClientInterface $client
      * @param Configuration   $config