From e282a052bf9efb72057458359c0717555a1abc08 Mon Sep 17 00:00:00 2001
From: Yuriy Belenko <yura-bely@mail.ru>
Date: Sun, 14 Jun 2020 17:40:06 +0300
Subject: [PATCH] [php-slim4] Set required PHP version to 7.2 (#6530)

* Bump required PHP version to 7.2

* Update rest dependencies to meet php 7.2

Latest phpunit 9 requires PHP 7.3, so I've set phpunit 8 as a fallback.

* Fix TestCase inheritance

* Add phpunit cache file to gitignore

* Put license @phpdoc into separate mustache

* Bump readme PHP version to 7.2

* Bump @phpdoc PHP version to 7.2

* Update Zend Diactoros with suggested package

* Refresh samples

* Remove broken tests

These tests will be fixed in next PR which moves Mock feature to
external repo.

* Point root Travis CI environment to PHP 7.3
---
 .travis.yml                                   |  2 +-
 .../php-slim4-server/README.mustache          |  4 +-
 .../php-slim4-server/SlimRouter.mustache      | 28 +-------
 .../abstract_authenticator.mustache           | 28 +-------
 .../resources/php-slim4-server/api.mustache   | 27 +-------
 .../php-slim4-server/api_test.mustache        | 37 ++---------
 .../php-slim4-server/composer.mustache        | 18 +++---
 .../main/resources/php-slim4-server/gitignore |  1 +
 .../resources/php-slim4-server/index.mustache | 16 ++---
 .../json_body_parser_middleware.mustache      | 28 +-------
 .../php-slim4-server/licenseInfo.mustache     | 23 +++++++
 .../resources/php-slim4-server/model.mustache | 12 +---
 .../php-slim4-server/model_interface.mustache | 28 +-------
 .../php-slim4-server/model_test.mustache      | 40 ++----------
 .../model_utils_trait.mustache                | 28 +-------
 .../model_utils_trait_test.mustache           | 28 +-------
 .../openapi_data_mocker.mustache              | 28 +-------
 .../openapi_data_mocker_interface.mustache    | 29 +--------
 .../openapi_data_mocker_middleware.mustache   | 28 +-------
 ...enapi_data_mocker_middleware_test.mustache | 28 +-------
 .../openapi_data_mocker_test.mustache         | 28 +-------
 .../php-slim4-server/phpunit.xml.mustache     |  8 ---
 .../string_utils_trait.mustache               | 28 +-------
 .../string_utils_trait_test.mustache          | 28 +-------
 samples/server/petstore/php-slim4/.gitignore  |  1 +
 .../php-slim4/.openapi-generator/FILES        | 54 ----------------
 samples/server/petstore/php-slim4/README.md   |  2 +-
 .../server/petstore/php-slim4/composer.json   | 12 ++--
 samples/server/petstore/php-slim4/index.php   | 17 +++--
 .../lib/Api/AbstractAnotherFakeApi.php        |  9 +--
 .../php-slim4/lib/Api/AbstractFakeApi.php     |  9 +--
 .../Api/AbstractFakeClassnameTags123Api.php   |  9 +--
 .../php-slim4/lib/Api/AbstractPetApi.php      |  9 +--
 .../php-slim4/lib/Api/AbstractStoreApi.php    |  9 +--
 .../php-slim4/lib/Api/AbstractUserApi.php     |  9 +--
 .../lib/Auth/AbstractAuthenticator.php        |  7 +-
 .../lib/Interfaces/ModelInterface.php         |  7 +-
 .../Middleware/JsonBodyParserMiddleware.php   |  7 +-
 .../php-slim4/lib/Mock/OpenApiDataMocker.php  |  7 +-
 .../lib/Mock/OpenApiDataMockerInterface.php   |  8 +--
 .../lib/Mock/OpenApiDataMockerMiddleware.php  |  7 +-
 .../lib/Model/AdditionalPropertiesAnyType.php | 13 ++--
 .../lib/Model/AdditionalPropertiesArray.php   | 13 ++--
 .../lib/Model/AdditionalPropertiesBoolean.php | 13 ++--
 .../lib/Model/AdditionalPropertiesClass.php   | 13 ++--
 .../lib/Model/AdditionalPropertiesInteger.php | 13 ++--
 .../lib/Model/AdditionalPropertiesNumber.php  | 13 ++--
 .../lib/Model/AdditionalPropertiesObject.php  | 13 ++--
 .../lib/Model/AdditionalPropertiesString.php  | 13 ++--
 .../petstore/php-slim4/lib/Model/Animal.php   | 13 ++--
 .../php-slim4/lib/Model/ApiResponse.php       | 13 ++--
 .../lib/Model/ArrayOfArrayOfNumberOnly.php    | 13 ++--
 .../php-slim4/lib/Model/ArrayOfNumberOnly.php | 13 ++--
 .../php-slim4/lib/Model/ArrayTest.php         | 13 ++--
 .../petstore/php-slim4/lib/Model/BigCat.php   | 13 ++--
 .../php-slim4/lib/Model/BigCatAllOf.php       | 13 ++--
 .../php-slim4/lib/Model/Capitalization.php    | 13 ++--
 .../petstore/php-slim4/lib/Model/Cat.php      | 13 ++--
 .../petstore/php-slim4/lib/Model/CatAllOf.php | 13 ++--
 .../petstore/php-slim4/lib/Model/Category.php | 13 ++--
 .../php-slim4/lib/Model/ClassModel.php        | 13 ++--
 .../petstore/php-slim4/lib/Model/Client.php   | 13 ++--
 .../petstore/php-slim4/lib/Model/Dog.php      | 13 ++--
 .../petstore/php-slim4/lib/Model/DogAllOf.php | 13 ++--
 .../php-slim4/lib/Model/EnumArrays.php        | 13 ++--
 .../php-slim4/lib/Model/EnumClass.php         | 13 ++--
 .../petstore/php-slim4/lib/Model/EnumTest.php | 13 ++--
 .../petstore/php-slim4/lib/Model/File.php     | 13 ++--
 .../lib/Model/FileSchemaTestClass.php         | 13 ++--
 .../php-slim4/lib/Model/FormatTest.php        | 13 ++--
 .../php-slim4/lib/Model/HasOnlyReadOnly.php   | 13 ++--
 .../php-slim4/lib/Model/InlineObject.php      | 63 ------------------
 .../php-slim4/lib/Model/InlineObject1.php     | 64 -------------------
 .../petstore/php-slim4/lib/Model/MapTest.php  | 13 ++--
 ...PropertiesAndAdditionalPropertiesClass.php | 13 ++--
 .../php-slim4/lib/Model/Model200Response.php  | 13 ++--
 .../php-slim4/lib/Model/ModelList.php         | 13 ++--
 .../php-slim4/lib/Model/ModelReturn.php       | 13 ++--
 .../petstore/php-slim4/lib/Model/Name.php     | 13 ++--
 .../php-slim4/lib/Model/NumberOnly.php        | 13 ++--
 .../petstore/php-slim4/lib/Model/Order.php    | 13 ++--
 .../php-slim4/lib/Model/OuterComposite.php    | 13 ++--
 .../php-slim4/lib/Model/OuterEnum.php         | 13 ++--
 .../petstore/php-slim4/lib/Model/Pet.php      | 13 ++--
 .../php-slim4/lib/Model/ReadOnlyFirst.php     | 13 ++--
 .../php-slim4/lib/Model/SpecialModelName.php  | 13 ++--
 .../petstore/php-slim4/lib/Model/Tag.php      | 13 ++--
 .../php-slim4/lib/Model/TypeHolderDefault.php | 13 ++--
 .../php-slim4/lib/Model/TypeHolderExample.php | 13 ++--
 .../petstore/php-slim4/lib/Model/User.php     | 13 ++--
 .../petstore/php-slim4/lib/Model/XmlItem.php  | 13 ++--
 .../petstore/php-slim4/lib/SlimRouter.php     | 59 ++++++++---------
 .../php-slim4/lib/Utils/ModelUtilsTrait.php   |  7 +-
 .../php-slim4/lib/Utils/StringUtilsTrait.php  |  7 +-
 .../petstore/php-slim4/phpunit.xml.dist       |  8 ---
 .../php-slim4/test/Api/AnotherFakeApiTest.php | 17 ++---
 .../php-slim4/test/Api/FakeApiTest.php        | 17 ++---
 .../test/Api/FakeClassnameTags123ApiTest.php  | 17 ++---
 .../php-slim4/test/Api/PetApiTest.php         | 17 ++---
 .../php-slim4/test/Api/StoreApiTest.php       | 17 ++---
 .../php-slim4/test/Api/UserApiTest.php        | 17 ++---
 .../Mock/OpenApiDataMockerMiddlewareTest.php  |  7 +-
 .../test/Mock/OpenApiDataMockerTest.php       |  7 +-
 .../Model/AdditionalPropertiesAnyTypeTest.php | 17 ++---
 .../Model/AdditionalPropertiesArrayTest.php   | 17 ++---
 .../Model/AdditionalPropertiesBooleanTest.php | 17 ++---
 .../Model/AdditionalPropertiesClassTest.php   | 17 ++---
 .../Model/AdditionalPropertiesIntegerTest.php | 17 ++---
 .../Model/AdditionalPropertiesNumberTest.php  | 17 ++---
 .../Model/AdditionalPropertiesObjectTest.php  | 17 ++---
 .../Model/AdditionalPropertiesStringTest.php  | 17 ++---
 .../php-slim4/test/Model/AnimalTest.php       | 17 ++---
 .../php-slim4/test/Model/ApiResponseTest.php  | 17 ++---
 .../Model/ArrayOfArrayOfNumberOnlyTest.php    | 17 ++---
 .../test/Model/ArrayOfNumberOnlyTest.php      | 17 ++---
 .../php-slim4/test/Model/ArrayTestTest.php    | 17 ++---
 .../php-slim4/test/Model/BigCatAllOfTest.php  | 17 ++---
 .../php-slim4/test/Model/BigCatTest.php       | 17 ++---
 .../test/Model/CapitalizationTest.php         | 17 ++---
 .../php-slim4/test/Model/CatAllOfTest.php     | 17 ++---
 .../petstore/php-slim4/test/Model/CatTest.php | 17 ++---
 .../php-slim4/test/Model/CategoryTest.php     | 17 ++---
 .../php-slim4/test/Model/ClassModelTest.php   | 17 ++---
 .../php-slim4/test/Model/ClientTest.php       | 17 ++---
 .../php-slim4/test/Model/DogAllOfTest.php     | 17 ++---
 .../petstore/php-slim4/test/Model/DogTest.php | 17 ++---
 .../php-slim4/test/Model/EnumArraysTest.php   | 17 ++---
 .../php-slim4/test/Model/EnumClassTest.php    | 17 ++---
 .../php-slim4/test/Model/EnumTestTest.php     | 17 ++---
 .../test/Model/FileSchemaTestClassTest.php    | 17 ++---
 .../php-slim4/test/Model/FileTest.php         | 17 ++---
 .../php-slim4/test/Model/FormatTestTest.php   | 17 ++---
 .../test/Model/HasOnlyReadOnlyTest.php        | 17 ++---
 .../php-slim4/test/Model/MapTestTest.php      | 17 ++---
 ...ertiesAndAdditionalPropertiesClassTest.php | 17 ++---
 .../test/Model/Model200ResponseTest.php       | 17 ++---
 .../php-slim4/test/Model/ModelListTest.php    | 17 ++---
 .../php-slim4/test/Model/ModelReturnTest.php  | 17 ++---
 .../php-slim4/test/Model/NameTest.php         | 17 ++---
 .../php-slim4/test/Model/NumberOnlyTest.php   | 17 ++---
 .../php-slim4/test/Model/OrderTest.php        | 17 ++---
 .../test/Model/OuterCompositeTest.php         | 17 ++---
 .../php-slim4/test/Model/OuterEnumTest.php    | 17 ++---
 .../petstore/php-slim4/test/Model/PetTest.php | 17 ++---
 .../test/Model/ReadOnlyFirstTest.php          | 17 ++---
 .../test/Model/SpecialModelNameTest.php       | 17 ++---
 .../petstore/php-slim4/test/Model/TagTest.php | 17 ++---
 .../test/Model/TypeHolderDefaultTest.php      | 17 ++---
 .../test/Model/TypeHolderExampleTest.php      | 17 ++---
 .../php-slim4/test/Model/UserTest.php         | 17 ++---
 .../php-slim4/test/Model/XmlItemTest.php      | 17 ++---
 .../test/Utils/ModelUtilsTraitTest.php        |  7 +-
 .../test/Utils/StringUtilsTraitTest.php       |  7 +-
 153 files changed, 983 insertions(+), 1531 deletions(-)
 create mode 100644 modules/openapi-generator/src/main/resources/php-slim4-server/licenseInfo.mustache
 delete mode 100644 samples/server/petstore/php-slim4/lib/Model/InlineObject.php
 delete mode 100644 samples/server/petstore/php-slim4/lib/Model/InlineObject1.php

diff --git a/.travis.yml b/.travis.yml
index d8493d013f5..70b7f54a160 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -85,7 +85,7 @@ before_install:
   #- sudo apt-get update
   #- sudo apt-get install dart
   # switch to php7
-  - phpenv global 7.1
+  - phpenv global 7.3
   - php -v
   # install perl module
   #- cpanm --local-lib=~/perl5 local::lib && eval $(perl -I ~/perl5/lib/perl5/ -Mlocal::lib)
diff --git a/modules/openapi-generator/src/main/resources/php-slim4-server/README.mustache b/modules/openapi-generator/src/main/resources/php-slim4-server/README.mustache
index 99317cce997..d96d2c46cb4 100644
--- a/modules/openapi-generator/src/main/resources/php-slim4-server/README.mustache
+++ b/modules/openapi-generator/src/main/resources/php-slim4-server/README.mustache
@@ -13,13 +13,13 @@ This server has been generated with [Nyholm PSR-7](https://github.com/Nyholm/psr
 This server has been generated with [Guzzle PSR-7](https://github.com/guzzle/psr7) implementation and [Guzzle HTTP Factory](https://github.com/http-interop/http-factory-guzzle).
 {{/isGuzzlePsr7}}
 {{#isZendDiactoros}}
-This server has been generated with [Zend Diactoros](https://github.com/zendframework/zend-diactoros).
+This server has been generated with [Laminas (Zend) PSR-7 implementation](https://github.com/laminas/laminas-diactoros).
 {{/isZendDiactoros}}
 
 ## Requirements
 
 * Web server with URL rewriting
-* PHP 7.1 or newer
+* PHP 7.2 or newer
 
 This package contains `.htaccess` for Apache configuration.
 If you use another server(Nginx, HHVM, IIS, lighttpd) check out [Web Servers](https://www.slimframework.com/docs/v3/start/web-servers.html) doc.
diff --git a/modules/openapi-generator/src/main/resources/php-slim4-server/SlimRouter.mustache b/modules/openapi-generator/src/main/resources/php-slim4-server/SlimRouter.mustache
index 7b077c8dd76..68433fc3402 100644
--- a/modules/openapi-generator/src/main/resources/php-slim4-server/SlimRouter.mustache
+++ b/modules/openapi-generator/src/main/resources/php-slim4-server/SlimRouter.mustache
@@ -1,36 +1,12 @@
 <?php
 
-/**
- * SlimRouter
- *
- * PHP version 7.1
- *
- * @package {{invokerPackage}}
- * @author  OpenAPI Generator team
- * @link    https://github.com/openapitools/openapi-generator
- */
-
-/**{{#apiInfo}}{{#appName}}
- * {{{appName}}}
- *
- {{/appName}}
- {{#appDescription}}
- * {{{appDescription}}}
- {{/appDescription}}
- {{#version}}
- * The version of the OpenAPI document: {{{version}}}
- {{/version}}
- {{#infoEmail}}
- * Contact: {{{infoEmail}}}
- {{/infoEmail}}
- * Generated by: https://github.com/openapitools/openapi-generator.git
- */
+{{>licenseInfo}}
 
 /**
  * NOTE: This class is auto generated by the openapi generator program.
  * https://github.com/openapitools/openapi-generator
  * Do not edit the class manually.
- */
+ */{{#apiInfo}}
 namespace {{invokerPackage}};
 
 use Slim\Factory\AppFactory;
diff --git a/modules/openapi-generator/src/main/resources/php-slim4-server/abstract_authenticator.mustache b/modules/openapi-generator/src/main/resources/php-slim4-server/abstract_authenticator.mustache
index 40e9aee2780..82fd8f648ea 100644
--- a/modules/openapi-generator/src/main/resources/php-slim4-server/abstract_authenticator.mustache
+++ b/modules/openapi-generator/src/main/resources/php-slim4-server/abstract_authenticator.mustache
@@ -1,36 +1,12 @@
 <?php
 
-/**
- * {{abstractNamePrefix}}Authenticator{{abstractNameSuffix}}
- *
- * PHP version 7.1
- *
- * @package {{invokerPackage}}
- * @author  OpenAPI Generator team
- * @link    https://github.com/openapitools/openapi-generator
- */
-
-/**{{#apiInfo}}{{#appName}}
- * {{{appName}}}
- *
- {{/appName}}
- {{#appDescription}}
- * {{{appDescription}}}
- {{/appDescription}}
- {{#version}}
- * The version of the OpenAPI document: {{{version}}}
- {{/version}}
- {{#infoEmail}}
- * Contact: {{{infoEmail}}}
- {{/infoEmail}}
- * Generated by: https://github.com/openapitools/openapi-generator.git
- */
+{{>licenseInfo}}
 
 /**
  * NOTE: This class is auto generated by the openapi generator program.
  * https://github.com/openapitools/openapi-generator
  * Do not edit the class manually.
- */
+ */{{#apiInfo}}
 namespace {{authPackage}};
 
 use Psr\Container\ContainerInterface;
diff --git a/modules/openapi-generator/src/main/resources/php-slim4-server/api.mustache b/modules/openapi-generator/src/main/resources/php-slim4-server/api.mustache
index ff90a276a00..f2a4a686f53 100644
--- a/modules/openapi-generator/src/main/resources/php-slim4-server/api.mustache
+++ b/modules/openapi-generator/src/main/resources/php-slim4-server/api.mustache
@@ -1,31 +1,6 @@
 <?php
 
-/**
- * {{classname}}
- *
- * PHP version 7.1
- *
- * @package {{apiPackage}}
- * @author  OpenAPI Generator team
- * @link    https://github.com/openapitools/openapi-generator
- */
-
-/**
- {{#appName}}
- * {{{appName}}}
- *
- {{/appName}}
- {{#appDescription}}
- * {{{appDescription}}}
- {{/appDescription}}
- {{#version}}
- * The version of the OpenAPI document: {{{version}}}
- {{/version}}
- {{#infoEmail}}
- * Contact: {{{infoEmail}}}
- {{/infoEmail}}
- * Generated by: https://github.com/openapitools/openapi-generator.git
- */
+{{>licenseInfo}}
 
 /**
  * NOTE: This class is auto generated by the openapi generator program.
diff --git a/modules/openapi-generator/src/main/resources/php-slim4-server/api_test.mustache b/modules/openapi-generator/src/main/resources/php-slim4-server/api_test.mustache
index eabddfa16cd..fb17fbe2f67 100644
--- a/modules/openapi-generator/src/main/resources/php-slim4-server/api_test.mustache
+++ b/modules/openapi-generator/src/main/resources/php-slim4-server/api_test.mustache
@@ -1,37 +1,12 @@
 <?php
 
-{{#operations}}/**
- * {{userClassname}}Test
- *
- * PHP version 7.1
- *
- * @package {{apiPackage}}
- * @author  OpenAPI Generator team
- * @link    https://github.com/openapitools/openapi-generator
- */
-
-/**
- {{#appName}}
- * {{{appName}}}
- *
- {{/appName}}
- {{#appDescription}}
- * {{{appDescription}}}
- {{/appDescription}}
- {{#version}}
- * The version of the OpenAPI document: {{{version}}}
- {{/version}}
- {{#infoEmail}}
- * Contact: {{{infoEmail}}}
- {{/infoEmail}}
- * Generated by: https://github.com/openapitools/openapi-generator.git
- */
+{{>licenseInfo}}
 
 /**
  * NOTE: This class is auto generated by the openapi generator program.
  * https://github.com/openapitools/openapi-generator
  * Please update the test case below to test the endpoint.
- */
+ */{{#operations}}
 namespace {{apiPackage}};
 
 use PHPUnit\Framework\TestCase;
@@ -52,28 +27,28 @@ class {{userClassname}}Test extends TestCase
     /**
      * Setup before running any test cases
      */
-    public static function setUpBeforeClass()
+    public static function setUpBeforeClass(): void
     {
     }
 
     /**
      * Setup before running each test case
      */
-    public function setUp()
+    public function setUp(): void
     {
     }
 
     /**
      * Clean up after running each test case
      */
-    public function tearDown()
+    public function tearDown(): void
     {
     }
 
     /**
      * Clean up after running all test cases
      */
-    public static function tearDownAfterClass()
+    public static function tearDownAfterClass(): void
     {
     }
     {{#operation}}
diff --git a/modules/openapi-generator/src/main/resources/php-slim4-server/composer.mustache b/modules/openapi-generator/src/main/resources/php-slim4-server/composer.mustache
index 10b4ec4a10c..ad746666cb2 100644
--- a/modules/openapi-generator/src/main/resources/php-slim4-server/composer.mustache
+++ b/modules/openapi-generator/src/main/resources/php-slim4-server/composer.mustache
@@ -8,27 +8,27 @@
     }
   ],
   "require": {
-    "php": "^7.1",
-    "slim/slim": "^4.0",
+    "php": "^7.2",
+    "slim/slim": "^4.5.0",
     "dyorg/slim-token-authentication": "dev-slim4",
     {{#isSlimPsr7}}
-    "slim/psr7": "^0.4.0"
+    "slim/psr7": "^1.1.0"
     {{/isSlimPsr7}}
     {{#isNyholmPsr7}}
-    "nyholm/psr7": "^1.1.0",
-    "nyholm/psr7-server": "^0.3.0"
+    "nyholm/psr7": "^1.3.0",
+    "nyholm/psr7-server": "^0.4.1"
     {{/isNyholmPsr7}}
     {{#isGuzzlePsr7}}
     "guzzlehttp/psr7": "^1.6.1",
     "http-interop/http-factory-guzzle": "^1.0.0"
     {{/isGuzzlePsr7}}
     {{#isZendDiactoros}}
-    "zendframework/zend-diactoros": "^2.1.3"
+    "laminas/laminas-diactoros": "^2.3.0"
     {{/isZendDiactoros}}
   },
   "require-dev": {
-    "phpunit/phpunit": "^6.0 || ^7.0",
-    "overtrue/phplint": "^1.0",
+    "phpunit/phpunit": "^8.0 || ^9.0",
+    "overtrue/phplint": "^2.0.2",
     "squizlabs/php_codesniffer": "^3.5"
   },
   "autoload": {
@@ -46,8 +46,6 @@
     ],
     "test-apis": "phpunit --testsuite Apis",
     "test-models": "phpunit --testsuite Models",
-    "test-mock": "phpunit --testsuite Mock",
-    "test-utils": "phpunit --testsuite Utils",
     "phpcs": "phpcs",
     "phplint": "phplint ./ --exclude=vendor"
   }
diff --git a/modules/openapi-generator/src/main/resources/php-slim4-server/gitignore b/modules/openapi-generator/src/main/resources/php-slim4-server/gitignore
index 3203d7d7814..2424ad0dc92 100644
--- a/modules/openapi-generator/src/main/resources/php-slim4-server/gitignore
+++ b/modules/openapi-generator/src/main/resources/php-slim4-server/gitignore
@@ -12,6 +12,7 @@ composer.lock
 
 # Do not commit local PHPUnit config
 /phpunit.xml
+/.phpunit.result.cache
 
 # Do not commit local PHP_CodeSniffer config
 /phpcs.xml
\ No newline at end of file
diff --git a/modules/openapi-generator/src/main/resources/php-slim4-server/index.mustache b/modules/openapi-generator/src/main/resources/php-slim4-server/index.mustache
index cb98beb8f30..01c9049226d 100644
--- a/modules/openapi-generator/src/main/resources/php-slim4-server/index.mustache
+++ b/modules/openapi-generator/src/main/resources/php-slim4-server/index.mustache
@@ -1,15 +1,11 @@
 <?php
 
-{{#apiInfo}}/**
- * {{appName}}
- *
- * PHP version 7.1
- *
- * @package {{apiPackage}}
- * @author  OpenAPI Generator team
- * @version {{appVersion}}
- * @link    https://github.com/openapitools/openapi-generator
- */
+{{>licenseInfo}}
+
+/**
+ * NOTE: This class is auto generated by the openapi generator program.
+ * https://github.com/openapitools/openapi-generator
+ */{{#apiInfo}}
 
 require_once __DIR__ . '/vendor/autoload.php';
 
diff --git a/modules/openapi-generator/src/main/resources/php-slim4-server/json_body_parser_middleware.mustache b/modules/openapi-generator/src/main/resources/php-slim4-server/json_body_parser_middleware.mustache
index 55ad7b637fd..509ec7247c9 100644
--- a/modules/openapi-generator/src/main/resources/php-slim4-server/json_body_parser_middleware.mustache
+++ b/modules/openapi-generator/src/main/resources/php-slim4-server/json_body_parser_middleware.mustache
@@ -1,36 +1,12 @@
 <?php
 
-/**
- * JsonBodyParserMiddleware
- *
- * PHP version 7.1
- *
- * @package {{invokerPackage}}
- * @author  OpenAPI Generator team
- * @link    https://github.com/openapitools/openapi-generator
- */
-
-/**{{#apiInfo}}{{#appName}}
- * {{{appName}}}
- *
- {{/appName}}
- {{#appDescription}}
- * {{{appDescription}}}
- {{/appDescription}}
- {{#version}}
- * The version of the OpenAPI document: {{{version}}}
- {{/version}}
- {{#infoEmail}}
- * Contact: {{{infoEmail}}}
- {{/infoEmail}}
- * Generated by: https://github.com/openapitools/openapi-generator.git
- */
+{{>licenseInfo}}
 
 /**
  * NOTE: This class is auto generated by the openapi generator program.
  * https://github.com/openapitools/openapi-generator
  * Do not edit the class manually.
- */
+ */{{#apiInfo}}
 namespace {{invokerPackage}}\Middleware;
 
 use Psr\Http\Message\ResponseInterface;
diff --git a/modules/openapi-generator/src/main/resources/php-slim4-server/licenseInfo.mustache b/modules/openapi-generator/src/main/resources/php-slim4-server/licenseInfo.mustache
new file mode 100644
index 00000000000..cf26381b5f5
--- /dev/null
+++ b/modules/openapi-generator/src/main/resources/php-slim4-server/licenseInfo.mustache
@@ -0,0 +1,23 @@
+/**
+ {{#appName}}
+ * {{{appName}}}
+ {{/appName}}
+ * PHP version 7.2
+ *
+ * @package {{invokerPackage}}
+ * @author  OpenAPI Generator team
+ * @link    https://github.com/openapitools/openapi-generator
+ */
+
+/**
+ {{#appDescription}}
+ * {{{appDescription}}}
+ {{/appDescription}}
+ {{#version}}
+ * The version of the OpenAPI document: {{{version}}}
+ {{/version}}
+ {{#infoEmail}}
+ * Contact: {{{infoEmail}}}
+ {{/infoEmail}}
+ * Generated by: https://github.com/openapitools/openapi-generator.git
+ */
\ No newline at end of file
diff --git a/modules/openapi-generator/src/main/resources/php-slim4-server/model.mustache b/modules/openapi-generator/src/main/resources/php-slim4-server/model.mustache
index 67112c85227..e9ec40e4b6e 100644
--- a/modules/openapi-generator/src/main/resources/php-slim4-server/model.mustache
+++ b/modules/openapi-generator/src/main/resources/php-slim4-server/model.mustache
@@ -1,19 +1,11 @@
 <?php
 
-{{#models}}{{#model}}/**
- * {{classname}}
- *
- * PHP version 7.1
- *
- * @package {{modelPackage}}
- * @author  OpenAPI Generator team
- * @link    https://github.com/openapitools/openapi-generator
- */
+{{>licenseInfo}}
 
 /**
  * NOTE: This class is auto generated by the openapi generator program.
  * https://github.com/openapitools/openapi-generator
- */
+ */{{#models}}{{#model}}
 namespace {{modelPackage}};
 
 use {{interfacesPackage}}\{{interfaceNamePrefix}}Model{{interfaceNameSuffix}};
diff --git a/modules/openapi-generator/src/main/resources/php-slim4-server/model_interface.mustache b/modules/openapi-generator/src/main/resources/php-slim4-server/model_interface.mustache
index eb440ee5598..07b75f7d558 100644
--- a/modules/openapi-generator/src/main/resources/php-slim4-server/model_interface.mustache
+++ b/modules/openapi-generator/src/main/resources/php-slim4-server/model_interface.mustache
@@ -1,36 +1,12 @@
 <?php
 
-/**
- * {{interfaceNamePrefix}}Model{{interfaceNameSuffix}}
- *
- * PHP version 7.1
- *
- * @package {{invokerPackage}}
- * @author  OpenAPI Generator team
- * @link    https://github.com/openapitools/openapi-generator
- */
-
-/**{{#apiInfo}}{{#appName}}
- * {{{appName}}}
- *
- {{/appName}}
- {{#appDescription}}
- * {{{appDescription}}}
- {{/appDescription}}
- {{#version}}
- * The version of the OpenAPI document: {{{version}}}
- {{/version}}
- {{#infoEmail}}
- * Contact: {{{infoEmail}}}
- {{/infoEmail}}
- * Generated by: https://github.com/openapitools/openapi-generator.git
- */
+{{>licenseInfo}}
 
 /**
  * NOTE: This class is auto generated by the openapi generator program.
  * https://github.com/openapitools/openapi-generator
  * Do not edit the class manually.
- */
+ */{{#apiInfo}}
 namespace {{interfacesPackage}};
 
 /**
diff --git a/modules/openapi-generator/src/main/resources/php-slim4-server/model_test.mustache b/modules/openapi-generator/src/main/resources/php-slim4-server/model_test.mustache
index 1b762f228fd..7aa842baef3 100644
--- a/modules/openapi-generator/src/main/resources/php-slim4-server/model_test.mustache
+++ b/modules/openapi-generator/src/main/resources/php-slim4-server/model_test.mustache
@@ -1,39 +1,13 @@
 <?php
 
-{{#models}}
-{{#model}}
-/**
- * {{classname}}Test
- *
- * PHP version 7.1
- *
- * @package {{modelPackage}}
- * @author  OpenAPI Generator team
- * @link    https://github.com/openapitools/openapi-generator
- */
-
-/**
- {{#appName}}
- * {{{appName}}}
- *
- {{/appName}}
- {{#appDescription}}
- * {{{appDescription}}}
- {{/appDescription}}
- {{#version}}
- * The version of the OpenAPI document: {{{version}}}
- {{/version}}
- {{#infoEmail}}
- * Contact: {{{infoEmail}}}
- {{/infoEmail}}
- * Generated by: https://github.com/openapitools/openapi-generator.git
- */
+{{>licenseInfo}}
 
 /**
  * NOTE: This class is auto generated by the openapi generator program.
  * https://github.com/openapitools/openapi-generator
  * Please update the test case below to test the model.
- */
+ */{{#models}}
+{{#model}}
 namespace {{modelPackage}};
 
 use PHPUnit\Framework\TestCase;
@@ -54,28 +28,28 @@ class {{classname}}Test extends TestCase
     /**
      * Setup before running any test cases
      */
-    public static function setUpBeforeClass()
+    public static function setUpBeforeClass(): void
     {
     }
 
     /**
      * Setup before running each test case
      */
-    public function setUp()
+    public function setUp(): void
     {
     }
 
     /**
      * Clean up after running each test case
      */
-    public function tearDown()
+    public function tearDown(): void
     {
     }
 
     /**
      * Clean up after running all test cases
      */
-    public static function tearDownAfterClass()
+    public static function tearDownAfterClass(): void
     {
     }
 
diff --git a/modules/openapi-generator/src/main/resources/php-slim4-server/model_utils_trait.mustache b/modules/openapi-generator/src/main/resources/php-slim4-server/model_utils_trait.mustache
index 7f068fa1c77..2c29d3ae820 100644
--- a/modules/openapi-generator/src/main/resources/php-slim4-server/model_utils_trait.mustache
+++ b/modules/openapi-generator/src/main/resources/php-slim4-server/model_utils_trait.mustache
@@ -1,36 +1,12 @@
 <?php
 
-/**
- * {{traitNamePrefix}}ModelUtils{{traitNameSuffix}}
- *
- * PHP version 7.1
- *
- * @package {{invokerPackage}}
- * @author  OpenAPI Generator team
- * @link    https://github.com/openapitools/openapi-generator
- */
-
-/**{{#apiInfo}}{{#appName}}
- * {{{appName}}}
- *
- {{/appName}}
- {{#appDescription}}
- * {{{appDescription}}}
- {{/appDescription}}
- {{#version}}
- * The version of the OpenAPI document: {{{version}}}
- {{/version}}
- {{#infoEmail}}
- * Contact: {{{infoEmail}}}
- {{/infoEmail}}
- * Generated by: https://github.com/openapitools/openapi-generator.git
- */
+{{>licenseInfo}}
 
 /**
  * NOTE: This class is auto generated by the openapi generator program.
  * https://github.com/openapitools/openapi-generator
  * Do not edit the class manually.
- */
+ */{{#apiInfo}}
 namespace {{utilsPackage}};
 
 use {{utilsPackage}}\{{traitNamePrefix}}StringUtils{{traitNameSuffix}};
diff --git a/modules/openapi-generator/src/main/resources/php-slim4-server/model_utils_trait_test.mustache b/modules/openapi-generator/src/main/resources/php-slim4-server/model_utils_trait_test.mustache
index f3d365eba67..123d9cf648b 100644
--- a/modules/openapi-generator/src/main/resources/php-slim4-server/model_utils_trait_test.mustache
+++ b/modules/openapi-generator/src/main/resources/php-slim4-server/model_utils_trait_test.mustache
@@ -1,36 +1,12 @@
 <?php
 
-/**
- * {{traitNamePrefix}}ModelUtils{{traitNameSuffix}}Test
- *
- * PHP version 7.1
- *
- * @package {{invokerPackage}}
- * @author  OpenAPI Generator team
- * @link    https://github.com/openapitools/openapi-generator
- */
-
-/**{{#apiInfo}}{{#appName}}
- * {{{appName}}}
- *
- {{/appName}}
- {{#appDescription}}
- * {{{appDescription}}}
- {{/appDescription}}
- {{#version}}
- * The version of the OpenAPI document: {{{version}}}
- {{/version}}
- {{#infoEmail}}
- * Contact: {{{infoEmail}}}
- {{/infoEmail}}
- * Generated by: https://github.com/openapitools/openapi-generator.git
- */
+{{>licenseInfo}}
 
 /**
  * NOTE: This class is auto generated by the openapi generator program.
  * https://github.com/openapitools/openapi-generator
  * Do not edit the class manually.
- */
+ */{{#apiInfo}}
 namespace {{utilsPackage}};
 
 use {{utilsPackage}}\{{traitNamePrefix}}ModelUtils{{traitNameSuffix}} as ModelUtils;
diff --git a/modules/openapi-generator/src/main/resources/php-slim4-server/openapi_data_mocker.mustache b/modules/openapi-generator/src/main/resources/php-slim4-server/openapi_data_mocker.mustache
index 5cb7ec947f4..a432434d924 100644
--- a/modules/openapi-generator/src/main/resources/php-slim4-server/openapi_data_mocker.mustache
+++ b/modules/openapi-generator/src/main/resources/php-slim4-server/openapi_data_mocker.mustache
@@ -1,36 +1,12 @@
 <?php
 
-/**
- * OpenApiDataMocker
- *
- * PHP version 7.1
- *
- * @package {{invokerPackage}}
- * @author  OpenAPI Generator team
- * @link    https://github.com/openapitools/openapi-generator
- */
-
-/**{{#apiInfo}}{{#appName}}
- * {{{appName}}}
- *
- {{/appName}}
- {{#appDescription}}
- * {{{appDescription}}}
- {{/appDescription}}
- {{#version}}
- * The version of the OpenAPI document: {{{version}}}
- {{/version}}
- {{#infoEmail}}
- * Contact: {{{infoEmail}}}
- {{/infoEmail}}
- * Generated by: https://github.com/openapitools/openapi-generator.git
- */
+{{>licenseInfo}}
 
 /**
  * NOTE: This class is auto generated by the openapi generator program.
  * https://github.com/openapitools/openapi-generator
  * Do not edit the class manually.
- */
+ */{{#apiInfo}}
 namespace {{mockPackage}};
 
 use {{mockPackage}}\{{interfaceNamePrefix}}OpenApiDataMocker{{interfaceNameSuffix}} as IMocker;
diff --git a/modules/openapi-generator/src/main/resources/php-slim4-server/openapi_data_mocker_interface.mustache b/modules/openapi-generator/src/main/resources/php-slim4-server/openapi_data_mocker_interface.mustache
index eaa28ba2b42..72920c76812 100644
--- a/modules/openapi-generator/src/main/resources/php-slim4-server/openapi_data_mocker_interface.mustache
+++ b/modules/openapi-generator/src/main/resources/php-slim4-server/openapi_data_mocker_interface.mustache
@@ -1,37 +1,12 @@
 <?php
 
-/**
- * {{interfaceNamePrefix}}OpenApiDataMocker{{interfaceNameSuffix}}
- * @ref https://github.com/OAI/OpenAPI-Specification/blob/master/versions/3.0.1.md#data-types
- *
- * PHP version 7.1
- *
- * @package {{invokerPackage}}
- * @author  OpenAPI Generator team
- * @link    https://github.com/openapitools/openapi-generator
- */
-
-/**{{#apiInfo}}{{#appName}}
- * {{{appName}}}
- *
- {{/appName}}
- {{#appDescription}}
- * {{{appDescription}}}
- {{/appDescription}}
- {{#version}}
- * The version of the OpenAPI document: {{{version}}}
- {{/version}}
- {{#infoEmail}}
- * Contact: {{{infoEmail}}}
- {{/infoEmail}}
- * Generated by: https://github.com/openapitools/openapi-generator.git
- */
+{{>licenseInfo}}
 
 /**
  * NOTE: This class is auto generated by the openapi generator program.
  * https://github.com/openapitools/openapi-generator
  * Do not edit the class manually.
- */
+ */{{#apiInfo}}
 namespace {{mockPackage}};
 
 use InvalidArgumentException;
diff --git a/modules/openapi-generator/src/main/resources/php-slim4-server/openapi_data_mocker_middleware.mustache b/modules/openapi-generator/src/main/resources/php-slim4-server/openapi_data_mocker_middleware.mustache
index c7c6192f768..d710ec6c24e 100644
--- a/modules/openapi-generator/src/main/resources/php-slim4-server/openapi_data_mocker_middleware.mustache
+++ b/modules/openapi-generator/src/main/resources/php-slim4-server/openapi_data_mocker_middleware.mustache
@@ -1,36 +1,12 @@
 <?php
 
-/**
- * OpenApiDataMockerMiddleware
- *
- * PHP version 7.1
- *
- * @package {{invokerPackage}}
- * @author  OpenAPI Generator team
- * @link    https://github.com/openapitools/openapi-generator
- */
-
-/**{{#apiInfo}}{{#appName}}
- * {{{appName}}}
- *
- {{/appName}}
- {{#appDescription}}
- * {{{appDescription}}}
- {{/appDescription}}
- {{#version}}
- * The version of the OpenAPI document: {{{version}}}
- {{/version}}
- {{#infoEmail}}
- * Contact: {{{infoEmail}}}
- {{/infoEmail}}
- * Generated by: https://github.com/openapitools/openapi-generator.git
- */
+{{>licenseInfo}}
 
 /**
  * NOTE: This class is auto generated by the openapi generator program.
  * https://github.com/openapitools/openapi-generator
  * Do not edit the class manually.
- */
+ */{{#apiInfo}}
 namespace {{mockPackage}};
 
 use Slim\Factory\AppFactory;
diff --git a/modules/openapi-generator/src/main/resources/php-slim4-server/openapi_data_mocker_middleware_test.mustache b/modules/openapi-generator/src/main/resources/php-slim4-server/openapi_data_mocker_middleware_test.mustache
index 2ea22728930..b341a98ed4c 100644
--- a/modules/openapi-generator/src/main/resources/php-slim4-server/openapi_data_mocker_middleware_test.mustache
+++ b/modules/openapi-generator/src/main/resources/php-slim4-server/openapi_data_mocker_middleware_test.mustache
@@ -1,36 +1,12 @@
 <?php
 
-/**
- * OpenApiDataMockerMiddlewareTest
- *
- * PHP version 7.1
- *
- * @package {{invokerPackage}}
- * @author  OpenAPI Generator team
- * @link    https://github.com/openapitools/openapi-generator
- */
-
-/**{{#apiInfo}}{{#invokerPackage}}
- * {{{invokerPackage}}}
- *
- {{/invokerPackage}}
- {{#appDescription}}
- * {{{appDescription}}}
- {{/appDescription}}
- {{#version}}
- * The version of the OpenAPI document: {{{version}}}
- {{/version}}
- {{#infoEmail}}
- * Contact: {{{infoEmail}}}
- {{/infoEmail}}
- * Generated by: https://github.com/openapitools/openapi-generator.git
- */
+{{>licenseInfo}}
 
 /**
  * NOTE: This class is auto generated by the openapi generator program.
  * https://github.com/openapitools/openapi-generator
  * Do not edit the class manually.
- */
+ */{{#apiInfo}}
 namespace {{mockPackage}};
 
 use {{mockPackage}}\OpenApiDataMockerMiddleware;
diff --git a/modules/openapi-generator/src/main/resources/php-slim4-server/openapi_data_mocker_test.mustache b/modules/openapi-generator/src/main/resources/php-slim4-server/openapi_data_mocker_test.mustache
index e02fa3ed3c9..51e50bc16f2 100644
--- a/modules/openapi-generator/src/main/resources/php-slim4-server/openapi_data_mocker_test.mustache
+++ b/modules/openapi-generator/src/main/resources/php-slim4-server/openapi_data_mocker_test.mustache
@@ -1,36 +1,12 @@
 <?php
 
-/**
- * OpenApiDataMockerTest
- *
- * PHP version 7.1
- *
- * @package {{invokerPackage}}
- * @author  OpenAPI Generator team
- * @link    https://github.com/openapitools/openapi-generator
- */
-
-/**{{#apiInfo}}{{#appName}}
- * {{{appName}}}
- *
- {{/appName}}
- {{#appDescription}}
- * {{{appDescription}}}
- {{/appDescription}}
- {{#version}}
- * The version of the OpenAPI document: {{{version}}}
- {{/version}}
- {{#infoEmail}}
- * Contact: {{{infoEmail}}}
- {{/infoEmail}}
- * Generated by: https://github.com/openapitools/openapi-generator.git
- */
+{{>licenseInfo}}
 
 /**
  * NOTE: This class is auto generated by the openapi generator program.
  * https://github.com/openapitools/openapi-generator
  * Do not edit the class manually.
- */
+ */{{#apiInfo}}
 namespace {{mockPackage}};
 
 use {{mockPackage}}\OpenApiDataMocker;
diff --git a/modules/openapi-generator/src/main/resources/php-slim4-server/phpunit.xml.mustache b/modules/openapi-generator/src/main/resources/php-slim4-server/phpunit.xml.mustache
index 82f86439083..b8852944a12 100644
--- a/modules/openapi-generator/src/main/resources/php-slim4-server/phpunit.xml.mustache
+++ b/modules/openapi-generator/src/main/resources/php-slim4-server/phpunit.xml.mustache
@@ -17,19 +17,11 @@
         <testsuite name="Models">
             <directory>{{modelTestPath}}</directory>
         </testsuite>
-        <testsuite name="Mock">
-            <directory>{{mockTestPath}}</directory>
-        </testsuite>
-        <testsuite name="Utils">
-            <directory>{{utilsTestPath}}</directory>
-        </testsuite>
     </testsuites>
     <filter>
         <whitelist processUncoveredFilesFromWhitelist="true">
             <directory suffix=".php">{{apiSrcPath}}</directory>
             <directory suffix=".php">{{modelSrcPath}}</directory>
-            <directory suffix=".php">{{mockSrcPath}}</directory>
-            <directory suffix=".php">{{utilsSrcPath}}</directory>
         </whitelist>
     </filter>
     <php>
diff --git a/modules/openapi-generator/src/main/resources/php-slim4-server/string_utils_trait.mustache b/modules/openapi-generator/src/main/resources/php-slim4-server/string_utils_trait.mustache
index 6d5d15feff6..f303bd7cc95 100644
--- a/modules/openapi-generator/src/main/resources/php-slim4-server/string_utils_trait.mustache
+++ b/modules/openapi-generator/src/main/resources/php-slim4-server/string_utils_trait.mustache
@@ -1,36 +1,12 @@
 <?php
 
-/**
- * {{traitNamePrefix}}StringUtils{{traitNameSuffix}}
- *
- * PHP version 7.1
- *
- * @package {{invokerPackage}}
- * @author  OpenAPI Generator team
- * @link    https://github.com/openapitools/openapi-generator
- */
-
-/**{{#apiInfo}}{{#appName}}
- * {{{appName}}}
- *
- {{/appName}}
- {{#appDescription}}
- * {{{appDescription}}}
- {{/appDescription}}
- {{#version}}
- * The version of the OpenAPI document: {{{version}}}
- {{/version}}
- {{#infoEmail}}
- * Contact: {{{infoEmail}}}
- {{/infoEmail}}
- * Generated by: https://github.com/openapitools/openapi-generator.git
- */
+{{>licenseInfo}}
 
 /**
  * NOTE: This class is auto generated by the openapi generator program.
  * https://github.com/openapitools/openapi-generator
  * Do not edit the class manually.
- */
+ */{{#apiInfo}}
 namespace {{utilsPackage}};
 
 /**
diff --git a/modules/openapi-generator/src/main/resources/php-slim4-server/string_utils_trait_test.mustache b/modules/openapi-generator/src/main/resources/php-slim4-server/string_utils_trait_test.mustache
index 9698d6bcf6c..d54c6bbee38 100644
--- a/modules/openapi-generator/src/main/resources/php-slim4-server/string_utils_trait_test.mustache
+++ b/modules/openapi-generator/src/main/resources/php-slim4-server/string_utils_trait_test.mustache
@@ -1,36 +1,12 @@
 <?php
 
-/**
- * {{traitNamePrefix}}StringUtils{{traitNameSuffix}}Test
- *
- * PHP version 7.1
- *
- * @package {{invokerPackage}}
- * @author  OpenAPI Generator team
- * @link    https://github.com/openapitools/openapi-generator
- */
-
-/**{{#apiInfo}}{{#appName}}
- * {{{appName}}}
- *
- {{/appName}}
- {{#appDescription}}
- * {{{appDescription}}}
- {{/appDescription}}
- {{#version}}
- * The version of the OpenAPI document: {{{version}}}
- {{/version}}
- {{#infoEmail}}
- * Contact: {{{infoEmail}}}
- {{/infoEmail}}
- * Generated by: https://github.com/openapitools/openapi-generator.git
- */
+{{>licenseInfo}}
 
 /**
  * NOTE: This class is auto generated by the openapi generator program.
  * https://github.com/openapitools/openapi-generator
  * Do not edit the class manually.
- */
+ */{{#apiInfo}}
 namespace {{utilsPackage}};
 
 use {{utilsPackage}}\{{traitNamePrefix}}StringUtils{{traitNameSuffix}} as StringUtils;
diff --git a/samples/server/petstore/php-slim4/.gitignore b/samples/server/petstore/php-slim4/.gitignore
index 3203d7d7814..2424ad0dc92 100644
--- a/samples/server/petstore/php-slim4/.gitignore
+++ b/samples/server/petstore/php-slim4/.gitignore
@@ -12,6 +12,7 @@ composer.lock
 
 # Do not commit local PHPUnit config
 /phpunit.xml
+/.phpunit.result.cache
 
 # Do not commit local PHP_CodeSniffer config
 /phpcs.xml
\ No newline at end of file
diff --git a/samples/server/petstore/php-slim4/.openapi-generator/FILES b/samples/server/petstore/php-slim4/.openapi-generator/FILES
index 08d44362bcf..ba22c031220 100644
--- a/samples/server/petstore/php-slim4/.openapi-generator/FILES
+++ b/samples/server/petstore/php-slim4/.openapi-generator/FILES
@@ -81,61 +81,7 @@ lib/Utils/ModelUtilsTrait.php
 lib/Utils/StringUtilsTrait.php
 phpcs.xml.dist
 phpunit.xml.dist
-test/Api/AnotherFakeApiTest.php
-test/Api/FakeApiTest.php
-test/Api/FakeClassnameTags123ApiTest.php
-test/Api/PetApiTest.php
-test/Api/StoreApiTest.php
-test/Api/UserApiTest.php
 test/Mock/OpenApiDataMockerMiddlewareTest.php
 test/Mock/OpenApiDataMockerTest.php
-test/Model/AdditionalPropertiesAnyTypeTest.php
-test/Model/AdditionalPropertiesArrayTest.php
-test/Model/AdditionalPropertiesBooleanTest.php
-test/Model/AdditionalPropertiesClassTest.php
-test/Model/AdditionalPropertiesIntegerTest.php
-test/Model/AdditionalPropertiesNumberTest.php
-test/Model/AdditionalPropertiesObjectTest.php
-test/Model/AdditionalPropertiesStringTest.php
-test/Model/AnimalTest.php
-test/Model/ApiResponseTest.php
-test/Model/ArrayOfArrayOfNumberOnlyTest.php
-test/Model/ArrayOfNumberOnlyTest.php
-test/Model/ArrayTestTest.php
-test/Model/BigCatAllOfTest.php
-test/Model/BigCatTest.php
-test/Model/CapitalizationTest.php
-test/Model/CatAllOfTest.php
-test/Model/CatTest.php
-test/Model/CategoryTest.php
-test/Model/ClassModelTest.php
-test/Model/ClientTest.php
-test/Model/DogAllOfTest.php
-test/Model/DogTest.php
-test/Model/EnumArraysTest.php
-test/Model/EnumClassTest.php
-test/Model/EnumTestTest.php
-test/Model/FileSchemaTestClassTest.php
-test/Model/FileTest.php
-test/Model/FormatTestTest.php
-test/Model/HasOnlyReadOnlyTest.php
-test/Model/MapTestTest.php
-test/Model/MixedPropertiesAndAdditionalPropertiesClassTest.php
-test/Model/Model200ResponseTest.php
-test/Model/ModelListTest.php
-test/Model/ModelReturnTest.php
-test/Model/NameTest.php
-test/Model/NumberOnlyTest.php
-test/Model/OrderTest.php
-test/Model/OuterCompositeTest.php
-test/Model/OuterEnumTest.php
-test/Model/PetTest.php
-test/Model/ReadOnlyFirstTest.php
-test/Model/SpecialModelNameTest.php
-test/Model/TagTest.php
-test/Model/TypeHolderDefaultTest.php
-test/Model/TypeHolderExampleTest.php
-test/Model/UserTest.php
-test/Model/XmlItemTest.php
 test/Utils/ModelUtilsTraitTest.php
 test/Utils/StringUtilsTraitTest.php
diff --git a/samples/server/petstore/php-slim4/README.md b/samples/server/petstore/php-slim4/README.md
index 325111aa624..7c550d25424 100644
--- a/samples/server/petstore/php-slim4/README.md
+++ b/samples/server/petstore/php-slim4/README.md
@@ -8,7 +8,7 @@ This server has been generated with [Slim PSR-7](https://github.com/slimphp/Slim
 ## Requirements
 
 * Web server with URL rewriting
-* PHP 7.1 or newer
+* PHP 7.2 or newer
 
 This package contains `.htaccess` for Apache configuration.
 If you use another server(Nginx, HHVM, IIS, lighttpd) check out [Web Servers](https://www.slimframework.com/docs/v3/start/web-servers.html) doc.
diff --git a/samples/server/petstore/php-slim4/composer.json b/samples/server/petstore/php-slim4/composer.json
index c1afb518ef1..0bc4d34e177 100644
--- a/samples/server/petstore/php-slim4/composer.json
+++ b/samples/server/petstore/php-slim4/composer.json
@@ -8,14 +8,14 @@
     }
   ],
   "require": {
-    "php": "^7.1",
-    "slim/slim": "^4.0",
+    "php": "^7.2",
+    "slim/slim": "^4.5.0",
     "dyorg/slim-token-authentication": "dev-slim4",
-    "slim/psr7": "^0.4.0"
+    "slim/psr7": "^1.1.0"
   },
   "require-dev": {
-    "phpunit/phpunit": "^6.0 || ^7.0",
-    "overtrue/phplint": "^1.0",
+    "phpunit/phpunit": "^8.0 || ^9.0",
+    "overtrue/phplint": "^2.0.2",
     "squizlabs/php_codesniffer": "^3.5"
   },
   "autoload": {
@@ -33,8 +33,6 @@
     ],
     "test-apis": "phpunit --testsuite Apis",
     "test-models": "phpunit --testsuite Models",
-    "test-mock": "phpunit --testsuite Mock",
-    "test-utils": "phpunit --testsuite Utils",
     "phpcs": "phpcs",
     "phplint": "phplint ./ --exclude=vendor"
   }
diff --git a/samples/server/petstore/php-slim4/index.php b/samples/server/petstore/php-slim4/index.php
index 8baabc9b139..ffeb1b88200 100644
--- a/samples/server/petstore/php-slim4/index.php
+++ b/samples/server/petstore/php-slim4/index.php
@@ -2,15 +2,24 @@
 
 /**
  * OpenAPI Petstore
+ * PHP version 7.2
  *
- * PHP version 7.1
- *
- * @package OpenAPIServer\Api
+ * @package OpenAPIServer
  * @author  OpenAPI Generator team
- * @version 1.0.0
  * @link    https://github.com/openapitools/openapi-generator
  */
 
+/**
+ * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
+ * The version of the OpenAPI document: 1.0.0
+ * Generated by: https://github.com/openapitools/openapi-generator.git
+ */
+
+/**
+ * NOTE: This class is auto generated by the openapi generator program.
+ * https://github.com/openapitools/openapi-generator
+ */
+
 require_once __DIR__ . '/vendor/autoload.php';
 
 use OpenAPIServer\SlimRouter;
diff --git a/samples/server/petstore/php-slim4/lib/Api/AbstractAnotherFakeApi.php b/samples/server/petstore/php-slim4/lib/Api/AbstractAnotherFakeApi.php
index 14cf312d692..64347eabd0b 100644
--- a/samples/server/petstore/php-slim4/lib/Api/AbstractAnotherFakeApi.php
+++ b/samples/server/petstore/php-slim4/lib/Api/AbstractAnotherFakeApi.php
@@ -1,18 +1,15 @@
 <?php
 
 /**
- * AbstractAnotherFakeApi
+ * OpenAPI Petstore
+ * PHP version 7.2
  *
- * PHP version 7.1
- *
- * @package OpenAPIServer\Api
+ * @package OpenAPIServer
  * @author  OpenAPI Generator team
  * @link    https://github.com/openapitools/openapi-generator
  */
 
 /**
- * OpenAPI Petstore
- *
  * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
  * The version of the OpenAPI document: 1.0.0
  * Generated by: https://github.com/openapitools/openapi-generator.git
diff --git a/samples/server/petstore/php-slim4/lib/Api/AbstractFakeApi.php b/samples/server/petstore/php-slim4/lib/Api/AbstractFakeApi.php
index a3887269f1f..b07703a954f 100644
--- a/samples/server/petstore/php-slim4/lib/Api/AbstractFakeApi.php
+++ b/samples/server/petstore/php-slim4/lib/Api/AbstractFakeApi.php
@@ -1,18 +1,15 @@
 <?php
 
 /**
- * AbstractFakeApi
+ * OpenAPI Petstore
+ * PHP version 7.2
  *
- * PHP version 7.1
- *
- * @package OpenAPIServer\Api
+ * @package OpenAPIServer
  * @author  OpenAPI Generator team
  * @link    https://github.com/openapitools/openapi-generator
  */
 
 /**
- * OpenAPI Petstore
- *
  * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
  * The version of the OpenAPI document: 1.0.0
  * Generated by: https://github.com/openapitools/openapi-generator.git
diff --git a/samples/server/petstore/php-slim4/lib/Api/AbstractFakeClassnameTags123Api.php b/samples/server/petstore/php-slim4/lib/Api/AbstractFakeClassnameTags123Api.php
index dbbfe05e0be..f49c392aa92 100644
--- a/samples/server/petstore/php-slim4/lib/Api/AbstractFakeClassnameTags123Api.php
+++ b/samples/server/petstore/php-slim4/lib/Api/AbstractFakeClassnameTags123Api.php
@@ -1,18 +1,15 @@
 <?php
 
 /**
- * AbstractFakeClassnameTags123Api
+ * OpenAPI Petstore
+ * PHP version 7.2
  *
- * PHP version 7.1
- *
- * @package OpenAPIServer\Api
+ * @package OpenAPIServer
  * @author  OpenAPI Generator team
  * @link    https://github.com/openapitools/openapi-generator
  */
 
 /**
- * OpenAPI Petstore
- *
  * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
  * The version of the OpenAPI document: 1.0.0
  * Generated by: https://github.com/openapitools/openapi-generator.git
diff --git a/samples/server/petstore/php-slim4/lib/Api/AbstractPetApi.php b/samples/server/petstore/php-slim4/lib/Api/AbstractPetApi.php
index f1ec2d3cafc..d835b2b0ab3 100644
--- a/samples/server/petstore/php-slim4/lib/Api/AbstractPetApi.php
+++ b/samples/server/petstore/php-slim4/lib/Api/AbstractPetApi.php
@@ -1,18 +1,15 @@
 <?php
 
 /**
- * AbstractPetApi
+ * OpenAPI Petstore
+ * PHP version 7.2
  *
- * PHP version 7.1
- *
- * @package OpenAPIServer\Api
+ * @package OpenAPIServer
  * @author  OpenAPI Generator team
  * @link    https://github.com/openapitools/openapi-generator
  */
 
 /**
- * OpenAPI Petstore
- *
  * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
  * The version of the OpenAPI document: 1.0.0
  * Generated by: https://github.com/openapitools/openapi-generator.git
diff --git a/samples/server/petstore/php-slim4/lib/Api/AbstractStoreApi.php b/samples/server/petstore/php-slim4/lib/Api/AbstractStoreApi.php
index b1cfa80969e..fbcf6ad53b9 100644
--- a/samples/server/petstore/php-slim4/lib/Api/AbstractStoreApi.php
+++ b/samples/server/petstore/php-slim4/lib/Api/AbstractStoreApi.php
@@ -1,18 +1,15 @@
 <?php
 
 /**
- * AbstractStoreApi
+ * OpenAPI Petstore
+ * PHP version 7.2
  *
- * PHP version 7.1
- *
- * @package OpenAPIServer\Api
+ * @package OpenAPIServer
  * @author  OpenAPI Generator team
  * @link    https://github.com/openapitools/openapi-generator
  */
 
 /**
- * OpenAPI Petstore
- *
  * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
  * The version of the OpenAPI document: 1.0.0
  * Generated by: https://github.com/openapitools/openapi-generator.git
diff --git a/samples/server/petstore/php-slim4/lib/Api/AbstractUserApi.php b/samples/server/petstore/php-slim4/lib/Api/AbstractUserApi.php
index d2beb8573df..ae779dbeda0 100644
--- a/samples/server/petstore/php-slim4/lib/Api/AbstractUserApi.php
+++ b/samples/server/petstore/php-slim4/lib/Api/AbstractUserApi.php
@@ -1,18 +1,15 @@
 <?php
 
 /**
- * AbstractUserApi
+ * OpenAPI Petstore
+ * PHP version 7.2
  *
- * PHP version 7.1
- *
- * @package OpenAPIServer\Api
+ * @package OpenAPIServer
  * @author  OpenAPI Generator team
  * @link    https://github.com/openapitools/openapi-generator
  */
 
 /**
- * OpenAPI Petstore
- *
  * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
  * The version of the OpenAPI document: 1.0.0
  * Generated by: https://github.com/openapitools/openapi-generator.git
diff --git a/samples/server/petstore/php-slim4/lib/Auth/AbstractAuthenticator.php b/samples/server/petstore/php-slim4/lib/Auth/AbstractAuthenticator.php
index b45f136f425..e9bdacd3f96 100644
--- a/samples/server/petstore/php-slim4/lib/Auth/AbstractAuthenticator.php
+++ b/samples/server/petstore/php-slim4/lib/Auth/AbstractAuthenticator.php
@@ -1,9 +1,8 @@
 <?php
 
 /**
- * AbstractAuthenticator
- *
- * PHP version 7.1
+ * OpenAPI Petstore
+ * PHP version 7.2
  *
  * @package OpenAPIServer
  * @author  OpenAPI Generator team
@@ -11,8 +10,6 @@
  */
 
 /**
- * OpenAPI Petstore
- *
  * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
  * The version of the OpenAPI document: 1.0.0
  * Generated by: https://github.com/openapitools/openapi-generator.git
diff --git a/samples/server/petstore/php-slim4/lib/Interfaces/ModelInterface.php b/samples/server/petstore/php-slim4/lib/Interfaces/ModelInterface.php
index 480eae3d38d..b61edc27a1e 100644
--- a/samples/server/petstore/php-slim4/lib/Interfaces/ModelInterface.php
+++ b/samples/server/petstore/php-slim4/lib/Interfaces/ModelInterface.php
@@ -1,9 +1,8 @@
 <?php
 
 /**
- * ModelInterface
- *
- * PHP version 7.1
+ * OpenAPI Petstore
+ * PHP version 7.2
  *
  * @package OpenAPIServer
  * @author  OpenAPI Generator team
@@ -11,8 +10,6 @@
  */
 
 /**
- * OpenAPI Petstore
- *
  * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
  * The version of the OpenAPI document: 1.0.0
  * Generated by: https://github.com/openapitools/openapi-generator.git
diff --git a/samples/server/petstore/php-slim4/lib/Middleware/JsonBodyParserMiddleware.php b/samples/server/petstore/php-slim4/lib/Middleware/JsonBodyParserMiddleware.php
index 6d03bb9383d..b90f3135f6c 100644
--- a/samples/server/petstore/php-slim4/lib/Middleware/JsonBodyParserMiddleware.php
+++ b/samples/server/petstore/php-slim4/lib/Middleware/JsonBodyParserMiddleware.php
@@ -1,9 +1,8 @@
 <?php
 
 /**
- * JsonBodyParserMiddleware
- *
- * PHP version 7.1
+ * OpenAPI Petstore
+ * PHP version 7.2
  *
  * @package OpenAPIServer
  * @author  OpenAPI Generator team
@@ -11,8 +10,6 @@
  */
 
 /**
- * OpenAPI Petstore
- *
  * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
  * The version of the OpenAPI document: 1.0.0
  * Generated by: https://github.com/openapitools/openapi-generator.git
diff --git a/samples/server/petstore/php-slim4/lib/Mock/OpenApiDataMocker.php b/samples/server/petstore/php-slim4/lib/Mock/OpenApiDataMocker.php
index 662cfcca9d5..9f80025481b 100644
--- a/samples/server/petstore/php-slim4/lib/Mock/OpenApiDataMocker.php
+++ b/samples/server/petstore/php-slim4/lib/Mock/OpenApiDataMocker.php
@@ -1,9 +1,8 @@
 <?php
 
 /**
- * OpenApiDataMocker
- *
- * PHP version 7.1
+ * OpenAPI Petstore
+ * PHP version 7.2
  *
  * @package OpenAPIServer
  * @author  OpenAPI Generator team
@@ -11,8 +10,6 @@
  */
 
 /**
- * OpenAPI Petstore
- *
  * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
  * The version of the OpenAPI document: 1.0.0
  * Generated by: https://github.com/openapitools/openapi-generator.git
diff --git a/samples/server/petstore/php-slim4/lib/Mock/OpenApiDataMockerInterface.php b/samples/server/petstore/php-slim4/lib/Mock/OpenApiDataMockerInterface.php
index 0a2852aaaf9..84a9f253840 100644
--- a/samples/server/petstore/php-slim4/lib/Mock/OpenApiDataMockerInterface.php
+++ b/samples/server/petstore/php-slim4/lib/Mock/OpenApiDataMockerInterface.php
@@ -1,10 +1,8 @@
 <?php
 
 /**
- * OpenApiDataMockerInterface
- * @ref https://github.com/OAI/OpenAPI-Specification/blob/master/versions/3.0.1.md#data-types
- *
- * PHP version 7.1
+ * OpenAPI Petstore
+ * PHP version 7.2
  *
  * @package OpenAPIServer
  * @author  OpenAPI Generator team
@@ -12,8 +10,6 @@
  */
 
 /**
- * OpenAPI Petstore
- *
  * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
  * The version of the OpenAPI document: 1.0.0
  * Generated by: https://github.com/openapitools/openapi-generator.git
diff --git a/samples/server/petstore/php-slim4/lib/Mock/OpenApiDataMockerMiddleware.php b/samples/server/petstore/php-slim4/lib/Mock/OpenApiDataMockerMiddleware.php
index 60ba929a403..88b6785fb09 100644
--- a/samples/server/petstore/php-slim4/lib/Mock/OpenApiDataMockerMiddleware.php
+++ b/samples/server/petstore/php-slim4/lib/Mock/OpenApiDataMockerMiddleware.php
@@ -1,9 +1,8 @@
 <?php
 
 /**
- * OpenApiDataMockerMiddleware
- *
- * PHP version 7.1
+ * OpenAPI Petstore
+ * PHP version 7.2
  *
  * @package OpenAPIServer
  * @author  OpenAPI Generator team
@@ -11,8 +10,6 @@
  */
 
 /**
- * OpenAPI Petstore
- *
  * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
  * The version of the OpenAPI document: 1.0.0
  * Generated by: https://github.com/openapitools/openapi-generator.git
diff --git a/samples/server/petstore/php-slim4/lib/Model/AdditionalPropertiesAnyType.php b/samples/server/petstore/php-slim4/lib/Model/AdditionalPropertiesAnyType.php
index d5bfc975b93..2a21dc42be0 100644
--- a/samples/server/petstore/php-slim4/lib/Model/AdditionalPropertiesAnyType.php
+++ b/samples/server/petstore/php-slim4/lib/Model/AdditionalPropertiesAnyType.php
@@ -1,15 +1,20 @@
 <?php
 
 /**
- * AdditionalPropertiesAnyType
+ * OpenAPI Petstore
+ * PHP version 7.2
  *
- * PHP version 7.1
- *
- * @package OpenAPIServer\Model
+ * @package OpenAPIServer
  * @author  OpenAPI Generator team
  * @link    https://github.com/openapitools/openapi-generator
  */
 
+/**
+ * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
+ * The version of the OpenAPI document: 1.0.0
+ * Generated by: https://github.com/openapitools/openapi-generator.git
+ */
+
 /**
  * NOTE: This class is auto generated by the openapi generator program.
  * https://github.com/openapitools/openapi-generator
diff --git a/samples/server/petstore/php-slim4/lib/Model/AdditionalPropertiesArray.php b/samples/server/petstore/php-slim4/lib/Model/AdditionalPropertiesArray.php
index eec1753f0df..4b4c549f562 100644
--- a/samples/server/petstore/php-slim4/lib/Model/AdditionalPropertiesArray.php
+++ b/samples/server/petstore/php-slim4/lib/Model/AdditionalPropertiesArray.php
@@ -1,15 +1,20 @@
 <?php
 
 /**
- * AdditionalPropertiesArray
+ * OpenAPI Petstore
+ * PHP version 7.2
  *
- * PHP version 7.1
- *
- * @package OpenAPIServer\Model
+ * @package OpenAPIServer
  * @author  OpenAPI Generator team
  * @link    https://github.com/openapitools/openapi-generator
  */
 
+/**
+ * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
+ * The version of the OpenAPI document: 1.0.0
+ * Generated by: https://github.com/openapitools/openapi-generator.git
+ */
+
 /**
  * NOTE: This class is auto generated by the openapi generator program.
  * https://github.com/openapitools/openapi-generator
diff --git a/samples/server/petstore/php-slim4/lib/Model/AdditionalPropertiesBoolean.php b/samples/server/petstore/php-slim4/lib/Model/AdditionalPropertiesBoolean.php
index f5503fa41ba..4facea384ba 100644
--- a/samples/server/petstore/php-slim4/lib/Model/AdditionalPropertiesBoolean.php
+++ b/samples/server/petstore/php-slim4/lib/Model/AdditionalPropertiesBoolean.php
@@ -1,15 +1,20 @@
 <?php
 
 /**
- * AdditionalPropertiesBoolean
+ * OpenAPI Petstore
+ * PHP version 7.2
  *
- * PHP version 7.1
- *
- * @package OpenAPIServer\Model
+ * @package OpenAPIServer
  * @author  OpenAPI Generator team
  * @link    https://github.com/openapitools/openapi-generator
  */
 
+/**
+ * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
+ * The version of the OpenAPI document: 1.0.0
+ * Generated by: https://github.com/openapitools/openapi-generator.git
+ */
+
 /**
  * NOTE: This class is auto generated by the openapi generator program.
  * https://github.com/openapitools/openapi-generator
diff --git a/samples/server/petstore/php-slim4/lib/Model/AdditionalPropertiesClass.php b/samples/server/petstore/php-slim4/lib/Model/AdditionalPropertiesClass.php
index 7fb8f08834e..292991082fc 100644
--- a/samples/server/petstore/php-slim4/lib/Model/AdditionalPropertiesClass.php
+++ b/samples/server/petstore/php-slim4/lib/Model/AdditionalPropertiesClass.php
@@ -1,15 +1,20 @@
 <?php
 
 /**
- * AdditionalPropertiesClass
+ * OpenAPI Petstore
+ * PHP version 7.2
  *
- * PHP version 7.1
- *
- * @package OpenAPIServer\Model
+ * @package OpenAPIServer
  * @author  OpenAPI Generator team
  * @link    https://github.com/openapitools/openapi-generator
  */
 
+/**
+ * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
+ * The version of the OpenAPI document: 1.0.0
+ * Generated by: https://github.com/openapitools/openapi-generator.git
+ */
+
 /**
  * NOTE: This class is auto generated by the openapi generator program.
  * https://github.com/openapitools/openapi-generator
diff --git a/samples/server/petstore/php-slim4/lib/Model/AdditionalPropertiesInteger.php b/samples/server/petstore/php-slim4/lib/Model/AdditionalPropertiesInteger.php
index 116ed20c56c..2b7ebe98651 100644
--- a/samples/server/petstore/php-slim4/lib/Model/AdditionalPropertiesInteger.php
+++ b/samples/server/petstore/php-slim4/lib/Model/AdditionalPropertiesInteger.php
@@ -1,15 +1,20 @@
 <?php
 
 /**
- * AdditionalPropertiesInteger
+ * OpenAPI Petstore
+ * PHP version 7.2
  *
- * PHP version 7.1
- *
- * @package OpenAPIServer\Model
+ * @package OpenAPIServer
  * @author  OpenAPI Generator team
  * @link    https://github.com/openapitools/openapi-generator
  */
 
+/**
+ * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
+ * The version of the OpenAPI document: 1.0.0
+ * Generated by: https://github.com/openapitools/openapi-generator.git
+ */
+
 /**
  * NOTE: This class is auto generated by the openapi generator program.
  * https://github.com/openapitools/openapi-generator
diff --git a/samples/server/petstore/php-slim4/lib/Model/AdditionalPropertiesNumber.php b/samples/server/petstore/php-slim4/lib/Model/AdditionalPropertiesNumber.php
index e234140479d..9b4a7450489 100644
--- a/samples/server/petstore/php-slim4/lib/Model/AdditionalPropertiesNumber.php
+++ b/samples/server/petstore/php-slim4/lib/Model/AdditionalPropertiesNumber.php
@@ -1,15 +1,20 @@
 <?php
 
 /**
- * AdditionalPropertiesNumber
+ * OpenAPI Petstore
+ * PHP version 7.2
  *
- * PHP version 7.1
- *
- * @package OpenAPIServer\Model
+ * @package OpenAPIServer
  * @author  OpenAPI Generator team
  * @link    https://github.com/openapitools/openapi-generator
  */
 
+/**
+ * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
+ * The version of the OpenAPI document: 1.0.0
+ * Generated by: https://github.com/openapitools/openapi-generator.git
+ */
+
 /**
  * NOTE: This class is auto generated by the openapi generator program.
  * https://github.com/openapitools/openapi-generator
diff --git a/samples/server/petstore/php-slim4/lib/Model/AdditionalPropertiesObject.php b/samples/server/petstore/php-slim4/lib/Model/AdditionalPropertiesObject.php
index 55ea5bf762c..dd4d6a76be0 100644
--- a/samples/server/petstore/php-slim4/lib/Model/AdditionalPropertiesObject.php
+++ b/samples/server/petstore/php-slim4/lib/Model/AdditionalPropertiesObject.php
@@ -1,15 +1,20 @@
 <?php
 
 /**
- * AdditionalPropertiesObject
+ * OpenAPI Petstore
+ * PHP version 7.2
  *
- * PHP version 7.1
- *
- * @package OpenAPIServer\Model
+ * @package OpenAPIServer
  * @author  OpenAPI Generator team
  * @link    https://github.com/openapitools/openapi-generator
  */
 
+/**
+ * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
+ * The version of the OpenAPI document: 1.0.0
+ * Generated by: https://github.com/openapitools/openapi-generator.git
+ */
+
 /**
  * NOTE: This class is auto generated by the openapi generator program.
  * https://github.com/openapitools/openapi-generator
diff --git a/samples/server/petstore/php-slim4/lib/Model/AdditionalPropertiesString.php b/samples/server/petstore/php-slim4/lib/Model/AdditionalPropertiesString.php
index 56471c9bc8c..b3f0bc29857 100644
--- a/samples/server/petstore/php-slim4/lib/Model/AdditionalPropertiesString.php
+++ b/samples/server/petstore/php-slim4/lib/Model/AdditionalPropertiesString.php
@@ -1,15 +1,20 @@
 <?php
 
 /**
- * AdditionalPropertiesString
+ * OpenAPI Petstore
+ * PHP version 7.2
  *
- * PHP version 7.1
- *
- * @package OpenAPIServer\Model
+ * @package OpenAPIServer
  * @author  OpenAPI Generator team
  * @link    https://github.com/openapitools/openapi-generator
  */
 
+/**
+ * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
+ * The version of the OpenAPI document: 1.0.0
+ * Generated by: https://github.com/openapitools/openapi-generator.git
+ */
+
 /**
  * NOTE: This class is auto generated by the openapi generator program.
  * https://github.com/openapitools/openapi-generator
diff --git a/samples/server/petstore/php-slim4/lib/Model/Animal.php b/samples/server/petstore/php-slim4/lib/Model/Animal.php
index b0f3c238498..b7b7a60d57b 100644
--- a/samples/server/petstore/php-slim4/lib/Model/Animal.php
+++ b/samples/server/petstore/php-slim4/lib/Model/Animal.php
@@ -1,15 +1,20 @@
 <?php
 
 /**
- * Animal
+ * OpenAPI Petstore
+ * PHP version 7.2
  *
- * PHP version 7.1
- *
- * @package OpenAPIServer\Model
+ * @package OpenAPIServer
  * @author  OpenAPI Generator team
  * @link    https://github.com/openapitools/openapi-generator
  */
 
+/**
+ * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
+ * The version of the OpenAPI document: 1.0.0
+ * Generated by: https://github.com/openapitools/openapi-generator.git
+ */
+
 /**
  * NOTE: This class is auto generated by the openapi generator program.
  * https://github.com/openapitools/openapi-generator
diff --git a/samples/server/petstore/php-slim4/lib/Model/ApiResponse.php b/samples/server/petstore/php-slim4/lib/Model/ApiResponse.php
index eb00821d060..819d96f9d89 100644
--- a/samples/server/petstore/php-slim4/lib/Model/ApiResponse.php
+++ b/samples/server/petstore/php-slim4/lib/Model/ApiResponse.php
@@ -1,15 +1,20 @@
 <?php
 
 /**
- * ApiResponse
+ * OpenAPI Petstore
+ * PHP version 7.2
  *
- * PHP version 7.1
- *
- * @package OpenAPIServer\Model
+ * @package OpenAPIServer
  * @author  OpenAPI Generator team
  * @link    https://github.com/openapitools/openapi-generator
  */
 
+/**
+ * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
+ * The version of the OpenAPI document: 1.0.0
+ * Generated by: https://github.com/openapitools/openapi-generator.git
+ */
+
 /**
  * NOTE: This class is auto generated by the openapi generator program.
  * https://github.com/openapitools/openapi-generator
diff --git a/samples/server/petstore/php-slim4/lib/Model/ArrayOfArrayOfNumberOnly.php b/samples/server/petstore/php-slim4/lib/Model/ArrayOfArrayOfNumberOnly.php
index ea7a72a4f1d..6239e428fb1 100644
--- a/samples/server/petstore/php-slim4/lib/Model/ArrayOfArrayOfNumberOnly.php
+++ b/samples/server/petstore/php-slim4/lib/Model/ArrayOfArrayOfNumberOnly.php
@@ -1,15 +1,20 @@
 <?php
 
 /**
- * ArrayOfArrayOfNumberOnly
+ * OpenAPI Petstore
+ * PHP version 7.2
  *
- * PHP version 7.1
- *
- * @package OpenAPIServer\Model
+ * @package OpenAPIServer
  * @author  OpenAPI Generator team
  * @link    https://github.com/openapitools/openapi-generator
  */
 
+/**
+ * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
+ * The version of the OpenAPI document: 1.0.0
+ * Generated by: https://github.com/openapitools/openapi-generator.git
+ */
+
 /**
  * NOTE: This class is auto generated by the openapi generator program.
  * https://github.com/openapitools/openapi-generator
diff --git a/samples/server/petstore/php-slim4/lib/Model/ArrayOfNumberOnly.php b/samples/server/petstore/php-slim4/lib/Model/ArrayOfNumberOnly.php
index 25b4c97c2a8..93944ffc65b 100644
--- a/samples/server/petstore/php-slim4/lib/Model/ArrayOfNumberOnly.php
+++ b/samples/server/petstore/php-slim4/lib/Model/ArrayOfNumberOnly.php
@@ -1,15 +1,20 @@
 <?php
 
 /**
- * ArrayOfNumberOnly
+ * OpenAPI Petstore
+ * PHP version 7.2
  *
- * PHP version 7.1
- *
- * @package OpenAPIServer\Model
+ * @package OpenAPIServer
  * @author  OpenAPI Generator team
  * @link    https://github.com/openapitools/openapi-generator
  */
 
+/**
+ * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
+ * The version of the OpenAPI document: 1.0.0
+ * Generated by: https://github.com/openapitools/openapi-generator.git
+ */
+
 /**
  * NOTE: This class is auto generated by the openapi generator program.
  * https://github.com/openapitools/openapi-generator
diff --git a/samples/server/petstore/php-slim4/lib/Model/ArrayTest.php b/samples/server/petstore/php-slim4/lib/Model/ArrayTest.php
index 66aa7e053a4..f454b4fac43 100644
--- a/samples/server/petstore/php-slim4/lib/Model/ArrayTest.php
+++ b/samples/server/petstore/php-slim4/lib/Model/ArrayTest.php
@@ -1,15 +1,20 @@
 <?php
 
 /**
- * ArrayTest
+ * OpenAPI Petstore
+ * PHP version 7.2
  *
- * PHP version 7.1
- *
- * @package OpenAPIServer\Model
+ * @package OpenAPIServer
  * @author  OpenAPI Generator team
  * @link    https://github.com/openapitools/openapi-generator
  */
 
+/**
+ * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
+ * The version of the OpenAPI document: 1.0.0
+ * Generated by: https://github.com/openapitools/openapi-generator.git
+ */
+
 /**
  * NOTE: This class is auto generated by the openapi generator program.
  * https://github.com/openapitools/openapi-generator
diff --git a/samples/server/petstore/php-slim4/lib/Model/BigCat.php b/samples/server/petstore/php-slim4/lib/Model/BigCat.php
index 4b795da2391..52265b58346 100644
--- a/samples/server/petstore/php-slim4/lib/Model/BigCat.php
+++ b/samples/server/petstore/php-slim4/lib/Model/BigCat.php
@@ -1,15 +1,20 @@
 <?php
 
 /**
- * BigCat
+ * OpenAPI Petstore
+ * PHP version 7.2
  *
- * PHP version 7.1
- *
- * @package OpenAPIServer\Model
+ * @package OpenAPIServer
  * @author  OpenAPI Generator team
  * @link    https://github.com/openapitools/openapi-generator
  */
 
+/**
+ * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
+ * The version of the OpenAPI document: 1.0.0
+ * Generated by: https://github.com/openapitools/openapi-generator.git
+ */
+
 /**
  * NOTE: This class is auto generated by the openapi generator program.
  * https://github.com/openapitools/openapi-generator
diff --git a/samples/server/petstore/php-slim4/lib/Model/BigCatAllOf.php b/samples/server/petstore/php-slim4/lib/Model/BigCatAllOf.php
index 10433c34b8e..f800e61a4b4 100644
--- a/samples/server/petstore/php-slim4/lib/Model/BigCatAllOf.php
+++ b/samples/server/petstore/php-slim4/lib/Model/BigCatAllOf.php
@@ -1,15 +1,20 @@
 <?php
 
 /**
- * BigCatAllOf
+ * OpenAPI Petstore
+ * PHP version 7.2
  *
- * PHP version 7.1
- *
- * @package OpenAPIServer\Model
+ * @package OpenAPIServer
  * @author  OpenAPI Generator team
  * @link    https://github.com/openapitools/openapi-generator
  */
 
+/**
+ * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
+ * The version of the OpenAPI document: 1.0.0
+ * Generated by: https://github.com/openapitools/openapi-generator.git
+ */
+
 /**
  * NOTE: This class is auto generated by the openapi generator program.
  * https://github.com/openapitools/openapi-generator
diff --git a/samples/server/petstore/php-slim4/lib/Model/Capitalization.php b/samples/server/petstore/php-slim4/lib/Model/Capitalization.php
index b596ec92270..bc646fc200e 100644
--- a/samples/server/petstore/php-slim4/lib/Model/Capitalization.php
+++ b/samples/server/petstore/php-slim4/lib/Model/Capitalization.php
@@ -1,15 +1,20 @@
 <?php
 
 /**
- * Capitalization
+ * OpenAPI Petstore
+ * PHP version 7.2
  *
- * PHP version 7.1
- *
- * @package OpenAPIServer\Model
+ * @package OpenAPIServer
  * @author  OpenAPI Generator team
  * @link    https://github.com/openapitools/openapi-generator
  */
 
+/**
+ * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
+ * The version of the OpenAPI document: 1.0.0
+ * Generated by: https://github.com/openapitools/openapi-generator.git
+ */
+
 /**
  * NOTE: This class is auto generated by the openapi generator program.
  * https://github.com/openapitools/openapi-generator
diff --git a/samples/server/petstore/php-slim4/lib/Model/Cat.php b/samples/server/petstore/php-slim4/lib/Model/Cat.php
index 1a6471a2316..23410af56cb 100644
--- a/samples/server/petstore/php-slim4/lib/Model/Cat.php
+++ b/samples/server/petstore/php-slim4/lib/Model/Cat.php
@@ -1,15 +1,20 @@
 <?php
 
 /**
- * Cat
+ * OpenAPI Petstore
+ * PHP version 7.2
  *
- * PHP version 7.1
- *
- * @package OpenAPIServer\Model
+ * @package OpenAPIServer
  * @author  OpenAPI Generator team
  * @link    https://github.com/openapitools/openapi-generator
  */
 
+/**
+ * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
+ * The version of the OpenAPI document: 1.0.0
+ * Generated by: https://github.com/openapitools/openapi-generator.git
+ */
+
 /**
  * NOTE: This class is auto generated by the openapi generator program.
  * https://github.com/openapitools/openapi-generator
diff --git a/samples/server/petstore/php-slim4/lib/Model/CatAllOf.php b/samples/server/petstore/php-slim4/lib/Model/CatAllOf.php
index 8caa1dc6e57..ef14ab81429 100644
--- a/samples/server/petstore/php-slim4/lib/Model/CatAllOf.php
+++ b/samples/server/petstore/php-slim4/lib/Model/CatAllOf.php
@@ -1,15 +1,20 @@
 <?php
 
 /**
- * CatAllOf
+ * OpenAPI Petstore
+ * PHP version 7.2
  *
- * PHP version 7.1
- *
- * @package OpenAPIServer\Model
+ * @package OpenAPIServer
  * @author  OpenAPI Generator team
  * @link    https://github.com/openapitools/openapi-generator
  */
 
+/**
+ * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
+ * The version of the OpenAPI document: 1.0.0
+ * Generated by: https://github.com/openapitools/openapi-generator.git
+ */
+
 /**
  * NOTE: This class is auto generated by the openapi generator program.
  * https://github.com/openapitools/openapi-generator
diff --git a/samples/server/petstore/php-slim4/lib/Model/Category.php b/samples/server/petstore/php-slim4/lib/Model/Category.php
index f53e2af8909..8bbfa7591d0 100644
--- a/samples/server/petstore/php-slim4/lib/Model/Category.php
+++ b/samples/server/petstore/php-slim4/lib/Model/Category.php
@@ -1,15 +1,20 @@
 <?php
 
 /**
- * Category
+ * OpenAPI Petstore
+ * PHP version 7.2
  *
- * PHP version 7.1
- *
- * @package OpenAPIServer\Model
+ * @package OpenAPIServer
  * @author  OpenAPI Generator team
  * @link    https://github.com/openapitools/openapi-generator
  */
 
+/**
+ * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
+ * The version of the OpenAPI document: 1.0.0
+ * Generated by: https://github.com/openapitools/openapi-generator.git
+ */
+
 /**
  * NOTE: This class is auto generated by the openapi generator program.
  * https://github.com/openapitools/openapi-generator
diff --git a/samples/server/petstore/php-slim4/lib/Model/ClassModel.php b/samples/server/petstore/php-slim4/lib/Model/ClassModel.php
index 3b3f5c28d94..75cfc5b4b4a 100644
--- a/samples/server/petstore/php-slim4/lib/Model/ClassModel.php
+++ b/samples/server/petstore/php-slim4/lib/Model/ClassModel.php
@@ -1,15 +1,20 @@
 <?php
 
 /**
- * ClassModel
+ * OpenAPI Petstore
+ * PHP version 7.2
  *
- * PHP version 7.1
- *
- * @package OpenAPIServer\Model
+ * @package OpenAPIServer
  * @author  OpenAPI Generator team
  * @link    https://github.com/openapitools/openapi-generator
  */
 
+/**
+ * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
+ * The version of the OpenAPI document: 1.0.0
+ * Generated by: https://github.com/openapitools/openapi-generator.git
+ */
+
 /**
  * NOTE: This class is auto generated by the openapi generator program.
  * https://github.com/openapitools/openapi-generator
diff --git a/samples/server/petstore/php-slim4/lib/Model/Client.php b/samples/server/petstore/php-slim4/lib/Model/Client.php
index 12aaff03c01..d1f4bec5065 100644
--- a/samples/server/petstore/php-slim4/lib/Model/Client.php
+++ b/samples/server/petstore/php-slim4/lib/Model/Client.php
@@ -1,15 +1,20 @@
 <?php
 
 /**
- * Client
+ * OpenAPI Petstore
+ * PHP version 7.2
  *
- * PHP version 7.1
- *
- * @package OpenAPIServer\Model
+ * @package OpenAPIServer
  * @author  OpenAPI Generator team
  * @link    https://github.com/openapitools/openapi-generator
  */
 
+/**
+ * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
+ * The version of the OpenAPI document: 1.0.0
+ * Generated by: https://github.com/openapitools/openapi-generator.git
+ */
+
 /**
  * NOTE: This class is auto generated by the openapi generator program.
  * https://github.com/openapitools/openapi-generator
diff --git a/samples/server/petstore/php-slim4/lib/Model/Dog.php b/samples/server/petstore/php-slim4/lib/Model/Dog.php
index c38c1ea4a66..913df4163fb 100644
--- a/samples/server/petstore/php-slim4/lib/Model/Dog.php
+++ b/samples/server/petstore/php-slim4/lib/Model/Dog.php
@@ -1,15 +1,20 @@
 <?php
 
 /**
- * Dog
+ * OpenAPI Petstore
+ * PHP version 7.2
  *
- * PHP version 7.1
- *
- * @package OpenAPIServer\Model
+ * @package OpenAPIServer
  * @author  OpenAPI Generator team
  * @link    https://github.com/openapitools/openapi-generator
  */
 
+/**
+ * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
+ * The version of the OpenAPI document: 1.0.0
+ * Generated by: https://github.com/openapitools/openapi-generator.git
+ */
+
 /**
  * NOTE: This class is auto generated by the openapi generator program.
  * https://github.com/openapitools/openapi-generator
diff --git a/samples/server/petstore/php-slim4/lib/Model/DogAllOf.php b/samples/server/petstore/php-slim4/lib/Model/DogAllOf.php
index cf81a5f99b4..ef4f5603cfd 100644
--- a/samples/server/petstore/php-slim4/lib/Model/DogAllOf.php
+++ b/samples/server/petstore/php-slim4/lib/Model/DogAllOf.php
@@ -1,15 +1,20 @@
 <?php
 
 /**
- * DogAllOf
+ * OpenAPI Petstore
+ * PHP version 7.2
  *
- * PHP version 7.1
- *
- * @package OpenAPIServer\Model
+ * @package OpenAPIServer
  * @author  OpenAPI Generator team
  * @link    https://github.com/openapitools/openapi-generator
  */
 
+/**
+ * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
+ * The version of the OpenAPI document: 1.0.0
+ * Generated by: https://github.com/openapitools/openapi-generator.git
+ */
+
 /**
  * NOTE: This class is auto generated by the openapi generator program.
  * https://github.com/openapitools/openapi-generator
diff --git a/samples/server/petstore/php-slim4/lib/Model/EnumArrays.php b/samples/server/petstore/php-slim4/lib/Model/EnumArrays.php
index aef61078eb5..d1979dca245 100644
--- a/samples/server/petstore/php-slim4/lib/Model/EnumArrays.php
+++ b/samples/server/petstore/php-slim4/lib/Model/EnumArrays.php
@@ -1,15 +1,20 @@
 <?php
 
 /**
- * EnumArrays
+ * OpenAPI Petstore
+ * PHP version 7.2
  *
- * PHP version 7.1
- *
- * @package OpenAPIServer\Model
+ * @package OpenAPIServer
  * @author  OpenAPI Generator team
  * @link    https://github.com/openapitools/openapi-generator
  */
 
+/**
+ * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
+ * The version of the OpenAPI document: 1.0.0
+ * Generated by: https://github.com/openapitools/openapi-generator.git
+ */
+
 /**
  * NOTE: This class is auto generated by the openapi generator program.
  * https://github.com/openapitools/openapi-generator
diff --git a/samples/server/petstore/php-slim4/lib/Model/EnumClass.php b/samples/server/petstore/php-slim4/lib/Model/EnumClass.php
index 3ddd829b313..3a40149f684 100644
--- a/samples/server/petstore/php-slim4/lib/Model/EnumClass.php
+++ b/samples/server/petstore/php-slim4/lib/Model/EnumClass.php
@@ -1,15 +1,20 @@
 <?php
 
 /**
- * EnumClass
+ * OpenAPI Petstore
+ * PHP version 7.2
  *
- * PHP version 7.1
- *
- * @package OpenAPIServer\Model
+ * @package OpenAPIServer
  * @author  OpenAPI Generator team
  * @link    https://github.com/openapitools/openapi-generator
  */
 
+/**
+ * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
+ * The version of the OpenAPI document: 1.0.0
+ * Generated by: https://github.com/openapitools/openapi-generator.git
+ */
+
 /**
  * NOTE: This class is auto generated by the openapi generator program.
  * https://github.com/openapitools/openapi-generator
diff --git a/samples/server/petstore/php-slim4/lib/Model/EnumTest.php b/samples/server/petstore/php-slim4/lib/Model/EnumTest.php
index e4c4ffc0ee0..7623d12d019 100644
--- a/samples/server/petstore/php-slim4/lib/Model/EnumTest.php
+++ b/samples/server/petstore/php-slim4/lib/Model/EnumTest.php
@@ -1,15 +1,20 @@
 <?php
 
 /**
- * EnumTest
+ * OpenAPI Petstore
+ * PHP version 7.2
  *
- * PHP version 7.1
- *
- * @package OpenAPIServer\Model
+ * @package OpenAPIServer
  * @author  OpenAPI Generator team
  * @link    https://github.com/openapitools/openapi-generator
  */
 
+/**
+ * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
+ * The version of the OpenAPI document: 1.0.0
+ * Generated by: https://github.com/openapitools/openapi-generator.git
+ */
+
 /**
  * NOTE: This class is auto generated by the openapi generator program.
  * https://github.com/openapitools/openapi-generator
diff --git a/samples/server/petstore/php-slim4/lib/Model/File.php b/samples/server/petstore/php-slim4/lib/Model/File.php
index 4237e721443..b99587fda0e 100644
--- a/samples/server/petstore/php-slim4/lib/Model/File.php
+++ b/samples/server/petstore/php-slim4/lib/Model/File.php
@@ -1,15 +1,20 @@
 <?php
 
 /**
- * File
+ * OpenAPI Petstore
+ * PHP version 7.2
  *
- * PHP version 7.1
- *
- * @package OpenAPIServer\Model
+ * @package OpenAPIServer
  * @author  OpenAPI Generator team
  * @link    https://github.com/openapitools/openapi-generator
  */
 
+/**
+ * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
+ * The version of the OpenAPI document: 1.0.0
+ * Generated by: https://github.com/openapitools/openapi-generator.git
+ */
+
 /**
  * NOTE: This class is auto generated by the openapi generator program.
  * https://github.com/openapitools/openapi-generator
diff --git a/samples/server/petstore/php-slim4/lib/Model/FileSchemaTestClass.php b/samples/server/petstore/php-slim4/lib/Model/FileSchemaTestClass.php
index 3ebabaa367c..acc18f2f8f2 100644
--- a/samples/server/petstore/php-slim4/lib/Model/FileSchemaTestClass.php
+++ b/samples/server/petstore/php-slim4/lib/Model/FileSchemaTestClass.php
@@ -1,15 +1,20 @@
 <?php
 
 /**
- * FileSchemaTestClass
+ * OpenAPI Petstore
+ * PHP version 7.2
  *
- * PHP version 7.1
- *
- * @package OpenAPIServer\Model
+ * @package OpenAPIServer
  * @author  OpenAPI Generator team
  * @link    https://github.com/openapitools/openapi-generator
  */
 
+/**
+ * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
+ * The version of the OpenAPI document: 1.0.0
+ * Generated by: https://github.com/openapitools/openapi-generator.git
+ */
+
 /**
  * NOTE: This class is auto generated by the openapi generator program.
  * https://github.com/openapitools/openapi-generator
diff --git a/samples/server/petstore/php-slim4/lib/Model/FormatTest.php b/samples/server/petstore/php-slim4/lib/Model/FormatTest.php
index 751f9607e8a..4a2490d18bf 100644
--- a/samples/server/petstore/php-slim4/lib/Model/FormatTest.php
+++ b/samples/server/petstore/php-slim4/lib/Model/FormatTest.php
@@ -1,15 +1,20 @@
 <?php
 
 /**
- * FormatTest
+ * OpenAPI Petstore
+ * PHP version 7.2
  *
- * PHP version 7.1
- *
- * @package OpenAPIServer\Model
+ * @package OpenAPIServer
  * @author  OpenAPI Generator team
  * @link    https://github.com/openapitools/openapi-generator
  */
 
+/**
+ * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
+ * The version of the OpenAPI document: 1.0.0
+ * Generated by: https://github.com/openapitools/openapi-generator.git
+ */
+
 /**
  * NOTE: This class is auto generated by the openapi generator program.
  * https://github.com/openapitools/openapi-generator
diff --git a/samples/server/petstore/php-slim4/lib/Model/HasOnlyReadOnly.php b/samples/server/petstore/php-slim4/lib/Model/HasOnlyReadOnly.php
index afeb12af3dd..13eb047fdf9 100644
--- a/samples/server/petstore/php-slim4/lib/Model/HasOnlyReadOnly.php
+++ b/samples/server/petstore/php-slim4/lib/Model/HasOnlyReadOnly.php
@@ -1,15 +1,20 @@
 <?php
 
 /**
- * HasOnlyReadOnly
+ * OpenAPI Petstore
+ * PHP version 7.2
  *
- * PHP version 7.1
- *
- * @package OpenAPIServer\Model
+ * @package OpenAPIServer
  * @author  OpenAPI Generator team
  * @link    https://github.com/openapitools/openapi-generator
  */
 
+/**
+ * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
+ * The version of the OpenAPI document: 1.0.0
+ * Generated by: https://github.com/openapitools/openapi-generator.git
+ */
+
 /**
  * NOTE: This class is auto generated by the openapi generator program.
  * https://github.com/openapitools/openapi-generator
diff --git a/samples/server/petstore/php-slim4/lib/Model/InlineObject.php b/samples/server/petstore/php-slim4/lib/Model/InlineObject.php
deleted file mode 100644
index 723616e8df4..00000000000
--- a/samples/server/petstore/php-slim4/lib/Model/InlineObject.php
+++ /dev/null
@@ -1,63 +0,0 @@
-<?php
-
-/**
- * InlineObject
- *
- * PHP version 7.1
- *
- * @package OpenAPIServer\Model
- * @author  OpenAPI Generator team
- * @link    https://github.com/openapitools/openapi-generator
- */
-
-/**
- * NOTE: This class is auto generated by the openapi generator program.
- * https://github.com/openapitools/openapi-generator
- */
-namespace OpenAPIServer\Model;
-
-use OpenAPIServer\Interfaces\ModelInterface;
-
-/**
- * InlineObject
- *
- * @package OpenAPIServer\Model
- * @author  OpenAPI Generator team
- * @link    https://github.com/openapitools/openapi-generator
- */
-class InlineObject implements ModelInterface
-{
-    private const MODEL_SCHEMA = <<<'SCHEMA'
-{
-  "type" : "object",
-  "properties" : {
-    "name" : {
-      "type" : "string",
-      "description" : "Updated name of the pet"
-    },
-    "status" : {
-      "type" : "string",
-      "description" : "Updated status of the pet"
-    }
-  }
-}
-SCHEMA;
-
-    /** @var string $name Updated name of the pet*/
-    private $name;
-
-    /** @var string $status Updated status of the pet*/
-    private $status;
-
-    /**
-     * Returns model schema.
-     *
-     * @param bool $assoc When TRUE, returned objects will be converted into associative arrays. Default FALSE.
-     *
-     * @return array
-     */
-    public static function getOpenApiSchema($assoc = false)
-    {
-        return json_decode(static::MODEL_SCHEMA, $assoc);
-    }
-}
diff --git a/samples/server/petstore/php-slim4/lib/Model/InlineObject1.php b/samples/server/petstore/php-slim4/lib/Model/InlineObject1.php
deleted file mode 100644
index 87cb07a3865..00000000000
--- a/samples/server/petstore/php-slim4/lib/Model/InlineObject1.php
+++ /dev/null
@@ -1,64 +0,0 @@
-<?php
-
-/**
- * InlineObject1
- *
- * PHP version 7.1
- *
- * @package OpenAPIServer\Model
- * @author  OpenAPI Generator team
- * @link    https://github.com/openapitools/openapi-generator
- */
-
-/**
- * NOTE: This class is auto generated by the openapi generator program.
- * https://github.com/openapitools/openapi-generator
- */
-namespace OpenAPIServer\Model;
-
-use OpenAPIServer\Interfaces\ModelInterface;
-
-/**
- * InlineObject1
- *
- * @package OpenAPIServer\Model
- * @author  OpenAPI Generator team
- * @link    https://github.com/openapitools/openapi-generator
- */
-class InlineObject1 implements ModelInterface
-{
-    private const MODEL_SCHEMA = <<<'SCHEMA'
-{
-  "type" : "object",
-  "properties" : {
-    "additionalMetadata" : {
-      "type" : "string",
-      "description" : "Additional data to pass to server"
-    },
-    "file" : {
-      "type" : "string",
-      "description" : "file to upload",
-      "format" : "binary"
-    }
-  }
-}
-SCHEMA;
-
-    /** @var string $additionalMetadata Additional data to pass to server*/
-    private $additionalMetadata;
-
-    /** @var \SplFileObject $file file to upload*/
-    private $file;
-
-    /**
-     * Returns model schema.
-     *
-     * @param bool $assoc When TRUE, returned objects will be converted into associative arrays. Default FALSE.
-     *
-     * @return array
-     */
-    public static function getOpenApiSchema($assoc = false)
-    {
-        return json_decode(static::MODEL_SCHEMA, $assoc);
-    }
-}
diff --git a/samples/server/petstore/php-slim4/lib/Model/MapTest.php b/samples/server/petstore/php-slim4/lib/Model/MapTest.php
index 2cc9edf7018..6826482ca96 100644
--- a/samples/server/petstore/php-slim4/lib/Model/MapTest.php
+++ b/samples/server/petstore/php-slim4/lib/Model/MapTest.php
@@ -1,15 +1,20 @@
 <?php
 
 /**
- * MapTest
+ * OpenAPI Petstore
+ * PHP version 7.2
  *
- * PHP version 7.1
- *
- * @package OpenAPIServer\Model
+ * @package OpenAPIServer
  * @author  OpenAPI Generator team
  * @link    https://github.com/openapitools/openapi-generator
  */
 
+/**
+ * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
+ * The version of the OpenAPI document: 1.0.0
+ * Generated by: https://github.com/openapitools/openapi-generator.git
+ */
+
 /**
  * NOTE: This class is auto generated by the openapi generator program.
  * https://github.com/openapitools/openapi-generator
diff --git a/samples/server/petstore/php-slim4/lib/Model/MixedPropertiesAndAdditionalPropertiesClass.php b/samples/server/petstore/php-slim4/lib/Model/MixedPropertiesAndAdditionalPropertiesClass.php
index 5d55499c7b0..ef987525015 100644
--- a/samples/server/petstore/php-slim4/lib/Model/MixedPropertiesAndAdditionalPropertiesClass.php
+++ b/samples/server/petstore/php-slim4/lib/Model/MixedPropertiesAndAdditionalPropertiesClass.php
@@ -1,15 +1,20 @@
 <?php
 
 /**
- * MixedPropertiesAndAdditionalPropertiesClass
+ * OpenAPI Petstore
+ * PHP version 7.2
  *
- * PHP version 7.1
- *
- * @package OpenAPIServer\Model
+ * @package OpenAPIServer
  * @author  OpenAPI Generator team
  * @link    https://github.com/openapitools/openapi-generator
  */
 
+/**
+ * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
+ * The version of the OpenAPI document: 1.0.0
+ * Generated by: https://github.com/openapitools/openapi-generator.git
+ */
+
 /**
  * NOTE: This class is auto generated by the openapi generator program.
  * https://github.com/openapitools/openapi-generator
diff --git a/samples/server/petstore/php-slim4/lib/Model/Model200Response.php b/samples/server/petstore/php-slim4/lib/Model/Model200Response.php
index 6af1b357c73..adab164af8b 100644
--- a/samples/server/petstore/php-slim4/lib/Model/Model200Response.php
+++ b/samples/server/petstore/php-slim4/lib/Model/Model200Response.php
@@ -1,15 +1,20 @@
 <?php
 
 /**
- * Model200Response
+ * OpenAPI Petstore
+ * PHP version 7.2
  *
- * PHP version 7.1
- *
- * @package OpenAPIServer\Model
+ * @package OpenAPIServer
  * @author  OpenAPI Generator team
  * @link    https://github.com/openapitools/openapi-generator
  */
 
+/**
+ * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
+ * The version of the OpenAPI document: 1.0.0
+ * Generated by: https://github.com/openapitools/openapi-generator.git
+ */
+
 /**
  * NOTE: This class is auto generated by the openapi generator program.
  * https://github.com/openapitools/openapi-generator
diff --git a/samples/server/petstore/php-slim4/lib/Model/ModelList.php b/samples/server/petstore/php-slim4/lib/Model/ModelList.php
index 48c984dad6c..47e836fbb54 100644
--- a/samples/server/petstore/php-slim4/lib/Model/ModelList.php
+++ b/samples/server/petstore/php-slim4/lib/Model/ModelList.php
@@ -1,15 +1,20 @@
 <?php
 
 /**
- * ModelList
+ * OpenAPI Petstore
+ * PHP version 7.2
  *
- * PHP version 7.1
- *
- * @package OpenAPIServer\Model
+ * @package OpenAPIServer
  * @author  OpenAPI Generator team
  * @link    https://github.com/openapitools/openapi-generator
  */
 
+/**
+ * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
+ * The version of the OpenAPI document: 1.0.0
+ * Generated by: https://github.com/openapitools/openapi-generator.git
+ */
+
 /**
  * NOTE: This class is auto generated by the openapi generator program.
  * https://github.com/openapitools/openapi-generator
diff --git a/samples/server/petstore/php-slim4/lib/Model/ModelReturn.php b/samples/server/petstore/php-slim4/lib/Model/ModelReturn.php
index b56717e60a8..fa9bbd9080a 100644
--- a/samples/server/petstore/php-slim4/lib/Model/ModelReturn.php
+++ b/samples/server/petstore/php-slim4/lib/Model/ModelReturn.php
@@ -1,15 +1,20 @@
 <?php
 
 /**
- * ModelReturn
+ * OpenAPI Petstore
+ * PHP version 7.2
  *
- * PHP version 7.1
- *
- * @package OpenAPIServer\Model
+ * @package OpenAPIServer
  * @author  OpenAPI Generator team
  * @link    https://github.com/openapitools/openapi-generator
  */
 
+/**
+ * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
+ * The version of the OpenAPI document: 1.0.0
+ * Generated by: https://github.com/openapitools/openapi-generator.git
+ */
+
 /**
  * NOTE: This class is auto generated by the openapi generator program.
  * https://github.com/openapitools/openapi-generator
diff --git a/samples/server/petstore/php-slim4/lib/Model/Name.php b/samples/server/petstore/php-slim4/lib/Model/Name.php
index 4eca6a4b6b0..d5d78f7d250 100644
--- a/samples/server/petstore/php-slim4/lib/Model/Name.php
+++ b/samples/server/petstore/php-slim4/lib/Model/Name.php
@@ -1,15 +1,20 @@
 <?php
 
 /**
- * Name
+ * OpenAPI Petstore
+ * PHP version 7.2
  *
- * PHP version 7.1
- *
- * @package OpenAPIServer\Model
+ * @package OpenAPIServer
  * @author  OpenAPI Generator team
  * @link    https://github.com/openapitools/openapi-generator
  */
 
+/**
+ * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
+ * The version of the OpenAPI document: 1.0.0
+ * Generated by: https://github.com/openapitools/openapi-generator.git
+ */
+
 /**
  * NOTE: This class is auto generated by the openapi generator program.
  * https://github.com/openapitools/openapi-generator
diff --git a/samples/server/petstore/php-slim4/lib/Model/NumberOnly.php b/samples/server/petstore/php-slim4/lib/Model/NumberOnly.php
index 89a47886edc..a9bde99d138 100644
--- a/samples/server/petstore/php-slim4/lib/Model/NumberOnly.php
+++ b/samples/server/petstore/php-slim4/lib/Model/NumberOnly.php
@@ -1,15 +1,20 @@
 <?php
 
 /**
- * NumberOnly
+ * OpenAPI Petstore
+ * PHP version 7.2
  *
- * PHP version 7.1
- *
- * @package OpenAPIServer\Model
+ * @package OpenAPIServer
  * @author  OpenAPI Generator team
  * @link    https://github.com/openapitools/openapi-generator
  */
 
+/**
+ * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
+ * The version of the OpenAPI document: 1.0.0
+ * Generated by: https://github.com/openapitools/openapi-generator.git
+ */
+
 /**
  * NOTE: This class is auto generated by the openapi generator program.
  * https://github.com/openapitools/openapi-generator
diff --git a/samples/server/petstore/php-slim4/lib/Model/Order.php b/samples/server/petstore/php-slim4/lib/Model/Order.php
index e8227de89ad..4042756aed4 100644
--- a/samples/server/petstore/php-slim4/lib/Model/Order.php
+++ b/samples/server/petstore/php-slim4/lib/Model/Order.php
@@ -1,15 +1,20 @@
 <?php
 
 /**
- * Order
+ * OpenAPI Petstore
+ * PHP version 7.2
  *
- * PHP version 7.1
- *
- * @package OpenAPIServer\Model
+ * @package OpenAPIServer
  * @author  OpenAPI Generator team
  * @link    https://github.com/openapitools/openapi-generator
  */
 
+/**
+ * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
+ * The version of the OpenAPI document: 1.0.0
+ * Generated by: https://github.com/openapitools/openapi-generator.git
+ */
+
 /**
  * NOTE: This class is auto generated by the openapi generator program.
  * https://github.com/openapitools/openapi-generator
diff --git a/samples/server/petstore/php-slim4/lib/Model/OuterComposite.php b/samples/server/petstore/php-slim4/lib/Model/OuterComposite.php
index 277df1f035f..95316f2a366 100644
--- a/samples/server/petstore/php-slim4/lib/Model/OuterComposite.php
+++ b/samples/server/petstore/php-slim4/lib/Model/OuterComposite.php
@@ -1,15 +1,20 @@
 <?php
 
 /**
- * OuterComposite
+ * OpenAPI Petstore
+ * PHP version 7.2
  *
- * PHP version 7.1
- *
- * @package OpenAPIServer\Model
+ * @package OpenAPIServer
  * @author  OpenAPI Generator team
  * @link    https://github.com/openapitools/openapi-generator
  */
 
+/**
+ * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
+ * The version of the OpenAPI document: 1.0.0
+ * Generated by: https://github.com/openapitools/openapi-generator.git
+ */
+
 /**
  * NOTE: This class is auto generated by the openapi generator program.
  * https://github.com/openapitools/openapi-generator
diff --git a/samples/server/petstore/php-slim4/lib/Model/OuterEnum.php b/samples/server/petstore/php-slim4/lib/Model/OuterEnum.php
index ac9d21d4606..f18335d1ec7 100644
--- a/samples/server/petstore/php-slim4/lib/Model/OuterEnum.php
+++ b/samples/server/petstore/php-slim4/lib/Model/OuterEnum.php
@@ -1,15 +1,20 @@
 <?php
 
 /**
- * OuterEnum
+ * OpenAPI Petstore
+ * PHP version 7.2
  *
- * PHP version 7.1
- *
- * @package OpenAPIServer\Model
+ * @package OpenAPIServer
  * @author  OpenAPI Generator team
  * @link    https://github.com/openapitools/openapi-generator
  */
 
+/**
+ * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
+ * The version of the OpenAPI document: 1.0.0
+ * Generated by: https://github.com/openapitools/openapi-generator.git
+ */
+
 /**
  * NOTE: This class is auto generated by the openapi generator program.
  * https://github.com/openapitools/openapi-generator
diff --git a/samples/server/petstore/php-slim4/lib/Model/Pet.php b/samples/server/petstore/php-slim4/lib/Model/Pet.php
index d81f045abe8..3ebe441eced 100644
--- a/samples/server/petstore/php-slim4/lib/Model/Pet.php
+++ b/samples/server/petstore/php-slim4/lib/Model/Pet.php
@@ -1,15 +1,20 @@
 <?php
 
 /**
- * Pet
+ * OpenAPI Petstore
+ * PHP version 7.2
  *
- * PHP version 7.1
- *
- * @package OpenAPIServer\Model
+ * @package OpenAPIServer
  * @author  OpenAPI Generator team
  * @link    https://github.com/openapitools/openapi-generator
  */
 
+/**
+ * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
+ * The version of the OpenAPI document: 1.0.0
+ * Generated by: https://github.com/openapitools/openapi-generator.git
+ */
+
 /**
  * NOTE: This class is auto generated by the openapi generator program.
  * https://github.com/openapitools/openapi-generator
diff --git a/samples/server/petstore/php-slim4/lib/Model/ReadOnlyFirst.php b/samples/server/petstore/php-slim4/lib/Model/ReadOnlyFirst.php
index 5ab8ee48389..7969234205d 100644
--- a/samples/server/petstore/php-slim4/lib/Model/ReadOnlyFirst.php
+++ b/samples/server/petstore/php-slim4/lib/Model/ReadOnlyFirst.php
@@ -1,15 +1,20 @@
 <?php
 
 /**
- * ReadOnlyFirst
+ * OpenAPI Petstore
+ * PHP version 7.2
  *
- * PHP version 7.1
- *
- * @package OpenAPIServer\Model
+ * @package OpenAPIServer
  * @author  OpenAPI Generator team
  * @link    https://github.com/openapitools/openapi-generator
  */
 
+/**
+ * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
+ * The version of the OpenAPI document: 1.0.0
+ * Generated by: https://github.com/openapitools/openapi-generator.git
+ */
+
 /**
  * NOTE: This class is auto generated by the openapi generator program.
  * https://github.com/openapitools/openapi-generator
diff --git a/samples/server/petstore/php-slim4/lib/Model/SpecialModelName.php b/samples/server/petstore/php-slim4/lib/Model/SpecialModelName.php
index e22f746884b..ce4df79f24e 100644
--- a/samples/server/petstore/php-slim4/lib/Model/SpecialModelName.php
+++ b/samples/server/petstore/php-slim4/lib/Model/SpecialModelName.php
@@ -1,15 +1,20 @@
 <?php
 
 /**
- * SpecialModelName
+ * OpenAPI Petstore
+ * PHP version 7.2
  *
- * PHP version 7.1
- *
- * @package OpenAPIServer\Model
+ * @package OpenAPIServer
  * @author  OpenAPI Generator team
  * @link    https://github.com/openapitools/openapi-generator
  */
 
+/**
+ * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
+ * The version of the OpenAPI document: 1.0.0
+ * Generated by: https://github.com/openapitools/openapi-generator.git
+ */
+
 /**
  * NOTE: This class is auto generated by the openapi generator program.
  * https://github.com/openapitools/openapi-generator
diff --git a/samples/server/petstore/php-slim4/lib/Model/Tag.php b/samples/server/petstore/php-slim4/lib/Model/Tag.php
index 6a7078552ac..97b444dfe11 100644
--- a/samples/server/petstore/php-slim4/lib/Model/Tag.php
+++ b/samples/server/petstore/php-slim4/lib/Model/Tag.php
@@ -1,15 +1,20 @@
 <?php
 
 /**
- * Tag
+ * OpenAPI Petstore
+ * PHP version 7.2
  *
- * PHP version 7.1
- *
- * @package OpenAPIServer\Model
+ * @package OpenAPIServer
  * @author  OpenAPI Generator team
  * @link    https://github.com/openapitools/openapi-generator
  */
 
+/**
+ * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
+ * The version of the OpenAPI document: 1.0.0
+ * Generated by: https://github.com/openapitools/openapi-generator.git
+ */
+
 /**
  * NOTE: This class is auto generated by the openapi generator program.
  * https://github.com/openapitools/openapi-generator
diff --git a/samples/server/petstore/php-slim4/lib/Model/TypeHolderDefault.php b/samples/server/petstore/php-slim4/lib/Model/TypeHolderDefault.php
index 2a4e87d43ef..cbbd6cdb891 100644
--- a/samples/server/petstore/php-slim4/lib/Model/TypeHolderDefault.php
+++ b/samples/server/petstore/php-slim4/lib/Model/TypeHolderDefault.php
@@ -1,15 +1,20 @@
 <?php
 
 /**
- * TypeHolderDefault
+ * OpenAPI Petstore
+ * PHP version 7.2
  *
- * PHP version 7.1
- *
- * @package OpenAPIServer\Model
+ * @package OpenAPIServer
  * @author  OpenAPI Generator team
  * @link    https://github.com/openapitools/openapi-generator
  */
 
+/**
+ * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
+ * The version of the OpenAPI document: 1.0.0
+ * Generated by: https://github.com/openapitools/openapi-generator.git
+ */
+
 /**
  * NOTE: This class is auto generated by the openapi generator program.
  * https://github.com/openapitools/openapi-generator
diff --git a/samples/server/petstore/php-slim4/lib/Model/TypeHolderExample.php b/samples/server/petstore/php-slim4/lib/Model/TypeHolderExample.php
index 958e3260757..5c3f067b227 100644
--- a/samples/server/petstore/php-slim4/lib/Model/TypeHolderExample.php
+++ b/samples/server/petstore/php-slim4/lib/Model/TypeHolderExample.php
@@ -1,15 +1,20 @@
 <?php
 
 /**
- * TypeHolderExample
+ * OpenAPI Petstore
+ * PHP version 7.2
  *
- * PHP version 7.1
- *
- * @package OpenAPIServer\Model
+ * @package OpenAPIServer
  * @author  OpenAPI Generator team
  * @link    https://github.com/openapitools/openapi-generator
  */
 
+/**
+ * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
+ * The version of the OpenAPI document: 1.0.0
+ * Generated by: https://github.com/openapitools/openapi-generator.git
+ */
+
 /**
  * NOTE: This class is auto generated by the openapi generator program.
  * https://github.com/openapitools/openapi-generator
diff --git a/samples/server/petstore/php-slim4/lib/Model/User.php b/samples/server/petstore/php-slim4/lib/Model/User.php
index ebd8f17ae35..1be6c8be158 100644
--- a/samples/server/petstore/php-slim4/lib/Model/User.php
+++ b/samples/server/petstore/php-slim4/lib/Model/User.php
@@ -1,15 +1,20 @@
 <?php
 
 /**
- * User
+ * OpenAPI Petstore
+ * PHP version 7.2
  *
- * PHP version 7.1
- *
- * @package OpenAPIServer\Model
+ * @package OpenAPIServer
  * @author  OpenAPI Generator team
  * @link    https://github.com/openapitools/openapi-generator
  */
 
+/**
+ * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
+ * The version of the OpenAPI document: 1.0.0
+ * Generated by: https://github.com/openapitools/openapi-generator.git
+ */
+
 /**
  * NOTE: This class is auto generated by the openapi generator program.
  * https://github.com/openapitools/openapi-generator
diff --git a/samples/server/petstore/php-slim4/lib/Model/XmlItem.php b/samples/server/petstore/php-slim4/lib/Model/XmlItem.php
index a63fc642646..fe98fc703ee 100644
--- a/samples/server/petstore/php-slim4/lib/Model/XmlItem.php
+++ b/samples/server/petstore/php-slim4/lib/Model/XmlItem.php
@@ -1,15 +1,20 @@
 <?php
 
 /**
- * XmlItem
+ * OpenAPI Petstore
+ * PHP version 7.2
  *
- * PHP version 7.1
- *
- * @package OpenAPIServer\Model
+ * @package OpenAPIServer
  * @author  OpenAPI Generator team
  * @link    https://github.com/openapitools/openapi-generator
  */
 
+/**
+ * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
+ * The version of the OpenAPI document: 1.0.0
+ * Generated by: https://github.com/openapitools/openapi-generator.git
+ */
+
 /**
  * NOTE: This class is auto generated by the openapi generator program.
  * https://github.com/openapitools/openapi-generator
diff --git a/samples/server/petstore/php-slim4/lib/SlimRouter.php b/samples/server/petstore/php-slim4/lib/SlimRouter.php
index ea386ac1332..20168a4aed9 100644
--- a/samples/server/petstore/php-slim4/lib/SlimRouter.php
+++ b/samples/server/petstore/php-slim4/lib/SlimRouter.php
@@ -1,9 +1,8 @@
 <?php
 
 /**
- * SlimRouter
- *
- * PHP version 7.1
+ * OpenAPI Petstore
+ * PHP version 7.2
  *
  * @package OpenAPIServer
  * @author  OpenAPI Generator team
@@ -11,8 +10,6 @@
  */
 
 /**
- * OpenAPI Petstore
- *
  * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
  * The version of the OpenAPI document: 1.0.0
  * Generated by: https://github.com/openapitools/openapi-generator.git
@@ -62,7 +59,7 @@ class SlimRouter
             'userClassname' => 'AnotherFakeApi',
             'operationId' => 'call123TestSpecialTags',
             'responses' => [
-                'default' => [
+                '200' => [
                     'code' => 200,
                     'message' => 'successful operation',
                     'jsonSchema' => '{
@@ -89,7 +86,7 @@ class SlimRouter
             'userClassname' => 'FakeApi',
             'operationId' => 'createXmlItem',
             'responses' => [
-                'default' => [
+                '200' => [
                     'code' => 200,
                     'message' => 'successful operation',
                     'jsonSchema' => '{
@@ -110,7 +107,7 @@ class SlimRouter
             'userClassname' => 'FakeApi',
             'operationId' => 'fakeOuterBooleanSerialize',
             'responses' => [
-                'default' => [
+                '200' => [
                     'code' => 200,
                     'message' => 'Output boolean',
                     'jsonSchema' => '{
@@ -137,7 +134,7 @@ class SlimRouter
             'userClassname' => 'FakeApi',
             'operationId' => 'fakeOuterCompositeSerialize',
             'responses' => [
-                'default' => [
+                '200' => [
                     'code' => 200,
                     'message' => 'Output composite',
                     'jsonSchema' => '{
@@ -164,7 +161,7 @@ class SlimRouter
             'userClassname' => 'FakeApi',
             'operationId' => 'fakeOuterNumberSerialize',
             'responses' => [
-                'default' => [
+                '200' => [
                     'code' => 200,
                     'message' => 'Output number',
                     'jsonSchema' => '{
@@ -191,7 +188,7 @@ class SlimRouter
             'userClassname' => 'FakeApi',
             'operationId' => 'fakeOuterStringSerialize',
             'responses' => [
-                'default' => [
+                '200' => [
                     'code' => 200,
                     'message' => 'Output string',
                     'jsonSchema' => '{
@@ -218,7 +215,7 @@ class SlimRouter
             'userClassname' => 'FakeApi',
             'operationId' => 'testBodyWithFileSchema',
             'responses' => [
-                'default' => [
+                '200' => [
                     'code' => 200,
                     'message' => 'Success',
                     'jsonSchema' => '{
@@ -239,7 +236,7 @@ class SlimRouter
             'userClassname' => 'FakeApi',
             'operationId' => 'testBodyWithQueryParams',
             'responses' => [
-                'default' => [
+                '200' => [
                     'code' => 200,
                     'message' => 'Success',
                     'jsonSchema' => '{
@@ -260,7 +257,7 @@ class SlimRouter
             'userClassname' => 'FakeApi',
             'operationId' => 'testClientModel',
             'responses' => [
-                'default' => [
+                '200' => [
                     'code' => 200,
                     'message' => 'successful operation',
                     'jsonSchema' => '{
@@ -374,7 +371,7 @@ class SlimRouter
             'userClassname' => 'FakeApi',
             'operationId' => 'testInlineAdditionalProperties',
             'responses' => [
-                'default' => [
+                '200' => [
                     'code' => 200,
                     'message' => 'successful operation',
                     'jsonSchema' => '{
@@ -395,7 +392,7 @@ class SlimRouter
             'userClassname' => 'FakeApi',
             'operationId' => 'testJsonFormData',
             'responses' => [
-                'default' => [
+                '200' => [
                     'code' => 200,
                     'message' => 'successful operation',
                     'jsonSchema' => '{
@@ -416,7 +413,7 @@ class SlimRouter
             'userClassname' => 'FakeApi',
             'operationId' => 'testQueryParameterCollectionFormat',
             'responses' => [
-                'default' => [
+                '200' => [
                     'code' => 200,
                     'message' => 'Success',
                     'jsonSchema' => '{
@@ -437,7 +434,7 @@ class SlimRouter
             'userClassname' => 'FakeClassnameTags123Api',
             'operationId' => 'testClassname',
             'responses' => [
-                'default' => [
+                '200' => [
                     'code' => 200,
                     'message' => 'successful operation',
                     'jsonSchema' => '{
@@ -476,7 +473,7 @@ class SlimRouter
             'userClassname' => 'PetApi',
             'operationId' => 'addPet',
             'responses' => [
-                'default' => [
+                '200' => [
                     'code' => 200,
                     'message' => 'successful operation',
                     'jsonSchema' => '{
@@ -517,7 +514,7 @@ class SlimRouter
             'userClassname' => 'PetApi',
             'operationId' => 'findPetsByStatus',
             'responses' => [
-                'default' => [
+                '200' => [
                     'code' => 200,
                     'message' => 'successful operation',
                     'jsonSchema' => '{
@@ -575,7 +572,7 @@ class SlimRouter
             'userClassname' => 'PetApi',
             'operationId' => 'findPetsByTags',
             'responses' => [
-                'default' => [
+                '200' => [
                     'code' => 200,
                     'message' => 'successful operation',
                     'jsonSchema' => '{
@@ -635,7 +632,7 @@ class SlimRouter
             'userClassname' => 'PetApi',
             'operationId' => 'updatePet',
             'responses' => [
-                'default' => [
+                '200' => [
                     'code' => 200,
                     'message' => 'successful operation',
                     'jsonSchema' => '{
@@ -692,7 +689,7 @@ class SlimRouter
             'userClassname' => 'PetApi',
             'operationId' => 'deletePet',
             'responses' => [
-                'default' => [
+                '200' => [
                     'code' => 200,
                     'message' => 'successful operation',
                     'jsonSchema' => '{
@@ -733,7 +730,7 @@ class SlimRouter
             'userClassname' => 'PetApi',
             'operationId' => 'getPetById',
             'responses' => [
-                'default' => [
+                '200' => [
                     'code' => 200,
                     'message' => 'successful operation',
                     'jsonSchema' => '{
@@ -826,7 +823,7 @@ class SlimRouter
             'userClassname' => 'PetApi',
             'operationId' => 'uploadFile',
             'responses' => [
-                'default' => [
+                '200' => [
                     'code' => 200,
                     'message' => 'successful operation',
                     'jsonSchema' => '{
@@ -865,7 +862,7 @@ class SlimRouter
             'userClassname' => 'PetApi',
             'operationId' => 'uploadFileWithRequiredFile',
             'responses' => [
-                'default' => [
+                '200' => [
                     'code' => 200,
                     'message' => 'successful operation',
                     'jsonSchema' => '{
@@ -904,7 +901,7 @@ class SlimRouter
             'userClassname' => 'StoreApi',
             'operationId' => 'getInventory',
             'responses' => [
-                'default' => [
+                '200' => [
                     'code' => 200,
                     'message' => 'successful operation',
                     'jsonSchema' => '{
@@ -947,7 +944,7 @@ class SlimRouter
             'userClassname' => 'StoreApi',
             'operationId' => 'placeOrder',
             'responses' => [
-                'default' => [
+                '200' => [
                     'code' => 200,
                     'message' => 'successful operation',
                     'jsonSchema' => '{
@@ -1016,7 +1013,7 @@ class SlimRouter
             'userClassname' => 'StoreApi',
             'operationId' => 'getOrderById',
             'responses' => [
-                'default' => [
+                '200' => [
                     'code' => 200,
                     'message' => 'successful operation',
                     'jsonSchema' => '{
@@ -1127,7 +1124,7 @@ class SlimRouter
             'userClassname' => 'UserApi',
             'operationId' => 'loginUser',
             'responses' => [
-                'default' => [
+                '200' => [
                     'code' => 200,
                     'message' => 'successful operation',
                     'jsonSchema' => '{
@@ -1233,7 +1230,7 @@ class SlimRouter
             'userClassname' => 'UserApi',
             'operationId' => 'getUserByName',
             'responses' => [
-                'default' => [
+                '200' => [
                     'code' => 200,
                     'message' => 'successful operation',
                     'jsonSchema' => '{
diff --git a/samples/server/petstore/php-slim4/lib/Utils/ModelUtilsTrait.php b/samples/server/petstore/php-slim4/lib/Utils/ModelUtilsTrait.php
index 97bb2ae884a..5eb771b9484 100644
--- a/samples/server/petstore/php-slim4/lib/Utils/ModelUtilsTrait.php
+++ b/samples/server/petstore/php-slim4/lib/Utils/ModelUtilsTrait.php
@@ -1,9 +1,8 @@
 <?php
 
 /**
- * ModelUtilsTrait
- *
- * PHP version 7.1
+ * OpenAPI Petstore
+ * PHP version 7.2
  *
  * @package OpenAPIServer
  * @author  OpenAPI Generator team
@@ -11,8 +10,6 @@
  */
 
 /**
- * OpenAPI Petstore
- *
  * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
  * The version of the OpenAPI document: 1.0.0
  * Generated by: https://github.com/openapitools/openapi-generator.git
diff --git a/samples/server/petstore/php-slim4/lib/Utils/StringUtilsTrait.php b/samples/server/petstore/php-slim4/lib/Utils/StringUtilsTrait.php
index bd0464fa598..a56088aeb3d 100644
--- a/samples/server/petstore/php-slim4/lib/Utils/StringUtilsTrait.php
+++ b/samples/server/petstore/php-slim4/lib/Utils/StringUtilsTrait.php
@@ -1,9 +1,8 @@
 <?php
 
 /**
- * StringUtilsTrait
- *
- * PHP version 7.1
+ * OpenAPI Petstore
+ * PHP version 7.2
  *
  * @package OpenAPIServer
  * @author  OpenAPI Generator team
@@ -11,8 +10,6 @@
  */
 
 /**
- * OpenAPI Petstore
- *
  * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
  * The version of the OpenAPI document: 1.0.0
  * Generated by: https://github.com/openapitools/openapi-generator.git
diff --git a/samples/server/petstore/php-slim4/phpunit.xml.dist b/samples/server/petstore/php-slim4/phpunit.xml.dist
index d0904268796..6af1442ee65 100644
--- a/samples/server/petstore/php-slim4/phpunit.xml.dist
+++ b/samples/server/petstore/php-slim4/phpunit.xml.dist
@@ -17,19 +17,11 @@
         <testsuite name="Models">
             <directory>./test/Model</directory>
         </testsuite>
-        <testsuite name="Mock">
-            <directory>./test/Mock</directory>
-        </testsuite>
-        <testsuite name="Utils">
-            <directory>./test/Utils</directory>
-        </testsuite>
     </testsuites>
     <filter>
         <whitelist processUncoveredFilesFromWhitelist="true">
             <directory suffix=".php">./lib/Api</directory>
             <directory suffix=".php">./lib/Model</directory>
-            <directory suffix=".php">./lib/Mock</directory>
-            <directory suffix=".php">./lib/Utils</directory>
         </whitelist>
     </filter>
     <php>
diff --git a/samples/server/petstore/php-slim4/test/Api/AnotherFakeApiTest.php b/samples/server/petstore/php-slim4/test/Api/AnotherFakeApiTest.php
index 25bca78aa0f..14b6cf86da4 100644
--- a/samples/server/petstore/php-slim4/test/Api/AnotherFakeApiTest.php
+++ b/samples/server/petstore/php-slim4/test/Api/AnotherFakeApiTest.php
@@ -1,18 +1,15 @@
 <?php
 
 /**
- * AnotherFakeApiTest
+ * OpenAPI Petstore
+ * PHP version 7.2
  *
- * PHP version 7.1
- *
- * @package OpenAPIServer\Api
+ * @package OpenAPIServer
  * @author  OpenAPI Generator team
  * @link    https://github.com/openapitools/openapi-generator
  */
 
 /**
- * OpenAPI Petstore
- *
  * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
  * The version of the OpenAPI document: 1.0.0
  * Generated by: https://github.com/openapitools/openapi-generator.git
@@ -43,28 +40,28 @@ class AnotherFakeApiTest extends TestCase
     /**
      * Setup before running any test cases
      */
-    public static function setUpBeforeClass()
+    public static function setUpBeforeClass(): void
     {
     }
 
     /**
      * Setup before running each test case
      */
-    public function setUp()
+    public function setUp(): void
     {
     }
 
     /**
      * Clean up after running each test case
      */
-    public function tearDown()
+    public function tearDown(): void
     {
     }
 
     /**
      * Clean up after running all test cases
      */
-    public static function tearDownAfterClass()
+    public static function tearDownAfterClass(): void
     {
     }
 
diff --git a/samples/server/petstore/php-slim4/test/Api/FakeApiTest.php b/samples/server/petstore/php-slim4/test/Api/FakeApiTest.php
index 80ff4f4c82f..edd9084c902 100644
--- a/samples/server/petstore/php-slim4/test/Api/FakeApiTest.php
+++ b/samples/server/petstore/php-slim4/test/Api/FakeApiTest.php
@@ -1,18 +1,15 @@
 <?php
 
 /**
- * FakeApiTest
+ * OpenAPI Petstore
+ * PHP version 7.2
  *
- * PHP version 7.1
- *
- * @package OpenAPIServer\Api
+ * @package OpenAPIServer
  * @author  OpenAPI Generator team
  * @link    https://github.com/openapitools/openapi-generator
  */
 
 /**
- * OpenAPI Petstore
- *
  * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
  * The version of the OpenAPI document: 1.0.0
  * Generated by: https://github.com/openapitools/openapi-generator.git
@@ -43,28 +40,28 @@ class FakeApiTest extends TestCase
     /**
      * Setup before running any test cases
      */
-    public static function setUpBeforeClass()
+    public static function setUpBeforeClass(): void
     {
     }
 
     /**
      * Setup before running each test case
      */
-    public function setUp()
+    public function setUp(): void
     {
     }
 
     /**
      * Clean up after running each test case
      */
-    public function tearDown()
+    public function tearDown(): void
     {
     }
 
     /**
      * Clean up after running all test cases
      */
-    public static function tearDownAfterClass()
+    public static function tearDownAfterClass(): void
     {
     }
 
diff --git a/samples/server/petstore/php-slim4/test/Api/FakeClassnameTags123ApiTest.php b/samples/server/petstore/php-slim4/test/Api/FakeClassnameTags123ApiTest.php
index c41ab163d31..b65dbc6fa80 100644
--- a/samples/server/petstore/php-slim4/test/Api/FakeClassnameTags123ApiTest.php
+++ b/samples/server/petstore/php-slim4/test/Api/FakeClassnameTags123ApiTest.php
@@ -1,18 +1,15 @@
 <?php
 
 /**
- * FakeClassnameTags123ApiTest
+ * OpenAPI Petstore
+ * PHP version 7.2
  *
- * PHP version 7.1
- *
- * @package OpenAPIServer\Api
+ * @package OpenAPIServer
  * @author  OpenAPI Generator team
  * @link    https://github.com/openapitools/openapi-generator
  */
 
 /**
- * OpenAPI Petstore
- *
  * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
  * The version of the OpenAPI document: 1.0.0
  * Generated by: https://github.com/openapitools/openapi-generator.git
@@ -43,28 +40,28 @@ class FakeClassnameTags123ApiTest extends TestCase
     /**
      * Setup before running any test cases
      */
-    public static function setUpBeforeClass()
+    public static function setUpBeforeClass(): void
     {
     }
 
     /**
      * Setup before running each test case
      */
-    public function setUp()
+    public function setUp(): void
     {
     }
 
     /**
      * Clean up after running each test case
      */
-    public function tearDown()
+    public function tearDown(): void
     {
     }
 
     /**
      * Clean up after running all test cases
      */
-    public static function tearDownAfterClass()
+    public static function tearDownAfterClass(): void
     {
     }
 
diff --git a/samples/server/petstore/php-slim4/test/Api/PetApiTest.php b/samples/server/petstore/php-slim4/test/Api/PetApiTest.php
index 6b8bf152a4f..3e70bd0fc13 100644
--- a/samples/server/petstore/php-slim4/test/Api/PetApiTest.php
+++ b/samples/server/petstore/php-slim4/test/Api/PetApiTest.php
@@ -1,18 +1,15 @@
 <?php
 
 /**
- * PetApiTest
+ * OpenAPI Petstore
+ * PHP version 7.2
  *
- * PHP version 7.1
- *
- * @package OpenAPIServer\Api
+ * @package OpenAPIServer
  * @author  OpenAPI Generator team
  * @link    https://github.com/openapitools/openapi-generator
  */
 
 /**
- * OpenAPI Petstore
- *
  * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
  * The version of the OpenAPI document: 1.0.0
  * Generated by: https://github.com/openapitools/openapi-generator.git
@@ -43,28 +40,28 @@ class PetApiTest extends TestCase
     /**
      * Setup before running any test cases
      */
-    public static function setUpBeforeClass()
+    public static function setUpBeforeClass(): void
     {
     }
 
     /**
      * Setup before running each test case
      */
-    public function setUp()
+    public function setUp(): void
     {
     }
 
     /**
      * Clean up after running each test case
      */
-    public function tearDown()
+    public function tearDown(): void
     {
     }
 
     /**
      * Clean up after running all test cases
      */
-    public static function tearDownAfterClass()
+    public static function tearDownAfterClass(): void
     {
     }
 
diff --git a/samples/server/petstore/php-slim4/test/Api/StoreApiTest.php b/samples/server/petstore/php-slim4/test/Api/StoreApiTest.php
index 5d76133c0d3..9dc0458710a 100644
--- a/samples/server/petstore/php-slim4/test/Api/StoreApiTest.php
+++ b/samples/server/petstore/php-slim4/test/Api/StoreApiTest.php
@@ -1,18 +1,15 @@
 <?php
 
 /**
- * StoreApiTest
+ * OpenAPI Petstore
+ * PHP version 7.2
  *
- * PHP version 7.1
- *
- * @package OpenAPIServer\Api
+ * @package OpenAPIServer
  * @author  OpenAPI Generator team
  * @link    https://github.com/openapitools/openapi-generator
  */
 
 /**
- * OpenAPI Petstore
- *
  * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
  * The version of the OpenAPI document: 1.0.0
  * Generated by: https://github.com/openapitools/openapi-generator.git
@@ -43,28 +40,28 @@ class StoreApiTest extends TestCase
     /**
      * Setup before running any test cases
      */
-    public static function setUpBeforeClass()
+    public static function setUpBeforeClass(): void
     {
     }
 
     /**
      * Setup before running each test case
      */
-    public function setUp()
+    public function setUp(): void
     {
     }
 
     /**
      * Clean up after running each test case
      */
-    public function tearDown()
+    public function tearDown(): void
     {
     }
 
     /**
      * Clean up after running all test cases
      */
-    public static function tearDownAfterClass()
+    public static function tearDownAfterClass(): void
     {
     }
 
diff --git a/samples/server/petstore/php-slim4/test/Api/UserApiTest.php b/samples/server/petstore/php-slim4/test/Api/UserApiTest.php
index 33d7a298a64..dff950e444a 100644
--- a/samples/server/petstore/php-slim4/test/Api/UserApiTest.php
+++ b/samples/server/petstore/php-slim4/test/Api/UserApiTest.php
@@ -1,18 +1,15 @@
 <?php
 
 /**
- * UserApiTest
+ * OpenAPI Petstore
+ * PHP version 7.2
  *
- * PHP version 7.1
- *
- * @package OpenAPIServer\Api
+ * @package OpenAPIServer
  * @author  OpenAPI Generator team
  * @link    https://github.com/openapitools/openapi-generator
  */
 
 /**
- * OpenAPI Petstore
- *
  * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
  * The version of the OpenAPI document: 1.0.0
  * Generated by: https://github.com/openapitools/openapi-generator.git
@@ -43,28 +40,28 @@ class UserApiTest extends TestCase
     /**
      * Setup before running any test cases
      */
-    public static function setUpBeforeClass()
+    public static function setUpBeforeClass(): void
     {
     }
 
     /**
      * Setup before running each test case
      */
-    public function setUp()
+    public function setUp(): void
     {
     }
 
     /**
      * Clean up after running each test case
      */
-    public function tearDown()
+    public function tearDown(): void
     {
     }
 
     /**
      * Clean up after running all test cases
      */
-    public static function tearDownAfterClass()
+    public static function tearDownAfterClass(): void
     {
     }
 
diff --git a/samples/server/petstore/php-slim4/test/Mock/OpenApiDataMockerMiddlewareTest.php b/samples/server/petstore/php-slim4/test/Mock/OpenApiDataMockerMiddlewareTest.php
index 67dbc36fd32..88ec0405126 100644
--- a/samples/server/petstore/php-slim4/test/Mock/OpenApiDataMockerMiddlewareTest.php
+++ b/samples/server/petstore/php-slim4/test/Mock/OpenApiDataMockerMiddlewareTest.php
@@ -1,9 +1,8 @@
 <?php
 
 /**
- * OpenApiDataMockerMiddlewareTest
- *
- * PHP version 7.1
+ * OpenAPI Petstore
+ * PHP version 7.2
  *
  * @package OpenAPIServer
  * @author  OpenAPI Generator team
@@ -11,8 +10,6 @@
  */
 
 /**
- * OpenAPIServer
- *
  * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
  * The version of the OpenAPI document: 1.0.0
  * Generated by: https://github.com/openapitools/openapi-generator.git
diff --git a/samples/server/petstore/php-slim4/test/Mock/OpenApiDataMockerTest.php b/samples/server/petstore/php-slim4/test/Mock/OpenApiDataMockerTest.php
index eeb95d67d6e..9b387c0d9e9 100644
--- a/samples/server/petstore/php-slim4/test/Mock/OpenApiDataMockerTest.php
+++ b/samples/server/petstore/php-slim4/test/Mock/OpenApiDataMockerTest.php
@@ -1,9 +1,8 @@
 <?php
 
 /**
- * OpenApiDataMockerTest
- *
- * PHP version 7.1
+ * OpenAPI Petstore
+ * PHP version 7.2
  *
  * @package OpenAPIServer
  * @author  OpenAPI Generator team
@@ -11,8 +10,6 @@
  */
 
 /**
- * OpenAPI Petstore
- *
  * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
  * The version of the OpenAPI document: 1.0.0
  * Generated by: https://github.com/openapitools/openapi-generator.git
diff --git a/samples/server/petstore/php-slim4/test/Model/AdditionalPropertiesAnyTypeTest.php b/samples/server/petstore/php-slim4/test/Model/AdditionalPropertiesAnyTypeTest.php
index 002865b885d..f1b10207256 100644
--- a/samples/server/petstore/php-slim4/test/Model/AdditionalPropertiesAnyTypeTest.php
+++ b/samples/server/petstore/php-slim4/test/Model/AdditionalPropertiesAnyTypeTest.php
@@ -1,18 +1,15 @@
 <?php
 
 /**
- * AdditionalPropertiesAnyTypeTest
+ * OpenAPI Petstore
+ * PHP version 7.2
  *
- * PHP version 7.1
- *
- * @package OpenAPIServer\Model
+ * @package OpenAPIServer
  * @author  OpenAPI Generator team
  * @link    https://github.com/openapitools/openapi-generator
  */
 
 /**
- * OpenAPI Petstore
- *
  * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
  * The version of the OpenAPI document: 1.0.0
  * Generated by: https://github.com/openapitools/openapi-generator.git
@@ -43,28 +40,28 @@ class AdditionalPropertiesAnyTypeTest extends TestCase
     /**
      * Setup before running any test cases
      */
-    public static function setUpBeforeClass()
+    public static function setUpBeforeClass(): void
     {
     }
 
     /**
      * Setup before running each test case
      */
-    public function setUp()
+    public function setUp(): void
     {
     }
 
     /**
      * Clean up after running each test case
      */
-    public function tearDown()
+    public function tearDown(): void
     {
     }
 
     /**
      * Clean up after running all test cases
      */
-    public static function tearDownAfterClass()
+    public static function tearDownAfterClass(): void
     {
     }
 
diff --git a/samples/server/petstore/php-slim4/test/Model/AdditionalPropertiesArrayTest.php b/samples/server/petstore/php-slim4/test/Model/AdditionalPropertiesArrayTest.php
index a898fe10b1c..f00f52a9d4f 100644
--- a/samples/server/petstore/php-slim4/test/Model/AdditionalPropertiesArrayTest.php
+++ b/samples/server/petstore/php-slim4/test/Model/AdditionalPropertiesArrayTest.php
@@ -1,18 +1,15 @@
 <?php
 
 /**
- * AdditionalPropertiesArrayTest
+ * OpenAPI Petstore
+ * PHP version 7.2
  *
- * PHP version 7.1
- *
- * @package OpenAPIServer\Model
+ * @package OpenAPIServer
  * @author  OpenAPI Generator team
  * @link    https://github.com/openapitools/openapi-generator
  */
 
 /**
- * OpenAPI Petstore
- *
  * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
  * The version of the OpenAPI document: 1.0.0
  * Generated by: https://github.com/openapitools/openapi-generator.git
@@ -43,28 +40,28 @@ class AdditionalPropertiesArrayTest extends TestCase
     /**
      * Setup before running any test cases
      */
-    public static function setUpBeforeClass()
+    public static function setUpBeforeClass(): void
     {
     }
 
     /**
      * Setup before running each test case
      */
-    public function setUp()
+    public function setUp(): void
     {
     }
 
     /**
      * Clean up after running each test case
      */
-    public function tearDown()
+    public function tearDown(): void
     {
     }
 
     /**
      * Clean up after running all test cases
      */
-    public static function tearDownAfterClass()
+    public static function tearDownAfterClass(): void
     {
     }
 
diff --git a/samples/server/petstore/php-slim4/test/Model/AdditionalPropertiesBooleanTest.php b/samples/server/petstore/php-slim4/test/Model/AdditionalPropertiesBooleanTest.php
index 6d71f1f2882..aa045267f42 100644
--- a/samples/server/petstore/php-slim4/test/Model/AdditionalPropertiesBooleanTest.php
+++ b/samples/server/petstore/php-slim4/test/Model/AdditionalPropertiesBooleanTest.php
@@ -1,18 +1,15 @@
 <?php
 
 /**
- * AdditionalPropertiesBooleanTest
+ * OpenAPI Petstore
+ * PHP version 7.2
  *
- * PHP version 7.1
- *
- * @package OpenAPIServer\Model
+ * @package OpenAPIServer
  * @author  OpenAPI Generator team
  * @link    https://github.com/openapitools/openapi-generator
  */
 
 /**
- * OpenAPI Petstore
- *
  * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
  * The version of the OpenAPI document: 1.0.0
  * Generated by: https://github.com/openapitools/openapi-generator.git
@@ -43,28 +40,28 @@ class AdditionalPropertiesBooleanTest extends TestCase
     /**
      * Setup before running any test cases
      */
-    public static function setUpBeforeClass()
+    public static function setUpBeforeClass(): void
     {
     }
 
     /**
      * Setup before running each test case
      */
-    public function setUp()
+    public function setUp(): void
     {
     }
 
     /**
      * Clean up after running each test case
      */
-    public function tearDown()
+    public function tearDown(): void
     {
     }
 
     /**
      * Clean up after running all test cases
      */
-    public static function tearDownAfterClass()
+    public static function tearDownAfterClass(): void
     {
     }
 
diff --git a/samples/server/petstore/php-slim4/test/Model/AdditionalPropertiesClassTest.php b/samples/server/petstore/php-slim4/test/Model/AdditionalPropertiesClassTest.php
index 34bb7175572..03125132976 100644
--- a/samples/server/petstore/php-slim4/test/Model/AdditionalPropertiesClassTest.php
+++ b/samples/server/petstore/php-slim4/test/Model/AdditionalPropertiesClassTest.php
@@ -1,18 +1,15 @@
 <?php
 
 /**
- * AdditionalPropertiesClassTest
+ * OpenAPI Petstore
+ * PHP version 7.2
  *
- * PHP version 7.1
- *
- * @package OpenAPIServer\Model
+ * @package OpenAPIServer
  * @author  OpenAPI Generator team
  * @link    https://github.com/openapitools/openapi-generator
  */
 
 /**
- * OpenAPI Petstore
- *
  * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
  * The version of the OpenAPI document: 1.0.0
  * Generated by: https://github.com/openapitools/openapi-generator.git
@@ -43,28 +40,28 @@ class AdditionalPropertiesClassTest extends TestCase
     /**
      * Setup before running any test cases
      */
-    public static function setUpBeforeClass()
+    public static function setUpBeforeClass(): void
     {
     }
 
     /**
      * Setup before running each test case
      */
-    public function setUp()
+    public function setUp(): void
     {
     }
 
     /**
      * Clean up after running each test case
      */
-    public function tearDown()
+    public function tearDown(): void
     {
     }
 
     /**
      * Clean up after running all test cases
      */
-    public static function tearDownAfterClass()
+    public static function tearDownAfterClass(): void
     {
     }
 
diff --git a/samples/server/petstore/php-slim4/test/Model/AdditionalPropertiesIntegerTest.php b/samples/server/petstore/php-slim4/test/Model/AdditionalPropertiesIntegerTest.php
index dbec16f3a6a..c2c34445396 100644
--- a/samples/server/petstore/php-slim4/test/Model/AdditionalPropertiesIntegerTest.php
+++ b/samples/server/petstore/php-slim4/test/Model/AdditionalPropertiesIntegerTest.php
@@ -1,18 +1,15 @@
 <?php
 
 /**
- * AdditionalPropertiesIntegerTest
+ * OpenAPI Petstore
+ * PHP version 7.2
  *
- * PHP version 7.1
- *
- * @package OpenAPIServer\Model
+ * @package OpenAPIServer
  * @author  OpenAPI Generator team
  * @link    https://github.com/openapitools/openapi-generator
  */
 
 /**
- * OpenAPI Petstore
- *
  * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
  * The version of the OpenAPI document: 1.0.0
  * Generated by: https://github.com/openapitools/openapi-generator.git
@@ -43,28 +40,28 @@ class AdditionalPropertiesIntegerTest extends TestCase
     /**
      * Setup before running any test cases
      */
-    public static function setUpBeforeClass()
+    public static function setUpBeforeClass(): void
     {
     }
 
     /**
      * Setup before running each test case
      */
-    public function setUp()
+    public function setUp(): void
     {
     }
 
     /**
      * Clean up after running each test case
      */
-    public function tearDown()
+    public function tearDown(): void
     {
     }
 
     /**
      * Clean up after running all test cases
      */
-    public static function tearDownAfterClass()
+    public static function tearDownAfterClass(): void
     {
     }
 
diff --git a/samples/server/petstore/php-slim4/test/Model/AdditionalPropertiesNumberTest.php b/samples/server/petstore/php-slim4/test/Model/AdditionalPropertiesNumberTest.php
index c0d7859cb00..a5e439ce98f 100644
--- a/samples/server/petstore/php-slim4/test/Model/AdditionalPropertiesNumberTest.php
+++ b/samples/server/petstore/php-slim4/test/Model/AdditionalPropertiesNumberTest.php
@@ -1,18 +1,15 @@
 <?php
 
 /**
- * AdditionalPropertiesNumberTest
+ * OpenAPI Petstore
+ * PHP version 7.2
  *
- * PHP version 7.1
- *
- * @package OpenAPIServer\Model
+ * @package OpenAPIServer
  * @author  OpenAPI Generator team
  * @link    https://github.com/openapitools/openapi-generator
  */
 
 /**
- * OpenAPI Petstore
- *
  * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
  * The version of the OpenAPI document: 1.0.0
  * Generated by: https://github.com/openapitools/openapi-generator.git
@@ -43,28 +40,28 @@ class AdditionalPropertiesNumberTest extends TestCase
     /**
      * Setup before running any test cases
      */
-    public static function setUpBeforeClass()
+    public static function setUpBeforeClass(): void
     {
     }
 
     /**
      * Setup before running each test case
      */
-    public function setUp()
+    public function setUp(): void
     {
     }
 
     /**
      * Clean up after running each test case
      */
-    public function tearDown()
+    public function tearDown(): void
     {
     }
 
     /**
      * Clean up after running all test cases
      */
-    public static function tearDownAfterClass()
+    public static function tearDownAfterClass(): void
     {
     }
 
diff --git a/samples/server/petstore/php-slim4/test/Model/AdditionalPropertiesObjectTest.php b/samples/server/petstore/php-slim4/test/Model/AdditionalPropertiesObjectTest.php
index a28f9a263f2..5f03164b5ed 100644
--- a/samples/server/petstore/php-slim4/test/Model/AdditionalPropertiesObjectTest.php
+++ b/samples/server/petstore/php-slim4/test/Model/AdditionalPropertiesObjectTest.php
@@ -1,18 +1,15 @@
 <?php
 
 /**
- * AdditionalPropertiesObjectTest
+ * OpenAPI Petstore
+ * PHP version 7.2
  *
- * PHP version 7.1
- *
- * @package OpenAPIServer\Model
+ * @package OpenAPIServer
  * @author  OpenAPI Generator team
  * @link    https://github.com/openapitools/openapi-generator
  */
 
 /**
- * OpenAPI Petstore
- *
  * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
  * The version of the OpenAPI document: 1.0.0
  * Generated by: https://github.com/openapitools/openapi-generator.git
@@ -43,28 +40,28 @@ class AdditionalPropertiesObjectTest extends TestCase
     /**
      * Setup before running any test cases
      */
-    public static function setUpBeforeClass()
+    public static function setUpBeforeClass(): void
     {
     }
 
     /**
      * Setup before running each test case
      */
-    public function setUp()
+    public function setUp(): void
     {
     }
 
     /**
      * Clean up after running each test case
      */
-    public function tearDown()
+    public function tearDown(): void
     {
     }
 
     /**
      * Clean up after running all test cases
      */
-    public static function tearDownAfterClass()
+    public static function tearDownAfterClass(): void
     {
     }
 
diff --git a/samples/server/petstore/php-slim4/test/Model/AdditionalPropertiesStringTest.php b/samples/server/petstore/php-slim4/test/Model/AdditionalPropertiesStringTest.php
index 942914d3f9a..438bcafe84e 100644
--- a/samples/server/petstore/php-slim4/test/Model/AdditionalPropertiesStringTest.php
+++ b/samples/server/petstore/php-slim4/test/Model/AdditionalPropertiesStringTest.php
@@ -1,18 +1,15 @@
 <?php
 
 /**
- * AdditionalPropertiesStringTest
+ * OpenAPI Petstore
+ * PHP version 7.2
  *
- * PHP version 7.1
- *
- * @package OpenAPIServer\Model
+ * @package OpenAPIServer
  * @author  OpenAPI Generator team
  * @link    https://github.com/openapitools/openapi-generator
  */
 
 /**
- * OpenAPI Petstore
- *
  * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
  * The version of the OpenAPI document: 1.0.0
  * Generated by: https://github.com/openapitools/openapi-generator.git
@@ -43,28 +40,28 @@ class AdditionalPropertiesStringTest extends TestCase
     /**
      * Setup before running any test cases
      */
-    public static function setUpBeforeClass()
+    public static function setUpBeforeClass(): void
     {
     }
 
     /**
      * Setup before running each test case
      */
-    public function setUp()
+    public function setUp(): void
     {
     }
 
     /**
      * Clean up after running each test case
      */
-    public function tearDown()
+    public function tearDown(): void
     {
     }
 
     /**
      * Clean up after running all test cases
      */
-    public static function tearDownAfterClass()
+    public static function tearDownAfterClass(): void
     {
     }
 
diff --git a/samples/server/petstore/php-slim4/test/Model/AnimalTest.php b/samples/server/petstore/php-slim4/test/Model/AnimalTest.php
index 25a73eeb42d..4ca0be03ef4 100644
--- a/samples/server/petstore/php-slim4/test/Model/AnimalTest.php
+++ b/samples/server/petstore/php-slim4/test/Model/AnimalTest.php
@@ -1,18 +1,15 @@
 <?php
 
 /**
- * AnimalTest
+ * OpenAPI Petstore
+ * PHP version 7.2
  *
- * PHP version 7.1
- *
- * @package OpenAPIServer\Model
+ * @package OpenAPIServer
  * @author  OpenAPI Generator team
  * @link    https://github.com/openapitools/openapi-generator
  */
 
 /**
- * OpenAPI Petstore
- *
  * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
  * The version of the OpenAPI document: 1.0.0
  * Generated by: https://github.com/openapitools/openapi-generator.git
@@ -43,28 +40,28 @@ class AnimalTest extends TestCase
     /**
      * Setup before running any test cases
      */
-    public static function setUpBeforeClass()
+    public static function setUpBeforeClass(): void
     {
     }
 
     /**
      * Setup before running each test case
      */
-    public function setUp()
+    public function setUp(): void
     {
     }
 
     /**
      * Clean up after running each test case
      */
-    public function tearDown()
+    public function tearDown(): void
     {
     }
 
     /**
      * Clean up after running all test cases
      */
-    public static function tearDownAfterClass()
+    public static function tearDownAfterClass(): void
     {
     }
 
diff --git a/samples/server/petstore/php-slim4/test/Model/ApiResponseTest.php b/samples/server/petstore/php-slim4/test/Model/ApiResponseTest.php
index e2b981f8055..b62fc2f3252 100644
--- a/samples/server/petstore/php-slim4/test/Model/ApiResponseTest.php
+++ b/samples/server/petstore/php-slim4/test/Model/ApiResponseTest.php
@@ -1,18 +1,15 @@
 <?php
 
 /**
- * ApiResponseTest
+ * OpenAPI Petstore
+ * PHP version 7.2
  *
- * PHP version 7.1
- *
- * @package OpenAPIServer\Model
+ * @package OpenAPIServer
  * @author  OpenAPI Generator team
  * @link    https://github.com/openapitools/openapi-generator
  */
 
 /**
- * OpenAPI Petstore
- *
  * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
  * The version of the OpenAPI document: 1.0.0
  * Generated by: https://github.com/openapitools/openapi-generator.git
@@ -43,28 +40,28 @@ class ApiResponseTest extends TestCase
     /**
      * Setup before running any test cases
      */
-    public static function setUpBeforeClass()
+    public static function setUpBeforeClass(): void
     {
     }
 
     /**
      * Setup before running each test case
      */
-    public function setUp()
+    public function setUp(): void
     {
     }
 
     /**
      * Clean up after running each test case
      */
-    public function tearDown()
+    public function tearDown(): void
     {
     }
 
     /**
      * Clean up after running all test cases
      */
-    public static function tearDownAfterClass()
+    public static function tearDownAfterClass(): void
     {
     }
 
diff --git a/samples/server/petstore/php-slim4/test/Model/ArrayOfArrayOfNumberOnlyTest.php b/samples/server/petstore/php-slim4/test/Model/ArrayOfArrayOfNumberOnlyTest.php
index 534b18469e1..040882180ec 100644
--- a/samples/server/petstore/php-slim4/test/Model/ArrayOfArrayOfNumberOnlyTest.php
+++ b/samples/server/petstore/php-slim4/test/Model/ArrayOfArrayOfNumberOnlyTest.php
@@ -1,18 +1,15 @@
 <?php
 
 /**
- * ArrayOfArrayOfNumberOnlyTest
+ * OpenAPI Petstore
+ * PHP version 7.2
  *
- * PHP version 7.1
- *
- * @package OpenAPIServer\Model
+ * @package OpenAPIServer
  * @author  OpenAPI Generator team
  * @link    https://github.com/openapitools/openapi-generator
  */
 
 /**
- * OpenAPI Petstore
- *
  * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
  * The version of the OpenAPI document: 1.0.0
  * Generated by: https://github.com/openapitools/openapi-generator.git
@@ -43,28 +40,28 @@ class ArrayOfArrayOfNumberOnlyTest extends TestCase
     /**
      * Setup before running any test cases
      */
-    public static function setUpBeforeClass()
+    public static function setUpBeforeClass(): void
     {
     }
 
     /**
      * Setup before running each test case
      */
-    public function setUp()
+    public function setUp(): void
     {
     }
 
     /**
      * Clean up after running each test case
      */
-    public function tearDown()
+    public function tearDown(): void
     {
     }
 
     /**
      * Clean up after running all test cases
      */
-    public static function tearDownAfterClass()
+    public static function tearDownAfterClass(): void
     {
     }
 
diff --git a/samples/server/petstore/php-slim4/test/Model/ArrayOfNumberOnlyTest.php b/samples/server/petstore/php-slim4/test/Model/ArrayOfNumberOnlyTest.php
index d06d979cfe8..b77b2634067 100644
--- a/samples/server/petstore/php-slim4/test/Model/ArrayOfNumberOnlyTest.php
+++ b/samples/server/petstore/php-slim4/test/Model/ArrayOfNumberOnlyTest.php
@@ -1,18 +1,15 @@
 <?php
 
 /**
- * ArrayOfNumberOnlyTest
+ * OpenAPI Petstore
+ * PHP version 7.2
  *
- * PHP version 7.1
- *
- * @package OpenAPIServer\Model
+ * @package OpenAPIServer
  * @author  OpenAPI Generator team
  * @link    https://github.com/openapitools/openapi-generator
  */
 
 /**
- * OpenAPI Petstore
- *
  * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
  * The version of the OpenAPI document: 1.0.0
  * Generated by: https://github.com/openapitools/openapi-generator.git
@@ -43,28 +40,28 @@ class ArrayOfNumberOnlyTest extends TestCase
     /**
      * Setup before running any test cases
      */
-    public static function setUpBeforeClass()
+    public static function setUpBeforeClass(): void
     {
     }
 
     /**
      * Setup before running each test case
      */
-    public function setUp()
+    public function setUp(): void
     {
     }
 
     /**
      * Clean up after running each test case
      */
-    public function tearDown()
+    public function tearDown(): void
     {
     }
 
     /**
      * Clean up after running all test cases
      */
-    public static function tearDownAfterClass()
+    public static function tearDownAfterClass(): void
     {
     }
 
diff --git a/samples/server/petstore/php-slim4/test/Model/ArrayTestTest.php b/samples/server/petstore/php-slim4/test/Model/ArrayTestTest.php
index 8ee5a228205..6f49e40e2ec 100644
--- a/samples/server/petstore/php-slim4/test/Model/ArrayTestTest.php
+++ b/samples/server/petstore/php-slim4/test/Model/ArrayTestTest.php
@@ -1,18 +1,15 @@
 <?php
 
 /**
- * ArrayTestTest
+ * OpenAPI Petstore
+ * PHP version 7.2
  *
- * PHP version 7.1
- *
- * @package OpenAPIServer\Model
+ * @package OpenAPIServer
  * @author  OpenAPI Generator team
  * @link    https://github.com/openapitools/openapi-generator
  */
 
 /**
- * OpenAPI Petstore
- *
  * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
  * The version of the OpenAPI document: 1.0.0
  * Generated by: https://github.com/openapitools/openapi-generator.git
@@ -43,28 +40,28 @@ class ArrayTestTest extends TestCase
     /**
      * Setup before running any test cases
      */
-    public static function setUpBeforeClass()
+    public static function setUpBeforeClass(): void
     {
     }
 
     /**
      * Setup before running each test case
      */
-    public function setUp()
+    public function setUp(): void
     {
     }
 
     /**
      * Clean up after running each test case
      */
-    public function tearDown()
+    public function tearDown(): void
     {
     }
 
     /**
      * Clean up after running all test cases
      */
-    public static function tearDownAfterClass()
+    public static function tearDownAfterClass(): void
     {
     }
 
diff --git a/samples/server/petstore/php-slim4/test/Model/BigCatAllOfTest.php b/samples/server/petstore/php-slim4/test/Model/BigCatAllOfTest.php
index daad6d31175..4b4f1667f6c 100644
--- a/samples/server/petstore/php-slim4/test/Model/BigCatAllOfTest.php
+++ b/samples/server/petstore/php-slim4/test/Model/BigCatAllOfTest.php
@@ -1,18 +1,15 @@
 <?php
 
 /**
- * BigCatAllOfTest
+ * OpenAPI Petstore
+ * PHP version 7.2
  *
- * PHP version 7.1
- *
- * @package OpenAPIServer\Model
+ * @package OpenAPIServer
  * @author  OpenAPI Generator team
  * @link    https://github.com/openapitools/openapi-generator
  */
 
 /**
- * OpenAPI Petstore
- *
  * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
  * The version of the OpenAPI document: 1.0.0
  * Generated by: https://github.com/openapitools/openapi-generator.git
@@ -43,28 +40,28 @@ class BigCatAllOfTest extends TestCase
     /**
      * Setup before running any test cases
      */
-    public static function setUpBeforeClass()
+    public static function setUpBeforeClass(): void
     {
     }
 
     /**
      * Setup before running each test case
      */
-    public function setUp()
+    public function setUp(): void
     {
     }
 
     /**
      * Clean up after running each test case
      */
-    public function tearDown()
+    public function tearDown(): void
     {
     }
 
     /**
      * Clean up after running all test cases
      */
-    public static function tearDownAfterClass()
+    public static function tearDownAfterClass(): void
     {
     }
 
diff --git a/samples/server/petstore/php-slim4/test/Model/BigCatTest.php b/samples/server/petstore/php-slim4/test/Model/BigCatTest.php
index c4775d9d565..cd8bf23092c 100644
--- a/samples/server/petstore/php-slim4/test/Model/BigCatTest.php
+++ b/samples/server/petstore/php-slim4/test/Model/BigCatTest.php
@@ -1,18 +1,15 @@
 <?php
 
 /**
- * BigCatTest
+ * OpenAPI Petstore
+ * PHP version 7.2
  *
- * PHP version 7.1
- *
- * @package OpenAPIServer\Model
+ * @package OpenAPIServer
  * @author  OpenAPI Generator team
  * @link    https://github.com/openapitools/openapi-generator
  */
 
 /**
- * OpenAPI Petstore
- *
  * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
  * The version of the OpenAPI document: 1.0.0
  * Generated by: https://github.com/openapitools/openapi-generator.git
@@ -43,28 +40,28 @@ class BigCatTest extends TestCase
     /**
      * Setup before running any test cases
      */
-    public static function setUpBeforeClass()
+    public static function setUpBeforeClass(): void
     {
     }
 
     /**
      * Setup before running each test case
      */
-    public function setUp()
+    public function setUp(): void
     {
     }
 
     /**
      * Clean up after running each test case
      */
-    public function tearDown()
+    public function tearDown(): void
     {
     }
 
     /**
      * Clean up after running all test cases
      */
-    public static function tearDownAfterClass()
+    public static function tearDownAfterClass(): void
     {
     }
 
diff --git a/samples/server/petstore/php-slim4/test/Model/CapitalizationTest.php b/samples/server/petstore/php-slim4/test/Model/CapitalizationTest.php
index 9acb2fe1d1a..692eb56d209 100644
--- a/samples/server/petstore/php-slim4/test/Model/CapitalizationTest.php
+++ b/samples/server/petstore/php-slim4/test/Model/CapitalizationTest.php
@@ -1,18 +1,15 @@
 <?php
 
 /**
- * CapitalizationTest
+ * OpenAPI Petstore
+ * PHP version 7.2
  *
- * PHP version 7.1
- *
- * @package OpenAPIServer\Model
+ * @package OpenAPIServer
  * @author  OpenAPI Generator team
  * @link    https://github.com/openapitools/openapi-generator
  */
 
 /**
- * OpenAPI Petstore
- *
  * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
  * The version of the OpenAPI document: 1.0.0
  * Generated by: https://github.com/openapitools/openapi-generator.git
@@ -43,28 +40,28 @@ class CapitalizationTest extends TestCase
     /**
      * Setup before running any test cases
      */
-    public static function setUpBeforeClass()
+    public static function setUpBeforeClass(): void
     {
     }
 
     /**
      * Setup before running each test case
      */
-    public function setUp()
+    public function setUp(): void
     {
     }
 
     /**
      * Clean up after running each test case
      */
-    public function tearDown()
+    public function tearDown(): void
     {
     }
 
     /**
      * Clean up after running all test cases
      */
-    public static function tearDownAfterClass()
+    public static function tearDownAfterClass(): void
     {
     }
 
diff --git a/samples/server/petstore/php-slim4/test/Model/CatAllOfTest.php b/samples/server/petstore/php-slim4/test/Model/CatAllOfTest.php
index ab504fb0677..81957f4c253 100644
--- a/samples/server/petstore/php-slim4/test/Model/CatAllOfTest.php
+++ b/samples/server/petstore/php-slim4/test/Model/CatAllOfTest.php
@@ -1,18 +1,15 @@
 <?php
 
 /**
- * CatAllOfTest
+ * OpenAPI Petstore
+ * PHP version 7.2
  *
- * PHP version 7.1
- *
- * @package OpenAPIServer\Model
+ * @package OpenAPIServer
  * @author  OpenAPI Generator team
  * @link    https://github.com/openapitools/openapi-generator
  */
 
 /**
- * OpenAPI Petstore
- *
  * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
  * The version of the OpenAPI document: 1.0.0
  * Generated by: https://github.com/openapitools/openapi-generator.git
@@ -43,28 +40,28 @@ class CatAllOfTest extends TestCase
     /**
      * Setup before running any test cases
      */
-    public static function setUpBeforeClass()
+    public static function setUpBeforeClass(): void
     {
     }
 
     /**
      * Setup before running each test case
      */
-    public function setUp()
+    public function setUp(): void
     {
     }
 
     /**
      * Clean up after running each test case
      */
-    public function tearDown()
+    public function tearDown(): void
     {
     }
 
     /**
      * Clean up after running all test cases
      */
-    public static function tearDownAfterClass()
+    public static function tearDownAfterClass(): void
     {
     }
 
diff --git a/samples/server/petstore/php-slim4/test/Model/CatTest.php b/samples/server/petstore/php-slim4/test/Model/CatTest.php
index 50b27fcc60c..cae780deb23 100644
--- a/samples/server/petstore/php-slim4/test/Model/CatTest.php
+++ b/samples/server/petstore/php-slim4/test/Model/CatTest.php
@@ -1,18 +1,15 @@
 <?php
 
 /**
- * CatTest
+ * OpenAPI Petstore
+ * PHP version 7.2
  *
- * PHP version 7.1
- *
- * @package OpenAPIServer\Model
+ * @package OpenAPIServer
  * @author  OpenAPI Generator team
  * @link    https://github.com/openapitools/openapi-generator
  */
 
 /**
- * OpenAPI Petstore
- *
  * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
  * The version of the OpenAPI document: 1.0.0
  * Generated by: https://github.com/openapitools/openapi-generator.git
@@ -43,28 +40,28 @@ class CatTest extends TestCase
     /**
      * Setup before running any test cases
      */
-    public static function setUpBeforeClass()
+    public static function setUpBeforeClass(): void
     {
     }
 
     /**
      * Setup before running each test case
      */
-    public function setUp()
+    public function setUp(): void
     {
     }
 
     /**
      * Clean up after running each test case
      */
-    public function tearDown()
+    public function tearDown(): void
     {
     }
 
     /**
      * Clean up after running all test cases
      */
-    public static function tearDownAfterClass()
+    public static function tearDownAfterClass(): void
     {
     }
 
diff --git a/samples/server/petstore/php-slim4/test/Model/CategoryTest.php b/samples/server/petstore/php-slim4/test/Model/CategoryTest.php
index f95f233d3c5..b494919f769 100644
--- a/samples/server/petstore/php-slim4/test/Model/CategoryTest.php
+++ b/samples/server/petstore/php-slim4/test/Model/CategoryTest.php
@@ -1,18 +1,15 @@
 <?php
 
 /**
- * CategoryTest
+ * OpenAPI Petstore
+ * PHP version 7.2
  *
- * PHP version 7.1
- *
- * @package OpenAPIServer\Model
+ * @package OpenAPIServer
  * @author  OpenAPI Generator team
  * @link    https://github.com/openapitools/openapi-generator
  */
 
 /**
- * OpenAPI Petstore
- *
  * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
  * The version of the OpenAPI document: 1.0.0
  * Generated by: https://github.com/openapitools/openapi-generator.git
@@ -43,28 +40,28 @@ class CategoryTest extends TestCase
     /**
      * Setup before running any test cases
      */
-    public static function setUpBeforeClass()
+    public static function setUpBeforeClass(): void
     {
     }
 
     /**
      * Setup before running each test case
      */
-    public function setUp()
+    public function setUp(): void
     {
     }
 
     /**
      * Clean up after running each test case
      */
-    public function tearDown()
+    public function tearDown(): void
     {
     }
 
     /**
      * Clean up after running all test cases
      */
-    public static function tearDownAfterClass()
+    public static function tearDownAfterClass(): void
     {
     }
 
diff --git a/samples/server/petstore/php-slim4/test/Model/ClassModelTest.php b/samples/server/petstore/php-slim4/test/Model/ClassModelTest.php
index 47b5b0bcf1b..44549d3378f 100644
--- a/samples/server/petstore/php-slim4/test/Model/ClassModelTest.php
+++ b/samples/server/petstore/php-slim4/test/Model/ClassModelTest.php
@@ -1,18 +1,15 @@
 <?php
 
 /**
- * ClassModelTest
+ * OpenAPI Petstore
+ * PHP version 7.2
  *
- * PHP version 7.1
- *
- * @package OpenAPIServer\Model
+ * @package OpenAPIServer
  * @author  OpenAPI Generator team
  * @link    https://github.com/openapitools/openapi-generator
  */
 
 /**
- * OpenAPI Petstore
- *
  * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
  * The version of the OpenAPI document: 1.0.0
  * Generated by: https://github.com/openapitools/openapi-generator.git
@@ -43,28 +40,28 @@ class ClassModelTest extends TestCase
     /**
      * Setup before running any test cases
      */
-    public static function setUpBeforeClass()
+    public static function setUpBeforeClass(): void
     {
     }
 
     /**
      * Setup before running each test case
      */
-    public function setUp()
+    public function setUp(): void
     {
     }
 
     /**
      * Clean up after running each test case
      */
-    public function tearDown()
+    public function tearDown(): void
     {
     }
 
     /**
      * Clean up after running all test cases
      */
-    public static function tearDownAfterClass()
+    public static function tearDownAfterClass(): void
     {
     }
 
diff --git a/samples/server/petstore/php-slim4/test/Model/ClientTest.php b/samples/server/petstore/php-slim4/test/Model/ClientTest.php
index 177d14a2ad3..2ba029877d0 100644
--- a/samples/server/petstore/php-slim4/test/Model/ClientTest.php
+++ b/samples/server/petstore/php-slim4/test/Model/ClientTest.php
@@ -1,18 +1,15 @@
 <?php
 
 /**
- * ClientTest
+ * OpenAPI Petstore
+ * PHP version 7.2
  *
- * PHP version 7.1
- *
- * @package OpenAPIServer\Model
+ * @package OpenAPIServer
  * @author  OpenAPI Generator team
  * @link    https://github.com/openapitools/openapi-generator
  */
 
 /**
- * OpenAPI Petstore
- *
  * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
  * The version of the OpenAPI document: 1.0.0
  * Generated by: https://github.com/openapitools/openapi-generator.git
@@ -43,28 +40,28 @@ class ClientTest extends TestCase
     /**
      * Setup before running any test cases
      */
-    public static function setUpBeforeClass()
+    public static function setUpBeforeClass(): void
     {
     }
 
     /**
      * Setup before running each test case
      */
-    public function setUp()
+    public function setUp(): void
     {
     }
 
     /**
      * Clean up after running each test case
      */
-    public function tearDown()
+    public function tearDown(): void
     {
     }
 
     /**
      * Clean up after running all test cases
      */
-    public static function tearDownAfterClass()
+    public static function tearDownAfterClass(): void
     {
     }
 
diff --git a/samples/server/petstore/php-slim4/test/Model/DogAllOfTest.php b/samples/server/petstore/php-slim4/test/Model/DogAllOfTest.php
index 70c217a41a9..b9a102b409e 100644
--- a/samples/server/petstore/php-slim4/test/Model/DogAllOfTest.php
+++ b/samples/server/petstore/php-slim4/test/Model/DogAllOfTest.php
@@ -1,18 +1,15 @@
 <?php
 
 /**
- * DogAllOfTest
+ * OpenAPI Petstore
+ * PHP version 7.2
  *
- * PHP version 7.1
- *
- * @package OpenAPIServer\Model
+ * @package OpenAPIServer
  * @author  OpenAPI Generator team
  * @link    https://github.com/openapitools/openapi-generator
  */
 
 /**
- * OpenAPI Petstore
- *
  * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
  * The version of the OpenAPI document: 1.0.0
  * Generated by: https://github.com/openapitools/openapi-generator.git
@@ -43,28 +40,28 @@ class DogAllOfTest extends TestCase
     /**
      * Setup before running any test cases
      */
-    public static function setUpBeforeClass()
+    public static function setUpBeforeClass(): void
     {
     }
 
     /**
      * Setup before running each test case
      */
-    public function setUp()
+    public function setUp(): void
     {
     }
 
     /**
      * Clean up after running each test case
      */
-    public function tearDown()
+    public function tearDown(): void
     {
     }
 
     /**
      * Clean up after running all test cases
      */
-    public static function tearDownAfterClass()
+    public static function tearDownAfterClass(): void
     {
     }
 
diff --git a/samples/server/petstore/php-slim4/test/Model/DogTest.php b/samples/server/petstore/php-slim4/test/Model/DogTest.php
index c59a75521c0..96845d82673 100644
--- a/samples/server/petstore/php-slim4/test/Model/DogTest.php
+++ b/samples/server/petstore/php-slim4/test/Model/DogTest.php
@@ -1,18 +1,15 @@
 <?php
 
 /**
- * DogTest
+ * OpenAPI Petstore
+ * PHP version 7.2
  *
- * PHP version 7.1
- *
- * @package OpenAPIServer\Model
+ * @package OpenAPIServer
  * @author  OpenAPI Generator team
  * @link    https://github.com/openapitools/openapi-generator
  */
 
 /**
- * OpenAPI Petstore
- *
  * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
  * The version of the OpenAPI document: 1.0.0
  * Generated by: https://github.com/openapitools/openapi-generator.git
@@ -43,28 +40,28 @@ class DogTest extends TestCase
     /**
      * Setup before running any test cases
      */
-    public static function setUpBeforeClass()
+    public static function setUpBeforeClass(): void
     {
     }
 
     /**
      * Setup before running each test case
      */
-    public function setUp()
+    public function setUp(): void
     {
     }
 
     /**
      * Clean up after running each test case
      */
-    public function tearDown()
+    public function tearDown(): void
     {
     }
 
     /**
      * Clean up after running all test cases
      */
-    public static function tearDownAfterClass()
+    public static function tearDownAfterClass(): void
     {
     }
 
diff --git a/samples/server/petstore/php-slim4/test/Model/EnumArraysTest.php b/samples/server/petstore/php-slim4/test/Model/EnumArraysTest.php
index 0259445d28d..4375e9a7c30 100644
--- a/samples/server/petstore/php-slim4/test/Model/EnumArraysTest.php
+++ b/samples/server/petstore/php-slim4/test/Model/EnumArraysTest.php
@@ -1,18 +1,15 @@
 <?php
 
 /**
- * EnumArraysTest
+ * OpenAPI Petstore
+ * PHP version 7.2
  *
- * PHP version 7.1
- *
- * @package OpenAPIServer\Model
+ * @package OpenAPIServer
  * @author  OpenAPI Generator team
  * @link    https://github.com/openapitools/openapi-generator
  */
 
 /**
- * OpenAPI Petstore
- *
  * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
  * The version of the OpenAPI document: 1.0.0
  * Generated by: https://github.com/openapitools/openapi-generator.git
@@ -43,28 +40,28 @@ class EnumArraysTest extends TestCase
     /**
      * Setup before running any test cases
      */
-    public static function setUpBeforeClass()
+    public static function setUpBeforeClass(): void
     {
     }
 
     /**
      * Setup before running each test case
      */
-    public function setUp()
+    public function setUp(): void
     {
     }
 
     /**
      * Clean up after running each test case
      */
-    public function tearDown()
+    public function tearDown(): void
     {
     }
 
     /**
      * Clean up after running all test cases
      */
-    public static function tearDownAfterClass()
+    public static function tearDownAfterClass(): void
     {
     }
 
diff --git a/samples/server/petstore/php-slim4/test/Model/EnumClassTest.php b/samples/server/petstore/php-slim4/test/Model/EnumClassTest.php
index 20dd3d274ba..9a226bf7077 100644
--- a/samples/server/petstore/php-slim4/test/Model/EnumClassTest.php
+++ b/samples/server/petstore/php-slim4/test/Model/EnumClassTest.php
@@ -1,18 +1,15 @@
 <?php
 
 /**
- * EnumClassTest
+ * OpenAPI Petstore
+ * PHP version 7.2
  *
- * PHP version 7.1
- *
- * @package OpenAPIServer\Model
+ * @package OpenAPIServer
  * @author  OpenAPI Generator team
  * @link    https://github.com/openapitools/openapi-generator
  */
 
 /**
- * OpenAPI Petstore
- *
  * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
  * The version of the OpenAPI document: 1.0.0
  * Generated by: https://github.com/openapitools/openapi-generator.git
@@ -43,28 +40,28 @@ class EnumClassTest extends TestCase
     /**
      * Setup before running any test cases
      */
-    public static function setUpBeforeClass()
+    public static function setUpBeforeClass(): void
     {
     }
 
     /**
      * Setup before running each test case
      */
-    public function setUp()
+    public function setUp(): void
     {
     }
 
     /**
      * Clean up after running each test case
      */
-    public function tearDown()
+    public function tearDown(): void
     {
     }
 
     /**
      * Clean up after running all test cases
      */
-    public static function tearDownAfterClass()
+    public static function tearDownAfterClass(): void
     {
     }
 
diff --git a/samples/server/petstore/php-slim4/test/Model/EnumTestTest.php b/samples/server/petstore/php-slim4/test/Model/EnumTestTest.php
index 6f6adeba263..96142f7e665 100644
--- a/samples/server/petstore/php-slim4/test/Model/EnumTestTest.php
+++ b/samples/server/petstore/php-slim4/test/Model/EnumTestTest.php
@@ -1,18 +1,15 @@
 <?php
 
 /**
- * EnumTestTest
+ * OpenAPI Petstore
+ * PHP version 7.2
  *
- * PHP version 7.1
- *
- * @package OpenAPIServer\Model
+ * @package OpenAPIServer
  * @author  OpenAPI Generator team
  * @link    https://github.com/openapitools/openapi-generator
  */
 
 /**
- * OpenAPI Petstore
- *
  * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
  * The version of the OpenAPI document: 1.0.0
  * Generated by: https://github.com/openapitools/openapi-generator.git
@@ -43,28 +40,28 @@ class EnumTestTest extends TestCase
     /**
      * Setup before running any test cases
      */
-    public static function setUpBeforeClass()
+    public static function setUpBeforeClass(): void
     {
     }
 
     /**
      * Setup before running each test case
      */
-    public function setUp()
+    public function setUp(): void
     {
     }
 
     /**
      * Clean up after running each test case
      */
-    public function tearDown()
+    public function tearDown(): void
     {
     }
 
     /**
      * Clean up after running all test cases
      */
-    public static function tearDownAfterClass()
+    public static function tearDownAfterClass(): void
     {
     }
 
diff --git a/samples/server/petstore/php-slim4/test/Model/FileSchemaTestClassTest.php b/samples/server/petstore/php-slim4/test/Model/FileSchemaTestClassTest.php
index abdda8087e2..656891ee583 100644
--- a/samples/server/petstore/php-slim4/test/Model/FileSchemaTestClassTest.php
+++ b/samples/server/petstore/php-slim4/test/Model/FileSchemaTestClassTest.php
@@ -1,18 +1,15 @@
 <?php
 
 /**
- * FileSchemaTestClassTest
+ * OpenAPI Petstore
+ * PHP version 7.2
  *
- * PHP version 7.1
- *
- * @package OpenAPIServer\Model
+ * @package OpenAPIServer
  * @author  OpenAPI Generator team
  * @link    https://github.com/openapitools/openapi-generator
  */
 
 /**
- * OpenAPI Petstore
- *
  * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
  * The version of the OpenAPI document: 1.0.0
  * Generated by: https://github.com/openapitools/openapi-generator.git
@@ -43,28 +40,28 @@ class FileSchemaTestClassTest extends TestCase
     /**
      * Setup before running any test cases
      */
-    public static function setUpBeforeClass()
+    public static function setUpBeforeClass(): void
     {
     }
 
     /**
      * Setup before running each test case
      */
-    public function setUp()
+    public function setUp(): void
     {
     }
 
     /**
      * Clean up after running each test case
      */
-    public function tearDown()
+    public function tearDown(): void
     {
     }
 
     /**
      * Clean up after running all test cases
      */
-    public static function tearDownAfterClass()
+    public static function tearDownAfterClass(): void
     {
     }
 
diff --git a/samples/server/petstore/php-slim4/test/Model/FileTest.php b/samples/server/petstore/php-slim4/test/Model/FileTest.php
index 941465c80cc..22d5778585f 100644
--- a/samples/server/petstore/php-slim4/test/Model/FileTest.php
+++ b/samples/server/petstore/php-slim4/test/Model/FileTest.php
@@ -1,18 +1,15 @@
 <?php
 
 /**
- * FileTest
+ * OpenAPI Petstore
+ * PHP version 7.2
  *
- * PHP version 7.1
- *
- * @package OpenAPIServer\Model
+ * @package OpenAPIServer
  * @author  OpenAPI Generator team
  * @link    https://github.com/openapitools/openapi-generator
  */
 
 /**
- * OpenAPI Petstore
- *
  * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
  * The version of the OpenAPI document: 1.0.0
  * Generated by: https://github.com/openapitools/openapi-generator.git
@@ -43,28 +40,28 @@ class FileTest extends TestCase
     /**
      * Setup before running any test cases
      */
-    public static function setUpBeforeClass()
+    public static function setUpBeforeClass(): void
     {
     }
 
     /**
      * Setup before running each test case
      */
-    public function setUp()
+    public function setUp(): void
     {
     }
 
     /**
      * Clean up after running each test case
      */
-    public function tearDown()
+    public function tearDown(): void
     {
     }
 
     /**
      * Clean up after running all test cases
      */
-    public static function tearDownAfterClass()
+    public static function tearDownAfterClass(): void
     {
     }
 
diff --git a/samples/server/petstore/php-slim4/test/Model/FormatTestTest.php b/samples/server/petstore/php-slim4/test/Model/FormatTestTest.php
index 1fe35f995bf..bd01053d801 100644
--- a/samples/server/petstore/php-slim4/test/Model/FormatTestTest.php
+++ b/samples/server/petstore/php-slim4/test/Model/FormatTestTest.php
@@ -1,18 +1,15 @@
 <?php
 
 /**
- * FormatTestTest
+ * OpenAPI Petstore
+ * PHP version 7.2
  *
- * PHP version 7.1
- *
- * @package OpenAPIServer\Model
+ * @package OpenAPIServer
  * @author  OpenAPI Generator team
  * @link    https://github.com/openapitools/openapi-generator
  */
 
 /**
- * OpenAPI Petstore
- *
  * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
  * The version of the OpenAPI document: 1.0.0
  * Generated by: https://github.com/openapitools/openapi-generator.git
@@ -43,28 +40,28 @@ class FormatTestTest extends TestCase
     /**
      * Setup before running any test cases
      */
-    public static function setUpBeforeClass()
+    public static function setUpBeforeClass(): void
     {
     }
 
     /**
      * Setup before running each test case
      */
-    public function setUp()
+    public function setUp(): void
     {
     }
 
     /**
      * Clean up after running each test case
      */
-    public function tearDown()
+    public function tearDown(): void
     {
     }
 
     /**
      * Clean up after running all test cases
      */
-    public static function tearDownAfterClass()
+    public static function tearDownAfterClass(): void
     {
     }
 
diff --git a/samples/server/petstore/php-slim4/test/Model/HasOnlyReadOnlyTest.php b/samples/server/petstore/php-slim4/test/Model/HasOnlyReadOnlyTest.php
index 2f7b4832008..c691248c370 100644
--- a/samples/server/petstore/php-slim4/test/Model/HasOnlyReadOnlyTest.php
+++ b/samples/server/petstore/php-slim4/test/Model/HasOnlyReadOnlyTest.php
@@ -1,18 +1,15 @@
 <?php
 
 /**
- * HasOnlyReadOnlyTest
+ * OpenAPI Petstore
+ * PHP version 7.2
  *
- * PHP version 7.1
- *
- * @package OpenAPIServer\Model
+ * @package OpenAPIServer
  * @author  OpenAPI Generator team
  * @link    https://github.com/openapitools/openapi-generator
  */
 
 /**
- * OpenAPI Petstore
- *
  * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
  * The version of the OpenAPI document: 1.0.0
  * Generated by: https://github.com/openapitools/openapi-generator.git
@@ -43,28 +40,28 @@ class HasOnlyReadOnlyTest extends TestCase
     /**
      * Setup before running any test cases
      */
-    public static function setUpBeforeClass()
+    public static function setUpBeforeClass(): void
     {
     }
 
     /**
      * Setup before running each test case
      */
-    public function setUp()
+    public function setUp(): void
     {
     }
 
     /**
      * Clean up after running each test case
      */
-    public function tearDown()
+    public function tearDown(): void
     {
     }
 
     /**
      * Clean up after running all test cases
      */
-    public static function tearDownAfterClass()
+    public static function tearDownAfterClass(): void
     {
     }
 
diff --git a/samples/server/petstore/php-slim4/test/Model/MapTestTest.php b/samples/server/petstore/php-slim4/test/Model/MapTestTest.php
index 605137aec54..a430539ee2b 100644
--- a/samples/server/petstore/php-slim4/test/Model/MapTestTest.php
+++ b/samples/server/petstore/php-slim4/test/Model/MapTestTest.php
@@ -1,18 +1,15 @@
 <?php
 
 /**
- * MapTestTest
+ * OpenAPI Petstore
+ * PHP version 7.2
  *
- * PHP version 7.1
- *
- * @package OpenAPIServer\Model
+ * @package OpenAPIServer
  * @author  OpenAPI Generator team
  * @link    https://github.com/openapitools/openapi-generator
  */
 
 /**
- * OpenAPI Petstore
- *
  * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
  * The version of the OpenAPI document: 1.0.0
  * Generated by: https://github.com/openapitools/openapi-generator.git
@@ -43,28 +40,28 @@ class MapTestTest extends TestCase
     /**
      * Setup before running any test cases
      */
-    public static function setUpBeforeClass()
+    public static function setUpBeforeClass(): void
     {
     }
 
     /**
      * Setup before running each test case
      */
-    public function setUp()
+    public function setUp(): void
     {
     }
 
     /**
      * Clean up after running each test case
      */
-    public function tearDown()
+    public function tearDown(): void
     {
     }
 
     /**
      * Clean up after running all test cases
      */
-    public static function tearDownAfterClass()
+    public static function tearDownAfterClass(): void
     {
     }
 
diff --git a/samples/server/petstore/php-slim4/test/Model/MixedPropertiesAndAdditionalPropertiesClassTest.php b/samples/server/petstore/php-slim4/test/Model/MixedPropertiesAndAdditionalPropertiesClassTest.php
index 38c9f55cf4b..62a43f1288b 100644
--- a/samples/server/petstore/php-slim4/test/Model/MixedPropertiesAndAdditionalPropertiesClassTest.php
+++ b/samples/server/petstore/php-slim4/test/Model/MixedPropertiesAndAdditionalPropertiesClassTest.php
@@ -1,18 +1,15 @@
 <?php
 
 /**
- * MixedPropertiesAndAdditionalPropertiesClassTest
+ * OpenAPI Petstore
+ * PHP version 7.2
  *
- * PHP version 7.1
- *
- * @package OpenAPIServer\Model
+ * @package OpenAPIServer
  * @author  OpenAPI Generator team
  * @link    https://github.com/openapitools/openapi-generator
  */
 
 /**
- * OpenAPI Petstore
- *
  * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
  * The version of the OpenAPI document: 1.0.0
  * Generated by: https://github.com/openapitools/openapi-generator.git
@@ -43,28 +40,28 @@ class MixedPropertiesAndAdditionalPropertiesClassTest extends TestCase
     /**
      * Setup before running any test cases
      */
-    public static function setUpBeforeClass()
+    public static function setUpBeforeClass(): void
     {
     }
 
     /**
      * Setup before running each test case
      */
-    public function setUp()
+    public function setUp(): void
     {
     }
 
     /**
      * Clean up after running each test case
      */
-    public function tearDown()
+    public function tearDown(): void
     {
     }
 
     /**
      * Clean up after running all test cases
      */
-    public static function tearDownAfterClass()
+    public static function tearDownAfterClass(): void
     {
     }
 
diff --git a/samples/server/petstore/php-slim4/test/Model/Model200ResponseTest.php b/samples/server/petstore/php-slim4/test/Model/Model200ResponseTest.php
index 18c1f34bd62..7c4478be005 100644
--- a/samples/server/petstore/php-slim4/test/Model/Model200ResponseTest.php
+++ b/samples/server/petstore/php-slim4/test/Model/Model200ResponseTest.php
@@ -1,18 +1,15 @@
 <?php
 
 /**
- * Model200ResponseTest
+ * OpenAPI Petstore
+ * PHP version 7.2
  *
- * PHP version 7.1
- *
- * @package OpenAPIServer\Model
+ * @package OpenAPIServer
  * @author  OpenAPI Generator team
  * @link    https://github.com/openapitools/openapi-generator
  */
 
 /**
- * OpenAPI Petstore
- *
  * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
  * The version of the OpenAPI document: 1.0.0
  * Generated by: https://github.com/openapitools/openapi-generator.git
@@ -43,28 +40,28 @@ class Model200ResponseTest extends TestCase
     /**
      * Setup before running any test cases
      */
-    public static function setUpBeforeClass()
+    public static function setUpBeforeClass(): void
     {
     }
 
     /**
      * Setup before running each test case
      */
-    public function setUp()
+    public function setUp(): void
     {
     }
 
     /**
      * Clean up after running each test case
      */
-    public function tearDown()
+    public function tearDown(): void
     {
     }
 
     /**
      * Clean up after running all test cases
      */
-    public static function tearDownAfterClass()
+    public static function tearDownAfterClass(): void
     {
     }
 
diff --git a/samples/server/petstore/php-slim4/test/Model/ModelListTest.php b/samples/server/petstore/php-slim4/test/Model/ModelListTest.php
index c6a6bdafcec..c1b1b98c9c0 100644
--- a/samples/server/petstore/php-slim4/test/Model/ModelListTest.php
+++ b/samples/server/petstore/php-slim4/test/Model/ModelListTest.php
@@ -1,18 +1,15 @@
 <?php
 
 /**
- * ModelListTest
+ * OpenAPI Petstore
+ * PHP version 7.2
  *
- * PHP version 7.1
- *
- * @package OpenAPIServer\Model
+ * @package OpenAPIServer
  * @author  OpenAPI Generator team
  * @link    https://github.com/openapitools/openapi-generator
  */
 
 /**
- * OpenAPI Petstore
- *
  * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
  * The version of the OpenAPI document: 1.0.0
  * Generated by: https://github.com/openapitools/openapi-generator.git
@@ -43,28 +40,28 @@ class ModelListTest extends TestCase
     /**
      * Setup before running any test cases
      */
-    public static function setUpBeforeClass()
+    public static function setUpBeforeClass(): void
     {
     }
 
     /**
      * Setup before running each test case
      */
-    public function setUp()
+    public function setUp(): void
     {
     }
 
     /**
      * Clean up after running each test case
      */
-    public function tearDown()
+    public function tearDown(): void
     {
     }
 
     /**
      * Clean up after running all test cases
      */
-    public static function tearDownAfterClass()
+    public static function tearDownAfterClass(): void
     {
     }
 
diff --git a/samples/server/petstore/php-slim4/test/Model/ModelReturnTest.php b/samples/server/petstore/php-slim4/test/Model/ModelReturnTest.php
index 84790d12726..5de9db5c901 100644
--- a/samples/server/petstore/php-slim4/test/Model/ModelReturnTest.php
+++ b/samples/server/petstore/php-slim4/test/Model/ModelReturnTest.php
@@ -1,18 +1,15 @@
 <?php
 
 /**
- * ModelReturnTest
+ * OpenAPI Petstore
+ * PHP version 7.2
  *
- * PHP version 7.1
- *
- * @package OpenAPIServer\Model
+ * @package OpenAPIServer
  * @author  OpenAPI Generator team
  * @link    https://github.com/openapitools/openapi-generator
  */
 
 /**
- * OpenAPI Petstore
- *
  * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
  * The version of the OpenAPI document: 1.0.0
  * Generated by: https://github.com/openapitools/openapi-generator.git
@@ -43,28 +40,28 @@ class ModelReturnTest extends TestCase
     /**
      * Setup before running any test cases
      */
-    public static function setUpBeforeClass()
+    public static function setUpBeforeClass(): void
     {
     }
 
     /**
      * Setup before running each test case
      */
-    public function setUp()
+    public function setUp(): void
     {
     }
 
     /**
      * Clean up after running each test case
      */
-    public function tearDown()
+    public function tearDown(): void
     {
     }
 
     /**
      * Clean up after running all test cases
      */
-    public static function tearDownAfterClass()
+    public static function tearDownAfterClass(): void
     {
     }
 
diff --git a/samples/server/petstore/php-slim4/test/Model/NameTest.php b/samples/server/petstore/php-slim4/test/Model/NameTest.php
index 554eeacecc5..b663eaea7b5 100644
--- a/samples/server/petstore/php-slim4/test/Model/NameTest.php
+++ b/samples/server/petstore/php-slim4/test/Model/NameTest.php
@@ -1,18 +1,15 @@
 <?php
 
 /**
- * NameTest
+ * OpenAPI Petstore
+ * PHP version 7.2
  *
- * PHP version 7.1
- *
- * @package OpenAPIServer\Model
+ * @package OpenAPIServer
  * @author  OpenAPI Generator team
  * @link    https://github.com/openapitools/openapi-generator
  */
 
 /**
- * OpenAPI Petstore
- *
  * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
  * The version of the OpenAPI document: 1.0.0
  * Generated by: https://github.com/openapitools/openapi-generator.git
@@ -43,28 +40,28 @@ class NameTest extends TestCase
     /**
      * Setup before running any test cases
      */
-    public static function setUpBeforeClass()
+    public static function setUpBeforeClass(): void
     {
     }
 
     /**
      * Setup before running each test case
      */
-    public function setUp()
+    public function setUp(): void
     {
     }
 
     /**
      * Clean up after running each test case
      */
-    public function tearDown()
+    public function tearDown(): void
     {
     }
 
     /**
      * Clean up after running all test cases
      */
-    public static function tearDownAfterClass()
+    public static function tearDownAfterClass(): void
     {
     }
 
diff --git a/samples/server/petstore/php-slim4/test/Model/NumberOnlyTest.php b/samples/server/petstore/php-slim4/test/Model/NumberOnlyTest.php
index 3314f7a9b9e..e8140c6ee3f 100644
--- a/samples/server/petstore/php-slim4/test/Model/NumberOnlyTest.php
+++ b/samples/server/petstore/php-slim4/test/Model/NumberOnlyTest.php
@@ -1,18 +1,15 @@
 <?php
 
 /**
- * NumberOnlyTest
+ * OpenAPI Petstore
+ * PHP version 7.2
  *
- * PHP version 7.1
- *
- * @package OpenAPIServer\Model
+ * @package OpenAPIServer
  * @author  OpenAPI Generator team
  * @link    https://github.com/openapitools/openapi-generator
  */
 
 /**
- * OpenAPI Petstore
- *
  * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
  * The version of the OpenAPI document: 1.0.0
  * Generated by: https://github.com/openapitools/openapi-generator.git
@@ -43,28 +40,28 @@ class NumberOnlyTest extends TestCase
     /**
      * Setup before running any test cases
      */
-    public static function setUpBeforeClass()
+    public static function setUpBeforeClass(): void
     {
     }
 
     /**
      * Setup before running each test case
      */
-    public function setUp()
+    public function setUp(): void
     {
     }
 
     /**
      * Clean up after running each test case
      */
-    public function tearDown()
+    public function tearDown(): void
     {
     }
 
     /**
      * Clean up after running all test cases
      */
-    public static function tearDownAfterClass()
+    public static function tearDownAfterClass(): void
     {
     }
 
diff --git a/samples/server/petstore/php-slim4/test/Model/OrderTest.php b/samples/server/petstore/php-slim4/test/Model/OrderTest.php
index 87d7483b2f1..d8f2cfde082 100644
--- a/samples/server/petstore/php-slim4/test/Model/OrderTest.php
+++ b/samples/server/petstore/php-slim4/test/Model/OrderTest.php
@@ -1,18 +1,15 @@
 <?php
 
 /**
- * OrderTest
+ * OpenAPI Petstore
+ * PHP version 7.2
  *
- * PHP version 7.1
- *
- * @package OpenAPIServer\Model
+ * @package OpenAPIServer
  * @author  OpenAPI Generator team
  * @link    https://github.com/openapitools/openapi-generator
  */
 
 /**
- * OpenAPI Petstore
- *
  * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
  * The version of the OpenAPI document: 1.0.0
  * Generated by: https://github.com/openapitools/openapi-generator.git
@@ -43,28 +40,28 @@ class OrderTest extends TestCase
     /**
      * Setup before running any test cases
      */
-    public static function setUpBeforeClass()
+    public static function setUpBeforeClass(): void
     {
     }
 
     /**
      * Setup before running each test case
      */
-    public function setUp()
+    public function setUp(): void
     {
     }
 
     /**
      * Clean up after running each test case
      */
-    public function tearDown()
+    public function tearDown(): void
     {
     }
 
     /**
      * Clean up after running all test cases
      */
-    public static function tearDownAfterClass()
+    public static function tearDownAfterClass(): void
     {
     }
 
diff --git a/samples/server/petstore/php-slim4/test/Model/OuterCompositeTest.php b/samples/server/petstore/php-slim4/test/Model/OuterCompositeTest.php
index 96db8ffbce2..dbc2ec630c3 100644
--- a/samples/server/petstore/php-slim4/test/Model/OuterCompositeTest.php
+++ b/samples/server/petstore/php-slim4/test/Model/OuterCompositeTest.php
@@ -1,18 +1,15 @@
 <?php
 
 /**
- * OuterCompositeTest
+ * OpenAPI Petstore
+ * PHP version 7.2
  *
- * PHP version 7.1
- *
- * @package OpenAPIServer\Model
+ * @package OpenAPIServer
  * @author  OpenAPI Generator team
  * @link    https://github.com/openapitools/openapi-generator
  */
 
 /**
- * OpenAPI Petstore
- *
  * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
  * The version of the OpenAPI document: 1.0.0
  * Generated by: https://github.com/openapitools/openapi-generator.git
@@ -43,28 +40,28 @@ class OuterCompositeTest extends TestCase
     /**
      * Setup before running any test cases
      */
-    public static function setUpBeforeClass()
+    public static function setUpBeforeClass(): void
     {
     }
 
     /**
      * Setup before running each test case
      */
-    public function setUp()
+    public function setUp(): void
     {
     }
 
     /**
      * Clean up after running each test case
      */
-    public function tearDown()
+    public function tearDown(): void
     {
     }
 
     /**
      * Clean up after running all test cases
      */
-    public static function tearDownAfterClass()
+    public static function tearDownAfterClass(): void
     {
     }
 
diff --git a/samples/server/petstore/php-slim4/test/Model/OuterEnumTest.php b/samples/server/petstore/php-slim4/test/Model/OuterEnumTest.php
index 828a7bb65b4..fd9eec6c375 100644
--- a/samples/server/petstore/php-slim4/test/Model/OuterEnumTest.php
+++ b/samples/server/petstore/php-slim4/test/Model/OuterEnumTest.php
@@ -1,18 +1,15 @@
 <?php
 
 /**
- * OuterEnumTest
+ * OpenAPI Petstore
+ * PHP version 7.2
  *
- * PHP version 7.1
- *
- * @package OpenAPIServer\Model
+ * @package OpenAPIServer
  * @author  OpenAPI Generator team
  * @link    https://github.com/openapitools/openapi-generator
  */
 
 /**
- * OpenAPI Petstore
- *
  * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
  * The version of the OpenAPI document: 1.0.0
  * Generated by: https://github.com/openapitools/openapi-generator.git
@@ -43,28 +40,28 @@ class OuterEnumTest extends TestCase
     /**
      * Setup before running any test cases
      */
-    public static function setUpBeforeClass()
+    public static function setUpBeforeClass(): void
     {
     }
 
     /**
      * Setup before running each test case
      */
-    public function setUp()
+    public function setUp(): void
     {
     }
 
     /**
      * Clean up after running each test case
      */
-    public function tearDown()
+    public function tearDown(): void
     {
     }
 
     /**
      * Clean up after running all test cases
      */
-    public static function tearDownAfterClass()
+    public static function tearDownAfterClass(): void
     {
     }
 
diff --git a/samples/server/petstore/php-slim4/test/Model/PetTest.php b/samples/server/petstore/php-slim4/test/Model/PetTest.php
index 76d5eb5ad40..7f1ae6b2075 100644
--- a/samples/server/petstore/php-slim4/test/Model/PetTest.php
+++ b/samples/server/petstore/php-slim4/test/Model/PetTest.php
@@ -1,18 +1,15 @@
 <?php
 
 /**
- * PetTest
+ * OpenAPI Petstore
+ * PHP version 7.2
  *
- * PHP version 7.1
- *
- * @package OpenAPIServer\Model
+ * @package OpenAPIServer
  * @author  OpenAPI Generator team
  * @link    https://github.com/openapitools/openapi-generator
  */
 
 /**
- * OpenAPI Petstore
- *
  * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
  * The version of the OpenAPI document: 1.0.0
  * Generated by: https://github.com/openapitools/openapi-generator.git
@@ -43,28 +40,28 @@ class PetTest extends TestCase
     /**
      * Setup before running any test cases
      */
-    public static function setUpBeforeClass()
+    public static function setUpBeforeClass(): void
     {
     }
 
     /**
      * Setup before running each test case
      */
-    public function setUp()
+    public function setUp(): void
     {
     }
 
     /**
      * Clean up after running each test case
      */
-    public function tearDown()
+    public function tearDown(): void
     {
     }
 
     /**
      * Clean up after running all test cases
      */
-    public static function tearDownAfterClass()
+    public static function tearDownAfterClass(): void
     {
     }
 
diff --git a/samples/server/petstore/php-slim4/test/Model/ReadOnlyFirstTest.php b/samples/server/petstore/php-slim4/test/Model/ReadOnlyFirstTest.php
index 0b44bf882ef..b3b34eaf5ca 100644
--- a/samples/server/petstore/php-slim4/test/Model/ReadOnlyFirstTest.php
+++ b/samples/server/petstore/php-slim4/test/Model/ReadOnlyFirstTest.php
@@ -1,18 +1,15 @@
 <?php
 
 /**
- * ReadOnlyFirstTest
+ * OpenAPI Petstore
+ * PHP version 7.2
  *
- * PHP version 7.1
- *
- * @package OpenAPIServer\Model
+ * @package OpenAPIServer
  * @author  OpenAPI Generator team
  * @link    https://github.com/openapitools/openapi-generator
  */
 
 /**
- * OpenAPI Petstore
- *
  * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
  * The version of the OpenAPI document: 1.0.0
  * Generated by: https://github.com/openapitools/openapi-generator.git
@@ -43,28 +40,28 @@ class ReadOnlyFirstTest extends TestCase
     /**
      * Setup before running any test cases
      */
-    public static function setUpBeforeClass()
+    public static function setUpBeforeClass(): void
     {
     }
 
     /**
      * Setup before running each test case
      */
-    public function setUp()
+    public function setUp(): void
     {
     }
 
     /**
      * Clean up after running each test case
      */
-    public function tearDown()
+    public function tearDown(): void
     {
     }
 
     /**
      * Clean up after running all test cases
      */
-    public static function tearDownAfterClass()
+    public static function tearDownAfterClass(): void
     {
     }
 
diff --git a/samples/server/petstore/php-slim4/test/Model/SpecialModelNameTest.php b/samples/server/petstore/php-slim4/test/Model/SpecialModelNameTest.php
index 54569af8ae9..fe84830c2c5 100644
--- a/samples/server/petstore/php-slim4/test/Model/SpecialModelNameTest.php
+++ b/samples/server/petstore/php-slim4/test/Model/SpecialModelNameTest.php
@@ -1,18 +1,15 @@
 <?php
 
 /**
- * SpecialModelNameTest
+ * OpenAPI Petstore
+ * PHP version 7.2
  *
- * PHP version 7.1
- *
- * @package OpenAPIServer\Model
+ * @package OpenAPIServer
  * @author  OpenAPI Generator team
  * @link    https://github.com/openapitools/openapi-generator
  */
 
 /**
- * OpenAPI Petstore
- *
  * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
  * The version of the OpenAPI document: 1.0.0
  * Generated by: https://github.com/openapitools/openapi-generator.git
@@ -43,28 +40,28 @@ class SpecialModelNameTest extends TestCase
     /**
      * Setup before running any test cases
      */
-    public static function setUpBeforeClass()
+    public static function setUpBeforeClass(): void
     {
     }
 
     /**
      * Setup before running each test case
      */
-    public function setUp()
+    public function setUp(): void
     {
     }
 
     /**
      * Clean up after running each test case
      */
-    public function tearDown()
+    public function tearDown(): void
     {
     }
 
     /**
      * Clean up after running all test cases
      */
-    public static function tearDownAfterClass()
+    public static function tearDownAfterClass(): void
     {
     }
 
diff --git a/samples/server/petstore/php-slim4/test/Model/TagTest.php b/samples/server/petstore/php-slim4/test/Model/TagTest.php
index 59071a96c7e..2790c8ba4db 100644
--- a/samples/server/petstore/php-slim4/test/Model/TagTest.php
+++ b/samples/server/petstore/php-slim4/test/Model/TagTest.php
@@ -1,18 +1,15 @@
 <?php
 
 /**
- * TagTest
+ * OpenAPI Petstore
+ * PHP version 7.2
  *
- * PHP version 7.1
- *
- * @package OpenAPIServer\Model
+ * @package OpenAPIServer
  * @author  OpenAPI Generator team
  * @link    https://github.com/openapitools/openapi-generator
  */
 
 /**
- * OpenAPI Petstore
- *
  * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
  * The version of the OpenAPI document: 1.0.0
  * Generated by: https://github.com/openapitools/openapi-generator.git
@@ -43,28 +40,28 @@ class TagTest extends TestCase
     /**
      * Setup before running any test cases
      */
-    public static function setUpBeforeClass()
+    public static function setUpBeforeClass(): void
     {
     }
 
     /**
      * Setup before running each test case
      */
-    public function setUp()
+    public function setUp(): void
     {
     }
 
     /**
      * Clean up after running each test case
      */
-    public function tearDown()
+    public function tearDown(): void
     {
     }
 
     /**
      * Clean up after running all test cases
      */
-    public static function tearDownAfterClass()
+    public static function tearDownAfterClass(): void
     {
     }
 
diff --git a/samples/server/petstore/php-slim4/test/Model/TypeHolderDefaultTest.php b/samples/server/petstore/php-slim4/test/Model/TypeHolderDefaultTest.php
index b0fba6bf51f..63ec0b433a9 100644
--- a/samples/server/petstore/php-slim4/test/Model/TypeHolderDefaultTest.php
+++ b/samples/server/petstore/php-slim4/test/Model/TypeHolderDefaultTest.php
@@ -1,18 +1,15 @@
 <?php
 
 /**
- * TypeHolderDefaultTest
+ * OpenAPI Petstore
+ * PHP version 7.2
  *
- * PHP version 7.1
- *
- * @package OpenAPIServer\Model
+ * @package OpenAPIServer
  * @author  OpenAPI Generator team
  * @link    https://github.com/openapitools/openapi-generator
  */
 
 /**
- * OpenAPI Petstore
- *
  * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
  * The version of the OpenAPI document: 1.0.0
  * Generated by: https://github.com/openapitools/openapi-generator.git
@@ -43,28 +40,28 @@ class TypeHolderDefaultTest extends TestCase
     /**
      * Setup before running any test cases
      */
-    public static function setUpBeforeClass()
+    public static function setUpBeforeClass(): void
     {
     }
 
     /**
      * Setup before running each test case
      */
-    public function setUp()
+    public function setUp(): void
     {
     }
 
     /**
      * Clean up after running each test case
      */
-    public function tearDown()
+    public function tearDown(): void
     {
     }
 
     /**
      * Clean up after running all test cases
      */
-    public static function tearDownAfterClass()
+    public static function tearDownAfterClass(): void
     {
     }
 
diff --git a/samples/server/petstore/php-slim4/test/Model/TypeHolderExampleTest.php b/samples/server/petstore/php-slim4/test/Model/TypeHolderExampleTest.php
index 3f707beb5ac..39f547c5b5f 100644
--- a/samples/server/petstore/php-slim4/test/Model/TypeHolderExampleTest.php
+++ b/samples/server/petstore/php-slim4/test/Model/TypeHolderExampleTest.php
@@ -1,18 +1,15 @@
 <?php
 
 /**
- * TypeHolderExampleTest
+ * OpenAPI Petstore
+ * PHP version 7.2
  *
- * PHP version 7.1
- *
- * @package OpenAPIServer\Model
+ * @package OpenAPIServer
  * @author  OpenAPI Generator team
  * @link    https://github.com/openapitools/openapi-generator
  */
 
 /**
- * OpenAPI Petstore
- *
  * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
  * The version of the OpenAPI document: 1.0.0
  * Generated by: https://github.com/openapitools/openapi-generator.git
@@ -43,28 +40,28 @@ class TypeHolderExampleTest extends TestCase
     /**
      * Setup before running any test cases
      */
-    public static function setUpBeforeClass()
+    public static function setUpBeforeClass(): void
     {
     }
 
     /**
      * Setup before running each test case
      */
-    public function setUp()
+    public function setUp(): void
     {
     }
 
     /**
      * Clean up after running each test case
      */
-    public function tearDown()
+    public function tearDown(): void
     {
     }
 
     /**
      * Clean up after running all test cases
      */
-    public static function tearDownAfterClass()
+    public static function tearDownAfterClass(): void
     {
     }
 
diff --git a/samples/server/petstore/php-slim4/test/Model/UserTest.php b/samples/server/petstore/php-slim4/test/Model/UserTest.php
index 900029a36e6..8f755cc9370 100644
--- a/samples/server/petstore/php-slim4/test/Model/UserTest.php
+++ b/samples/server/petstore/php-slim4/test/Model/UserTest.php
@@ -1,18 +1,15 @@
 <?php
 
 /**
- * UserTest
+ * OpenAPI Petstore
+ * PHP version 7.2
  *
- * PHP version 7.1
- *
- * @package OpenAPIServer\Model
+ * @package OpenAPIServer
  * @author  OpenAPI Generator team
  * @link    https://github.com/openapitools/openapi-generator
  */
 
 /**
- * OpenAPI Petstore
- *
  * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
  * The version of the OpenAPI document: 1.0.0
  * Generated by: https://github.com/openapitools/openapi-generator.git
@@ -43,28 +40,28 @@ class UserTest extends TestCase
     /**
      * Setup before running any test cases
      */
-    public static function setUpBeforeClass()
+    public static function setUpBeforeClass(): void
     {
     }
 
     /**
      * Setup before running each test case
      */
-    public function setUp()
+    public function setUp(): void
     {
     }
 
     /**
      * Clean up after running each test case
      */
-    public function tearDown()
+    public function tearDown(): void
     {
     }
 
     /**
      * Clean up after running all test cases
      */
-    public static function tearDownAfterClass()
+    public static function tearDownAfterClass(): void
     {
     }
 
diff --git a/samples/server/petstore/php-slim4/test/Model/XmlItemTest.php b/samples/server/petstore/php-slim4/test/Model/XmlItemTest.php
index ac6ee0e7d38..699ea8db344 100644
--- a/samples/server/petstore/php-slim4/test/Model/XmlItemTest.php
+++ b/samples/server/petstore/php-slim4/test/Model/XmlItemTest.php
@@ -1,18 +1,15 @@
 <?php
 
 /**
- * XmlItemTest
+ * OpenAPI Petstore
+ * PHP version 7.2
  *
- * PHP version 7.1
- *
- * @package OpenAPIServer\Model
+ * @package OpenAPIServer
  * @author  OpenAPI Generator team
  * @link    https://github.com/openapitools/openapi-generator
  */
 
 /**
- * OpenAPI Petstore
- *
  * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
  * The version of the OpenAPI document: 1.0.0
  * Generated by: https://github.com/openapitools/openapi-generator.git
@@ -43,28 +40,28 @@ class XmlItemTest extends TestCase
     /**
      * Setup before running any test cases
      */
-    public static function setUpBeforeClass()
+    public static function setUpBeforeClass(): void
     {
     }
 
     /**
      * Setup before running each test case
      */
-    public function setUp()
+    public function setUp(): void
     {
     }
 
     /**
      * Clean up after running each test case
      */
-    public function tearDown()
+    public function tearDown(): void
     {
     }
 
     /**
      * Clean up after running all test cases
      */
-    public static function tearDownAfterClass()
+    public static function tearDownAfterClass(): void
     {
     }
 
diff --git a/samples/server/petstore/php-slim4/test/Utils/ModelUtilsTraitTest.php b/samples/server/petstore/php-slim4/test/Utils/ModelUtilsTraitTest.php
index 9ed05378f2b..f9611ad65df 100644
--- a/samples/server/petstore/php-slim4/test/Utils/ModelUtilsTraitTest.php
+++ b/samples/server/petstore/php-slim4/test/Utils/ModelUtilsTraitTest.php
@@ -1,9 +1,8 @@
 <?php
 
 /**
- * ModelUtilsTraitTest
- *
- * PHP version 7.1
+ * OpenAPI Petstore
+ * PHP version 7.2
  *
  * @package OpenAPIServer
  * @author  OpenAPI Generator team
@@ -11,8 +10,6 @@
  */
 
 /**
- * OpenAPI Petstore
- *
  * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
  * The version of the OpenAPI document: 1.0.0
  * Generated by: https://github.com/openapitools/openapi-generator.git
diff --git a/samples/server/petstore/php-slim4/test/Utils/StringUtilsTraitTest.php b/samples/server/petstore/php-slim4/test/Utils/StringUtilsTraitTest.php
index d06aa405eeb..5cd52756e80 100644
--- a/samples/server/petstore/php-slim4/test/Utils/StringUtilsTraitTest.php
+++ b/samples/server/petstore/php-slim4/test/Utils/StringUtilsTraitTest.php
@@ -1,9 +1,8 @@
 <?php
 
 /**
- * StringUtilsTraitTest
- *
- * PHP version 7.1
+ * OpenAPI Petstore
+ * PHP version 7.2
  *
  * @package OpenAPIServer
  * @author  OpenAPI Generator team
@@ -11,8 +10,6 @@
  */
 
 /**
- * OpenAPI Petstore
- *
  * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
  * The version of the OpenAPI document: 1.0.0
  * Generated by: https://github.com/openapitools/openapi-generator.git