From 40f97e6bfe636729c460a335feb8a8303f02a833 Mon Sep 17 00:00:00 2001
From: Yuriy Belenko <yura-bely@mail.ru>
Date: Mon, 2 Jul 2018 22:45:58 +0500
Subject: [PATCH 1/2] [Slim] Decouple Api files into separated PHP Classes

This enhancement required for modular testing and code coverage generating.
---
 .../languages/PhpSlimServerCodegen.java       |  54 +++++++---
 .../AbstractApiController.mustache            |  63 +++++++++++
 .../resources/php-slim-server/api.mustache    | 102 ++++++++++++++++++
 .../resources/php-slim-server/composer.json   |   6 --
 .../php-slim-server/composer.mustache         |   9 ++
 .../resources/php-slim-server/index.mustache  |  38 +------
 .../resources/php-slim-server/model.mustache  |   2 +-
 7 files changed, 213 insertions(+), 61 deletions(-)
 create mode 100644 modules/openapi-generator/src/main/resources/php-slim-server/AbstractApiController.mustache
 create mode 100644 modules/openapi-generator/src/main/resources/php-slim-server/api.mustache
 delete mode 100644 modules/openapi-generator/src/main/resources/php-slim-server/composer.json
 create mode 100644 modules/openapi-generator/src/main/resources/php-slim-server/composer.mustache

diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/PhpSlimServerCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/PhpSlimServerCodegen.java
index 3cade86ac1ad..a24865228727 100644
--- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/PhpSlimServerCodegen.java
+++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/PhpSlimServerCodegen.java
@@ -48,13 +48,11 @@ public PhpSlimServerCodegen() {
         variableNamingConvention = "camelCase";
         artifactVersion = "1.0.0";
         packagePath = ""; // empty packagePath (top folder)
-        invokerPackage = camelize("OpenAPIServer");
-        modelPackage = packagePath + "\\Models";
-        apiPackage = packagePath;
+        setInvokerPackage("OpenAPIServer");
+        apiPackage = invokerPackage + "\\" + apiDirName;
+        modelPackage = invokerPackage + "\\" + modelDirName;
         outputFolder = "generated-code" + File.separator + "slim";
 
-        // no api files
-        apiTemplateFiles.clear();
         // no test files
         apiTestTemplateFiles.clear();
         // no doc files
@@ -63,11 +61,9 @@ public PhpSlimServerCodegen() {
 
         embeddedTemplateDir = templateDir = "php-slim-server";
 
-        // additionalProperties.put(CodegenConstants.INVOKER_PACKAGE, invokerPackage);
         additionalProperties.put(CodegenConstants.GROUP_ID, groupId);
-        additionalProperties.put(CodegenConstants.ARTIFACT_ID, artifactId);
-        // additionalProperties.put(CodegenConstants.ARTIFACT_VERSION, artifactVersion);
-        
+        additionalProperties.put(CodegenConstants.ARTIFACT_ID, artifactId);      
+
         // override cliOptions from AbstractPhpCodegen
         for (CliOption co : cliOptions) {
             if (co.getOpt().equals(AbstractPhpCodegen.VARIABLE_NAMING_CONVENTION)) {
@@ -75,14 +71,8 @@ public PhpSlimServerCodegen() {
                 co.setDefault("camelCase");
                 break;
             }
-        }
-
-        supportingFiles.add(new SupportingFile("README.mustache", packagePath.replace('/', File.separatorChar), "README.md"));
-        supportingFiles.add(new SupportingFile("composer.json", packagePath.replace('/', File.separatorChar), "composer.json"));
-        supportingFiles.add(new SupportingFile("index.mustache", packagePath.replace('/', File.separatorChar), "index.php"));
-        supportingFiles.add(new SupportingFile(".htaccess", packagePath.replace('/', File.separatorChar), ".htaccess"));
-        supportingFiles.add(new SupportingFile(".gitignore", packagePath.replace('/', File.separatorChar), ".gitignore"));
-    }
+        }        
+    }    
 
     @Override
     public CodegenType getTag() {
@@ -99,6 +89,36 @@ public String getHelp() {
         return "Generates a PHP Slim Framework server library.";
     }
 
+    @Override
+    public String apiFileFolder() {
+        if (apiPackage.matches("^" + invokerPackage + "\\\\*(.+)")) {
+            // need to strip out invokerPackage from path
+            return (outputFolder + File.separator + toPackagePath(apiPackage.replaceFirst("^" + invokerPackage + "\\\\*(.+)", "$1"), srcBasePath));
+        }  
+        return (outputFolder + File.separator + toPackagePath(apiPackage, srcBasePath));
+    }
+
+    @Override
+    public String modelFileFolder() {
+        if (modelPackage.matches("^" + invokerPackage + "\\\\*(.+)")) {
+            // need to strip out invokerPackage from path
+            return (outputFolder + File.separator + toPackagePath(modelPackage.replaceFirst("^" + invokerPackage + "\\\\*(.+)", "$1"), srcBasePath));
+        }
+        return (outputFolder + File.separator + toPackagePath(modelPackage, srcBasePath));
+    }
+
+    @Override
+    public void processOpts() {
+        super.processOpts();
+
+        supportingFiles.add(new SupportingFile("README.mustache", getPackagePath(), "README.md"));
+        supportingFiles.add(new SupportingFile("composer.mustache", getPackagePath(), "composer.json"));
+        supportingFiles.add(new SupportingFile("index.mustache", getPackagePath(), "index.php"));
+        supportingFiles.add(new SupportingFile(".htaccess", getPackagePath(), ".htaccess"));
+        supportingFiles.add(new SupportingFile(".gitignore", getPackagePath(), ".gitignore"));       
+        supportingFiles.add(new SupportingFile("AbstractApiController.mustache", toSrcPath(invokerPackage, srcBasePath), "AbstractApiController.php"));        
+    }
+
     @Override
     public Map<String, Object> postProcessOperationsWithModels(Map<String, Object> objs, List<Object> allModels) {
         Map<String, Object> operations = (Map<String, Object>) objs.get("operations");
diff --git a/modules/openapi-generator/src/main/resources/php-slim-server/AbstractApiController.mustache b/modules/openapi-generator/src/main/resources/php-slim-server/AbstractApiController.mustache
new file mode 100644
index 000000000000..c058491dd4e4
--- /dev/null
+++ b/modules/openapi-generator/src/main/resources/php-slim-server/AbstractApiController.mustache
@@ -0,0 +1,63 @@
+<?php
+/**
+ * Abstract Api Controller
+ *
+ * PHP version 5
+ *
+ * @category Class
+ * @package  {{invokerPackage}}
+ * @author   OpenAPI Generator team
+ * @link     https://github.com/openapitools/openapi-generator
+ */
+
+/**
+ {{#appName}}
+ * {{{appName}}}
+ *
+ {{/appName}}
+ {{#appDescription}}
+ * {{{appDescription}}}
+ {{/appDescription}}
+ {{#version}}
+ * OpenAPI spec version: {{{version}}}
+ {{/version}}
+ {{#infoEmail}}
+ * Contact: {{{infoEmail}}}
+ {{/infoEmail}}
+ * 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
+ * Do not edit the class manually.
+ */
+namespace {{invokerPackage}};
+
+/**
+ * ApiServer Class Doc Comment
+ *
+ * PHP version 5
+ *
+ * @category Class
+ * @package  {{invokerPackage}}
+ * @author   OpenAPI Generator team
+ * @link     https://github.com/openapitools/openapi-generator
+ */
+abstract class AbstractApiController {
+
+    /**
+     * @var \Interop\Container\ContainerInterface Slim app container instance
+     */
+    protected $container;
+
+    /**
+     * Route Controller constructor receives container
+     *
+     * @param \Interop\Container\ContainerInterface $container Slim app container instance
+     */
+    public function __construct($container) {
+        $this->container = $container;
+    }
+
+}
diff --git a/modules/openapi-generator/src/main/resources/php-slim-server/api.mustache b/modules/openapi-generator/src/main/resources/php-slim-server/api.mustache
new file mode 100644
index 000000000000..84e2b6a1acd9
--- /dev/null
+++ b/modules/openapi-generator/src/main/resources/php-slim-server/api.mustache
@@ -0,0 +1,102 @@
+<?php
+/**
+ * {{classname}}
+ *
+ * PHP version 5
+ *
+ * @category Class
+ * @package  {{apiPackage}}
+ * @author   OpenAPI Generator team
+ * @link     https://github.com/openapitools/openapi-generator
+ */
+
+/**
+ {{#appName}}
+ * {{{appName}}}
+ *
+ {{/appName}}
+ {{#appDescription}}
+ * {{{appDescription}}}
+ {{/appDescription}}
+ {{#version}}
+ * OpenAPI spec version: {{{version}}}
+ {{/version}}
+ {{#infoEmail}}
+ * Contact: {{{infoEmail}}}
+ {{/infoEmail}}
+ * 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
+ * Do not edit the class manually.
+ */
+namespace {{apiPackage}};
+
+use {{invokerPackage}}\AbstractApiController;
+
+/**
+ * {{classname}} Class Doc Comment
+ *
+ * PHP version 5
+ *
+ * @category Class
+ * @package  {{apiPackage}}
+ * @author   OpenAPI Generator team
+ * @link     https://github.com/openapitools/openapi-generator
+ */
+class {{classname}} extends AbstractApiController {
+
+    {{#operations}}
+    {{#operation}}
+    /**
+     * {{httpMethod}} {{operationId}}
+     * Summary: {{summary}}
+     * Notes: {{notes}}
+     {{#hasProduces}}
+     * Output-Formats: [{{#produces}}{{{mediaType}}}{{#hasMore}}, {{/hasMore}}{{/produces}}]
+     {{/hasProduces}}
+     *
+     * @param \Psr\Http\Message\ServerRequestInterface $request  Request
+     * @param \Psr\Http\Message\ResponseInterface      $response Response
+     * @param array|null                               $args     Path arguments
+     */
+    public function {{operationId}}($request, $response, $args) {
+        {{#hasHeaderParams}}
+        $headers = $request->getHeaders();
+        {{#headerParams}}
+        ${{paramName}} = $request->hasHeader('{{baseName}}') ? $headers['{{baseName}}'] : null;
+        {{/headerParams}}
+        {{/hasHeaderParams}}
+        {{#hasPathParams}}
+        {{#pathParams}}
+        ${{paramName}} = $args['{{baseName}}'];
+        {{/pathParams}}
+        {{/hasPathParams}}
+        {{#hasQueryParams}}
+        $queryParams = $request->getQueryParams();
+        {{#queryParams}}
+        ${{paramName}} = $request->getQueryParam('{{baseName}}');
+        {{/queryParams}}
+        {{/hasQueryParams}}
+        {{#hasFormParams}}
+        {{#formParams}}
+        {{^isFile}}
+        ${{paramName}} = $request->getParsedBodyParam('{{baseName}}');
+        {{/isFile}}
+        {{#isFile}}
+        ${{paramName}} = (key_exists('{{baseName}}', $request->getUploadedFiles())) ? $request->getUploadedFiles()['{{baseName}}'] : null;
+        {{/isFile}}
+        {{/formParams}}
+        {{/hasFormParams}}
+        {{#hasBodyParam}}
+        $body = $request->getParsedBody();
+        {{/hasBodyParam}}
+        $response->write('How about implementing {{nickname}} as a {{httpMethod}} method ?');
+        return $response;
+    }
+    {{#hasMore}}{{/hasMore}}
+    {{/operation}}
+    {{/operations}}
+}
diff --git a/modules/openapi-generator/src/main/resources/php-slim-server/composer.json b/modules/openapi-generator/src/main/resources/php-slim-server/composer.json
deleted file mode 100644
index c55c81817653..000000000000
--- a/modules/openapi-generator/src/main/resources/php-slim-server/composer.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{
-  "minimum-stability": "RC",
-  "require": {
-    "slim/slim": "3.*"
-  }
-}
\ No newline at end of file
diff --git a/modules/openapi-generator/src/main/resources/php-slim-server/composer.mustache b/modules/openapi-generator/src/main/resources/php-slim-server/composer.mustache
new file mode 100644
index 000000000000..696e2195d1f0
--- /dev/null
+++ b/modules/openapi-generator/src/main/resources/php-slim-server/composer.mustache
@@ -0,0 +1,9 @@
+{
+  "minimum-stability": "RC",
+  "require": {
+    "slim/slim": "3.*"
+  },
+  "autoload": {
+    "psr-4": { "{{escapedInvokerPackage}}\\": "{{srcBasePath}}/" }
+  }
+}
\ No newline at end of file
diff --git a/modules/openapi-generator/src/main/resources/php-slim-server/index.mustache b/modules/openapi-generator/src/main/resources/php-slim-server/index.mustache
index 74784585848e..b8f98f43c81a 100644
--- a/modules/openapi-generator/src/main/resources/php-slim-server/index.mustache
+++ b/modules/openapi-generator/src/main/resources/php-slim-server/index.mustache
@@ -13,44 +13,8 @@ $app = new Slim\App();
  * {{httpMethod}} {{nickname}}
  * Summary: {{summary}}
  * Notes: {{notes}}
- {{#hasProduces}}
- * Output-Formats: [{{#produces}}{{{mediaType}}}{{#hasMore}}, {{/hasMore}}{{/produces}}]
- {{/hasProduces}}
  */
-$app->{{httpMethod}}('{{{basePathWithoutHost}}}{{{path}}}', function($request, $response, $args) {
-    {{#hasHeaderParams}}
-    $headers = $request->getHeaders();
-    {{#headerParams}}
-    ${{paramName}} = $request->hasHeader('{{baseName}}') ? $headers['{{baseName}}'] : null;
-    {{/headerParams}}
-    {{/hasHeaderParams}}
-    {{#hasPathParams}}
-    {{#pathParams}}
-    ${{paramName}} = $args['{{baseName}}'];
-    {{/pathParams}}
-    {{/hasPathParams}}
-    {{#hasQueryParams}}
-    $queryParams = $request->getQueryParams();
-    {{#queryParams}}
-    ${{paramName}} = $request->getQueryParam('{{baseName}}');
-    {{/queryParams}}
-    {{/hasQueryParams}}
-    {{#hasFormParams}}
-    {{#formParams}}
-    {{^isFile}}
-    ${{paramName}} = $request->getParsedBodyParam('{{baseName}}');
-    {{/isFile}}
-    {{#isFile}}
-    ${{paramName}} = (key_exists('{{baseName}}', $request->getUploadedFiles())) ? $request->getUploadedFiles()['{{baseName}}'] : null;
-    {{/isFile}}
-    {{/formParams}}
-    {{/hasFormParams}}
-    {{#hasBodyParam}}
-    $body = $request->getParsedBody();
-    {{/hasBodyParam}}
-    $response->write('How about implementing {{nickname}} as a {{httpMethod}} method ?');
-    return $response;
-});
+$app->{{httpMethod}}('{{{basePathWithoutHost}}}{{{path}}}', \{{apiPackage}}\{{classname}}::class . ':{{operationId}}');
 
 {{/operation}}{{/operations}}{{/apis}}{{/apiInfo}}
 
diff --git a/modules/openapi-generator/src/main/resources/php-slim-server/model.mustache b/modules/openapi-generator/src/main/resources/php-slim-server/model.mustache
index 7ba5f441f4d8..dc92d31eb0fb 100644
--- a/modules/openapi-generator/src/main/resources/php-slim-server/model.mustache
+++ b/modules/openapi-generator/src/main/resources/php-slim-server/model.mustache
@@ -2,7 +2,7 @@
 {{#models}}{{#model}}/*
  * {{classname}}
  */
-namespace {{package}};
+namespace {{modelPackage}};
 
 /*
  * {{classname}}

From b7addcde8c9f6b4b6276caa14f66dec061890c48 Mon Sep 17 00:00:00 2001
From: Yuriy Belenko <yura-bely@mail.ru>
Date: Mon, 2 Jul 2018 23:40:36 +0500
Subject: [PATCH 2/2] [Slim] Define all app routes in SlimRouter PHP Class.
 Generate new samples

---
 .../languages/PhpSlimServerCodegen.java       |  13 +-
 .../php-slim-server/SlimRouter.mustache       |  88 ++++
 .../resources/php-slim-server/index.mustache  |  15 +-
 .../resources/php-slim-server/model.mustache  |   9 +-
 .../php-slim/composer.json                    |   3 +
 .../petstore-security-test/php-slim/index.php |  18 +-
 .../php-slim/lib/AbstractApiController.php    |  55 +++
 .../php-slim/lib/Api/FakeApi.php              |  58 +++
 .../php-slim/lib/Model/ModelReturn.php        |  15 +
 .../php-slim/lib/Models/ModelReturn.php       |  13 -
 .../php-slim/lib/SlimRouter.php               |  72 +++
 .../server/petstore/php-slim/composer.json    |   3 +
 samples/server/petstore/php-slim/index.php    | 455 +-----------------
 .../php-slim/lib/AbstractApiController.php    |  54 +++
 .../php-slim/lib/Api/AnotherFakeApi.php       |  58 +++
 .../petstore/php-slim/lib/Api/FakeApi.php     | 222 +++++++++
 .../lib/Api/FakeClassnameTags123Api.php       |  58 +++
 .../petstore/php-slim/lib/Api/PetApi.php      | 192 ++++++++
 .../petstore/php-slim/lib/Api/StoreApi.php    | 104 ++++
 .../petstore/php-slim/lib/Api/UserApi.php     | 166 +++++++
 .../AdditionalPropertiesClass.php             |  13 +-
 .../petstore/php-slim/lib/Model/Animal.php    |  18 +
 .../lib/{Models => Model}/AnimalFarm.php      |   9 +-
 .../php-slim/lib/Model/ApiResponse.php        |  21 +
 .../ArrayOfArrayOfNumberOnly.php              |  10 +-
 .../{Models => Model}/ArrayOfNumberOnly.php   |  10 +-
 .../petstore/php-slim/lib/Model/ArrayTest.php |  21 +
 .../php-slim/lib/Model/Capitalization.php     |  30 ++
 .../petstore/php-slim/lib/Model/Cat.php       |  21 +
 .../petstore/php-slim/lib/Model/Category.php  |  18 +
 .../lib/{Models => Model}/ClassModel.php      |  10 +-
 .../php-slim/lib/{Models => Model}/Client.php |  10 +-
 .../petstore/php-slim/lib/Model/Dog.php       |  21 +
 .../lib/{Models => Model}/EnumArrays.php      |  13 +-
 .../lib/{Models => Model}/EnumClass.php       |   9 +-
 .../petstore/php-slim/lib/Model/EnumTest.php  |  27 ++
 .../php-slim/lib/Model/FormatTest.php         |  51 ++
 .../lib/{Models => Model}/HasOnlyReadOnly.php |  13 +-
 .../petstore/php-slim/lib/Model/MapTest.php   |  24 +
 ...PropertiesAndAdditionalPropertiesClass.php |  16 +-
 .../{Models => Model}/Model200Response.php    |  13 +-
 .../lib/{Models => Model}/ModelList.php       |  10 +-
 .../lib/{Models => Model}/ModelReturn.php     |  10 +-
 .../petstore/php-slim/lib/Model/Name.php      |  24 +
 .../lib/{Models => Model}/NumberOnly.php      |  10 +-
 .../petstore/php-slim/lib/Model/Order.php     |  30 ++
 .../lib/{Models => Model}/OuterComposite.php  |  16 +-
 .../lib/{Models => Model}/OuterEnum.php       |   9 +-
 .../petstore/php-slim/lib/Model/Pet.php       |  30 ++
 .../lib/{Models => Model}/ReadOnlyFirst.php   |  13 +-
 .../{Models => Model}/SpecialModelName.php    |  10 +-
 .../{Models => Model}/StringBooleanMap.php    |   9 +-
 .../petstore/php-slim/lib/Model/Tag.php       |  18 +
 .../petstore/php-slim/lib/Model/User.php      |  36 ++
 .../petstore/php-slim/lib/Models/Animal.php   |  15 -
 .../php-slim/lib/Models/ApiResponse.php       |  17 -
 .../php-slim/lib/Models/ArrayTest.php         |  17 -
 .../php-slim/lib/Models/Capitalization.php    |  23 -
 .../petstore/php-slim/lib/Models/Cat.php      |  17 -
 .../petstore/php-slim/lib/Models/Category.php |  15 -
 .../petstore/php-slim/lib/Models/Dog.php      |  17 -
 .../petstore/php-slim/lib/Models/EnumTest.php |  21 -
 .../php-slim/lib/Models/FormatTest.php        |  37 --
 .../petstore/php-slim/lib/Models/MapTest.php  |  19 -
 .../petstore/php-slim/lib/Models/Name.php     |  19 -
 .../petstore/php-slim/lib/Models/Order.php    |  23 -
 .../petstore/php-slim/lib/Models/Pet.php      |  23 -
 .../petstore/php-slim/lib/Models/Tag.php      |  15 -
 .../petstore/php-slim/lib/Models/User.php     |  27 --
 .../petstore/php-slim/lib/SlimRouter.php      | 108 +++++
 70 files changed, 1797 insertions(+), 890 deletions(-)
 create mode 100644 modules/openapi-generator/src/main/resources/php-slim-server/SlimRouter.mustache
 create mode 100644 samples/server/petstore-security-test/php-slim/lib/AbstractApiController.php
 create mode 100644 samples/server/petstore-security-test/php-slim/lib/Api/FakeApi.php
 create mode 100644 samples/server/petstore-security-test/php-slim/lib/Model/ModelReturn.php
 delete mode 100644 samples/server/petstore-security-test/php-slim/lib/Models/ModelReturn.php
 create mode 100644 samples/server/petstore-security-test/php-slim/lib/SlimRouter.php
 create mode 100644 samples/server/petstore/php-slim/lib/AbstractApiController.php
 create mode 100644 samples/server/petstore/php-slim/lib/Api/AnotherFakeApi.php
 create mode 100644 samples/server/petstore/php-slim/lib/Api/FakeApi.php
 create mode 100644 samples/server/petstore/php-slim/lib/Api/FakeClassnameTags123Api.php
 create mode 100644 samples/server/petstore/php-slim/lib/Api/PetApi.php
 create mode 100644 samples/server/petstore/php-slim/lib/Api/StoreApi.php
 create mode 100644 samples/server/petstore/php-slim/lib/Api/UserApi.php
 rename samples/server/petstore/php-slim/lib/{Models => Model}/AdditionalPropertiesClass.php (51%)
 create mode 100644 samples/server/petstore/php-slim/lib/Model/Animal.php
 rename samples/server/petstore/php-slim/lib/{Models => Model}/AnimalFarm.php (59%)
 create mode 100644 samples/server/petstore/php-slim/lib/Model/ApiResponse.php
 rename samples/server/petstore/php-slim/lib/{Models => Model}/ArrayOfArrayOfNumberOnly.php (61%)
 rename samples/server/petstore/php-slim/lib/{Models => Model}/ArrayOfNumberOnly.php (58%)
 create mode 100644 samples/server/petstore/php-slim/lib/Model/ArrayTest.php
 create mode 100644 samples/server/petstore/php-slim/lib/Model/Capitalization.php
 create mode 100644 samples/server/petstore/php-slim/lib/Model/Cat.php
 create mode 100644 samples/server/petstore/php-slim/lib/Model/Category.php
 rename samples/server/petstore/php-slim/lib/{Models => Model}/ClassModel.php (54%)
 rename samples/server/petstore/php-slim/lib/{Models => Model}/Client.php (50%)
 create mode 100644 samples/server/petstore/php-slim/lib/Model/Dog.php
 rename samples/server/petstore/php-slim/lib/{Models => Model}/EnumArrays.php (50%)
 rename samples/server/petstore/php-slim/lib/{Models => Model}/EnumClass.php (58%)
 create mode 100644 samples/server/petstore/php-slim/lib/Model/EnumTest.php
 create mode 100644 samples/server/petstore/php-slim/lib/Model/FormatTest.php
 rename samples/server/petstore/php-slim/lib/{Models => Model}/HasOnlyReadOnly.php (53%)
 create mode 100644 samples/server/petstore/php-slim/lib/Model/MapTest.php
 rename samples/server/petstore/php-slim/lib/{Models => Model}/MixedPropertiesAndAdditionalPropertiesClass.php (56%)
 rename samples/server/petstore/php-slim/lib/{Models => Model}/Model200Response.php (55%)
 rename samples/server/petstore/php-slim/lib/{Models => Model}/ModelList.php (53%)
 rename samples/server/petstore/php-slim/lib/{Models => Model}/ModelReturn.php (56%)
 create mode 100644 samples/server/petstore/php-slim/lib/Model/Name.php
 rename samples/server/petstore/php-slim/lib/{Models => Model}/NumberOnly.php (54%)
 create mode 100644 samples/server/petstore/php-slim/lib/Model/Order.php
 rename samples/server/petstore/php-slim/lib/{Models => Model}/OuterComposite.php (51%)
 rename samples/server/petstore/php-slim/lib/{Models => Model}/OuterEnum.php (58%)
 create mode 100644 samples/server/petstore/php-slim/lib/Model/Pet.php
 rename samples/server/petstore/php-slim/lib/{Models => Model}/ReadOnlyFirst.php (52%)
 rename samples/server/petstore/php-slim/lib/{Models => Model}/SpecialModelName.php (58%)
 rename samples/server/petstore/php-slim/lib/{Models => Model}/StringBooleanMap.php (65%)
 create mode 100644 samples/server/petstore/php-slim/lib/Model/Tag.php
 create mode 100644 samples/server/petstore/php-slim/lib/Model/User.php
 delete mode 100644 samples/server/petstore/php-slim/lib/Models/Animal.php
 delete mode 100644 samples/server/petstore/php-slim/lib/Models/ApiResponse.php
 delete mode 100644 samples/server/petstore/php-slim/lib/Models/ArrayTest.php
 delete mode 100644 samples/server/petstore/php-slim/lib/Models/Capitalization.php
 delete mode 100644 samples/server/petstore/php-slim/lib/Models/Cat.php
 delete mode 100644 samples/server/petstore/php-slim/lib/Models/Category.php
 delete mode 100644 samples/server/petstore/php-slim/lib/Models/Dog.php
 delete mode 100644 samples/server/petstore/php-slim/lib/Models/EnumTest.php
 delete mode 100644 samples/server/petstore/php-slim/lib/Models/FormatTest.php
 delete mode 100644 samples/server/petstore/php-slim/lib/Models/MapTest.php
 delete mode 100644 samples/server/petstore/php-slim/lib/Models/Name.php
 delete mode 100644 samples/server/petstore/php-slim/lib/Models/Order.php
 delete mode 100644 samples/server/petstore/php-slim/lib/Models/Pet.php
 delete mode 100644 samples/server/petstore/php-slim/lib/Models/Tag.php
 delete mode 100644 samples/server/petstore/php-slim/lib/Models/User.php
 create mode 100644 samples/server/petstore/php-slim/lib/SlimRouter.php

diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/PhpSlimServerCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/PhpSlimServerCodegen.java
index a24865228727..273c3c1d3787 100644
--- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/PhpSlimServerCodegen.java
+++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/PhpSlimServerCodegen.java
@@ -62,7 +62,7 @@ public PhpSlimServerCodegen() {
         embeddedTemplateDir = templateDir = "php-slim-server";
 
         additionalProperties.put(CodegenConstants.GROUP_ID, groupId);
-        additionalProperties.put(CodegenConstants.ARTIFACT_ID, artifactId);      
+        additionalProperties.put(CodegenConstants.ARTIFACT_ID, artifactId);
 
         // override cliOptions from AbstractPhpCodegen
         for (CliOption co : cliOptions) {
@@ -71,8 +71,8 @@ public PhpSlimServerCodegen() {
                 co.setDefault("camelCase");
                 break;
             }
-        }        
-    }    
+        }
+    }
 
     @Override
     public CodegenType getTag() {
@@ -94,7 +94,7 @@ public String apiFileFolder() {
         if (apiPackage.matches("^" + invokerPackage + "\\\\*(.+)")) {
             // need to strip out invokerPackage from path
             return (outputFolder + File.separator + toPackagePath(apiPackage.replaceFirst("^" + invokerPackage + "\\\\*(.+)", "$1"), srcBasePath));
-        }  
+        }
         return (outputFolder + File.separator + toPackagePath(apiPackage, srcBasePath));
     }
 
@@ -115,8 +115,9 @@ public void processOpts() {
         supportingFiles.add(new SupportingFile("composer.mustache", getPackagePath(), "composer.json"));
         supportingFiles.add(new SupportingFile("index.mustache", getPackagePath(), "index.php"));
         supportingFiles.add(new SupportingFile(".htaccess", getPackagePath(), ".htaccess"));
-        supportingFiles.add(new SupportingFile(".gitignore", getPackagePath(), ".gitignore"));       
-        supportingFiles.add(new SupportingFile("AbstractApiController.mustache", toSrcPath(invokerPackage, srcBasePath), "AbstractApiController.php"));        
+        supportingFiles.add(new SupportingFile(".gitignore", getPackagePath(), ".gitignore"));
+        supportingFiles.add(new SupportingFile("AbstractApiController.mustache", toSrcPath(invokerPackage, srcBasePath), "AbstractApiController.php"));
+        supportingFiles.add(new SupportingFile("SlimRouter.mustache", toSrcPath(invokerPackage, srcBasePath), "SlimRouter.php"));
     }
 
     @Override
diff --git a/modules/openapi-generator/src/main/resources/php-slim-server/SlimRouter.mustache b/modules/openapi-generator/src/main/resources/php-slim-server/SlimRouter.mustache
new file mode 100644
index 000000000000..7636cab3e01d
--- /dev/null
+++ b/modules/openapi-generator/src/main/resources/php-slim-server/SlimRouter.mustache
@@ -0,0 +1,88 @@
+<?php
+/**
+ * SlimRouter
+ *
+ * PHP version 5
+ *
+ * @category Class
+ * @package  {{invokerPackage}}
+ * @author   OpenAPI Generator team
+ * @link     https://github.com/openapitools/openapi-generator
+ */
+
+/**{{#apiInfo}}{{#appName}} 
+ * {{{appName}}}
+ *
+ {{/appName}}
+ {{#appDescription}}
+ * {{{appDescription}}}
+ {{/appDescription}}
+ {{#version}}
+ * OpenAPI spec version: {{{version}}}
+ {{/version}}
+ {{#infoEmail}}
+ * Contact: {{{infoEmail}}}
+ {{/infoEmail}}
+ * 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
+ * Do not edit the class manually.
+ */
+namespace {{invokerPackage}};
+
+{{#apis}}
+use {{apiPackage}}\{{classname}};
+{{/apis}}
+use Slim\App;
+use Psr\Container\ContainerInterface;
+use InvalidArgumentException;
+
+/**
+ * SlimRouter Class Doc Comment
+ *
+ * PHP version 5
+ *
+ * @category Class
+ * @package  {{apiPackage}}
+ * @author   OpenAPI Generator team
+ * @link     https://github.com/openapitools/openapi-generator
+ */
+class SlimRouter {
+
+    /**
+     * @var $slimApp Slim\App instance
+     */
+    private $slimApp;
+
+    /**
+     * Class constructor
+     *
+     * @param ContainerInterface|array $container Either a ContainerInterface or an associative array of app settings
+     * @throws InvalidArgumentException when no container is provided that implements ContainerInterface
+     */
+    public function __construct($container = []) {
+        $app = new App($container);
+
+        {{#apis}}
+        {{#operations}}
+        {{#operation}}
+        $app->{{httpMethod}}('{{{basePathWithoutHost}}}{{{path}}}', {{classname}}::class . ':{{operationId}}');
+        {{/operation}}
+        {{/operations}}
+        {{/apis}}
+
+        $this->slimApp = $app;
+    }
+
+    /**
+     * Returns Slim Framework instance
+     * @return App
+     */
+    public function getSlimApp() {
+        return $this->slimApp;
+    }
+}
+{{/apiInfo}}
diff --git a/modules/openapi-generator/src/main/resources/php-slim-server/index.mustache b/modules/openapi-generator/src/main/resources/php-slim-server/index.mustache
index b8f98f43c81a..704b3f3b52d5 100644
--- a/modules/openapi-generator/src/main/resources/php-slim-server/index.mustache
+++ b/modules/openapi-generator/src/main/resources/php-slim-server/index.mustache
@@ -6,16 +6,9 @@
 
 require_once __DIR__ . '/vendor/autoload.php';
 
-$app = new Slim\App();
-
-{{#apis}}{{#operations}}{{#operation}}
-/**
- * {{httpMethod}} {{nickname}}
- * Summary: {{summary}}
- * Notes: {{notes}}
- */
-$app->{{httpMethod}}('{{{basePathWithoutHost}}}{{{path}}}', \{{apiPackage}}\{{classname}}::class . ':{{operationId}}');
-
-{{/operation}}{{/operations}}{{/apis}}{{/apiInfo}}
+use {{invokerPackage}}\SlimRouter;
+{{/apiInfo}}
 
+$router = new SlimRouter();
+$app = $router->getSlimApp();
 $app->run();
diff --git a/modules/openapi-generator/src/main/resources/php-slim-server/model.mustache b/modules/openapi-generator/src/main/resources/php-slim-server/model.mustache
index dc92d31eb0fb..94fd28ef53fe 100644
--- a/modules/openapi-generator/src/main/resources/php-slim-server/model.mustache
+++ b/modules/openapi-generator/src/main/resources/php-slim-server/model.mustache
@@ -1,15 +1,18 @@
 <?php
-{{#models}}{{#model}}/*
+{{#models}}{{#model}}/**
  * {{classname}}
  */
 namespace {{modelPackage}};
 
-/*
+/**
  * {{classname}}
  */
 class {{classname}} {
-    {{#vars}}/* @var {{dataType}} ${{name}} {{#description}}{{description}}{{/description}} */
+
+    {{#vars}}
+    /** @var {{dataType}} ${{name}} {{#description}}{{description}}{{/description}}*/
     private ${{name}};
+
     {{/vars}}
 }
 {{/model}}{{/models}}
\ No newline at end of file
diff --git a/samples/server/petstore-security-test/php-slim/composer.json b/samples/server/petstore-security-test/php-slim/composer.json
index c55c81817653..5e9f23d24644 100644
--- a/samples/server/petstore-security-test/php-slim/composer.json
+++ b/samples/server/petstore-security-test/php-slim/composer.json
@@ -2,5 +2,8 @@
   "minimum-stability": "RC",
   "require": {
     "slim/slim": "3.*"
+  },
+  "autoload": {
+    "psr-4": { "OpenAPIServer\\": "lib/" }
   }
 }
\ No newline at end of file
diff --git a/samples/server/petstore-security-test/php-slim/index.php b/samples/server/petstore-security-test/php-slim/index.php
index 9fc3246ad894..434e9dd80154 100644
--- a/samples/server/petstore-security-test/php-slim/index.php
+++ b/samples/server/petstore-security-test/php-slim/index.php
@@ -6,20 +6,8 @@
 
 require_once __DIR__ . '/vendor/autoload.php';
 
-$app = new Slim\App();
-
-
-/**
- * PUT testCodeInjectEndRnNR
- * Summary: To test code injection  &#39; \&quot; &#x3D;end -- \\r\\n \\n \\r
- * Notes: 
- */
-$app->PUT('/fake', function($request, $response, $args) {
-    $body = $request->getParsedBody();
-    $response->write('How about implementing testCodeInjectEndRnNR as a PUT method ?');
-    return $response;
-});
-
-
+use OpenAPIServer\SlimRouter;
 
+$router = new SlimRouter();
+$app = $router->getSlimApp();
 $app->run();
diff --git a/samples/server/petstore-security-test/php-slim/lib/AbstractApiController.php b/samples/server/petstore-security-test/php-slim/lib/AbstractApiController.php
new file mode 100644
index 000000000000..f2097c6d3869
--- /dev/null
+++ b/samples/server/petstore-security-test/php-slim/lib/AbstractApiController.php
@@ -0,0 +1,55 @@
+<?php
+/**
+ * Abstract Api Controller
+ *
+ * PHP version 5
+ *
+ * @category Class
+ * @package  OpenAPIServer
+ * @author   OpenAPI Generator team
+ * @link     https://github.com/openapitools/openapi-generator
+ */
+
+/**
+ * OpenAPI Petstore  ' \" =end -- \\r\\n \\n \\r
+ *
+ * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\   ' \" =end --       
+ * OpenAPI spec version: 1.0.0  ' \" =end -- \\r\\n \\n \\r
+ * Contact: something@something.abc  ' \" =end -- \\r\\n \\n \\r
+ * 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
+ * Do not edit the class manually.
+ */
+namespace OpenAPIServer;
+
+/**
+ * ApiServer Class Doc Comment
+ *
+ * PHP version 5
+ *
+ * @category Class
+ * @package  OpenAPIServer
+ * @author   OpenAPI Generator team
+ * @link     https://github.com/openapitools/openapi-generator
+ */
+abstract class AbstractApiController {
+
+    /**
+     * @var \Interop\Container\ContainerInterface Slim app container instance
+     */
+    protected $container;
+
+    /**
+     * Route Controller constructor receives container
+     *
+     * @param \Interop\Container\ContainerInterface $container Slim app container instance
+     */
+    public function __construct($container) {
+        $this->container = $container;
+    }
+
+}
diff --git a/samples/server/petstore-security-test/php-slim/lib/Api/FakeApi.php b/samples/server/petstore-security-test/php-slim/lib/Api/FakeApi.php
new file mode 100644
index 000000000000..a931eae1a0ad
--- /dev/null
+++ b/samples/server/petstore-security-test/php-slim/lib/Api/FakeApi.php
@@ -0,0 +1,58 @@
+<?php
+/**
+ * FakeApi
+ *
+ * PHP version 5
+ *
+ * @category Class
+ * @package  OpenAPIServer\Api
+ * @author   OpenAPI Generator team
+ * @link     https://github.com/openapitools/openapi-generator
+ */
+
+/**
+ * OpenAPI Petstore  ' \" =end -- \\r\\n \\n \\r
+ *
+ * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\   ' \" =end --       
+ * OpenAPI spec version: 1.0.0  ' \" =end -- \\r\\n \\n \\r
+ * Contact: something@something.abc  ' \" =end -- \\r\\n \\n \\r
+ * 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
+ * Do not edit the class manually.
+ */
+namespace OpenAPIServer\Api;
+
+use OpenAPIServer\AbstractApiController;
+
+/**
+ * FakeApi Class Doc Comment
+ *
+ * PHP version 5
+ *
+ * @category Class
+ * @package  OpenAPIServer\Api
+ * @author   OpenAPI Generator team
+ * @link     https://github.com/openapitools/openapi-generator
+ */
+class FakeApi extends AbstractApiController {
+
+    /**
+     * PUT testCodeInjectEndRnNR
+     * Summary: To test code injection  &#39; \&quot; &#x3D;end -- \\r\\n \\n \\r
+     * Notes: 
+     *
+     * @param \Psr\Http\Message\ServerRequestInterface $request  Request
+     * @param \Psr\Http\Message\ResponseInterface      $response Response
+     * @param array|null                               $args     Path arguments
+     */
+    public function testCodeInjectEndRnNR($request, $response, $args) {
+        $body = $request->getParsedBody();
+        $response->write('How about implementing testCodeInjectEndRnNR as a PUT method ?');
+        return $response;
+    }
+    
+}
diff --git a/samples/server/petstore-security-test/php-slim/lib/Model/ModelReturn.php b/samples/server/petstore-security-test/php-slim/lib/Model/ModelReturn.php
new file mode 100644
index 000000000000..bc2165d08d0f
--- /dev/null
+++ b/samples/server/petstore-security-test/php-slim/lib/Model/ModelReturn.php
@@ -0,0 +1,15 @@
+<?php
+/**
+ * ModelReturn
+ */
+namespace OpenAPIServer\Model;
+
+/**
+ * ModelReturn
+ */
+class ModelReturn {
+
+    /** @var int $return property description   &#39; \&quot; &#x3D;end -- \\r\\n \\n \\r*/
+    private $return;
+
+}
diff --git a/samples/server/petstore-security-test/php-slim/lib/Models/ModelReturn.php b/samples/server/petstore-security-test/php-slim/lib/Models/ModelReturn.php
deleted file mode 100644
index 9d3ed859a8d3..000000000000
--- a/samples/server/petstore-security-test/php-slim/lib/Models/ModelReturn.php
+++ /dev/null
@@ -1,13 +0,0 @@
-<?php
-/*
- * ModelReturn
- */
-namespace \Models;
-
-/*
- * ModelReturn
- */
-class ModelReturn {
-    /* @var int $return property description   &#39; \&quot; &#x3D;end -- \\r\\n \\n \\r */
-    private $return;
-}
diff --git a/samples/server/petstore-security-test/php-slim/lib/SlimRouter.php b/samples/server/petstore-security-test/php-slim/lib/SlimRouter.php
new file mode 100644
index 000000000000..5de6efff1dbb
--- /dev/null
+++ b/samples/server/petstore-security-test/php-slim/lib/SlimRouter.php
@@ -0,0 +1,72 @@
+<?php
+/**
+ * SlimRouter
+ *
+ * PHP version 5
+ *
+ * @category Class
+ * @package  OpenAPIServer
+ * @author   OpenAPI Generator team
+ * @link     https://github.com/openapitools/openapi-generator
+ */
+
+/** 
+ * OpenAPI Petstore  ' \" =end -- \\r\\n \\n \\r
+ *
+ * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\   ' \" =end --       
+ * OpenAPI spec version: 1.0.0  ' \" =end -- \\r\\n \\n \\r
+ * Contact: something@something.abc  ' \" =end -- \\r\\n \\n \\r
+ * 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
+ * Do not edit the class manually.
+ */
+namespace OpenAPIServer;
+
+use OpenAPIServer\Api\FakeApi;
+use Slim\App;
+use Psr\Container\ContainerInterface;
+use InvalidArgumentException;
+
+/**
+ * SlimRouter Class Doc Comment
+ *
+ * PHP version 5
+ *
+ * @category Class
+ * @package  OpenAPIServer\Api
+ * @author   OpenAPI Generator team
+ * @link     https://github.com/openapitools/openapi-generator
+ */
+class SlimRouter {
+
+    /**
+     * @var $slimApp Slim\App instance
+     */
+    private $slimApp;
+
+    /**
+     * Class constructor
+     *
+     * @param ContainerInterface|array $container Either a ContainerInterface or an associative array of app settings
+     * @throws InvalidArgumentException when no container is provided that implements ContainerInterface
+     */
+    public function __construct($container = []) {
+        $app = new App($container);
+
+        $app->PUT('/fake', FakeApi::class . ':testCodeInjectEndRnNR');
+
+        $this->slimApp = $app;
+    }
+
+    /**
+     * Returns Slim Framework instance
+     * @return App
+     */
+    public function getSlimApp() {
+        return $this->slimApp;
+    }
+}
diff --git a/samples/server/petstore/php-slim/composer.json b/samples/server/petstore/php-slim/composer.json
index c55c81817653..5e9f23d24644 100644
--- a/samples/server/petstore/php-slim/composer.json
+++ b/samples/server/petstore/php-slim/composer.json
@@ -2,5 +2,8 @@
   "minimum-stability": "RC",
   "require": {
     "slim/slim": "3.*"
+  },
+  "autoload": {
+    "psr-4": { "OpenAPIServer\\": "lib/" }
   }
 }
\ No newline at end of file
diff --git a/samples/server/petstore/php-slim/index.php b/samples/server/petstore/php-slim/index.php
index dc0849ad7959..7a69dc94812b 100644
--- a/samples/server/petstore/php-slim/index.php
+++ b/samples/server/petstore/php-slim/index.php
@@ -6,457 +6,8 @@
 
 require_once __DIR__ . '/vendor/autoload.php';
 
-$app = new Slim\App();
-
-
-/**
- * PATCH testSpecialTags
- * Summary: To test special tags
- * Notes: To test special tags
- * Output-Formats: [application/json]
- */
-$app->PATCH('/v2/another-fake/dummy', function($request, $response, $args) {
-    $body = $request->getParsedBody();
-    $response->write('How about implementing testSpecialTags as a PATCH method ?');
-    return $response;
-});
-
-
-/**
- * POST fakeOuterBooleanSerialize
- * Summary: 
- * Notes: Test serialization of outer boolean types
- * Output-Formats: [*_/_*]
- */
-$app->POST('/v2/fake/outer/boolean', function($request, $response, $args) {
-    $body = $request->getParsedBody();
-    $response->write('How about implementing fakeOuterBooleanSerialize as a POST method ?');
-    return $response;
-});
-
-
-/**
- * POST fakeOuterCompositeSerialize
- * Summary: 
- * Notes: Test serialization of object with outer number type
- * Output-Formats: [*_/_*]
- */
-$app->POST('/v2/fake/outer/composite', function($request, $response, $args) {
-    $body = $request->getParsedBody();
-    $response->write('How about implementing fakeOuterCompositeSerialize as a POST method ?');
-    return $response;
-});
-
-
-/**
- * POST fakeOuterNumberSerialize
- * Summary: 
- * Notes: Test serialization of outer number types
- * Output-Formats: [*_/_*]
- */
-$app->POST('/v2/fake/outer/number', function($request, $response, $args) {
-    $body = $request->getParsedBody();
-    $response->write('How about implementing fakeOuterNumberSerialize as a POST method ?');
-    return $response;
-});
-
-
-/**
- * POST fakeOuterStringSerialize
- * Summary: 
- * Notes: Test serialization of outer string types
- * Output-Formats: [*_/_*]
- */
-$app->POST('/v2/fake/outer/string', function($request, $response, $args) {
-    $body = $request->getParsedBody();
-    $response->write('How about implementing fakeOuterStringSerialize as a POST method ?');
-    return $response;
-});
-
-
-/**
- * PUT testBodyWithQueryParams
- * Summary: 
- * Notes: 
- */
-$app->PUT('/v2/fake/body-with-query-params', function($request, $response, $args) {
-    $queryParams = $request->getQueryParams();
-    $query = $request->getQueryParam('query');
-    $body = $request->getParsedBody();
-    $response->write('How about implementing testBodyWithQueryParams as a PUT method ?');
-    return $response;
-});
-
-
-/**
- * PATCH testClientModel
- * Summary: To test \&quot;client\&quot; model
- * Notes: To test \&quot;client\&quot; model
- * Output-Formats: [application/json]
- */
-$app->PATCH('/v2/fake', function($request, $response, $args) {
-    $body = $request->getParsedBody();
-    $response->write('How about implementing testClientModel as a PATCH method ?');
-    return $response;
-});
-
-
-/**
- * POST testEndpointParameters
- * Summary: Fake endpoint for testing various parameters 假端點 偽のエンドポイント 가짜 엔드 포인트 
- * Notes: Fake endpoint for testing various parameters 假端點 偽のエンドポイント 가짜 엔드 포인트 
- */
-$app->POST('/v2/fake', function($request, $response, $args) {
-    $integer = $request->getParsedBodyParam('integer');
-    $int32 = $request->getParsedBodyParam('int32');
-    $int64 = $request->getParsedBodyParam('int64');
-    $number = $request->getParsedBodyParam('number');
-    $float = $request->getParsedBodyParam('float');
-    $double = $request->getParsedBodyParam('double');
-    $string = $request->getParsedBodyParam('string');
-    $patternWithoutDelimiter = $request->getParsedBodyParam('pattern_without_delimiter');
-    $byte = $request->getParsedBodyParam('byte');
-    $binary = (key_exists('binary', $request->getUploadedFiles())) ? $request->getUploadedFiles()['binary'] : null;
-    $date = $request->getParsedBodyParam('date');
-    $dateTime = $request->getParsedBodyParam('dateTime');
-    $password = $request->getParsedBodyParam('password');
-    $callback = $request->getParsedBodyParam('callback');
-    $response->write('How about implementing testEndpointParameters as a POST method ?');
-    return $response;
-});
-
-
-/**
- * GET testEnumParameters
- * Summary: To test enum parameters
- * Notes: To test enum parameters
- */
-$app->GET('/v2/fake', function($request, $response, $args) {
-    $headers = $request->getHeaders();
-    $enumHeaderStringArray = $request->hasHeader('enum_header_string_array') ? $headers['enum_header_string_array'] : null;
-    $enumHeaderString = $request->hasHeader('enum_header_string') ? $headers['enum_header_string'] : null;
-    $queryParams = $request->getQueryParams();
-    $enumQueryStringArray = $request->getQueryParam('enum_query_string_array');
-    $enumQueryString = $request->getQueryParam('enum_query_string');
-    $enumQueryInteger = $request->getQueryParam('enum_query_integer');
-    $enumQueryDouble = $request->getQueryParam('enum_query_double');
-    $enumFormStringArray = $request->getParsedBodyParam('enum_form_string_array');
-    $enumFormString = $request->getParsedBodyParam('enum_form_string');
-    $response->write('How about implementing testEnumParameters as a GET method ?');
-    return $response;
-});
-
-
-/**
- * POST testInlineAdditionalProperties
- * Summary: test inline additionalProperties
- * Notes: 
- */
-$app->POST('/v2/fake/inline-additionalProperties', function($request, $response, $args) {
-    $body = $request->getParsedBody();
-    $response->write('How about implementing testInlineAdditionalProperties as a POST method ?');
-    return $response;
-});
-
-
-/**
- * GET testJsonFormData
- * Summary: test json serialization of form data
- * Notes: 
- */
-$app->GET('/v2/fake/jsonFormData', function($request, $response, $args) {
-    $param = $request->getParsedBodyParam('param');
-    $param2 = $request->getParsedBodyParam('param2');
-    $response->write('How about implementing testJsonFormData as a GET method ?');
-    return $response;
-});
-
-
-/**
- * PATCH testClassname
- * Summary: To test class name in snake case
- * Notes: To test class name in snake case
- * Output-Formats: [application/json]
- */
-$app->PATCH('/v2/fake_classname_test', function($request, $response, $args) {
-    $body = $request->getParsedBody();
-    $response->write('How about implementing testClassname as a PATCH method ?');
-    return $response;
-});
-
-
-/**
- * POST addPet
- * Summary: Add a new pet to the store
- * Notes: 
- */
-$app->POST('/v2/pet', function($request, $response, $args) {
-    $body = $request->getParsedBody();
-    $response->write('How about implementing addPet as a POST method ?');
-    return $response;
-});
-
-
-/**
- * GET findPetsByStatus
- * Summary: Finds Pets by status
- * Notes: Multiple status values can be provided with comma separated strings
- * Output-Formats: [application/xml, application/json]
- */
-$app->GET('/v2/pet/findByStatus', function($request, $response, $args) {
-    $queryParams = $request->getQueryParams();
-    $status = $request->getQueryParam('status');
-    $response->write('How about implementing findPetsByStatus as a GET method ?');
-    return $response;
-});
-
-
-/**
- * GET findPetsByTags
- * Summary: Finds Pets by tags
- * Notes: Multiple tags can be provided with comma separated strings. Use tag1, tag2, tag3 for testing.
- * Output-Formats: [application/xml, application/json]
- */
-$app->GET('/v2/pet/findByTags', function($request, $response, $args) {
-    $queryParams = $request->getQueryParams();
-    $tags = $request->getQueryParam('tags');
-    $response->write('How about implementing findPetsByTags as a GET method ?');
-    return $response;
-});
-
-
-/**
- * PUT updatePet
- * Summary: Update an existing pet
- * Notes: 
- */
-$app->PUT('/v2/pet', function($request, $response, $args) {
-    $body = $request->getParsedBody();
-    $response->write('How about implementing updatePet as a PUT method ?');
-    return $response;
-});
-
-
-/**
- * DELETE deletePet
- * Summary: Deletes a pet
- * Notes: 
- */
-$app->DELETE('/v2/pet/{petId}', function($request, $response, $args) {
-    $headers = $request->getHeaders();
-    $apiKey = $request->hasHeader('api_key') ? $headers['api_key'] : null;
-    $petId = $args['petId'];
-    $response->write('How about implementing deletePet as a DELETE method ?');
-    return $response;
-});
-
-
-/**
- * GET getPetById
- * Summary: Find pet by ID
- * Notes: Returns a single pet
- * Output-Formats: [application/xml, application/json]
- */
-$app->GET('/v2/pet/{petId}', function($request, $response, $args) {
-    $petId = $args['petId'];
-    $response->write('How about implementing getPetById as a GET method ?');
-    return $response;
-});
-
-
-/**
- * POST updatePetWithForm
- * Summary: Updates a pet in the store with form data
- * Notes: 
- */
-$app->POST('/v2/pet/{petId}', function($request, $response, $args) {
-    $petId = $args['petId'];
-    $name = $request->getParsedBodyParam('name');
-    $status = $request->getParsedBodyParam('status');
-    $response->write('How about implementing updatePetWithForm as a POST method ?');
-    return $response;
-});
-
-
-/**
- * POST uploadFile
- * Summary: uploads an image
- * Notes: 
- * Output-Formats: [application/json]
- */
-$app->POST('/v2/pet/{petId}/uploadImage', function($request, $response, $args) {
-    $petId = $args['petId'];
-    $additionalMetadata = $request->getParsedBodyParam('additionalMetadata');
-    $file = (key_exists('file', $request->getUploadedFiles())) ? $request->getUploadedFiles()['file'] : null;
-    $response->write('How about implementing uploadFile as a POST method ?');
-    return $response;
-});
-
-
-/**
- * POST uploadFileWithRequiredFile
- * Summary: uploads an image (required)
- * Notes: 
- * Output-Formats: [application/json]
- */
-$app->POST('/v2/fake/{petId}/uploadImageWithRequiredFile', function($request, $response, $args) {
-    $petId = $args['petId'];
-    $additionalMetadata = $request->getParsedBodyParam('additionalMetadata');
-    $file = (key_exists('file', $request->getUploadedFiles())) ? $request->getUploadedFiles()['file'] : null;
-    $response->write('How about implementing uploadFileWithRequiredFile as a POST method ?');
-    return $response;
-});
-
-
-/**
- * GET getInventory
- * Summary: Returns pet inventories by status
- * Notes: Returns a map of status codes to quantities
- * Output-Formats: [application/json]
- */
-$app->GET('/v2/store/inventory', function($request, $response, $args) {
-    $response->write('How about implementing getInventory as a GET method ?');
-    return $response;
-});
-
-
-/**
- * POST placeOrder
- * Summary: Place an order for a pet
- * Notes: 
- * Output-Formats: [application/xml, application/json]
- */
-$app->POST('/v2/store/order', function($request, $response, $args) {
-    $body = $request->getParsedBody();
-    $response->write('How about implementing placeOrder as a POST method ?');
-    return $response;
-});
-
-
-/**
- * DELETE deleteOrder
- * Summary: Delete purchase order by ID
- * Notes: For valid response try integer IDs with value &lt; 1000. Anything above 1000 or nonintegers will generate API errors
- */
-$app->DELETE('/v2/store/order/{order_id}', function($request, $response, $args) {
-    $orderId = $args['order_id'];
-    $response->write('How about implementing deleteOrder as a DELETE method ?');
-    return $response;
-});
-
-
-/**
- * GET getOrderById
- * Summary: Find purchase order by ID
- * Notes: For valid response try integer IDs with value &lt;&#x3D; 5 or &gt; 10. Other values will generated exceptions
- * Output-Formats: [application/xml, application/json]
- */
-$app->GET('/v2/store/order/{order_id}', function($request, $response, $args) {
-    $orderId = $args['order_id'];
-    $response->write('How about implementing getOrderById as a GET method ?');
-    return $response;
-});
-
-
-/**
- * POST createUser
- * Summary: Create user
- * Notes: This can only be done by the logged in user.
- */
-$app->POST('/v2/user', function($request, $response, $args) {
-    $body = $request->getParsedBody();
-    $response->write('How about implementing createUser as a POST method ?');
-    return $response;
-});
-
-
-/**
- * POST createUsersWithArrayInput
- * Summary: Creates list of users with given input array
- * Notes: 
- */
-$app->POST('/v2/user/createWithArray', function($request, $response, $args) {
-    $body = $request->getParsedBody();
-    $response->write('How about implementing createUsersWithArrayInput as a POST method ?');
-    return $response;
-});
-
-
-/**
- * POST createUsersWithListInput
- * Summary: Creates list of users with given input array
- * Notes: 
- */
-$app->POST('/v2/user/createWithList', function($request, $response, $args) {
-    $body = $request->getParsedBody();
-    $response->write('How about implementing createUsersWithListInput as a POST method ?');
-    return $response;
-});
-
-
-/**
- * GET loginUser
- * Summary: Logs user into the system
- * Notes: 
- * Output-Formats: [application/xml, application/json]
- */
-$app->GET('/v2/user/login', function($request, $response, $args) {
-    $queryParams = $request->getQueryParams();
-    $username = $request->getQueryParam('username');
-    $password = $request->getQueryParam('password');
-    $response->write('How about implementing loginUser as a GET method ?');
-    return $response;
-});
-
-
-/**
- * GET logoutUser
- * Summary: Logs out current logged in user session
- * Notes: 
- */
-$app->GET('/v2/user/logout', function($request, $response, $args) {
-    $response->write('How about implementing logoutUser as a GET method ?');
-    return $response;
-});
-
-
-/**
- * DELETE deleteUser
- * Summary: Delete user
- * Notes: This can only be done by the logged in user.
- */
-$app->DELETE('/v2/user/{username}', function($request, $response, $args) {
-    $username = $args['username'];
-    $response->write('How about implementing deleteUser as a DELETE method ?');
-    return $response;
-});
-
-
-/**
- * GET getUserByName
- * Summary: Get user by user name
- * Notes: 
- * Output-Formats: [application/xml, application/json]
- */
-$app->GET('/v2/user/{username}', function($request, $response, $args) {
-    $username = $args['username'];
-    $response->write('How about implementing getUserByName as a GET method ?');
-    return $response;
-});
-
-
-/**
- * PUT updateUser
- * Summary: Updated user
- * Notes: This can only be done by the logged in user.
- */
-$app->PUT('/v2/user/{username}', function($request, $response, $args) {
-    $username = $args['username'];
-    $body = $request->getParsedBody();
-    $response->write('How about implementing updateUser as a PUT method ?');
-    return $response;
-});
-
-
+use OpenAPIServer\SlimRouter;
 
+$router = new SlimRouter();
+$app = $router->getSlimApp();
 $app->run();
diff --git a/samples/server/petstore/php-slim/lib/AbstractApiController.php b/samples/server/petstore/php-slim/lib/AbstractApiController.php
new file mode 100644
index 000000000000..7f1ee4141914
--- /dev/null
+++ b/samples/server/petstore/php-slim/lib/AbstractApiController.php
@@ -0,0 +1,54 @@
+<?php
+/**
+ * Abstract Api Controller
+ *
+ * PHP version 5
+ *
+ * @category Class
+ * @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: \" \\
+ * OpenAPI spec version: 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
+ * Do not edit the class manually.
+ */
+namespace OpenAPIServer;
+
+/**
+ * ApiServer Class Doc Comment
+ *
+ * PHP version 5
+ *
+ * @category Class
+ * @package  OpenAPIServer
+ * @author   OpenAPI Generator team
+ * @link     https://github.com/openapitools/openapi-generator
+ */
+abstract class AbstractApiController {
+
+    /**
+     * @var \Interop\Container\ContainerInterface Slim app container instance
+     */
+    protected $container;
+
+    /**
+     * Route Controller constructor receives container
+     *
+     * @param \Interop\Container\ContainerInterface $container Slim app container instance
+     */
+    public function __construct($container) {
+        $this->container = $container;
+    }
+
+}
diff --git a/samples/server/petstore/php-slim/lib/Api/AnotherFakeApi.php b/samples/server/petstore/php-slim/lib/Api/AnotherFakeApi.php
new file mode 100644
index 000000000000..1888e1319cbc
--- /dev/null
+++ b/samples/server/petstore/php-slim/lib/Api/AnotherFakeApi.php
@@ -0,0 +1,58 @@
+<?php
+/**
+ * AnotherFakeApi
+ *
+ * PHP version 5
+ *
+ * @category Class
+ * @package  OpenAPIServer\Api
+ * @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: \" \\
+ * OpenAPI spec version: 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
+ * Do not edit the class manually.
+ */
+namespace OpenAPIServer\Api;
+
+use OpenAPIServer\AbstractApiController;
+
+/**
+ * AnotherFakeApi Class Doc Comment
+ *
+ * PHP version 5
+ *
+ * @category Class
+ * @package  OpenAPIServer\Api
+ * @author   OpenAPI Generator team
+ * @link     https://github.com/openapitools/openapi-generator
+ */
+class AnotherFakeApi extends AbstractApiController {
+
+    /**
+     * PATCH testSpecialTags
+     * Summary: To test special tags
+     * Notes: To test special tags
+     * Output-Formats: [application/json]
+     *
+     * @param \Psr\Http\Message\ServerRequestInterface $request  Request
+     * @param \Psr\Http\Message\ResponseInterface      $response Response
+     * @param array|null                               $args     Path arguments
+     */
+    public function testSpecialTags($request, $response, $args) {
+        $body = $request->getParsedBody();
+        $response->write('How about implementing testSpecialTags as a PATCH method ?');
+        return $response;
+    }
+    
+}
diff --git a/samples/server/petstore/php-slim/lib/Api/FakeApi.php b/samples/server/petstore/php-slim/lib/Api/FakeApi.php
new file mode 100644
index 000000000000..8baa4619a763
--- /dev/null
+++ b/samples/server/petstore/php-slim/lib/Api/FakeApi.php
@@ -0,0 +1,222 @@
+<?php
+/**
+ * FakeApi
+ *
+ * PHP version 5
+ *
+ * @category Class
+ * @package  OpenAPIServer\Api
+ * @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: \" \\
+ * OpenAPI spec version: 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
+ * Do not edit the class manually.
+ */
+namespace OpenAPIServer\Api;
+
+use OpenAPIServer\AbstractApiController;
+
+/**
+ * FakeApi Class Doc Comment
+ *
+ * PHP version 5
+ *
+ * @category Class
+ * @package  OpenAPIServer\Api
+ * @author   OpenAPI Generator team
+ * @link     https://github.com/openapitools/openapi-generator
+ */
+class FakeApi extends AbstractApiController {
+
+    /**
+     * POST fakeOuterBooleanSerialize
+     * Summary: 
+     * Notes: Test serialization of outer boolean types
+     * Output-Formats: [*_/_*]
+     *
+     * @param \Psr\Http\Message\ServerRequestInterface $request  Request
+     * @param \Psr\Http\Message\ResponseInterface      $response Response
+     * @param array|null                               $args     Path arguments
+     */
+    public function fakeOuterBooleanSerialize($request, $response, $args) {
+        $body = $request->getParsedBody();
+        $response->write('How about implementing fakeOuterBooleanSerialize as a POST method ?');
+        return $response;
+    }
+    
+    /**
+     * POST fakeOuterCompositeSerialize
+     * Summary: 
+     * Notes: Test serialization of object with outer number type
+     * Output-Formats: [*_/_*]
+     *
+     * @param \Psr\Http\Message\ServerRequestInterface $request  Request
+     * @param \Psr\Http\Message\ResponseInterface      $response Response
+     * @param array|null                               $args     Path arguments
+     */
+    public function fakeOuterCompositeSerialize($request, $response, $args) {
+        $body = $request->getParsedBody();
+        $response->write('How about implementing fakeOuterCompositeSerialize as a POST method ?');
+        return $response;
+    }
+    
+    /**
+     * POST fakeOuterNumberSerialize
+     * Summary: 
+     * Notes: Test serialization of outer number types
+     * Output-Formats: [*_/_*]
+     *
+     * @param \Psr\Http\Message\ServerRequestInterface $request  Request
+     * @param \Psr\Http\Message\ResponseInterface      $response Response
+     * @param array|null                               $args     Path arguments
+     */
+    public function fakeOuterNumberSerialize($request, $response, $args) {
+        $body = $request->getParsedBody();
+        $response->write('How about implementing fakeOuterNumberSerialize as a POST method ?');
+        return $response;
+    }
+    
+    /**
+     * POST fakeOuterStringSerialize
+     * Summary: 
+     * Notes: Test serialization of outer string types
+     * Output-Formats: [*_/_*]
+     *
+     * @param \Psr\Http\Message\ServerRequestInterface $request  Request
+     * @param \Psr\Http\Message\ResponseInterface      $response Response
+     * @param array|null                               $args     Path arguments
+     */
+    public function fakeOuterStringSerialize($request, $response, $args) {
+        $body = $request->getParsedBody();
+        $response->write('How about implementing fakeOuterStringSerialize as a POST method ?');
+        return $response;
+    }
+    
+    /**
+     * PUT testBodyWithQueryParams
+     * Summary: 
+     * Notes: 
+     *
+     * @param \Psr\Http\Message\ServerRequestInterface $request  Request
+     * @param \Psr\Http\Message\ResponseInterface      $response Response
+     * @param array|null                               $args     Path arguments
+     */
+    public function testBodyWithQueryParams($request, $response, $args) {
+        $queryParams = $request->getQueryParams();
+        $query = $request->getQueryParam('query');
+        $body = $request->getParsedBody();
+        $response->write('How about implementing testBodyWithQueryParams as a PUT method ?');
+        return $response;
+    }
+    
+    /**
+     * PATCH testClientModel
+     * Summary: To test \&quot;client\&quot; model
+     * Notes: To test \&quot;client\&quot; model
+     * Output-Formats: [application/json]
+     *
+     * @param \Psr\Http\Message\ServerRequestInterface $request  Request
+     * @param \Psr\Http\Message\ResponseInterface      $response Response
+     * @param array|null                               $args     Path arguments
+     */
+    public function testClientModel($request, $response, $args) {
+        $body = $request->getParsedBody();
+        $response->write('How about implementing testClientModel as a PATCH method ?');
+        return $response;
+    }
+    
+    /**
+     * POST testEndpointParameters
+     * Summary: Fake endpoint for testing various parameters 假端點 偽のエンドポイント 가짜 엔드 포인트 
+     * Notes: Fake endpoint for testing various parameters 假端點 偽のエンドポイント 가짜 엔드 포인트 
+     *
+     * @param \Psr\Http\Message\ServerRequestInterface $request  Request
+     * @param \Psr\Http\Message\ResponseInterface      $response Response
+     * @param array|null                               $args     Path arguments
+     */
+    public function testEndpointParameters($request, $response, $args) {
+        $integer = $request->getParsedBodyParam('integer');
+        $int32 = $request->getParsedBodyParam('int32');
+        $int64 = $request->getParsedBodyParam('int64');
+        $number = $request->getParsedBodyParam('number');
+        $float = $request->getParsedBodyParam('float');
+        $double = $request->getParsedBodyParam('double');
+        $string = $request->getParsedBodyParam('string');
+        $patternWithoutDelimiter = $request->getParsedBodyParam('pattern_without_delimiter');
+        $byte = $request->getParsedBodyParam('byte');
+        $binary = (key_exists('binary', $request->getUploadedFiles())) ? $request->getUploadedFiles()['binary'] : null;
+        $date = $request->getParsedBodyParam('date');
+        $dateTime = $request->getParsedBodyParam('dateTime');
+        $password = $request->getParsedBodyParam('password');
+        $callback = $request->getParsedBodyParam('callback');
+        $response->write('How about implementing testEndpointParameters as a POST method ?');
+        return $response;
+    }
+    
+    /**
+     * GET testEnumParameters
+     * Summary: To test enum parameters
+     * Notes: To test enum parameters
+     *
+     * @param \Psr\Http\Message\ServerRequestInterface $request  Request
+     * @param \Psr\Http\Message\ResponseInterface      $response Response
+     * @param array|null                               $args     Path arguments
+     */
+    public function testEnumParameters($request, $response, $args) {
+        $headers = $request->getHeaders();
+        $enumHeaderStringArray = $request->hasHeader('enum_header_string_array') ? $headers['enum_header_string_array'] : null;
+        $enumHeaderString = $request->hasHeader('enum_header_string') ? $headers['enum_header_string'] : null;
+        $queryParams = $request->getQueryParams();
+        $enumQueryStringArray = $request->getQueryParam('enum_query_string_array');
+        $enumQueryString = $request->getQueryParam('enum_query_string');
+        $enumQueryInteger = $request->getQueryParam('enum_query_integer');
+        $enumQueryDouble = $request->getQueryParam('enum_query_double');
+        $enumFormStringArray = $request->getParsedBodyParam('enum_form_string_array');
+        $enumFormString = $request->getParsedBodyParam('enum_form_string');
+        $response->write('How about implementing testEnumParameters as a GET method ?');
+        return $response;
+    }
+    
+    /**
+     * POST testInlineAdditionalProperties
+     * Summary: test inline additionalProperties
+     * Notes: 
+     *
+     * @param \Psr\Http\Message\ServerRequestInterface $request  Request
+     * @param \Psr\Http\Message\ResponseInterface      $response Response
+     * @param array|null                               $args     Path arguments
+     */
+    public function testInlineAdditionalProperties($request, $response, $args) {
+        $body = $request->getParsedBody();
+        $response->write('How about implementing testInlineAdditionalProperties as a POST method ?');
+        return $response;
+    }
+    
+    /**
+     * GET testJsonFormData
+     * Summary: test json serialization of form data
+     * Notes: 
+     *
+     * @param \Psr\Http\Message\ServerRequestInterface $request  Request
+     * @param \Psr\Http\Message\ResponseInterface      $response Response
+     * @param array|null                               $args     Path arguments
+     */
+    public function testJsonFormData($request, $response, $args) {
+        $param = $request->getParsedBodyParam('param');
+        $param2 = $request->getParsedBodyParam('param2');
+        $response->write('How about implementing testJsonFormData as a GET method ?');
+        return $response;
+    }
+    
+}
diff --git a/samples/server/petstore/php-slim/lib/Api/FakeClassnameTags123Api.php b/samples/server/petstore/php-slim/lib/Api/FakeClassnameTags123Api.php
new file mode 100644
index 000000000000..e824913c4e34
--- /dev/null
+++ b/samples/server/petstore/php-slim/lib/Api/FakeClassnameTags123Api.php
@@ -0,0 +1,58 @@
+<?php
+/**
+ * FakeClassnameTags123Api
+ *
+ * PHP version 5
+ *
+ * @category Class
+ * @package  OpenAPIServer\Api
+ * @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: \" \\
+ * OpenAPI spec version: 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
+ * Do not edit the class manually.
+ */
+namespace OpenAPIServer\Api;
+
+use OpenAPIServer\AbstractApiController;
+
+/**
+ * FakeClassnameTags123Api Class Doc Comment
+ *
+ * PHP version 5
+ *
+ * @category Class
+ * @package  OpenAPIServer\Api
+ * @author   OpenAPI Generator team
+ * @link     https://github.com/openapitools/openapi-generator
+ */
+class FakeClassnameTags123Api extends AbstractApiController {
+
+    /**
+     * PATCH testClassname
+     * Summary: To test class name in snake case
+     * Notes: To test class name in snake case
+     * Output-Formats: [application/json]
+     *
+     * @param \Psr\Http\Message\ServerRequestInterface $request  Request
+     * @param \Psr\Http\Message\ResponseInterface      $response Response
+     * @param array|null                               $args     Path arguments
+     */
+    public function testClassname($request, $response, $args) {
+        $body = $request->getParsedBody();
+        $response->write('How about implementing testClassname as a PATCH method ?');
+        return $response;
+    }
+    
+}
diff --git a/samples/server/petstore/php-slim/lib/Api/PetApi.php b/samples/server/petstore/php-slim/lib/Api/PetApi.php
new file mode 100644
index 000000000000..666b0e5ab9ab
--- /dev/null
+++ b/samples/server/petstore/php-slim/lib/Api/PetApi.php
@@ -0,0 +1,192 @@
+<?php
+/**
+ * PetApi
+ *
+ * PHP version 5
+ *
+ * @category Class
+ * @package  OpenAPIServer\Api
+ * @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: \" \\
+ * OpenAPI spec version: 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
+ * Do not edit the class manually.
+ */
+namespace OpenAPIServer\Api;
+
+use OpenAPIServer\AbstractApiController;
+
+/**
+ * PetApi Class Doc Comment
+ *
+ * PHP version 5
+ *
+ * @category Class
+ * @package  OpenAPIServer\Api
+ * @author   OpenAPI Generator team
+ * @link     https://github.com/openapitools/openapi-generator
+ */
+class PetApi extends AbstractApiController {
+
+    /**
+     * POST addPet
+     * Summary: Add a new pet to the store
+     * Notes: 
+     *
+     * @param \Psr\Http\Message\ServerRequestInterface $request  Request
+     * @param \Psr\Http\Message\ResponseInterface      $response Response
+     * @param array|null                               $args     Path arguments
+     */
+    public function addPet($request, $response, $args) {
+        $body = $request->getParsedBody();
+        $response->write('How about implementing addPet as a POST method ?');
+        return $response;
+    }
+    
+    /**
+     * DELETE deletePet
+     * Summary: Deletes a pet
+     * Notes: 
+     *
+     * @param \Psr\Http\Message\ServerRequestInterface $request  Request
+     * @param \Psr\Http\Message\ResponseInterface      $response Response
+     * @param array|null                               $args     Path arguments
+     */
+    public function deletePet($request, $response, $args) {
+        $headers = $request->getHeaders();
+        $apiKey = $request->hasHeader('api_key') ? $headers['api_key'] : null;
+        $petId = $args['petId'];
+        $response->write('How about implementing deletePet as a DELETE method ?');
+        return $response;
+    }
+    
+    /**
+     * GET findPetsByStatus
+     * Summary: Finds Pets by status
+     * Notes: Multiple status values can be provided with comma separated strings
+     * Output-Formats: [application/xml, application/json]
+     *
+     * @param \Psr\Http\Message\ServerRequestInterface $request  Request
+     * @param \Psr\Http\Message\ResponseInterface      $response Response
+     * @param array|null                               $args     Path arguments
+     */
+    public function findPetsByStatus($request, $response, $args) {
+        $queryParams = $request->getQueryParams();
+        $status = $request->getQueryParam('status');
+        $response->write('How about implementing findPetsByStatus as a GET method ?');
+        return $response;
+    }
+    
+    /**
+     * GET findPetsByTags
+     * Summary: Finds Pets by tags
+     * Notes: Multiple tags can be provided with comma separated strings. Use tag1, tag2, tag3 for testing.
+     * Output-Formats: [application/xml, application/json]
+     *
+     * @param \Psr\Http\Message\ServerRequestInterface $request  Request
+     * @param \Psr\Http\Message\ResponseInterface      $response Response
+     * @param array|null                               $args     Path arguments
+     */
+    public function findPetsByTags($request, $response, $args) {
+        $queryParams = $request->getQueryParams();
+        $tags = $request->getQueryParam('tags');
+        $response->write('How about implementing findPetsByTags as a GET method ?');
+        return $response;
+    }
+    
+    /**
+     * GET getPetById
+     * Summary: Find pet by ID
+     * Notes: Returns a single pet
+     * Output-Formats: [application/xml, application/json]
+     *
+     * @param \Psr\Http\Message\ServerRequestInterface $request  Request
+     * @param \Psr\Http\Message\ResponseInterface      $response Response
+     * @param array|null                               $args     Path arguments
+     */
+    public function getPetById($request, $response, $args) {
+        $petId = $args['petId'];
+        $response->write('How about implementing getPetById as a GET method ?');
+        return $response;
+    }
+    
+    /**
+     * PUT updatePet
+     * Summary: Update an existing pet
+     * Notes: 
+     *
+     * @param \Psr\Http\Message\ServerRequestInterface $request  Request
+     * @param \Psr\Http\Message\ResponseInterface      $response Response
+     * @param array|null                               $args     Path arguments
+     */
+    public function updatePet($request, $response, $args) {
+        $body = $request->getParsedBody();
+        $response->write('How about implementing updatePet as a PUT method ?');
+        return $response;
+    }
+    
+    /**
+     * POST updatePetWithForm
+     * Summary: Updates a pet in the store with form data
+     * Notes: 
+     *
+     * @param \Psr\Http\Message\ServerRequestInterface $request  Request
+     * @param \Psr\Http\Message\ResponseInterface      $response Response
+     * @param array|null                               $args     Path arguments
+     */
+    public function updatePetWithForm($request, $response, $args) {
+        $petId = $args['petId'];
+        $name = $request->getParsedBodyParam('name');
+        $status = $request->getParsedBodyParam('status');
+        $response->write('How about implementing updatePetWithForm as a POST method ?');
+        return $response;
+    }
+    
+    /**
+     * POST uploadFile
+     * Summary: uploads an image
+     * Notes: 
+     * Output-Formats: [application/json]
+     *
+     * @param \Psr\Http\Message\ServerRequestInterface $request  Request
+     * @param \Psr\Http\Message\ResponseInterface      $response Response
+     * @param array|null                               $args     Path arguments
+     */
+    public function uploadFile($request, $response, $args) {
+        $petId = $args['petId'];
+        $additionalMetadata = $request->getParsedBodyParam('additionalMetadata');
+        $file = (key_exists('file', $request->getUploadedFiles())) ? $request->getUploadedFiles()['file'] : null;
+        $response->write('How about implementing uploadFile as a POST method ?');
+        return $response;
+    }
+    
+    /**
+     * POST uploadFileWithRequiredFile
+     * Summary: uploads an image (required)
+     * Notes: 
+     * Output-Formats: [application/json]
+     *
+     * @param \Psr\Http\Message\ServerRequestInterface $request  Request
+     * @param \Psr\Http\Message\ResponseInterface      $response Response
+     * @param array|null                               $args     Path arguments
+     */
+    public function uploadFileWithRequiredFile($request, $response, $args) {
+        $petId = $args['petId'];
+        $additionalMetadata = $request->getParsedBodyParam('additionalMetadata');
+        $file = (key_exists('file', $request->getUploadedFiles())) ? $request->getUploadedFiles()['file'] : null;
+        $response->write('How about implementing uploadFileWithRequiredFile as a POST method ?');
+        return $response;
+    }
+    
+}
diff --git a/samples/server/petstore/php-slim/lib/Api/StoreApi.php b/samples/server/petstore/php-slim/lib/Api/StoreApi.php
new file mode 100644
index 000000000000..181c66337eb3
--- /dev/null
+++ b/samples/server/petstore/php-slim/lib/Api/StoreApi.php
@@ -0,0 +1,104 @@
+<?php
+/**
+ * StoreApi
+ *
+ * PHP version 5
+ *
+ * @category Class
+ * @package  OpenAPIServer\Api
+ * @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: \" \\
+ * OpenAPI spec version: 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
+ * Do not edit the class manually.
+ */
+namespace OpenAPIServer\Api;
+
+use OpenAPIServer\AbstractApiController;
+
+/**
+ * StoreApi Class Doc Comment
+ *
+ * PHP version 5
+ *
+ * @category Class
+ * @package  OpenAPIServer\Api
+ * @author   OpenAPI Generator team
+ * @link     https://github.com/openapitools/openapi-generator
+ */
+class StoreApi extends AbstractApiController {
+
+    /**
+     * DELETE deleteOrder
+     * Summary: Delete purchase order by ID
+     * Notes: For valid response try integer IDs with value &lt; 1000. Anything above 1000 or nonintegers will generate API errors
+     *
+     * @param \Psr\Http\Message\ServerRequestInterface $request  Request
+     * @param \Psr\Http\Message\ResponseInterface      $response Response
+     * @param array|null                               $args     Path arguments
+     */
+    public function deleteOrder($request, $response, $args) {
+        $orderId = $args['order_id'];
+        $response->write('How about implementing deleteOrder as a DELETE method ?');
+        return $response;
+    }
+    
+    /**
+     * GET getInventory
+     * Summary: Returns pet inventories by status
+     * Notes: Returns a map of status codes to quantities
+     * Output-Formats: [application/json]
+     *
+     * @param \Psr\Http\Message\ServerRequestInterface $request  Request
+     * @param \Psr\Http\Message\ResponseInterface      $response Response
+     * @param array|null                               $args     Path arguments
+     */
+    public function getInventory($request, $response, $args) {
+        $response->write('How about implementing getInventory as a GET method ?');
+        return $response;
+    }
+    
+    /**
+     * GET getOrderById
+     * Summary: Find purchase order by ID
+     * Notes: For valid response try integer IDs with value &lt;&#x3D; 5 or &gt; 10. Other values will generated exceptions
+     * Output-Formats: [application/xml, application/json]
+     *
+     * @param \Psr\Http\Message\ServerRequestInterface $request  Request
+     * @param \Psr\Http\Message\ResponseInterface      $response Response
+     * @param array|null                               $args     Path arguments
+     */
+    public function getOrderById($request, $response, $args) {
+        $orderId = $args['order_id'];
+        $response->write('How about implementing getOrderById as a GET method ?');
+        return $response;
+    }
+    
+    /**
+     * POST placeOrder
+     * Summary: Place an order for a pet
+     * Notes: 
+     * Output-Formats: [application/xml, application/json]
+     *
+     * @param \Psr\Http\Message\ServerRequestInterface $request  Request
+     * @param \Psr\Http\Message\ResponseInterface      $response Response
+     * @param array|null                               $args     Path arguments
+     */
+    public function placeOrder($request, $response, $args) {
+        $body = $request->getParsedBody();
+        $response->write('How about implementing placeOrder as a POST method ?');
+        return $response;
+    }
+    
+}
diff --git a/samples/server/petstore/php-slim/lib/Api/UserApi.php b/samples/server/petstore/php-slim/lib/Api/UserApi.php
new file mode 100644
index 000000000000..4ba8c652b71a
--- /dev/null
+++ b/samples/server/petstore/php-slim/lib/Api/UserApi.php
@@ -0,0 +1,166 @@
+<?php
+/**
+ * UserApi
+ *
+ * PHP version 5
+ *
+ * @category Class
+ * @package  OpenAPIServer\Api
+ * @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: \" \\
+ * OpenAPI spec version: 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
+ * Do not edit the class manually.
+ */
+namespace OpenAPIServer\Api;
+
+use OpenAPIServer\AbstractApiController;
+
+/**
+ * UserApi Class Doc Comment
+ *
+ * PHP version 5
+ *
+ * @category Class
+ * @package  OpenAPIServer\Api
+ * @author   OpenAPI Generator team
+ * @link     https://github.com/openapitools/openapi-generator
+ */
+class UserApi extends AbstractApiController {
+
+    /**
+     * POST createUser
+     * Summary: Create user
+     * Notes: This can only be done by the logged in user.
+     *
+     * @param \Psr\Http\Message\ServerRequestInterface $request  Request
+     * @param \Psr\Http\Message\ResponseInterface      $response Response
+     * @param array|null                               $args     Path arguments
+     */
+    public function createUser($request, $response, $args) {
+        $body = $request->getParsedBody();
+        $response->write('How about implementing createUser as a POST method ?');
+        return $response;
+    }
+    
+    /**
+     * POST createUsersWithArrayInput
+     * Summary: Creates list of users with given input array
+     * Notes: 
+     *
+     * @param \Psr\Http\Message\ServerRequestInterface $request  Request
+     * @param \Psr\Http\Message\ResponseInterface      $response Response
+     * @param array|null                               $args     Path arguments
+     */
+    public function createUsersWithArrayInput($request, $response, $args) {
+        $body = $request->getParsedBody();
+        $response->write('How about implementing createUsersWithArrayInput as a POST method ?');
+        return $response;
+    }
+    
+    /**
+     * POST createUsersWithListInput
+     * Summary: Creates list of users with given input array
+     * Notes: 
+     *
+     * @param \Psr\Http\Message\ServerRequestInterface $request  Request
+     * @param \Psr\Http\Message\ResponseInterface      $response Response
+     * @param array|null                               $args     Path arguments
+     */
+    public function createUsersWithListInput($request, $response, $args) {
+        $body = $request->getParsedBody();
+        $response->write('How about implementing createUsersWithListInput as a POST method ?');
+        return $response;
+    }
+    
+    /**
+     * DELETE deleteUser
+     * Summary: Delete user
+     * Notes: This can only be done by the logged in user.
+     *
+     * @param \Psr\Http\Message\ServerRequestInterface $request  Request
+     * @param \Psr\Http\Message\ResponseInterface      $response Response
+     * @param array|null                               $args     Path arguments
+     */
+    public function deleteUser($request, $response, $args) {
+        $username = $args['username'];
+        $response->write('How about implementing deleteUser as a DELETE method ?');
+        return $response;
+    }
+    
+    /**
+     * GET getUserByName
+     * Summary: Get user by user name
+     * Notes: 
+     * Output-Formats: [application/xml, application/json]
+     *
+     * @param \Psr\Http\Message\ServerRequestInterface $request  Request
+     * @param \Psr\Http\Message\ResponseInterface      $response Response
+     * @param array|null                               $args     Path arguments
+     */
+    public function getUserByName($request, $response, $args) {
+        $username = $args['username'];
+        $response->write('How about implementing getUserByName as a GET method ?');
+        return $response;
+    }
+    
+    /**
+     * GET loginUser
+     * Summary: Logs user into the system
+     * Notes: 
+     * Output-Formats: [application/xml, application/json]
+     *
+     * @param \Psr\Http\Message\ServerRequestInterface $request  Request
+     * @param \Psr\Http\Message\ResponseInterface      $response Response
+     * @param array|null                               $args     Path arguments
+     */
+    public function loginUser($request, $response, $args) {
+        $queryParams = $request->getQueryParams();
+        $username = $request->getQueryParam('username');
+        $password = $request->getQueryParam('password');
+        $response->write('How about implementing loginUser as a GET method ?');
+        return $response;
+    }
+    
+    /**
+     * GET logoutUser
+     * Summary: Logs out current logged in user session
+     * Notes: 
+     *
+     * @param \Psr\Http\Message\ServerRequestInterface $request  Request
+     * @param \Psr\Http\Message\ResponseInterface      $response Response
+     * @param array|null                               $args     Path arguments
+     */
+    public function logoutUser($request, $response, $args) {
+        $response->write('How about implementing logoutUser as a GET method ?');
+        return $response;
+    }
+    
+    /**
+     * PUT updateUser
+     * Summary: Updated user
+     * Notes: This can only be done by the logged in user.
+     *
+     * @param \Psr\Http\Message\ServerRequestInterface $request  Request
+     * @param \Psr\Http\Message\ResponseInterface      $response Response
+     * @param array|null                               $args     Path arguments
+     */
+    public function updateUser($request, $response, $args) {
+        $username = $args['username'];
+        $body = $request->getParsedBody();
+        $response->write('How about implementing updateUser as a PUT method ?');
+        return $response;
+    }
+    
+}
diff --git a/samples/server/petstore/php-slim/lib/Models/AdditionalPropertiesClass.php b/samples/server/petstore/php-slim/lib/Model/AdditionalPropertiesClass.php
similarity index 51%
rename from samples/server/petstore/php-slim/lib/Models/AdditionalPropertiesClass.php
rename to samples/server/petstore/php-slim/lib/Model/AdditionalPropertiesClass.php
index f41a1fe67a6a..460fd8573bb0 100644
--- a/samples/server/petstore/php-slim/lib/Models/AdditionalPropertiesClass.php
+++ b/samples/server/petstore/php-slim/lib/Model/AdditionalPropertiesClass.php
@@ -1,15 +1,18 @@
 <?php
-/*
+/**
  * AdditionalPropertiesClass
  */
-namespace \Models;
+namespace OpenAPIServer\Model;
 
-/*
+/**
  * AdditionalPropertiesClass
  */
 class AdditionalPropertiesClass {
-    /* @var map[string,string] $mapProperty  */
+
+    /** @var map[string,string] $mapProperty */
     private $mapProperty;
-/* @var map[string,map[string,string]] $mapOfMapProperty  */
+
+    /** @var map[string,map[string,string]] $mapOfMapProperty */
     private $mapOfMapProperty;
+
 }
diff --git a/samples/server/petstore/php-slim/lib/Model/Animal.php b/samples/server/petstore/php-slim/lib/Model/Animal.php
new file mode 100644
index 000000000000..d4c127fc7573
--- /dev/null
+++ b/samples/server/petstore/php-slim/lib/Model/Animal.php
@@ -0,0 +1,18 @@
+<?php
+/**
+ * Animal
+ */
+namespace OpenAPIServer\Model;
+
+/**
+ * Animal
+ */
+class Animal {
+
+    /** @var string $className */
+    private $className;
+
+    /** @var string $color */
+    private $color;
+
+}
diff --git a/samples/server/petstore/php-slim/lib/Models/AnimalFarm.php b/samples/server/petstore/php-slim/lib/Model/AnimalFarm.php
similarity index 59%
rename from samples/server/petstore/php-slim/lib/Models/AnimalFarm.php
rename to samples/server/petstore/php-slim/lib/Model/AnimalFarm.php
index 174b67c2a6f2..3d3e6bc01835 100644
--- a/samples/server/petstore/php-slim/lib/Models/AnimalFarm.php
+++ b/samples/server/petstore/php-slim/lib/Model/AnimalFarm.php
@@ -1,11 +1,12 @@
 <?php
-/*
+/**
  * AnimalFarm
  */
-namespace \Models;
+namespace OpenAPIServer\Model;
 
-/*
+/**
  * AnimalFarm
  */
 class AnimalFarm {
-    }
+
+}
diff --git a/samples/server/petstore/php-slim/lib/Model/ApiResponse.php b/samples/server/petstore/php-slim/lib/Model/ApiResponse.php
new file mode 100644
index 000000000000..fe48dcd69cef
--- /dev/null
+++ b/samples/server/petstore/php-slim/lib/Model/ApiResponse.php
@@ -0,0 +1,21 @@
+<?php
+/**
+ * ApiResponse
+ */
+namespace OpenAPIServer\Model;
+
+/**
+ * ApiResponse
+ */
+class ApiResponse {
+
+    /** @var int $code */
+    private $code;
+
+    /** @var string $type */
+    private $type;
+
+    /** @var string $message */
+    private $message;
+
+}
diff --git a/samples/server/petstore/php-slim/lib/Models/ArrayOfArrayOfNumberOnly.php b/samples/server/petstore/php-slim/lib/Model/ArrayOfArrayOfNumberOnly.php
similarity index 61%
rename from samples/server/petstore/php-slim/lib/Models/ArrayOfArrayOfNumberOnly.php
rename to samples/server/petstore/php-slim/lib/Model/ArrayOfArrayOfNumberOnly.php
index 7db7dec81d68..604011125290 100644
--- a/samples/server/petstore/php-slim/lib/Models/ArrayOfArrayOfNumberOnly.php
+++ b/samples/server/petstore/php-slim/lib/Model/ArrayOfArrayOfNumberOnly.php
@@ -1,13 +1,15 @@
 <?php
-/*
+/**
  * ArrayOfArrayOfNumberOnly
  */
-namespace \Models;
+namespace OpenAPIServer\Model;
 
-/*
+/**
  * ArrayOfArrayOfNumberOnly
  */
 class ArrayOfArrayOfNumberOnly {
-    /* @var float[][] $arrayArrayNumber  */
+
+    /** @var float[][] $arrayArrayNumber */
     private $arrayArrayNumber;
+
 }
diff --git a/samples/server/petstore/php-slim/lib/Models/ArrayOfNumberOnly.php b/samples/server/petstore/php-slim/lib/Model/ArrayOfNumberOnly.php
similarity index 58%
rename from samples/server/petstore/php-slim/lib/Models/ArrayOfNumberOnly.php
rename to samples/server/petstore/php-slim/lib/Model/ArrayOfNumberOnly.php
index 3f50691a282b..a3b2e76c22c3 100644
--- a/samples/server/petstore/php-slim/lib/Models/ArrayOfNumberOnly.php
+++ b/samples/server/petstore/php-slim/lib/Model/ArrayOfNumberOnly.php
@@ -1,13 +1,15 @@
 <?php
-/*
+/**
  * ArrayOfNumberOnly
  */
-namespace \Models;
+namespace OpenAPIServer\Model;
 
-/*
+/**
  * ArrayOfNumberOnly
  */
 class ArrayOfNumberOnly {
-    /* @var float[] $arrayNumber  */
+
+    /** @var float[] $arrayNumber */
     private $arrayNumber;
+
 }
diff --git a/samples/server/petstore/php-slim/lib/Model/ArrayTest.php b/samples/server/petstore/php-slim/lib/Model/ArrayTest.php
new file mode 100644
index 000000000000..08e8a8ea03a0
--- /dev/null
+++ b/samples/server/petstore/php-slim/lib/Model/ArrayTest.php
@@ -0,0 +1,21 @@
+<?php
+/**
+ * ArrayTest
+ */
+namespace OpenAPIServer\Model;
+
+/**
+ * ArrayTest
+ */
+class ArrayTest {
+
+    /** @var string[] $arrayOfString */
+    private $arrayOfString;
+
+    /** @var int[][] $arrayArrayOfInteger */
+    private $arrayArrayOfInteger;
+
+    /** @var \OpenAPIServer\Model\ReadOnlyFirst[][] $arrayArrayOfModel */
+    private $arrayArrayOfModel;
+
+}
diff --git a/samples/server/petstore/php-slim/lib/Model/Capitalization.php b/samples/server/petstore/php-slim/lib/Model/Capitalization.php
new file mode 100644
index 000000000000..c85a6506cc97
--- /dev/null
+++ b/samples/server/petstore/php-slim/lib/Model/Capitalization.php
@@ -0,0 +1,30 @@
+<?php
+/**
+ * Capitalization
+ */
+namespace OpenAPIServer\Model;
+
+/**
+ * Capitalization
+ */
+class Capitalization {
+
+    /** @var string $smallCamel */
+    private $smallCamel;
+
+    /** @var string $capitalCamel */
+    private $capitalCamel;
+
+    /** @var string $smallSnake */
+    private $smallSnake;
+
+    /** @var string $capitalSnake */
+    private $capitalSnake;
+
+    /** @var string $sCAETHFlowPoints */
+    private $sCAETHFlowPoints;
+
+    /** @var string $aTTNAME Name of the pet */
+    private $aTTNAME;
+
+}
diff --git a/samples/server/petstore/php-slim/lib/Model/Cat.php b/samples/server/petstore/php-slim/lib/Model/Cat.php
new file mode 100644
index 000000000000..072c86d1cb82
--- /dev/null
+++ b/samples/server/petstore/php-slim/lib/Model/Cat.php
@@ -0,0 +1,21 @@
+<?php
+/**
+ * Cat
+ */
+namespace OpenAPIServer\Model;
+
+/**
+ * Cat
+ */
+class Cat {
+
+    /** @var string $className */
+    private $className;
+
+    /** @var string $color */
+    private $color;
+
+    /** @var bool $declawed */
+    private $declawed;
+
+}
diff --git a/samples/server/petstore/php-slim/lib/Model/Category.php b/samples/server/petstore/php-slim/lib/Model/Category.php
new file mode 100644
index 000000000000..92d49af1ba65
--- /dev/null
+++ b/samples/server/petstore/php-slim/lib/Model/Category.php
@@ -0,0 +1,18 @@
+<?php
+/**
+ * Category
+ */
+namespace OpenAPIServer\Model;
+
+/**
+ * Category
+ */
+class Category {
+
+    /** @var int $id */
+    private $id;
+
+    /** @var string $name */
+    private $name;
+
+}
diff --git a/samples/server/petstore/php-slim/lib/Models/ClassModel.php b/samples/server/petstore/php-slim/lib/Model/ClassModel.php
similarity index 54%
rename from samples/server/petstore/php-slim/lib/Models/ClassModel.php
rename to samples/server/petstore/php-slim/lib/Model/ClassModel.php
index 8b3afa357b27..831e8afad417 100644
--- a/samples/server/petstore/php-slim/lib/Models/ClassModel.php
+++ b/samples/server/petstore/php-slim/lib/Model/ClassModel.php
@@ -1,13 +1,15 @@
 <?php
-/*
+/**
  * ClassModel
  */
-namespace \Models;
+namespace OpenAPIServer\Model;
 
-/*
+/**
  * ClassModel
  */
 class ClassModel {
-    /* @var string $class  */
+
+    /** @var string $class */
     private $class;
+
 }
diff --git a/samples/server/petstore/php-slim/lib/Models/Client.php b/samples/server/petstore/php-slim/lib/Model/Client.php
similarity index 50%
rename from samples/server/petstore/php-slim/lib/Models/Client.php
rename to samples/server/petstore/php-slim/lib/Model/Client.php
index f644911b2443..573a7f71b097 100644
--- a/samples/server/petstore/php-slim/lib/Models/Client.php
+++ b/samples/server/petstore/php-slim/lib/Model/Client.php
@@ -1,13 +1,15 @@
 <?php
-/*
+/**
  * Client
  */
-namespace \Models;
+namespace OpenAPIServer\Model;
 
-/*
+/**
  * Client
  */
 class Client {
-    /* @var string $client  */
+
+    /** @var string $client */
     private $client;
+
 }
diff --git a/samples/server/petstore/php-slim/lib/Model/Dog.php b/samples/server/petstore/php-slim/lib/Model/Dog.php
new file mode 100644
index 000000000000..cbb138e27047
--- /dev/null
+++ b/samples/server/petstore/php-slim/lib/Model/Dog.php
@@ -0,0 +1,21 @@
+<?php
+/**
+ * Dog
+ */
+namespace OpenAPIServer\Model;
+
+/**
+ * Dog
+ */
+class Dog {
+
+    /** @var string $className */
+    private $className;
+
+    /** @var string $color */
+    private $color;
+
+    /** @var string $breed */
+    private $breed;
+
+}
diff --git a/samples/server/petstore/php-slim/lib/Models/EnumArrays.php b/samples/server/petstore/php-slim/lib/Model/EnumArrays.php
similarity index 50%
rename from samples/server/petstore/php-slim/lib/Models/EnumArrays.php
rename to samples/server/petstore/php-slim/lib/Model/EnumArrays.php
index 7694d8c53613..420c603ff94f 100644
--- a/samples/server/petstore/php-slim/lib/Models/EnumArrays.php
+++ b/samples/server/petstore/php-slim/lib/Model/EnumArrays.php
@@ -1,15 +1,18 @@
 <?php
-/*
+/**
  * EnumArrays
  */
-namespace \Models;
+namespace OpenAPIServer\Model;
 
-/*
+/**
  * EnumArrays
  */
 class EnumArrays {
-    /* @var string $justSymbol  */
+
+    /** @var string $justSymbol */
     private $justSymbol;
-/* @var string[] $arrayEnum  */
+
+    /** @var string[] $arrayEnum */
     private $arrayEnum;
+
 }
diff --git a/samples/server/petstore/php-slim/lib/Models/EnumClass.php b/samples/server/petstore/php-slim/lib/Model/EnumClass.php
similarity index 58%
rename from samples/server/petstore/php-slim/lib/Models/EnumClass.php
rename to samples/server/petstore/php-slim/lib/Model/EnumClass.php
index 6c2c2a2b31a9..b6ec1ac94217 100644
--- a/samples/server/petstore/php-slim/lib/Models/EnumClass.php
+++ b/samples/server/petstore/php-slim/lib/Model/EnumClass.php
@@ -1,11 +1,12 @@
 <?php
-/*
+/**
  * EnumClass
  */
-namespace \Models;
+namespace OpenAPIServer\Model;
 
-/*
+/**
  * EnumClass
  */
 class EnumClass {
-    }
+
+}
diff --git a/samples/server/petstore/php-slim/lib/Model/EnumTest.php b/samples/server/petstore/php-slim/lib/Model/EnumTest.php
new file mode 100644
index 000000000000..eef0cfb6aa93
--- /dev/null
+++ b/samples/server/petstore/php-slim/lib/Model/EnumTest.php
@@ -0,0 +1,27 @@
+<?php
+/**
+ * EnumTest
+ */
+namespace OpenAPIServer\Model;
+
+/**
+ * EnumTest
+ */
+class EnumTest {
+
+    /** @var string $enumString */
+    private $enumString;
+
+    /** @var string $enumStringRequired */
+    private $enumStringRequired;
+
+    /** @var int $enumInteger */
+    private $enumInteger;
+
+    /** @var double $enumNumber */
+    private $enumNumber;
+
+    /** @var \OpenAPIServer\Model\OuterEnum $outerEnum */
+    private $outerEnum;
+
+}
diff --git a/samples/server/petstore/php-slim/lib/Model/FormatTest.php b/samples/server/petstore/php-slim/lib/Model/FormatTest.php
new file mode 100644
index 000000000000..c04cc766ab08
--- /dev/null
+++ b/samples/server/petstore/php-slim/lib/Model/FormatTest.php
@@ -0,0 +1,51 @@
+<?php
+/**
+ * FormatTest
+ */
+namespace OpenAPIServer\Model;
+
+/**
+ * FormatTest
+ */
+class FormatTest {
+
+    /** @var int $integer */
+    private $integer;
+
+    /** @var int $int32 */
+    private $int32;
+
+    /** @var int $int64 */
+    private $int64;
+
+    /** @var float $number */
+    private $number;
+
+    /** @var float $float */
+    private $float;
+
+    /** @var double $double */
+    private $double;
+
+    /** @var string $string */
+    private $string;
+
+    /** @var string $byte */
+    private $byte;
+
+    /** @var \SplFileObject $binary */
+    private $binary;
+
+    /** @var \DateTime $date */
+    private $date;
+
+    /** @var \DateTime $dateTime */
+    private $dateTime;
+
+    /** @var string $uuid */
+    private $uuid;
+
+    /** @var string $password */
+    private $password;
+
+}
diff --git a/samples/server/petstore/php-slim/lib/Models/HasOnlyReadOnly.php b/samples/server/petstore/php-slim/lib/Model/HasOnlyReadOnly.php
similarity index 53%
rename from samples/server/petstore/php-slim/lib/Models/HasOnlyReadOnly.php
rename to samples/server/petstore/php-slim/lib/Model/HasOnlyReadOnly.php
index da0bad0263c1..de4638ac296a 100644
--- a/samples/server/petstore/php-slim/lib/Models/HasOnlyReadOnly.php
+++ b/samples/server/petstore/php-slim/lib/Model/HasOnlyReadOnly.php
@@ -1,15 +1,18 @@
 <?php
-/*
+/**
  * HasOnlyReadOnly
  */
-namespace \Models;
+namespace OpenAPIServer\Model;
 
-/*
+/**
  * HasOnlyReadOnly
  */
 class HasOnlyReadOnly {
-    /* @var string $bar  */
+
+    /** @var string $bar */
     private $bar;
-/* @var string $foo  */
+
+    /** @var string $foo */
     private $foo;
+
 }
diff --git a/samples/server/petstore/php-slim/lib/Model/MapTest.php b/samples/server/petstore/php-slim/lib/Model/MapTest.php
new file mode 100644
index 000000000000..58415e379ef5
--- /dev/null
+++ b/samples/server/petstore/php-slim/lib/Model/MapTest.php
@@ -0,0 +1,24 @@
+<?php
+/**
+ * MapTest
+ */
+namespace OpenAPIServer\Model;
+
+/**
+ * MapTest
+ */
+class MapTest {
+
+    /** @var map[string,map[string,string]] $mapMapOfString */
+    private $mapMapOfString;
+
+    /** @var map[string,string] $mapOfEnumString */
+    private $mapOfEnumString;
+
+    /** @var map[string,bool] $directMap */
+    private $directMap;
+
+    /** @var \OpenAPIServer\Model\StringBooleanMap $indirectMap */
+    private $indirectMap;
+
+}
diff --git a/samples/server/petstore/php-slim/lib/Models/MixedPropertiesAndAdditionalPropertiesClass.php b/samples/server/petstore/php-slim/lib/Model/MixedPropertiesAndAdditionalPropertiesClass.php
similarity index 56%
rename from samples/server/petstore/php-slim/lib/Models/MixedPropertiesAndAdditionalPropertiesClass.php
rename to samples/server/petstore/php-slim/lib/Model/MixedPropertiesAndAdditionalPropertiesClass.php
index 0240487e722f..077a355cc1ec 100644
--- a/samples/server/petstore/php-slim/lib/Models/MixedPropertiesAndAdditionalPropertiesClass.php
+++ b/samples/server/petstore/php-slim/lib/Model/MixedPropertiesAndAdditionalPropertiesClass.php
@@ -1,17 +1,21 @@
 <?php
-/*
+/**
  * MixedPropertiesAndAdditionalPropertiesClass
  */
-namespace \Models;
+namespace OpenAPIServer\Model;
 
-/*
+/**
  * MixedPropertiesAndAdditionalPropertiesClass
  */
 class MixedPropertiesAndAdditionalPropertiesClass {
-    /* @var string $uuid  */
+
+    /** @var string $uuid */
     private $uuid;
-/* @var \DateTime $dateTime  */
+
+    /** @var \DateTime $dateTime */
     private $dateTime;
-/* @var map[string,\\Models\Animal] $map  */
+
+    /** @var map[string,\OpenAPIServer\Model\Animal] $map */
     private $map;
+
 }
diff --git a/samples/server/petstore/php-slim/lib/Models/Model200Response.php b/samples/server/petstore/php-slim/lib/Model/Model200Response.php
similarity index 55%
rename from samples/server/petstore/php-slim/lib/Models/Model200Response.php
rename to samples/server/petstore/php-slim/lib/Model/Model200Response.php
index 83c654b05854..404ceaad1b7a 100644
--- a/samples/server/petstore/php-slim/lib/Models/Model200Response.php
+++ b/samples/server/petstore/php-slim/lib/Model/Model200Response.php
@@ -1,15 +1,18 @@
 <?php
-/*
+/**
  * Model200Response
  */
-namespace \Models;
+namespace OpenAPIServer\Model;
 
-/*
+/**
  * Model200Response
  */
 class Model200Response {
-    /* @var int $name  */
+
+    /** @var int $name */
     private $name;
-/* @var string $class  */
+
+    /** @var string $class */
     private $class;
+
 }
diff --git a/samples/server/petstore/php-slim/lib/Models/ModelList.php b/samples/server/petstore/php-slim/lib/Model/ModelList.php
similarity index 53%
rename from samples/server/petstore/php-slim/lib/Models/ModelList.php
rename to samples/server/petstore/php-slim/lib/Model/ModelList.php
index eeb477b2f84e..8e668357a198 100644
--- a/samples/server/petstore/php-slim/lib/Models/ModelList.php
+++ b/samples/server/petstore/php-slim/lib/Model/ModelList.php
@@ -1,13 +1,15 @@
 <?php
-/*
+/**
  * ModelList
  */
-namespace \Models;
+namespace OpenAPIServer\Model;
 
-/*
+/**
  * ModelList
  */
 class ModelList {
-    /* @var string $_123list  */
+
+    /** @var string $_123list */
     private $_123list;
+
 }
diff --git a/samples/server/petstore/php-slim/lib/Models/ModelReturn.php b/samples/server/petstore/php-slim/lib/Model/ModelReturn.php
similarity index 56%
rename from samples/server/petstore/php-slim/lib/Models/ModelReturn.php
rename to samples/server/petstore/php-slim/lib/Model/ModelReturn.php
index 56ea1a73c177..5373aa2e7b1e 100644
--- a/samples/server/petstore/php-slim/lib/Models/ModelReturn.php
+++ b/samples/server/petstore/php-slim/lib/Model/ModelReturn.php
@@ -1,13 +1,15 @@
 <?php
-/*
+/**
  * ModelReturn
  */
-namespace \Models;
+namespace OpenAPIServer\Model;
 
-/*
+/**
  * ModelReturn
  */
 class ModelReturn {
-    /* @var int $return  */
+
+    /** @var int $return */
     private $return;
+
 }
diff --git a/samples/server/petstore/php-slim/lib/Model/Name.php b/samples/server/petstore/php-slim/lib/Model/Name.php
new file mode 100644
index 000000000000..162aa21ebe6c
--- /dev/null
+++ b/samples/server/petstore/php-slim/lib/Model/Name.php
@@ -0,0 +1,24 @@
+<?php
+/**
+ * Name
+ */
+namespace OpenAPIServer\Model;
+
+/**
+ * Name
+ */
+class Name {
+
+    /** @var int $name */
+    private $name;
+
+    /** @var int $snakeCase */
+    private $snakeCase;
+
+    /** @var string $property */
+    private $property;
+
+    /** @var int $_123number */
+    private $_123number;
+
+}
diff --git a/samples/server/petstore/php-slim/lib/Models/NumberOnly.php b/samples/server/petstore/php-slim/lib/Model/NumberOnly.php
similarity index 54%
rename from samples/server/petstore/php-slim/lib/Models/NumberOnly.php
rename to samples/server/petstore/php-slim/lib/Model/NumberOnly.php
index 5352681abf14..c725eb39fdb8 100644
--- a/samples/server/petstore/php-slim/lib/Models/NumberOnly.php
+++ b/samples/server/petstore/php-slim/lib/Model/NumberOnly.php
@@ -1,13 +1,15 @@
 <?php
-/*
+/**
  * NumberOnly
  */
-namespace \Models;
+namespace OpenAPIServer\Model;
 
-/*
+/**
  * NumberOnly
  */
 class NumberOnly {
-    /* @var float $justNumber  */
+
+    /** @var float $justNumber */
     private $justNumber;
+
 }
diff --git a/samples/server/petstore/php-slim/lib/Model/Order.php b/samples/server/petstore/php-slim/lib/Model/Order.php
new file mode 100644
index 000000000000..7295a384c8d1
--- /dev/null
+++ b/samples/server/petstore/php-slim/lib/Model/Order.php
@@ -0,0 +1,30 @@
+<?php
+/**
+ * Order
+ */
+namespace OpenAPIServer\Model;
+
+/**
+ * Order
+ */
+class Order {
+
+    /** @var int $id */
+    private $id;
+
+    /** @var int $petId */
+    private $petId;
+
+    /** @var int $quantity */
+    private $quantity;
+
+    /** @var \DateTime $shipDate */
+    private $shipDate;
+
+    /** @var string $status Order Status*/
+    private $status;
+
+    /** @var bool $complete */
+    private $complete;
+
+}
diff --git a/samples/server/petstore/php-slim/lib/Models/OuterComposite.php b/samples/server/petstore/php-slim/lib/Model/OuterComposite.php
similarity index 51%
rename from samples/server/petstore/php-slim/lib/Models/OuterComposite.php
rename to samples/server/petstore/php-slim/lib/Model/OuterComposite.php
index a30028255db7..522683f125ad 100644
--- a/samples/server/petstore/php-slim/lib/Models/OuterComposite.php
+++ b/samples/server/petstore/php-slim/lib/Model/OuterComposite.php
@@ -1,17 +1,21 @@
 <?php
-/*
+/**
  * OuterComposite
  */
-namespace \Models;
+namespace OpenAPIServer\Model;
 
-/*
+/**
  * OuterComposite
  */
 class OuterComposite {
-    /* @var float $myNumber  */
+
+    /** @var float $myNumber */
     private $myNumber;
-/* @var string $myString  */
+
+    /** @var string $myString */
     private $myString;
-/* @var bool $myBoolean  */
+
+    /** @var bool $myBoolean */
     private $myBoolean;
+
 }
diff --git a/samples/server/petstore/php-slim/lib/Models/OuterEnum.php b/samples/server/petstore/php-slim/lib/Model/OuterEnum.php
similarity index 58%
rename from samples/server/petstore/php-slim/lib/Models/OuterEnum.php
rename to samples/server/petstore/php-slim/lib/Model/OuterEnum.php
index 864b5cc6f39e..bd529aca5ee3 100644
--- a/samples/server/petstore/php-slim/lib/Models/OuterEnum.php
+++ b/samples/server/petstore/php-slim/lib/Model/OuterEnum.php
@@ -1,11 +1,12 @@
 <?php
-/*
+/**
  * OuterEnum
  */
-namespace \Models;
+namespace OpenAPIServer\Model;
 
-/*
+/**
  * OuterEnum
  */
 class OuterEnum {
-    }
+
+}
diff --git a/samples/server/petstore/php-slim/lib/Model/Pet.php b/samples/server/petstore/php-slim/lib/Model/Pet.php
new file mode 100644
index 000000000000..6699506e33a5
--- /dev/null
+++ b/samples/server/petstore/php-slim/lib/Model/Pet.php
@@ -0,0 +1,30 @@
+<?php
+/**
+ * Pet
+ */
+namespace OpenAPIServer\Model;
+
+/**
+ * Pet
+ */
+class Pet {
+
+    /** @var int $id */
+    private $id;
+
+    /** @var \OpenAPIServer\Model\Category $category */
+    private $category;
+
+    /** @var string $name */
+    private $name;
+
+    /** @var string[] $photoUrls */
+    private $photoUrls;
+
+    /** @var \OpenAPIServer\Model\Tag[] $tags */
+    private $tags;
+
+    /** @var string $status pet status in the store*/
+    private $status;
+
+}
diff --git a/samples/server/petstore/php-slim/lib/Models/ReadOnlyFirst.php b/samples/server/petstore/php-slim/lib/Model/ReadOnlyFirst.php
similarity index 52%
rename from samples/server/petstore/php-slim/lib/Models/ReadOnlyFirst.php
rename to samples/server/petstore/php-slim/lib/Model/ReadOnlyFirst.php
index 296586fb2bb5..17ae0f6c9870 100644
--- a/samples/server/petstore/php-slim/lib/Models/ReadOnlyFirst.php
+++ b/samples/server/petstore/php-slim/lib/Model/ReadOnlyFirst.php
@@ -1,15 +1,18 @@
 <?php
-/*
+/**
  * ReadOnlyFirst
  */
-namespace \Models;
+namespace OpenAPIServer\Model;
 
-/*
+/**
  * ReadOnlyFirst
  */
 class ReadOnlyFirst {
-    /* @var string $bar  */
+
+    /** @var string $bar */
     private $bar;
-/* @var string $baz  */
+
+    /** @var string $baz */
     private $baz;
+
 }
diff --git a/samples/server/petstore/php-slim/lib/Models/SpecialModelName.php b/samples/server/petstore/php-slim/lib/Model/SpecialModelName.php
similarity index 58%
rename from samples/server/petstore/php-slim/lib/Models/SpecialModelName.php
rename to samples/server/petstore/php-slim/lib/Model/SpecialModelName.php
index 23bf81fe8fd1..dd1d71ff4b12 100644
--- a/samples/server/petstore/php-slim/lib/Models/SpecialModelName.php
+++ b/samples/server/petstore/php-slim/lib/Model/SpecialModelName.php
@@ -1,13 +1,15 @@
 <?php
-/*
+/**
  * SpecialModelName
  */
-namespace \Models;
+namespace OpenAPIServer\Model;
 
-/*
+/**
  * SpecialModelName
  */
 class SpecialModelName {
-    /* @var int $specialPropertyName  */
+
+    /** @var int $specialPropertyName */
     private $specialPropertyName;
+
 }
diff --git a/samples/server/petstore/php-slim/lib/Models/StringBooleanMap.php b/samples/server/petstore/php-slim/lib/Model/StringBooleanMap.php
similarity index 65%
rename from samples/server/petstore/php-slim/lib/Models/StringBooleanMap.php
rename to samples/server/petstore/php-slim/lib/Model/StringBooleanMap.php
index e342fbcb9f23..1164e1d70703 100644
--- a/samples/server/petstore/php-slim/lib/Models/StringBooleanMap.php
+++ b/samples/server/petstore/php-slim/lib/Model/StringBooleanMap.php
@@ -1,11 +1,12 @@
 <?php
-/*
+/**
  * StringBooleanMap
  */
-namespace \Models;
+namespace OpenAPIServer\Model;
 
-/*
+/**
  * StringBooleanMap
  */
 class StringBooleanMap {
-    }
+
+}
diff --git a/samples/server/petstore/php-slim/lib/Model/Tag.php b/samples/server/petstore/php-slim/lib/Model/Tag.php
new file mode 100644
index 000000000000..d4ff6fad5d50
--- /dev/null
+++ b/samples/server/petstore/php-slim/lib/Model/Tag.php
@@ -0,0 +1,18 @@
+<?php
+/**
+ * Tag
+ */
+namespace OpenAPIServer\Model;
+
+/**
+ * Tag
+ */
+class Tag {
+
+    /** @var int $id */
+    private $id;
+
+    /** @var string $name */
+    private $name;
+
+}
diff --git a/samples/server/petstore/php-slim/lib/Model/User.php b/samples/server/petstore/php-slim/lib/Model/User.php
new file mode 100644
index 000000000000..c68813e5a541
--- /dev/null
+++ b/samples/server/petstore/php-slim/lib/Model/User.php
@@ -0,0 +1,36 @@
+<?php
+/**
+ * User
+ */
+namespace OpenAPIServer\Model;
+
+/**
+ * User
+ */
+class User {
+
+    /** @var int $id */
+    private $id;
+
+    /** @var string $username */
+    private $username;
+
+    /** @var string $firstName */
+    private $firstName;
+
+    /** @var string $lastName */
+    private $lastName;
+
+    /** @var string $email */
+    private $email;
+
+    /** @var string $password */
+    private $password;
+
+    /** @var string $phone */
+    private $phone;
+
+    /** @var int $userStatus User Status*/
+    private $userStatus;
+
+}
diff --git a/samples/server/petstore/php-slim/lib/Models/Animal.php b/samples/server/petstore/php-slim/lib/Models/Animal.php
deleted file mode 100644
index 632eb19c788b..000000000000
--- a/samples/server/petstore/php-slim/lib/Models/Animal.php
+++ /dev/null
@@ -1,15 +0,0 @@
-<?php
-/*
- * Animal
- */
-namespace \Models;
-
-/*
- * Animal
- */
-class Animal {
-    /* @var string $className  */
-    private $className;
-/* @var string $color  */
-    private $color;
-}
diff --git a/samples/server/petstore/php-slim/lib/Models/ApiResponse.php b/samples/server/petstore/php-slim/lib/Models/ApiResponse.php
deleted file mode 100644
index dae8eb24117c..000000000000
--- a/samples/server/petstore/php-slim/lib/Models/ApiResponse.php
+++ /dev/null
@@ -1,17 +0,0 @@
-<?php
-/*
- * ApiResponse
- */
-namespace \Models;
-
-/*
- * ApiResponse
- */
-class ApiResponse {
-    /* @var int $code  */
-    private $code;
-/* @var string $type  */
-    private $type;
-/* @var string $message  */
-    private $message;
-}
diff --git a/samples/server/petstore/php-slim/lib/Models/ArrayTest.php b/samples/server/petstore/php-slim/lib/Models/ArrayTest.php
deleted file mode 100644
index bbdb952c17ad..000000000000
--- a/samples/server/petstore/php-slim/lib/Models/ArrayTest.php
+++ /dev/null
@@ -1,17 +0,0 @@
-<?php
-/*
- * ArrayTest
- */
-namespace \Models;
-
-/*
- * ArrayTest
- */
-class ArrayTest {
-    /* @var string[] $arrayOfString  */
-    private $arrayOfString;
-/* @var int[][] $arrayArrayOfInteger  */
-    private $arrayArrayOfInteger;
-/* @var \\Models\ReadOnlyFirst[][] $arrayArrayOfModel  */
-    private $arrayArrayOfModel;
-}
diff --git a/samples/server/petstore/php-slim/lib/Models/Capitalization.php b/samples/server/petstore/php-slim/lib/Models/Capitalization.php
deleted file mode 100644
index a5bc10d67ee7..000000000000
--- a/samples/server/petstore/php-slim/lib/Models/Capitalization.php
+++ /dev/null
@@ -1,23 +0,0 @@
-<?php
-/*
- * Capitalization
- */
-namespace \Models;
-
-/*
- * Capitalization
- */
-class Capitalization {
-    /* @var string $smallCamel  */
-    private $smallCamel;
-/* @var string $capitalCamel  */
-    private $capitalCamel;
-/* @var string $smallSnake  */
-    private $smallSnake;
-/* @var string $capitalSnake  */
-    private $capitalSnake;
-/* @var string $sCAETHFlowPoints  */
-    private $sCAETHFlowPoints;
-/* @var string $aTTNAME Name of the pet  */
-    private $aTTNAME;
-}
diff --git a/samples/server/petstore/php-slim/lib/Models/Cat.php b/samples/server/petstore/php-slim/lib/Models/Cat.php
deleted file mode 100644
index d8db38c4b4c9..000000000000
--- a/samples/server/petstore/php-slim/lib/Models/Cat.php
+++ /dev/null
@@ -1,17 +0,0 @@
-<?php
-/*
- * Cat
- */
-namespace \Models;
-
-/*
- * Cat
- */
-class Cat {
-    /* @var string $className  */
-    private $className;
-/* @var string $color  */
-    private $color;
-/* @var bool $declawed  */
-    private $declawed;
-}
diff --git a/samples/server/petstore/php-slim/lib/Models/Category.php b/samples/server/petstore/php-slim/lib/Models/Category.php
deleted file mode 100644
index 60abce57d169..000000000000
--- a/samples/server/petstore/php-slim/lib/Models/Category.php
+++ /dev/null
@@ -1,15 +0,0 @@
-<?php
-/*
- * Category
- */
-namespace \Models;
-
-/*
- * Category
- */
-class Category {
-    /* @var int $id  */
-    private $id;
-/* @var string $name  */
-    private $name;
-}
diff --git a/samples/server/petstore/php-slim/lib/Models/Dog.php b/samples/server/petstore/php-slim/lib/Models/Dog.php
deleted file mode 100644
index b98c55d669c4..000000000000
--- a/samples/server/petstore/php-slim/lib/Models/Dog.php
+++ /dev/null
@@ -1,17 +0,0 @@
-<?php
-/*
- * Dog
- */
-namespace \Models;
-
-/*
- * Dog
- */
-class Dog {
-    /* @var string $className  */
-    private $className;
-/* @var string $color  */
-    private $color;
-/* @var string $breed  */
-    private $breed;
-}
diff --git a/samples/server/petstore/php-slim/lib/Models/EnumTest.php b/samples/server/petstore/php-slim/lib/Models/EnumTest.php
deleted file mode 100644
index c7cd690925c7..000000000000
--- a/samples/server/petstore/php-slim/lib/Models/EnumTest.php
+++ /dev/null
@@ -1,21 +0,0 @@
-<?php
-/*
- * EnumTest
- */
-namespace \Models;
-
-/*
- * EnumTest
- */
-class EnumTest {
-    /* @var string $enumString  */
-    private $enumString;
-/* @var string $enumStringRequired  */
-    private $enumStringRequired;
-/* @var int $enumInteger  */
-    private $enumInteger;
-/* @var double $enumNumber  */
-    private $enumNumber;
-/* @var \\Models\OuterEnum $outerEnum  */
-    private $outerEnum;
-}
diff --git a/samples/server/petstore/php-slim/lib/Models/FormatTest.php b/samples/server/petstore/php-slim/lib/Models/FormatTest.php
deleted file mode 100644
index a08aa0bc54f6..000000000000
--- a/samples/server/petstore/php-slim/lib/Models/FormatTest.php
+++ /dev/null
@@ -1,37 +0,0 @@
-<?php
-/*
- * FormatTest
- */
-namespace \Models;
-
-/*
- * FormatTest
- */
-class FormatTest {
-    /* @var int $integer  */
-    private $integer;
-/* @var int $int32  */
-    private $int32;
-/* @var int $int64  */
-    private $int64;
-/* @var float $number  */
-    private $number;
-/* @var float $float  */
-    private $float;
-/* @var double $double  */
-    private $double;
-/* @var string $string  */
-    private $string;
-/* @var string $byte  */
-    private $byte;
-/* @var \SplFileObject $binary  */
-    private $binary;
-/* @var \DateTime $date  */
-    private $date;
-/* @var \DateTime $dateTime  */
-    private $dateTime;
-/* @var string $uuid  */
-    private $uuid;
-/* @var string $password  */
-    private $password;
-}
diff --git a/samples/server/petstore/php-slim/lib/Models/MapTest.php b/samples/server/petstore/php-slim/lib/Models/MapTest.php
deleted file mode 100644
index 6b8eaa391595..000000000000
--- a/samples/server/petstore/php-slim/lib/Models/MapTest.php
+++ /dev/null
@@ -1,19 +0,0 @@
-<?php
-/*
- * MapTest
- */
-namespace \Models;
-
-/*
- * MapTest
- */
-class MapTest {
-    /* @var map[string,map[string,string]] $mapMapOfString  */
-    private $mapMapOfString;
-/* @var map[string,string] $mapOfEnumString  */
-    private $mapOfEnumString;
-/* @var map[string,bool] $directMap  */
-    private $directMap;
-/* @var \\Models\StringBooleanMap $indirectMap  */
-    private $indirectMap;
-}
diff --git a/samples/server/petstore/php-slim/lib/Models/Name.php b/samples/server/petstore/php-slim/lib/Models/Name.php
deleted file mode 100644
index c1d4977a9c97..000000000000
--- a/samples/server/petstore/php-slim/lib/Models/Name.php
+++ /dev/null
@@ -1,19 +0,0 @@
-<?php
-/*
- * Name
- */
-namespace \Models;
-
-/*
- * Name
- */
-class Name {
-    /* @var int $name  */
-    private $name;
-/* @var int $snakeCase  */
-    private $snakeCase;
-/* @var string $property  */
-    private $property;
-/* @var int $_123number  */
-    private $_123number;
-}
diff --git a/samples/server/petstore/php-slim/lib/Models/Order.php b/samples/server/petstore/php-slim/lib/Models/Order.php
deleted file mode 100644
index ae1e9837d319..000000000000
--- a/samples/server/petstore/php-slim/lib/Models/Order.php
+++ /dev/null
@@ -1,23 +0,0 @@
-<?php
-/*
- * Order
- */
-namespace \Models;
-
-/*
- * Order
- */
-class Order {
-    /* @var int $id  */
-    private $id;
-/* @var int $petId  */
-    private $petId;
-/* @var int $quantity  */
-    private $quantity;
-/* @var \DateTime $shipDate  */
-    private $shipDate;
-/* @var string $status Order Status */
-    private $status;
-/* @var bool $complete  */
-    private $complete;
-}
diff --git a/samples/server/petstore/php-slim/lib/Models/Pet.php b/samples/server/petstore/php-slim/lib/Models/Pet.php
deleted file mode 100644
index ce042fe261c7..000000000000
--- a/samples/server/petstore/php-slim/lib/Models/Pet.php
+++ /dev/null
@@ -1,23 +0,0 @@
-<?php
-/*
- * Pet
- */
-namespace \Models;
-
-/*
- * Pet
- */
-class Pet {
-    /* @var int $id  */
-    private $id;
-/* @var \\Models\Category $category  */
-    private $category;
-/* @var string $name  */
-    private $name;
-/* @var string[] $photoUrls  */
-    private $photoUrls;
-/* @var \\Models\Tag[] $tags  */
-    private $tags;
-/* @var string $status pet status in the store */
-    private $status;
-}
diff --git a/samples/server/petstore/php-slim/lib/Models/Tag.php b/samples/server/petstore/php-slim/lib/Models/Tag.php
deleted file mode 100644
index 2122aa09b548..000000000000
--- a/samples/server/petstore/php-slim/lib/Models/Tag.php
+++ /dev/null
@@ -1,15 +0,0 @@
-<?php
-/*
- * Tag
- */
-namespace \Models;
-
-/*
- * Tag
- */
-class Tag {
-    /* @var int $id  */
-    private $id;
-/* @var string $name  */
-    private $name;
-}
diff --git a/samples/server/petstore/php-slim/lib/Models/User.php b/samples/server/petstore/php-slim/lib/Models/User.php
deleted file mode 100644
index 2444fb8e5c41..000000000000
--- a/samples/server/petstore/php-slim/lib/Models/User.php
+++ /dev/null
@@ -1,27 +0,0 @@
-<?php
-/*
- * User
- */
-namespace \Models;
-
-/*
- * User
- */
-class User {
-    /* @var int $id  */
-    private $id;
-/* @var string $username  */
-    private $username;
-/* @var string $firstName  */
-    private $firstName;
-/* @var string $lastName  */
-    private $lastName;
-/* @var string $email  */
-    private $email;
-/* @var string $password  */
-    private $password;
-/* @var string $phone  */
-    private $phone;
-/* @var int $userStatus User Status */
-    private $userStatus;
-}
diff --git a/samples/server/petstore/php-slim/lib/SlimRouter.php b/samples/server/petstore/php-slim/lib/SlimRouter.php
new file mode 100644
index 000000000000..698baf5a211e
--- /dev/null
+++ b/samples/server/petstore/php-slim/lib/SlimRouter.php
@@ -0,0 +1,108 @@
+<?php
+/**
+ * SlimRouter
+ *
+ * PHP version 5
+ *
+ * @category Class
+ * @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: \" \\
+ * OpenAPI spec version: 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
+ * Do not edit the class manually.
+ */
+namespace OpenAPIServer;
+
+use OpenAPIServer\Api\AnotherFakeApi;
+use OpenAPIServer\Api\FakeApi;
+use OpenAPIServer\Api\FakeClassnameTags123Api;
+use OpenAPIServer\Api\PetApi;
+use OpenAPIServer\Api\StoreApi;
+use OpenAPIServer\Api\UserApi;
+use Slim\App;
+use Psr\Container\ContainerInterface;
+use InvalidArgumentException;
+
+/**
+ * SlimRouter Class Doc Comment
+ *
+ * PHP version 5
+ *
+ * @category Class
+ * @package  OpenAPIServer\Api
+ * @author   OpenAPI Generator team
+ * @link     https://github.com/openapitools/openapi-generator
+ */
+class SlimRouter {
+
+    /**
+     * @var $slimApp Slim\App instance
+     */
+    private $slimApp;
+
+    /**
+     * Class constructor
+     *
+     * @param ContainerInterface|array $container Either a ContainerInterface or an associative array of app settings
+     * @throws InvalidArgumentException when no container is provided that implements ContainerInterface
+     */
+    public function __construct($container = []) {
+        $app = new App($container);
+
+        $app->PATCH('/v2/another-fake/dummy', AnotherFakeApi::class . ':testSpecialTags');
+        $app->POST('/v2/fake/outer/boolean', FakeApi::class . ':fakeOuterBooleanSerialize');
+        $app->POST('/v2/fake/outer/composite', FakeApi::class . ':fakeOuterCompositeSerialize');
+        $app->POST('/v2/fake/outer/number', FakeApi::class . ':fakeOuterNumberSerialize');
+        $app->POST('/v2/fake/outer/string', FakeApi::class . ':fakeOuterStringSerialize');
+        $app->PUT('/v2/fake/body-with-query-params', FakeApi::class . ':testBodyWithQueryParams');
+        $app->PATCH('/v2/fake', FakeApi::class . ':testClientModel');
+        $app->POST('/v2/fake', FakeApi::class . ':testEndpointParameters');
+        $app->GET('/v2/fake', FakeApi::class . ':testEnumParameters');
+        $app->POST('/v2/fake/inline-additionalProperties', FakeApi::class . ':testInlineAdditionalProperties');
+        $app->GET('/v2/fake/jsonFormData', FakeApi::class . ':testJsonFormData');
+        $app->PATCH('/v2/fake_classname_test', FakeClassnameTags123Api::class . ':testClassname');
+        $app->POST('/v2/pet', PetApi::class . ':addPet');
+        $app->GET('/v2/pet/findByStatus', PetApi::class . ':findPetsByStatus');
+        $app->GET('/v2/pet/findByTags', PetApi::class . ':findPetsByTags');
+        $app->PUT('/v2/pet', PetApi::class . ':updatePet');
+        $app->DELETE('/v2/pet/{petId}', PetApi::class . ':deletePet');
+        $app->GET('/v2/pet/{petId}', PetApi::class . ':getPetById');
+        $app->POST('/v2/pet/{petId}', PetApi::class . ':updatePetWithForm');
+        $app->POST('/v2/pet/{petId}/uploadImage', PetApi::class . ':uploadFile');
+        $app->POST('/v2/fake/{petId}/uploadImageWithRequiredFile', PetApi::class . ':uploadFileWithRequiredFile');
+        $app->GET('/v2/store/inventory', StoreApi::class . ':getInventory');
+        $app->POST('/v2/store/order', StoreApi::class . ':placeOrder');
+        $app->DELETE('/v2/store/order/{order_id}', StoreApi::class . ':deleteOrder');
+        $app->GET('/v2/store/order/{order_id}', StoreApi::class . ':getOrderById');
+        $app->POST('/v2/user', UserApi::class . ':createUser');
+        $app->POST('/v2/user/createWithArray', UserApi::class . ':createUsersWithArrayInput');
+        $app->POST('/v2/user/createWithList', UserApi::class . ':createUsersWithListInput');
+        $app->GET('/v2/user/login', UserApi::class . ':loginUser');
+        $app->GET('/v2/user/logout', UserApi::class . ':logoutUser');
+        $app->DELETE('/v2/user/{username}', UserApi::class . ':deleteUser');
+        $app->GET('/v2/user/{username}', UserApi::class . ':getUserByName');
+        $app->PUT('/v2/user/{username}', UserApi::class . ':updateUser');
+
+        $this->slimApp = $app;
+    }
+
+    /**
+     * Returns Slim Framework instance
+     * @return App
+     */
+    public function getSlimApp() {
+        return $this->slimApp;
+    }
+}