[PHP] Bump minimum required version to PHP7.1 (OpenAPITools#1491)

* Bump minimum required version to PHP7.1 ref: http://php.net/supported-versions.php * Bump phpunit * Update [api|model]_test.mustache * Update samples bin/openapi3/php-petstore.sh * Update namespace of PHPUnit ("tests" folder) * `setExpectedException` is deleted in PHPUnit 7.4 * Update namespace of "Assert" class * The attribute 'name' is required * Add anotation to exclude the test from risky testcheck * Update samples (samples/client/petstore/php) * Apply updates to "test" in openapi2 folder (samples/client/petstore/php) OpenAPITools@b3495ec OpenAPITools@15e00ae OpenAPITools@2fc6917 OpenAPITools@0d016c0 * Install php7.1 * Switch to php7 * Update samples (security) bin/security/php-petstore.sh
ihsmarkitoss · Nov 26, 2018 · b50ecf7 · b50ecf7
1 parent e370bc8
commit b50ecf7
Show file tree

Hide file tree

Showing 145 changed files with 416 additions and 166 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -80,6 +80,9 @@ before_install:
   - sudo sh -c 'curl https://storage.googleapis.com/download.dartlang.org/linux/debian/dart_stable.list > /etc/apt/sources.list.d/dart_stable.list'
   - sudo apt-get update
   - sudo apt-get install dart
+  # switch to php7
+  - phpenv global 7.1
+  - php -v
   # install perl module
   #- cpanm --local-lib=~/perl5 local::lib && eval $(perl -I ~/perl5/lib/perl5/ -Mlocal::lib)
   #- cpanm Test::Exception Test::More Log::Any LWP::UserAgent JSON URI:Query Module::Runtime DateTime Module::Find Moose::Role

diff --git a/modules/openapi-generator/src/main/resources/php/api_test.mustache b/modules/openapi-generator/src/main/resources/php/api_test.mustache
@@ -21,6 +21,7 @@ namespace {{invokerPackage}};
 use \{{invokerPackage}}\Configuration;
 use \{{invokerPackage}}\ApiException;
 use \{{invokerPackage}}\ObjectSerializer;
+use PHPUnit\Framework\TestCase;
 
 /**
  * {{classname}}Test Class Doc Comment
@@ -30,7 +31,7 @@ use \{{invokerPackage}}\ObjectSerializer;
  * @author   OpenAPI Generator team
  * @link     https://openapi-generator.tech
  */
-{{#operations}}class {{classname}}Test extends \PHPUnit_Framework_TestCase
+{{#operations}}class {{classname}}Test extends TestCase
 {
 
     /**

diff --git a/modules/openapi-generator/src/main/resources/php/composer.mustache b/modules/openapi-generator/src/main/resources/php/composer.mustache
@@ -21,14 +21,14 @@
         }
     ],
     "require": {
-        "php": ">=5.6",
+        "php": ">=7.1",
         "ext-curl": "*",
         "ext-json": "*",
         "ext-mbstring": "*",
         "guzzlehttp/guzzle": "^6.2"
     },
     "require-dev": {
-        "phpunit/phpunit": "^4.8",
+        "phpunit/phpunit": "^7.4",
         "squizlabs/php_codesniffer": "~2.6",
         "friendsofphp/php-cs-fixer": "~2.12"
     },

diff --git a/modules/openapi-generator/src/main/resources/php/model_test.mustache b/modules/openapi-generator/src/main/resources/php/model_test.mustache
@@ -21,6 +21,8 @@
 
 namespace {{invokerPackage}};
 
+use PHPUnit\Framework\TestCase;
+
 /**
  * {{classname}}Test Class Doc Comment
  *
@@ -30,7 +32,7 @@ namespace {{invokerPackage}};
  * @author      OpenAPI Generator team
  * @link        https://openapi-generator.tech
  */
-class {{classname}}Test extends \PHPUnit_Framework_TestCase
+class {{classname}}Test extends TestCase
 {
 
     /**

diff --git a/modules/openapi-generator/src/main/resources/php/phpunit.xml.mustache b/modules/openapi-generator/src/main/resources/php/phpunit.xml.mustache
@@ -6,7 +6,7 @@
          convertWarningsToExceptions="true"
          stopOnFailure="false">
     <testsuites>
-        <testsuite>
+        <testsuite name="tests">
             <directory>{{apiTestPath}}</directory>
             <directory>{{modelTestPath}}</directory>
         </testsuite>

diff --git a/samples/client/petstore-security-test/php/OpenAPIClient-php/composer.json b/samples/client/petstore-security-test/php/OpenAPIClient-php/composer.json
@@ -18,14 +18,14 @@
         }
     ],
     "require": {
-        "php": ">=5.6",
+        "php": ">=7.1",
         "ext-curl": "*",
         "ext-json": "*",
         "ext-mbstring": "*",
         "guzzlehttp/guzzle": "^6.2"
     },
     "require-dev": {
-        "phpunit/phpunit": "^4.8",
+        "phpunit/phpunit": "^7.4",
         "squizlabs/php_codesniffer": "~2.6",
         "friendsofphp/php-cs-fixer": "~2.12"
     },

diff --git a/samples/client/petstore-security-test/php/OpenAPIClient-php/phpunit.xml.dist b/samples/client/petstore-security-test/php/OpenAPIClient-php/phpunit.xml.dist
@@ -6,7 +6,7 @@
          convertWarningsToExceptions="true"
          stopOnFailure="false">
     <testsuites>
-        <testsuite>
+        <testsuite name="tests">
             <directory>./test/Api</directory>
             <directory>./test/Model</directory>
         </testsuite>

diff --git a/samples/client/petstore/php/OpenAPIClient-php/composer.json b/samples/client/petstore/php/OpenAPIClient-php/composer.json
@@ -18,14 +18,14 @@
         }
     ],
     "require": {
-        "php": ">=5.6",
+        "php": ">=7.1",
         "ext-curl": "*",
         "ext-json": "*",
         "ext-mbstring": "*",
         "guzzlehttp/guzzle": "^6.2"
     },
     "require-dev": {
-        "phpunit/phpunit": "^4.8",
+        "phpunit/phpunit": "^7.4",
         "squizlabs/php_codesniffer": "~2.6",
         "friendsofphp/php-cs-fixer": "~2.12"
     },

diff --git a/samples/client/petstore/php/OpenAPIClient-php/phpunit.xml.dist b/samples/client/petstore/php/OpenAPIClient-php/phpunit.xml.dist
@@ -6,7 +6,7 @@
          convertWarningsToExceptions="true"
          stopOnFailure="false">
     <testsuites>
-        <testsuite>
+        <testsuite name="tests">
             <directory>./test/Api</directory>
             <directory>./test/Model</directory>
         </testsuite>

diff --git a/samples/client/petstore/php/OpenAPIClient-php/test/Api/AnotherFakeApiTest.php b/samples/client/petstore/php/OpenAPIClient-php/test/Api/AnotherFakeApiTest.php
@@ -31,6 +31,7 @@
 use \OpenAPI\Client\Configuration;
 use \OpenAPI\Client\ApiException;
 use \OpenAPI\Client\ObjectSerializer;
+use PHPUnit\Framework\TestCase;
 
 /**
  * AnotherFakeApiTest Class Doc Comment
@@ -40,7 +41,7 @@
  * @author   OpenAPI Generator team
  * @link     https://openapi-generator.tech
  */
-class AnotherFakeApiTest extends \PHPUnit_Framework_TestCase
+class AnotherFakeApiTest extends TestCase
 {
 
     /**

diff --git a/samples/client/petstore/php/OpenAPIClient-php/test/Api/FakeApiTest.php b/samples/client/petstore/php/OpenAPIClient-php/test/Api/FakeApiTest.php
@@ -31,6 +31,7 @@
 use \OpenAPI\Client\Configuration;
 use \OpenAPI\Client\ApiException;
 use \OpenAPI\Client\ObjectSerializer;
+use PHPUnit\Framework\TestCase;
 
 /**
  * FakeApiTest Class Doc Comment
@@ -40,7 +41,7 @@
  * @author   OpenAPI Generator team
  * @link     https://openapi-generator.tech
  */
-class FakeApiTest extends \PHPUnit_Framework_TestCase
+class FakeApiTest extends TestCase
 {
 
     /**

diff --git a/samples/client/petstore/php/OpenAPIClient-php/test/Api/FakeClassnameTags123ApiTest.php b/samples/client/petstore/php/OpenAPIClient-php/test/Api/FakeClassnameTags123ApiTest.php
@@ -31,6 +31,7 @@
 use \OpenAPI\Client\Configuration;
 use \OpenAPI\Client\ApiException;
 use \OpenAPI\Client\ObjectSerializer;
+use PHPUnit\Framework\TestCase;
 
 /**
  * FakeClassnameTags123ApiTest Class Doc Comment
@@ -40,7 +41,7 @@
  * @author   OpenAPI Generator team
  * @link     https://openapi-generator.tech
  */
-class FakeClassnameTags123ApiTest extends \PHPUnit_Framework_TestCase
+class FakeClassnameTags123ApiTest extends TestCase
 {
 
     /**

diff --git a/samples/client/petstore/php/OpenAPIClient-php/test/Api/PetApiTest.php b/samples/client/petstore/php/OpenAPIClient-php/test/Api/PetApiTest.php
@@ -31,6 +31,7 @@
 use \OpenAPI\Client\Configuration;
 use \OpenAPI\Client\ApiException;
 use \OpenAPI\Client\ObjectSerializer;
+use PHPUnit\Framework\TestCase;
 
 /**
  * PetApiTest Class Doc Comment
@@ -40,7 +41,7 @@
  * @author   OpenAPI Generator team
  * @link     https://openapi-generator.tech
  */
-class PetApiTest extends \PHPUnit_Framework_TestCase
+class PetApiTest extends TestCase
 {
 
     /**

diff --git a/samples/client/petstore/php/OpenAPIClient-php/test/Api/StoreApiTest.php b/samples/client/petstore/php/OpenAPIClient-php/test/Api/StoreApiTest.php
@@ -31,6 +31,7 @@
 use \OpenAPI\Client\Configuration;
 use \OpenAPI\Client\ApiException;
 use \OpenAPI\Client\ObjectSerializer;
+use PHPUnit\Framework\TestCase;
 
 /**
  * StoreApiTest Class Doc Comment
@@ -40,7 +41,7 @@
  * @author   OpenAPI Generator team
  * @link     https://openapi-generator.tech
  */
-class StoreApiTest extends \PHPUnit_Framework_TestCase
+class StoreApiTest extends TestCase
 {
 
     /**

diff --git a/samples/client/petstore/php/OpenAPIClient-php/test/Api/UserApiTest.php b/samples/client/petstore/php/OpenAPIClient-php/test/Api/UserApiTest.php
@@ -31,6 +31,7 @@
 use \OpenAPI\Client\Configuration;
 use \OpenAPI\Client\ApiException;
 use \OpenAPI\Client\ObjectSerializer;
+use PHPUnit\Framework\TestCase;
 
 /**
  * UserApiTest Class Doc Comment
@@ -40,7 +41,7 @@
  * @author   OpenAPI Generator team
  * @link     https://openapi-generator.tech
  */
-class UserApiTest extends \PHPUnit_Framework_TestCase
+class UserApiTest extends TestCase
 {
 
     /**

diff --git a/samples/client/petstore/php/OpenAPIClient-php/test/Model/AdditionalPropertiesClassTest.php b/samples/client/petstore/php/OpenAPIClient-php/test/Model/AdditionalPropertiesClassTest.php
@@ -29,6 +29,8 @@
 
 namespace OpenAPI\Client;
 
+use PHPUnit\Framework\TestCase;
+
 /**
  * AdditionalPropertiesClassTest Class Doc Comment
  *
@@ -38,7 +40,7 @@
  * @author      OpenAPI Generator team
  * @link        https://openapi-generator.tech
  */
-class AdditionalPropertiesClassTest extends \PHPUnit_Framework_TestCase
+class AdditionalPropertiesClassTest extends TestCase
 {
 
     /**

diff --git a/samples/client/petstore/php/OpenAPIClient-php/test/Model/AnimalFarmTest.php b/samples/client/petstore/php/OpenAPIClient-php/test/Model/AnimalFarmTest.php
@@ -29,6 +29,8 @@
 
 namespace OpenAPI\Client;
 
+use PHPUnit\Framework\TestCase;
+
 /**
  * AnimalFarmTest Class Doc Comment
  *
@@ -38,7 +40,7 @@
  * @author      OpenAPI Generator team
  * @link        https://openapi-generator.tech
  */
-class AnimalFarmTest extends \PHPUnit_Framework_TestCase
+class AnimalFarmTest extends TestCase
 {
 
     /**

diff --git a/samples/client/petstore/php/OpenAPIClient-php/test/Model/AnimalTest.php b/samples/client/petstore/php/OpenAPIClient-php/test/Model/AnimalTest.php
@@ -29,6 +29,8 @@
 
 namespace OpenAPI\Client;
 
+use PHPUnit\Framework\TestCase;
+
 /**
  * AnimalTest Class Doc Comment
  *
@@ -38,7 +40,7 @@
  * @author      OpenAPI Generator team
  * @link        https://openapi-generator.tech
  */
-class AnimalTest extends \PHPUnit_Framework_TestCase
+class AnimalTest extends TestCase
 {
 
     /**

diff --git a/samples/client/petstore/php/OpenAPIClient-php/test/Model/ApiResponseTest.php b/samples/client/petstore/php/OpenAPIClient-php/test/Model/ApiResponseTest.php
@@ -29,6 +29,8 @@
 
 namespace OpenAPI\Client;
 
+use PHPUnit\Framework\TestCase;
+
 /**
  * ApiResponseTest Class Doc Comment
  *
@@ -38,7 +40,7 @@
  * @author      OpenAPI Generator team
  * @link        https://openapi-generator.tech
  */
-class ApiResponseTest extends \PHPUnit_Framework_TestCase
+class ApiResponseTest extends TestCase
 {
 
     /**

diff --git a/samples/client/petstore/php/OpenAPIClient-php/test/Model/ArrayOfArrayOfNumberOnlyTest.php b/samples/client/petstore/php/OpenAPIClient-php/test/Model/ArrayOfArrayOfNumberOnlyTest.php
@@ -29,6 +29,8 @@
 
 namespace OpenAPI\Client;
 
+use PHPUnit\Framework\TestCase;
+
 /**
  * ArrayOfArrayOfNumberOnlyTest Class Doc Comment
  *
@@ -38,7 +40,7 @@
  * @author      OpenAPI Generator team
  * @link        https://openapi-generator.tech
  */
-class ArrayOfArrayOfNumberOnlyTest extends \PHPUnit_Framework_TestCase
+class ArrayOfArrayOfNumberOnlyTest extends TestCase
 {
 
     /**

diff --git a/samples/client/petstore/php/OpenAPIClient-php/test/Model/ArrayOfNumberOnlyTest.php b/samples/client/petstore/php/OpenAPIClient-php/test/Model/ArrayOfNumberOnlyTest.php
@@ -29,6 +29,8 @@
 
 namespace OpenAPI\Client;
 
+use PHPUnit\Framework\TestCase;
+
 /**
  * ArrayOfNumberOnlyTest Class Doc Comment
  *
@@ -38,7 +40,7 @@
  * @author      OpenAPI Generator team
  * @link        https://openapi-generator.tech
  */
-class ArrayOfNumberOnlyTest extends \PHPUnit_Framework_TestCase
+class ArrayOfNumberOnlyTest extends TestCase
 {
 
     /**

diff --git a/samples/client/petstore/php/OpenAPIClient-php/test/Model/ArrayTestTest.php b/samples/client/petstore/php/OpenAPIClient-php/test/Model/ArrayTestTest.php
@@ -29,6 +29,8 @@
 
 namespace OpenAPI\Client;
 
+use PHPUnit\Framework\TestCase;
+
 /**
  * ArrayTestTest Class Doc Comment
  *
@@ -38,7 +40,7 @@
  * @author      OpenAPI Generator team
  * @link        https://openapi-generator.tech
  */
-class ArrayTestTest extends \PHPUnit_Framework_TestCase
+class ArrayTestTest extends TestCase
 {
 
     /**

diff --git a/samples/client/petstore/php/OpenAPIClient-php/test/Model/CapitalizationTest.php b/samples/client/petstore/php/OpenAPIClient-php/test/Model/CapitalizationTest.php
@@ -29,6 +29,8 @@
 
 namespace OpenAPI\Client;
 
+use PHPUnit\Framework\TestCase;
+
 /**
  * CapitalizationTest Class Doc Comment
  *
@@ -38,7 +40,7 @@
  * @author      OpenAPI Generator team
  * @link        https://openapi-generator.tech
  */
-class CapitalizationTest extends \PHPUnit_Framework_TestCase
+class CapitalizationTest extends TestCase
 {
 
     /**

diff --git a/samples/client/petstore/php/OpenAPIClient-php/test/Model/CatTest.php b/samples/client/petstore/php/OpenAPIClient-php/test/Model/CatTest.php
@@ -29,6 +29,8 @@
 
 namespace OpenAPI\Client;
 
+use PHPUnit\Framework\TestCase;
+
 /**
  * CatTest Class Doc Comment
  *
@@ -38,7 +40,7 @@
  * @author      OpenAPI Generator team
  * @link        https://openapi-generator.tech
  */
-class CatTest extends \PHPUnit_Framework_TestCase
+class CatTest extends TestCase
 {
 
     /**