Merge remote-tracking branch 'origin/3.1.x' into 4.0.x

# Conflicts:
#	samples/server/petstore/kotlin-server/ktor/.openapi-generator/VERSION
#	samples/server/petstore/kotlin-server/ktor/README.md
#	samples/server/petstore/php-silex/.openapi-generator/VERSION

samples/client/petstore/php/OpenAPIClient-php/test/Model/MapTestTest.php

@@ -89,4 +89,18 @@ class MapTestTest extends \PHPUnit_Framework_TestCase
     public function testPropertyMapOfEnumString()
     {
     }
+
+    /**
+     * Test attribute "direct_map"
+     */
+    public function testPropertyDirectMap()
+    {
+    }
+
+    /**
+     * Test attribute "indirect_map"
+     */
+    public function testPropertyIndirectMap()
+    {
+    }
 }

samples/client/petstore/php/OpenAPIClient-php/test/Model/StringBooleanMapTest.php

@@ -0,0 +1,78 @@
+<?php
+/**
+ * StringBooleanMapTest
+ *
+ * PHP version 5
+ *
+ * @category Class
+ * @package  OpenAPI\Client
+ * @author   OpenAPI Generator team
+ * @link     https://openapi-generator.tech
+ */
+
+/**
+ * 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://openapi-generator.tech
+ * OpenAPI Generator version: 4.0.0-SNAPSHOT
+ */
+
+/**
+ * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
+ * https://openapi-generator.tech
+ * Please update the test case below to test the model.
+ */
+
+namespace OpenAPI\Client;
+
+/**
+ * StringBooleanMapTest Class Doc Comment
+ *
+ * @category    Class
+ * @description StringBooleanMap
+ * @package     OpenAPI\Client
+ * @author      OpenAPI Generator team
+ * @link        https://openapi-generator.tech
+ */
+class StringBooleanMapTest extends \PHPUnit_Framework_TestCase
+{
+
+    /**
+     * Setup before running any test case
+     */
+    public static function setUpBeforeClass()
+    {
+    }
+
+    /**
+     * Setup before running each test case
+     */
+    public function setUp()
+    {
+    }
+
+    /**
+     * Clean up after running each test case
+     */
+    public function tearDown()
+    {
+    }
+
+    /**
+     * Clean up after running all test cases
+     */
+    public static function tearDownAfterClass()
+    {
+    }
+
+    /**
+     * Test "StringBooleanMap"
+     */
+    public function testStringBooleanMap()
+    {
+    }
+}