Merge branch 'master' into guzzleRequestOptions

Author: apoorv2407

.github/workflows/release-master.yml

@@ -3,6 +3,15 @@ name: Release  Master
 on:
   workflow_dispatch:
     branches: ["master"]
+    inputs:
+      skip_deploy:
+        description: 'Skip maven deploy (use if artifacts already published to Central)'
+        required: false
+        default: 'false'
+        type: choice
+        options:
+          - 'false'
+          - 'true'
 
 jobs:
   build:
@@ -60,7 +69,7 @@ jobs:
         git config --global hub.protocol https
         git remote set-url origin https://\${{ secrets.GITHUB_TOKEN }}:x-oauth-basic@github.com/swagger-api/swagger-codegen.git
     - name:  Run maven deploy/release
-      if: env.RELEASE_OK == 'yes'
+      if: env.RELEASE_OK == 'yes' && github.event.inputs.skip_deploy != 'true'
       run: |
         mvn --no-transfer-progress -B -Prelease deploy
     - name: Set up QEMU

modules/swagger-codegen-cli/pom.xml

@@ -3,7 +3,7 @@
     <parent>
         <groupId>io.swagger</groupId>
         <artifactId>swagger-codegen-project</artifactId>
-        <version>2.4.51-SNAPSHOT</version>
+        <version>2.4.52-SNAPSHOT</version>
         <relativePath>../..</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>

modules/swagger-codegen-maven-plugin/pom.xml

@@ -4,7 +4,7 @@
     <parent>
         <groupId>io.swagger</groupId>
         <artifactId>swagger-codegen-project</artifactId>
-        <version>2.4.51-SNAPSHOT</version>
+        <version>2.4.52-SNAPSHOT</version>
         <relativePath>../..</relativePath>
     </parent>
     <artifactId>swagger-codegen-maven-plugin</artifactId>

modules/swagger-codegen/pom.xml

@@ -3,7 +3,7 @@
     <parent>
         <groupId>io.swagger</groupId>
         <artifactId>swagger-codegen-project</artifactId>
-        <version>2.4.51-SNAPSHOT</version>
+        <version>2.4.52-SNAPSHOT</version>
         <relativePath>../..</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>

modules/swagger-codegen/src/main/resources/php/README.mustache

@@ -59,6 +59,8 @@ composer install
 ./vendor/bin/phpunit
 ```
 
+**Note:** Running tests requires PHP 7.2 or later, while the runtime library supports PHP 5.5 and later.
+
 ## Getting Started
 
 Please follow the [installation procedure](#installation--usage) and then run the following:

modules/swagger-codegen/src/main/resources/php/api_test.mustache

@@ -30,34 +30,34 @@ use \{{invokerPackage}}\ObjectSerializer;
  * @author   Swagger Codegen team
  * @link     https://github.com/swagger-api/swagger-codegen
  */
-{{#operations}}class {{classname}}Test extends \PHPUnit_Framework_TestCase
+{{#operations}}class {{classname}}Test extends \PHPUnit\Framework\TestCase
 {
 
     /**
      * Setup before running any test cases
      */
-    public static function setUpBeforeClass()
+    public static function setUpBeforeClass(): void
     {
     }
 
     /**
      * Setup before running each test case
      */
-    public function setUp()
+    public function setUp(): void
     {
     }
 
     /**
      * Clean up after running each test case
      */
-    public function tearDown()
+    public function tearDown(): void
     {
     }
 
     /**
      * Clean up after running all test cases
      */
-    public static function tearDownAfterClass()
+    public static function tearDownAfterClass(): void
     {
     }
     {{#operation}}

modules/swagger-codegen/src/main/resources/php/composer.mustache

@@ -26,7 +26,7 @@
         "guzzlehttp/guzzle": "^6.2"
     },
     "require-dev": {
-        "phpunit/phpunit": "^4.8",
+        "phpunit/phpunit": "^8.5.52",
         "squizlabs/php_codesniffer": "~2.6",
         "friendsofphp/php-cs-fixer": "~2.12"
     },

modules/swagger-codegen/src/main/resources/php/model_test.mustache

@@ -30,34 +30,34 @@ namespace {{invokerPackage}};
  * @author      Swagger Codegen team
  * @link        https://github.com/swagger-api/swagger-codegen
  */
-class {{classname}}Test extends \PHPUnit_Framework_TestCase
+class {{classname}}Test extends \PHPUnit\Framework\TestCase
 {
 
     /**
      * Setup before running any test case
      */
-    public static function setUpBeforeClass()
+    public static function setUpBeforeClass(): void
     {
     }
 
     /**
      * Setup before running each test case
      */
-    public function setUp()
+    public function setUp(): void
     {
     }
 
     /**
      * Clean up after running each test case
      */
-    public function tearDown()
+    public function tearDown(): void
     {
     }
 
     /**
      * Clean up after running all test cases
      */
-    public static function tearDownAfterClass()
+    public static function tearDownAfterClass(): void
     {
     }
 

modules/swagger-generator/pom.xml

@@ -4,7 +4,7 @@
     <parent>
         <groupId>io.swagger</groupId>
         <artifactId>swagger-codegen-project</artifactId>
-        <version>2.4.51-SNAPSHOT</version>
+        <version>2.4.52-SNAPSHOT</version>
         <relativePath>../..</relativePath>
     </parent>
     <artifactId>swagger-generator</artifactId>

pom.xml

@@ -6,7 +6,7 @@
     <name>swagger-codegen-project</name>
     <description>swagger-codegen-project</description>
     <url>https://github.com/swagger-api/swagger-codegen</url>
-    <version>2.4.51-SNAPSHOT</version>
+    <version>2.4.52-SNAPSHOT</version>
     <scm>
         <connection>scm:git:git@github.com:swagger-api/swagger-codegen.git</connection>
         <developerConnection>scm:git:git@github.com:swagger-api/swagger-codegen.git</developerConnection>