[PHP] Bump minimum required version to PHP7.1 (#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) b3495ecbfe 15e00ae89d 2fc6917d13 0d016c00ed * Install php7.1 * Switch to php7 * Update samples (security) bin/security/php-petstore.sh
2024-11-06 02:25:20 +00:00 · 2018-11-26 08:59:22 +07:00 · 2018-11-26 08:59:22 +07:00 · 34abedeb8a
commit 34abedeb8a
parent 2146081ffb
145 changed files with 416 additions and 166 deletions
--- 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
--- 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
 {

    /**
--- 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"
    },
--- 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
 {

    /**
--- 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>
--- 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"
    },
--- 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>
--- 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"
    },
--- 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>
--- 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 @@ namespace OpenAPI\Client;
 use \OpenAPI\Client\Configuration;
 use \OpenAPI\Client\ApiException;
 use \OpenAPI\Client\ObjectSerializer;
+use PHPUnit\Framework\TestCase;

 /**
 * AnotherFakeApiTest Class Doc Comment
@ -40,7 +41,7 @@ use \OpenAPI\Client\ObjectSerializer;
 * @author   OpenAPI Generator team
 * @link     https://openapi-generator.tech
 */
-class AnotherFakeApiTest extends \PHPUnit_Framework_TestCase
+class AnotherFakeApiTest extends TestCase
 {

    /**
--- 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 @@ namespace OpenAPI\Client;
 use \OpenAPI\Client\Configuration;
 use \OpenAPI\Client\ApiException;
 use \OpenAPI\Client\ObjectSerializer;
+use PHPUnit\Framework\TestCase;

 /**
 * FakeApiTest Class Doc Comment
@ -40,7 +41,7 @@ use \OpenAPI\Client\ObjectSerializer;
 * @author   OpenAPI Generator team
 * @link     https://openapi-generator.tech
 */
-class FakeApiTest extends \PHPUnit_Framework_TestCase
+class FakeApiTest extends TestCase
 {

    /**
--- 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 @@ namespace OpenAPI\Client;
 use \OpenAPI\Client\Configuration;
 use \OpenAPI\Client\ApiException;
 use \OpenAPI\Client\ObjectSerializer;
+use PHPUnit\Framework\TestCase;

 /**
 * FakeClassnameTags123ApiTest Class Doc Comment
@ -40,7 +41,7 @@ use \OpenAPI\Client\ObjectSerializer;
 * @author   OpenAPI Generator team
 * @link     https://openapi-generator.tech
 */
-class FakeClassnameTags123ApiTest extends \PHPUnit_Framework_TestCase
+class FakeClassnameTags123ApiTest extends TestCase
 {

    /**
--- 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 @@ namespace OpenAPI\Client;
 use \OpenAPI\Client\Configuration;
 use \OpenAPI\Client\ApiException;
 use \OpenAPI\Client\ObjectSerializer;
+use PHPUnit\Framework\TestCase;

 /**
 * PetApiTest Class Doc Comment
@ -40,7 +41,7 @@ use \OpenAPI\Client\ObjectSerializer;
 * @author   OpenAPI Generator team
 * @link     https://openapi-generator.tech
 */
-class PetApiTest extends \PHPUnit_Framework_TestCase
+class PetApiTest extends TestCase
 {

    /**
--- 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 @@ namespace OpenAPI\Client;
 use \OpenAPI\Client\Configuration;
 use \OpenAPI\Client\ApiException;
 use \OpenAPI\Client\ObjectSerializer;
+use PHPUnit\Framework\TestCase;

 /**
 * StoreApiTest Class Doc Comment
@ -40,7 +41,7 @@ use \OpenAPI\Client\ObjectSerializer;
 * @author   OpenAPI Generator team
 * @link     https://openapi-generator.tech
 */
-class StoreApiTest extends \PHPUnit_Framework_TestCase
+class StoreApiTest extends TestCase
 {

    /**
--- 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 @@ namespace OpenAPI\Client;
 use \OpenAPI\Client\Configuration;
 use \OpenAPI\Client\ApiException;
 use \OpenAPI\Client\ObjectSerializer;
+use PHPUnit\Framework\TestCase;

 /**
 * UserApiTest Class Doc Comment
@ -40,7 +41,7 @@ use \OpenAPI\Client\ObjectSerializer;
 * @author   OpenAPI Generator team
 * @link     https://openapi-generator.tech
 */
-class UserApiTest extends \PHPUnit_Framework_TestCase
+class UserApiTest extends TestCase
 {

    /**
--- 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 @@ namespace OpenAPI\Client;
 * @author      OpenAPI Generator team
 * @link        https://openapi-generator.tech
 */
-class AdditionalPropertiesClassTest extends \PHPUnit_Framework_TestCase
+class AdditionalPropertiesClassTest extends TestCase
 {

    /**
--- 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 @@ namespace OpenAPI\Client;
 * @author      OpenAPI Generator team
 * @link        https://openapi-generator.tech
 */
-class AnimalFarmTest extends \PHPUnit_Framework_TestCase
+class AnimalFarmTest extends TestCase
 {

    /**
--- 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 @@ namespace OpenAPI\Client;
 * @author      OpenAPI Generator team
 * @link        https://openapi-generator.tech
 */
-class AnimalTest extends \PHPUnit_Framework_TestCase
+class AnimalTest extends TestCase
 {

    /**
--- 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 @@ namespace OpenAPI\Client;
 * @author      OpenAPI Generator team
 * @link        https://openapi-generator.tech
 */
-class ApiResponseTest extends \PHPUnit_Framework_TestCase
+class ApiResponseTest extends TestCase
 {

    /**
--- 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 @@ namespace OpenAPI\Client;
 * @author      OpenAPI Generator team
 * @link        https://openapi-generator.tech
 */
-class ArrayOfArrayOfNumberOnlyTest extends \PHPUnit_Framework_TestCase
+class ArrayOfArrayOfNumberOnlyTest extends TestCase
 {

    /**
--- 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 @@ namespace OpenAPI\Client;
 * @author      OpenAPI Generator team
 * @link        https://openapi-generator.tech
 */
-class ArrayOfNumberOnlyTest extends \PHPUnit_Framework_TestCase
+class ArrayOfNumberOnlyTest extends TestCase
 {

    /**
--- 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 @@ namespace OpenAPI\Client;
 * @author      OpenAPI Generator team
 * @link        https://openapi-generator.tech
 */
-class ArrayTestTest extends \PHPUnit_Framework_TestCase
+class ArrayTestTest extends TestCase
 {

    /**
--- 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 @@ namespace OpenAPI\Client;
 * @author      OpenAPI Generator team
 * @link        https://openapi-generator.tech
 */
-class CapitalizationTest extends \PHPUnit_Framework_TestCase
+class CapitalizationTest extends TestCase
 {

    /**
--- 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 @@ namespace OpenAPI\Client;
 * @author      OpenAPI Generator team
 * @link        https://openapi-generator.tech
 */
-class CatTest extends \PHPUnit_Framework_TestCase
+class CatTest extends TestCase
 {

    /**
--- a/samples/client/petstore/php/OpenAPIClient-php/test/Model/CategoryTest.php
+++ b/samples/client/petstore/php/OpenAPIClient-php/test/Model/CategoryTest.php
@ -29,6 +29,8 @@

 namespace OpenAPI\Client;

+use PHPUnit\Framework\TestCase;
+
 /**
 * CategoryTest Class Doc Comment
 *
@ -38,7 +40,7 @@ namespace OpenAPI\Client;
 * @author      OpenAPI Generator team
 * @link        https://openapi-generator.tech
 */
-class CategoryTest extends \PHPUnit_Framework_TestCase
+class CategoryTest extends TestCase
 {

    /**
--- a/samples/client/petstore/php/OpenAPIClient-php/test/Model/ClassModelTest.php
+++ b/samples/client/petstore/php/OpenAPIClient-php/test/Model/ClassModelTest.php
@ -29,6 +29,8 @@

 namespace OpenAPI\Client;

+use PHPUnit\Framework\TestCase;
+
 /**
 * ClassModelTest Class Doc Comment
 *
@ -38,7 +40,7 @@ namespace OpenAPI\Client;
 * @author      OpenAPI Generator team
 * @link        https://openapi-generator.tech
 */
-class ClassModelTest extends \PHPUnit_Framework_TestCase
+class ClassModelTest extends TestCase
 {

    /**
--- a/samples/client/petstore/php/OpenAPIClient-php/test/Model/ClientTest.php
+++ b/samples/client/petstore/php/OpenAPIClient-php/test/Model/ClientTest.php
@ -29,6 +29,8 @@

 namespace OpenAPI\Client;

+use PHPUnit\Framework\TestCase;
+
 /**
 * ClientTest Class Doc Comment
 *
@ -38,7 +40,7 @@ namespace OpenAPI\Client;
 * @author      OpenAPI Generator team
 * @link        https://openapi-generator.tech
 */
-class ClientTest extends \PHPUnit_Framework_TestCase
+class ClientTest extends TestCase
 {

    /**
--- a/samples/client/petstore/php/OpenAPIClient-php/test/Model/DogTest.php
+++ b/samples/client/petstore/php/OpenAPIClient-php/test/Model/DogTest.php
@ -29,6 +29,8 @@

 namespace OpenAPI\Client;

+use PHPUnit\Framework\TestCase;
+
 /**
 * DogTest Class Doc Comment
 *
@ -38,7 +40,7 @@ namespace OpenAPI\Client;
 * @author      OpenAPI Generator team
 * @link        https://openapi-generator.tech
 */
-class DogTest extends \PHPUnit_Framework_TestCase
+class DogTest extends TestCase
 {

    /**
--- a/samples/client/petstore/php/OpenAPIClient-php/test/Model/EnumArraysTest.php
+++ b/samples/client/petstore/php/OpenAPIClient-php/test/Model/EnumArraysTest.php
@ -29,6 +29,8 @@

 namespace OpenAPI\Client;

+use PHPUnit\Framework\TestCase;
+
 /**
 * EnumArraysTest Class Doc Comment
 *
@ -38,7 +40,7 @@ namespace OpenAPI\Client;
 * @author      OpenAPI Generator team
 * @link        https://openapi-generator.tech
 */
-class EnumArraysTest extends \PHPUnit_Framework_TestCase
+class EnumArraysTest extends TestCase
 {

    /**
--- a/samples/client/petstore/php/OpenAPIClient-php/test/Model/EnumClassTest.php
+++ b/samples/client/petstore/php/OpenAPIClient-php/test/Model/EnumClassTest.php
@ -29,6 +29,8 @@

 namespace OpenAPI\Client;

+use PHPUnit\Framework\TestCase;
+
 /**
 * EnumClassTest Class Doc Comment
 *
@ -38,7 +40,7 @@ namespace OpenAPI\Client;
 * @author      OpenAPI Generator team
 * @link        https://openapi-generator.tech
 */
-class EnumClassTest extends \PHPUnit_Framework_TestCase
+class EnumClassTest extends TestCase
 {

    /**
--- a/samples/client/petstore/php/OpenAPIClient-php/test/Model/EnumTestTest.php
+++ b/samples/client/petstore/php/OpenAPIClient-php/test/Model/EnumTestTest.php
@ -29,6 +29,8 @@

 namespace OpenAPI\Client;

+use PHPUnit\Framework\TestCase;
+
 /**
 * EnumTestTest Class Doc Comment
 *
@ -38,7 +40,7 @@ namespace OpenAPI\Client;
 * @author      OpenAPI Generator team
 * @link        https://openapi-generator.tech
 */
-class EnumTestTest extends \PHPUnit_Framework_TestCase
+class EnumTestTest extends TestCase
 {

    /**
--- a/samples/client/petstore/php/OpenAPIClient-php/test/Model/FileSchemaTestClassTest.php
+++ b/samples/client/petstore/php/OpenAPIClient-php/test/Model/FileSchemaTestClassTest.php
@ -29,6 +29,8 @@

 namespace OpenAPI\Client;

+use PHPUnit\Framework\TestCase;
+
 /**
 * FileSchemaTestClassTest Class Doc Comment
 *
@ -38,7 +40,7 @@ namespace OpenAPI\Client;
 * @author      OpenAPI Generator team
 * @link        https://openapi-generator.tech
 */
-class FileSchemaTestClassTest extends \PHPUnit_Framework_TestCase
+class FileSchemaTestClassTest extends TestCase
 {

    /**
--- a/samples/client/petstore/php/OpenAPIClient-php/test/Model/FileTest.php
+++ b/samples/client/petstore/php/OpenAPIClient-php/test/Model/FileTest.php
@ -29,6 +29,8 @@

 namespace OpenAPI\Client;

+use PHPUnit\Framework\TestCase;
+
 /**
 * FileTest Class Doc Comment
 *
@ -38,7 +40,7 @@ namespace OpenAPI\Client;
 * @author      OpenAPI Generator team
 * @link        https://openapi-generator.tech
 */
-class FileTest extends \PHPUnit_Framework_TestCase
+class FileTest extends TestCase
 {

    /**
--- a/samples/client/petstore/php/OpenAPIClient-php/test/Model/FormatTestTest.php
+++ b/samples/client/petstore/php/OpenAPIClient-php/test/Model/FormatTestTest.php
@ -29,6 +29,8 @@

 namespace OpenAPI\Client;

+use PHPUnit\Framework\TestCase;
+
 /**
 * FormatTestTest Class Doc Comment
 *
@ -38,7 +40,7 @@ namespace OpenAPI\Client;
 * @author      OpenAPI Generator team
 * @link        https://openapi-generator.tech
 */
-class FormatTestTest extends \PHPUnit_Framework_TestCase
+class FormatTestTest extends TestCase
 {

    /**
--- a/samples/client/petstore/php/OpenAPIClient-php/test/Model/HasOnlyReadOnlyTest.php
+++ b/samples/client/petstore/php/OpenAPIClient-php/test/Model/HasOnlyReadOnlyTest.php
@ -29,6 +29,8 @@

 namespace OpenAPI\Client;

+use PHPUnit\Framework\TestCase;
+
 /**
 * HasOnlyReadOnlyTest Class Doc Comment
 *
@ -38,7 +40,7 @@ namespace OpenAPI\Client;
 * @author      OpenAPI Generator team
 * @link        https://openapi-generator.tech
 */
-class HasOnlyReadOnlyTest extends \PHPUnit_Framework_TestCase
+class HasOnlyReadOnlyTest extends TestCase
 {

    /**
--- a/samples/client/petstore/php/OpenAPIClient-php/test/Model/MapTestTest.php
+++ b/samples/client/petstore/php/OpenAPIClient-php/test/Model/MapTestTest.php
@ -29,6 +29,8 @@

 namespace OpenAPI\Client;

+use PHPUnit\Framework\TestCase;
+
 /**
 * MapTestTest Class Doc Comment
 *
@ -38,7 +40,7 @@ namespace OpenAPI\Client;
 * @author      OpenAPI Generator team
 * @link        https://openapi-generator.tech
 */
-class MapTestTest extends \PHPUnit_Framework_TestCase
+class MapTestTest extends TestCase
 {

    /**
--- a/samples/client/petstore/php/OpenAPIClient-php/test/Model/MixedPropertiesAndAdditionalPropertiesClassTest.php
+++ b/samples/client/petstore/php/OpenAPIClient-php/test/Model/MixedPropertiesAndAdditionalPropertiesClassTest.php
@ -29,6 +29,8 @@

 namespace OpenAPI\Client;

+use PHPUnit\Framework\TestCase;
+
 /**
 * MixedPropertiesAndAdditionalPropertiesClassTest Class Doc Comment
 *
@ -38,7 +40,7 @@ namespace OpenAPI\Client;
 * @author      OpenAPI Generator team
 * @link        https://openapi-generator.tech
 */
-class MixedPropertiesAndAdditionalPropertiesClassTest extends \PHPUnit_Framework_TestCase
+class MixedPropertiesAndAdditionalPropertiesClassTest extends TestCase
 {

    /**
--- a/samples/client/petstore/php/OpenAPIClient-php/test/Model/Model200ResponseTest.php
+++ b/samples/client/petstore/php/OpenAPIClient-php/test/Model/Model200ResponseTest.php
@ -29,6 +29,8 @@

 namespace OpenAPI\Client;

+use PHPUnit\Framework\TestCase;
+
 /**
 * Model200ResponseTest Class Doc Comment
 *
@ -38,7 +40,7 @@ namespace OpenAPI\Client;
 * @author      OpenAPI Generator team
 * @link        https://openapi-generator.tech
 */
-class Model200ResponseTest extends \PHPUnit_Framework_TestCase
+class Model200ResponseTest extends TestCase
 {

    /**
--- a/samples/client/petstore/php/OpenAPIClient-php/test/Model/ModelListTest.php
+++ b/samples/client/petstore/php/OpenAPIClient-php/test/Model/ModelListTest.php
@ -29,6 +29,8 @@

 namespace OpenAPI\Client;

+use PHPUnit\Framework\TestCase;
+
 /**
 * ModelListTest Class Doc Comment
 *
@ -38,7 +40,7 @@ namespace OpenAPI\Client;
 * @author      OpenAPI Generator team
 * @link        https://openapi-generator.tech
 */
-class ModelListTest extends \PHPUnit_Framework_TestCase
+class ModelListTest extends TestCase
 {

    /**
--- a/samples/client/petstore/php/OpenAPIClient-php/test/Model/ModelReturnTest.php
+++ b/samples/client/petstore/php/OpenAPIClient-php/test/Model/ModelReturnTest.php
@ -29,6 +29,8 @@

 namespace OpenAPI\Client;

+use PHPUnit\Framework\TestCase;
+
 /**
 * ModelReturnTest Class Doc Comment
 *
@ -38,7 +40,7 @@ namespace OpenAPI\Client;
 * @author      OpenAPI Generator team
 * @link        https://openapi-generator.tech
 */
-class ModelReturnTest extends \PHPUnit_Framework_TestCase
+class ModelReturnTest extends TestCase
 {

    /**
--- a/samples/client/petstore/php/OpenAPIClient-php/test/Model/NameTest.php
+++ b/samples/client/petstore/php/OpenAPIClient-php/test/Model/NameTest.php
@ -29,6 +29,8 @@

 namespace OpenAPI\Client;

+use PHPUnit\Framework\TestCase;
+
 /**
 * NameTest Class Doc Comment
 *
@ -38,7 +40,7 @@ namespace OpenAPI\Client;
 * @author      OpenAPI Generator team
 * @link        https://openapi-generator.tech
 */
-class NameTest extends \PHPUnit_Framework_TestCase
+class NameTest extends TestCase
 {

    /**
--- a/samples/client/petstore/php/OpenAPIClient-php/test/Model/NumberOnlyTest.php
+++ b/samples/client/petstore/php/OpenAPIClient-php/test/Model/NumberOnlyTest.php
@ -29,6 +29,8 @@

 namespace OpenAPI\Client;

+use PHPUnit\Framework\TestCase;
+
 /**
 * NumberOnlyTest Class Doc Comment
 *
@ -38,7 +40,7 @@ namespace OpenAPI\Client;
 * @author      OpenAPI Generator team
 * @link        https://openapi-generator.tech
 */
-class NumberOnlyTest extends \PHPUnit_Framework_TestCase
+class NumberOnlyTest extends TestCase
 {

    /**
--- a/samples/client/petstore/php/OpenAPIClient-php/test/Model/OrderTest.php
+++ b/samples/client/petstore/php/OpenAPIClient-php/test/Model/OrderTest.php
@ -29,6 +29,8 @@

 namespace OpenAPI\Client;

+use PHPUnit\Framework\TestCase;
+
 /**
 * OrderTest Class Doc Comment
 *
@ -38,7 +40,7 @@ namespace OpenAPI\Client;
 * @author      OpenAPI Generator team
 * @link        https://openapi-generator.tech
 */
-class OrderTest extends \PHPUnit_Framework_TestCase
+class OrderTest extends TestCase
 {

    /**
--- a/samples/client/petstore/php/OpenAPIClient-php/test/Model/OuterCompositeTest.php
+++ b/samples/client/petstore/php/OpenAPIClient-php/test/Model/OuterCompositeTest.php
@ -29,6 +29,8 @@

 namespace OpenAPI\Client;

+use PHPUnit\Framework\TestCase;
+
 /**
 * OuterCompositeTest Class Doc Comment
 *
@ -38,7 +40,7 @@ namespace OpenAPI\Client;
 * @author      OpenAPI Generator team
 * @link        https://openapi-generator.tech
 */
-class OuterCompositeTest extends \PHPUnit_Framework_TestCase
+class OuterCompositeTest extends TestCase
 {

    /**
--- a/samples/client/petstore/php/OpenAPIClient-php/test/Model/OuterEnumTest.php
+++ b/samples/client/petstore/php/OpenAPIClient-php/test/Model/OuterEnumTest.php
@ -29,6 +29,8 @@

 namespace OpenAPI\Client;

+use PHPUnit\Framework\TestCase;
+
 /**
 * OuterEnumTest Class Doc Comment
 *
@ -38,7 +40,7 @@ namespace OpenAPI\Client;
 * @author      OpenAPI Generator team
 * @link        https://openapi-generator.tech
 */
-class OuterEnumTest extends \PHPUnit_Framework_TestCase
+class OuterEnumTest extends TestCase
 {

    /**
--- a/samples/client/petstore/php/OpenAPIClient-php/test/Model/PetTest.php
+++ b/samples/client/petstore/php/OpenAPIClient-php/test/Model/PetTest.php
@ -29,6 +29,8 @@

 namespace OpenAPI\Client;

+use PHPUnit\Framework\TestCase;
+
 /**
 * PetTest Class Doc Comment
 *
@ -38,7 +40,7 @@ namespace OpenAPI\Client;
 * @author      OpenAPI Generator team
 * @link        https://openapi-generator.tech
 */
-class PetTest extends \PHPUnit_Framework_TestCase
+class PetTest extends TestCase
 {

    /**
--- a/samples/client/petstore/php/OpenAPIClient-php/test/Model/ReadOnlyFirstTest.php
+++ b/samples/client/petstore/php/OpenAPIClient-php/test/Model/ReadOnlyFirstTest.php
@ -29,6 +29,8 @@

 namespace OpenAPI\Client;

+use PHPUnit\Framework\TestCase;
+
 /**
 * ReadOnlyFirstTest Class Doc Comment
 *
@ -38,7 +40,7 @@ namespace OpenAPI\Client;
 * @author      OpenAPI Generator team
 * @link        https://openapi-generator.tech
 */
-class ReadOnlyFirstTest extends \PHPUnit_Framework_TestCase
+class ReadOnlyFirstTest extends TestCase
 {

    /**
--- a/samples/client/petstore/php/OpenAPIClient-php/test/Model/SpecialModelNameTest.php
+++ b/samples/client/petstore/php/OpenAPIClient-php/test/Model/SpecialModelNameTest.php
@ -29,6 +29,8 @@

 namespace OpenAPI\Client;

+use PHPUnit\Framework\TestCase;
+
 /**
 * SpecialModelNameTest Class Doc Comment
 *
@ -38,7 +40,7 @@ namespace OpenAPI\Client;
 * @author      OpenAPI Generator team
 * @link        https://openapi-generator.tech
 */
-class SpecialModelNameTest extends \PHPUnit_Framework_TestCase
+class SpecialModelNameTest extends TestCase
 {

    /**
--- a/samples/client/petstore/php/OpenAPIClient-php/test/Model/StringBooleanMapTest.php
+++ b/samples/client/petstore/php/OpenAPIClient-php/test/Model/StringBooleanMapTest.php
@ -29,6 +29,8 @@

 namespace OpenAPI\Client;

+use PHPUnit\Framework\TestCase;
+
 /**
 * StringBooleanMapTest Class Doc Comment
 *
@ -38,7 +40,7 @@ namespace OpenAPI\Client;
 * @author      OpenAPI Generator team
 * @link        https://openapi-generator.tech
 */
-class StringBooleanMapTest extends \PHPUnit_Framework_TestCase
+class StringBooleanMapTest extends TestCase
 {

    /**
--- a/samples/client/petstore/php/OpenAPIClient-php/test/Model/TagTest.php
+++ b/samples/client/petstore/php/OpenAPIClient-php/test/Model/TagTest.php
@ -29,6 +29,8 @@

 namespace OpenAPI\Client;

+use PHPUnit\Framework\TestCase;
+
 /**
 * TagTest Class Doc Comment
 *
@ -38,7 +40,7 @@ namespace OpenAPI\Client;
 * @author      OpenAPI Generator team
 * @link        https://openapi-generator.tech
 */
-class TagTest extends \PHPUnit_Framework_TestCase
+class TagTest extends TestCase
 {

    /**
--- a/samples/client/petstore/php/OpenAPIClient-php/test/Model/UserTest.php
+++ b/samples/client/petstore/php/OpenAPIClient-php/test/Model/UserTest.php
@ -29,6 +29,8 @@

 namespace OpenAPI\Client;

+use PHPUnit\Framework\TestCase;
+
 /**
 * UserTest Class Doc Comment
 *
@ -38,7 +40,7 @@ namespace OpenAPI\Client;
 * @author      OpenAPI Generator team
 * @link        https://openapi-generator.tech
 */
-class UserTest extends \PHPUnit_Framework_TestCase
+class UserTest extends TestCase
 {

    /**
--- a/samples/client/petstore/php/OpenAPIClient-php/tests/AsyncTest.php
+++ b/samples/client/petstore/php/OpenAPIClient-php/tests/AsyncTest.php
@ -4,8 +4,9 @@ namespace OpenAPI\Client;

 use OpenAPI\Client\Api\PetApi;
 use OpenAPI\Client\Model\Pet;
+use PHPUnit\Framework\TestCase;

-class AsyncTest extends \PHPUnit_Framework_TestCase
+class AsyncTest extends TestCase
 {
    /** @var PetApi */
    private $api;
@ -61,24 +62,29 @@ class AsyncTest extends \PHPUnit_Framework_TestCase
        $this->assertInstanceOf(Pet::class, $pet);
    }

+    /**
+     * @expectedException \OpenAPI\Client\ApiException
+     */
    public function testAsyncThrowingException()
    {
-        $this->setExpectedException(ApiException::class);
-
        $promise = $this->api->getPetByIdAsync(0);
        $promise->wait();
    }

+    /**
+     * @doesNotPerformAssertions
+     */
    public function testAsyncApiExceptionWithoutWaitIsNotThrown()
    {
        $promise = $this->api->getPetByIdAsync(0);
        sleep(1);
    }

+    /**
+     * @expectedException \OpenAPI\Client\ApiException
+     */
    public function testAsyncHttpInfoThrowingException()
    {
-        $this->setExpectedException(ApiException::class);
-
        $promise = $this->api->getPetByIdAsyncWithHttpInfo(0);
        $promise->wait();
    }
--- a/samples/client/petstore/php/OpenAPIClient-php/tests/AuthTest.php
+++ b/samples/client/petstore/php/OpenAPIClient-php/tests/AuthTest.php
@ -5,10 +5,11 @@ namespace OpenAPI\Client;
 use OpenAPI\Client\Api\FakeApi;
 use OpenAPI\Client\Api\PetApi;
 use OpenAPI\Client\Model\Pet;
+use PHPUnit\Framework\TestCase;

 require_once __DIR__ . '/FakeHttpClient.php';

-class AuthTest extends \PHPUnit_Framework_TestCase
+class AuthTest extends TestCase
 {
    public function testCustomApiKeyHeader()
    {
--- a/samples/client/petstore/php/OpenAPIClient-php/tests/DateTimeSerializerTest.php
+++ b/samples/client/petstore/php/OpenAPIClient-php/tests/DateTimeSerializerTest.php
@ -3,8 +3,9 @@
 namespace OpenAPI\Client;

 use OpenAPI\Client\Model\FormatTest;
+use PHPUnit\Framework\TestCase;

-class DateTimeSerializerTest extends \PHPUnit_Framework_TestCase
+class DateTimeSerializerTest extends TestCase
 {
    public function testDateTimeSanitazion()
    {
--- a/samples/client/petstore/php/OpenAPIClient-php/tests/DebugTest.php
+++ b/samples/client/petstore/php/OpenAPIClient-php/tests/DebugTest.php
@ -1,7 +1,9 @@
 <?php
 namespace OpenAPI\Client;

-class DebugTest extends \PHPUnit_Framework_TestCase
+use PHPUnit\Framework\TestCase;
+
+class DebugTest extends TestCase
 {
    public function testEnableDebugOutput()
    {
--- a/samples/client/petstore/php/OpenAPIClient-php/tests/EnumClassTest.php
+++ b/samples/client/petstore/php/OpenAPIClient-php/tests/EnumClassTest.php
@ -3,8 +3,9 @@
 namespace OpenAPI\Client;

 use OpenAPI\Client\Model\EnumClass;
+use PHPUnit\Framework\TestCase;

-class EnumClassTest extends \PHPUnit_Framework_TestCase
+class EnumClassTest extends TestCase
 {
    public function testPossibleValues()
    {
--- a/samples/client/petstore/php/OpenAPIClient-php/tests/EnumTestTest.php
+++ b/samples/client/petstore/php/OpenAPIClient-php/tests/EnumTestTest.php
@ -3,8 +3,9 @@
 namespace OpenAPI\Client;

 use OpenAPI\Client\Model\EnumTest;
+use PHPUnit\Framework\TestCase;

-class EnumTestTest extends \PHPUnit_Framework_TestCase
+class EnumTestTest extends TestCase
 {
    public function testPossibleValues()
    {
--- a/samples/client/petstore/php/OpenAPIClient-php/tests/ExceptionTest.php
+++ b/samples/client/petstore/php/OpenAPIClient-php/tests/ExceptionTest.php
@ -3,8 +3,9 @@
 namespace OpenAPI\Client;

 use GuzzleHttp\Client;
+use PHPUnit\Framework\TestCase;

-class ExceptionTest extends \PHPUnit_Framework_TestCase
+class ExceptionTest extends TestCase
 {
    /**
     * @expectedException \OpenAPI\Client\ApiException
--- a/samples/client/petstore/php/OpenAPIClient-php/tests/FormatTestTest.php
+++ b/samples/client/petstore/php/OpenAPIClient-php/tests/FormatTestTest.php
@ -1,8 +1,9 @@
 <?php

 use OpenAPI\Client\Model\FormatTest;
+use PHPUnit\Framework\TestCase;

-class FormatTestTest extends \PHPUnit_Framework_TestCase
+class FormatTestTest extends TestCase
 {
    public function testCountTheLengthOfMultiByteStringsCorrectly()
    {
--- a/samples/client/petstore/php/OpenAPIClient-php/tests/HeaderSelectorTest.php
+++ b/samples/client/petstore/php/OpenAPIClient-php/tests/HeaderSelectorTest.php
@ -2,7 +2,9 @@

 namespace OpenAPI\Client;

-class HeaderSelectorTest extends \PHPUnit_Framework_TestCase
+use PHPUnit\Framework\TestCase;
+
+class HeaderSelectorTest extends TestCase
 {
    public function testSelectingHeaders()
    {
--- a/samples/client/petstore/php/OpenAPIClient-php/tests/HeadersTest.php
+++ b/samples/client/petstore/php/OpenAPIClient-php/tests/HeadersTest.php
@ -2,9 +2,11 @@

 namespace OpenAPI\Client;

+use PHPUnit\Framework\TestCase;
+
 require_once __DIR__ . '/FakeHttpClient.php';

-class HeadersTest extends \PHPUnit_Framework_TestCase
+class HeadersTest extends TestCase
 {
    /** @var  FakeHttpClient */
    private $fakeHttpClient;
--- a/samples/client/petstore/php/OpenAPIClient-php/tests/ModelInheritanceTest.php
+++ b/samples/client/petstore/php/OpenAPIClient-php/tests/ModelInheritanceTest.php
@ -6,13 +6,14 @@ use OpenAPI\Client\Model\Animal;
 use OpenAPI\Client\Model\AnimalFarm;
 use OpenAPI\Client\Model\Cat;
 use OpenAPI\Client\Model\Dog;
+use PHPUnit\Framework\TestCase;

 /**
 * Test that Dog properly inherit Animal
 *
 * @package OpenAPI\Client
 */
-class ModelInheritanceTest extends \PHPUnit_Framework_TestCase
+class ModelInheritanceTest extends TestCase
 {
    /**
     * test if default values works
--- a/samples/client/petstore/php/OpenAPIClient-php/tests/ObjectSerializerTest.php
+++ b/samples/client/petstore/php/OpenAPIClient-php/tests/ObjectSerializerTest.php
@ -2,8 +2,10 @@

 namespace OpenAPI\Client;

+use PHPUnit\Framework\TestCase;
+
 // test object serializer
-class ObjectSerializerTest extends \PHPUnit_Framework_TestCase
+class ObjectSerializerTest extends TestCase
 {
    // test sanitizeFilename
    public function testSanitizeFilename()
--- a/samples/client/petstore/php/OpenAPIClient-php/tests/OrderApiTest.php
+++ b/samples/client/petstore/php/OpenAPIClient-php/tests/OrderApiTest.php
@ -2,7 +2,9 @@

 namespace OpenAPI\Client;

-class OrderApiTest extends \PHPUnit_Framework_TestCase
+use PHPUnit\Framework\TestCase;
+
+class OrderApiTest extends TestCase
 {

    // add a new pet (id 10005) to ensure the pet object is available for all the tests
--- a/samples/client/petstore/php/OpenAPIClient-php/tests/OuterEnumTest.php
+++ b/samples/client/petstore/php/OpenAPIClient-php/tests/OuterEnumTest.php
@ -4,8 +4,9 @@ namespace OpenAPI\Client;

 use OpenAPI\Client\Model\EnumTest;
 use OpenAPI\Client\Model\OuterEnum;
+use PHPUnit\Framework\TestCase;

-class OuterEnumTest extends \PHPUnit_Framework_TestCase
+class OuterEnumTest extends TestCase
 {
    public function testDeserialize()
    {
@ -18,10 +19,12 @@ class OuterEnumTest extends \PHPUnit_Framework_TestCase
        $this->assertEquals('placed', $result);
    }

+    /**
+     * @expectedException \InvalidArgumentException
+     * @expectedExceptionMessage Invalid value for enum
+     */
    public function testDeserializeInvalidValue()
    {
-        $this->setExpectedException(\InvalidArgumentException::class, 'Invalid value for enum');
-
        ObjectSerializer::deserialize(
            "lkjfalgkdfjg",
            OuterEnum::class
@ -78,10 +81,12 @@ class OuterEnumTest extends \PHPUnit_Framework_TestCase
        $this->assertEquals('approved', $result->outerEnum);
    }

+    /**
+     * @expectedException \InvalidArgumentException
+     * @expectedExceptionMessage Invalid value for enum
+     */
    public function testSanitizeNestedInvalidValue()
    {
-        $this->setExpectedException(\InvalidArgumentException::class, 'Invalid value for enum');
-
        $input = new EnumTest([
            'enum_string' => 'UPPER',
            'enum_integer' => -1,
--- a/samples/client/petstore/php/OpenAPIClient-php/tests/ParametersTest.php
+++ b/samples/client/petstore/php/OpenAPIClient-php/tests/ParametersTest.php
@ -4,10 +4,11 @@ namespace OpenAPI\Client;

 use OpenAPI\Client\Api\FakeApi;
 use OpenAPI\Client\Api\UserApi;
+use PHPUnit\Framework\TestCase;

 require_once __DIR__ . '/FakeHttpClient.php';

-class ParametersTest extends \PHPUnit_Framework_TestCase
+class ParametersTest extends TestCase
 {
    /** @var  FakeHttpClient */
    private $fakeHttpClient;
--- a/samples/client/petstore/php/OpenAPIClient-php/tests/PetApiTest.php
+++ b/samples/client/petstore/php/OpenAPIClient-php/tests/PetApiTest.php
@ -5,8 +5,10 @@ namespace OpenAPI\Client;
 use OpenAPI\Client\Api\PetApi;
 use OpenAPI\Client\Model\ApiResponse;
 use OpenAPI\Client\Model\Pet;
+use PHPUnit\Framework\Assert;
+use PHPUnit\Framework\TestCase;

-class PetApiTest extends \PHPUnit_Framework_TestCase
+class PetApiTest extends TestCase
 {

    /** @var  PetApi */
@ -45,7 +47,7 @@ class PetApiTest extends \PHPUnit_Framework_TestCase

        // add a new pet (model)
        list(, $status) = $petApi->addPetWithHttpInfo($newPet);
-        \PHPUnit_Framework_Assert::assertEquals(200, $status);
+        Assert::assertEquals(200, $status);
    }

    public function setUp()
--- a/samples/client/petstore/php/OpenAPIClient-php/tests/PetTest.php
+++ b/samples/client/petstore/php/OpenAPIClient-php/tests/PetTest.php
@ -3,8 +3,9 @@
 namespace OpenAPI\Client;

 use OpenAPI\Client\Model\Pet;
+use PHPUnit\Framework\TestCase;

-class PetTest extends \PHPUnit_Framework_TestCase
+class PetTest extends TestCase
 {
    /**
     * test empty object serialization
--- a/samples/client/petstore/php/OpenAPIClient-php/tests/RequestTest.php
+++ b/samples/client/petstore/php/OpenAPIClient-php/tests/RequestTest.php
@ -3,10 +3,11 @@
 namespace OpenAPI\Client;

 use OpenAPI\Client\Api\FakeApi;
+use PHPUnit\Framework\TestCase;

 require_once __DIR__ . '/FakeHttpClient.php';

-class RequestTest extends \PHPUnit_Framework_TestCase
+class RequestTest extends TestCase
 {

    /** @var FakeApi */
--- a/samples/client/petstore/php/OpenAPIClient-php/tests/ResponseTypesTest.php
+++ b/samples/client/petstore/php/OpenAPIClient-php/tests/ResponseTypesTest.php
@ -5,10 +5,11 @@ namespace OpenAPI\Client;
 use GuzzleHttp\Psr7\Response;
 use OpenAPI\Client\Api\PetApi;
 use OpenAPI\Client\Model\Pet;
+use PHPUnit\Framework\TestCase;

 require_once __DIR__ . '/FakeHttpClient.php';

-class ResponseTypesTest extends \PHPUnit_Framework_TestCase
+class ResponseTypesTest extends TestCase
 {
    /** @var PetApi */
    private $api;
--- a/samples/client/petstore/php/OpenAPIClient-php/tests/StoreApiTest.php
+++ b/samples/client/petstore/php/OpenAPIClient-php/tests/StoreApiTest.php
@ -7,8 +7,9 @@ use OpenAPI\Client\Api\StoreApi;
 use OpenAPI\Client\Model\Category;
 use OpenAPI\Client\Model\Pet;
 use OpenAPI\Client\Model\Tag;
+use PHPUnit\Framework\TestCase;

-class StoreApiTest extends \PHPUnit_Framework_TestCase
+class StoreApiTest extends TestCase
 {
    /** @var  StoreApi */
    private $api;
--- a/samples/client/petstore/php/OpenAPIClient-php/tests/UserApiTest.php
+++ b/samples/client/petstore/php/OpenAPIClient-php/tests/UserApiTest.php
@ -3,8 +3,9 @@
 namespace OpenAPI\Client;

 use OpenAPI\Client\Api\UserApi;
+use PHPUnit\Framework\TestCase;

-class UserApiTest extends \PHPUnit_Framework_TestCase
+class UserApiTest extends TestCase
 {

    /** @var UserApi*/
--- a/samples/openapi3/client/petstore/php/OpenAPIClient-php/composer.json
+++ b/samples/openapi3/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"
    },
--- a/samples/openapi3/client/petstore/php/OpenAPIClient-php/phpunit.xml.dist
+++ b/samples/openapi3/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>
--- a/samples/openapi3/client/petstore/php/OpenAPIClient-php/test/Api/AnotherFakeApiTest.php
+++ b/samples/openapi3/client/petstore/php/OpenAPIClient-php/test/Api/AnotherFakeApiTest.php
@ -31,6 +31,7 @@ namespace OpenAPI\Client;
 use \OpenAPI\Client\Configuration;
 use \OpenAPI\Client\ApiException;
 use \OpenAPI\Client\ObjectSerializer;
+use PHPUnit\Framework\TestCase;

 /**
 * AnotherFakeApiTest Class Doc Comment
@ -40,7 +41,7 @@ use \OpenAPI\Client\ObjectSerializer;
 * @author   OpenAPI Generator team
 * @link     https://openapi-generator.tech
 */
-class AnotherFakeApiTest extends \PHPUnit_Framework_TestCase
+class AnotherFakeApiTest extends TestCase
 {

    /**
--- a/samples/openapi3/client/petstore/php/OpenAPIClient-php/test/Api/DefaultApiTest.php
+++ b/samples/openapi3/client/petstore/php/OpenAPIClient-php/test/Api/DefaultApiTest.php
@ -31,6 +31,7 @@ namespace OpenAPI\Client;
 use \OpenAPI\Client\Configuration;
 use \OpenAPI\Client\ApiException;
 use \OpenAPI\Client\ObjectSerializer;
+use PHPUnit\Framework\TestCase;

 /**
 * DefaultApiTest Class Doc Comment
@ -40,7 +41,7 @@ use \OpenAPI\Client\ObjectSerializer;
 * @author   OpenAPI Generator team
 * @link     https://openapi-generator.tech
 */
-class DefaultApiTest extends \PHPUnit_Framework_TestCase
+class DefaultApiTest extends TestCase
 {

    /**
--- a/samples/openapi3/client/petstore/php/OpenAPIClient-php/test/Api/FakeApiTest.php
+++ b/samples/openapi3/client/petstore/php/OpenAPIClient-php/test/Api/FakeApiTest.php
@ -31,6 +31,7 @@ namespace OpenAPI\Client;
 use \OpenAPI\Client\Configuration;
 use \OpenAPI\Client\ApiException;
 use \OpenAPI\Client\ObjectSerializer;
+use PHPUnit\Framework\TestCase;

 /**
 * FakeApiTest Class Doc Comment
@ -40,7 +41,7 @@ use \OpenAPI\Client\ObjectSerializer;
 * @author   OpenAPI Generator team
 * @link     https://openapi-generator.tech
 */
-class FakeApiTest extends \PHPUnit_Framework_TestCase
+class FakeApiTest extends TestCase
 {

    /**
--- a/samples/openapi3/client/petstore/php/OpenAPIClient-php/test/Api/FakeClassnameTags123ApiTest.php
+++ b/samples/openapi3/client/petstore/php/OpenAPIClient-php/test/Api/FakeClassnameTags123ApiTest.php
@ -31,6 +31,7 @@ namespace OpenAPI\Client;
 use \OpenAPI\Client\Configuration;
 use \OpenAPI\Client\ApiException;
 use \OpenAPI\Client\ObjectSerializer;
+use PHPUnit\Framework\TestCase;

 /**
 * FakeClassnameTags123ApiTest Class Doc Comment
@ -40,7 +41,7 @@ use \OpenAPI\Client\ObjectSerializer;
 * @author   OpenAPI Generator team
 * @link     https://openapi-generator.tech
 */
-class FakeClassnameTags123ApiTest extends \PHPUnit_Framework_TestCase
+class FakeClassnameTags123ApiTest extends TestCase
 {

    /**
--- a/samples/openapi3/client/petstore/php/OpenAPIClient-php/test/Api/PetApiTest.php
+++ b/samples/openapi3/client/petstore/php/OpenAPIClient-php/test/Api/PetApiTest.php
@ -31,6 +31,7 @@ namespace OpenAPI\Client;
 use \OpenAPI\Client\Configuration;
 use \OpenAPI\Client\ApiException;
 use \OpenAPI\Client\ObjectSerializer;
+use PHPUnit\Framework\TestCase;

 /**
 * PetApiTest Class Doc Comment
@ -40,7 +41,7 @@ use \OpenAPI\Client\ObjectSerializer;
 * @author   OpenAPI Generator team
 * @link     https://openapi-generator.tech
 */
-class PetApiTest extends \PHPUnit_Framework_TestCase
+class PetApiTest extends TestCase
 {

    /**
--- a/samples/openapi3/client/petstore/php/OpenAPIClient-php/test/Api/StoreApiTest.php
+++ b/samples/openapi3/client/petstore/php/OpenAPIClient-php/test/Api/StoreApiTest.php
@ -31,6 +31,7 @@ namespace OpenAPI\Client;
 use \OpenAPI\Client\Configuration;
 use \OpenAPI\Client\ApiException;
 use \OpenAPI\Client\ObjectSerializer;
+use PHPUnit\Framework\TestCase;

 /**
 * StoreApiTest Class Doc Comment
@ -40,7 +41,7 @@ use \OpenAPI\Client\ObjectSerializer;
 * @author   OpenAPI Generator team
 * @link     https://openapi-generator.tech
 */
-class StoreApiTest extends \PHPUnit_Framework_TestCase
+class StoreApiTest extends TestCase
 {

    /**
--- a/samples/openapi3/client/petstore/php/OpenAPIClient-php/test/Api/UserApiTest.php
+++ b/samples/openapi3/client/petstore/php/OpenAPIClient-php/test/Api/UserApiTest.php
@ -31,6 +31,7 @@ namespace OpenAPI\Client;
 use \OpenAPI\Client\Configuration;
 use \OpenAPI\Client\ApiException;
 use \OpenAPI\Client\ObjectSerializer;
+use PHPUnit\Framework\TestCase;

 /**
 * UserApiTest Class Doc Comment
@ -40,7 +41,7 @@ use \OpenAPI\Client\ObjectSerializer;
 * @author   OpenAPI Generator team
 * @link     https://openapi-generator.tech
 */
-class UserApiTest extends \PHPUnit_Framework_TestCase
+class UserApiTest extends TestCase
 {

    /**
--- a/samples/openapi3/client/petstore/php/OpenAPIClient-php/test/Model/AdditionalPropertiesClassTest.php
+++ b/samples/openapi3/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 @@ namespace OpenAPI\Client;
 * @author      OpenAPI Generator team
 * @link        https://openapi-generator.tech
 */
-class AdditionalPropertiesClassTest extends \PHPUnit_Framework_TestCase
+class AdditionalPropertiesClassTest extends TestCase
 {

    /**
--- a/samples/openapi3/client/petstore/php/OpenAPIClient-php/test/Model/AnimalFarmTest.php
+++ b/samples/openapi3/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 @@ namespace OpenAPI\Client;
 * @author      OpenAPI Generator team
 * @link        https://openapi-generator.tech
 */
-class AnimalFarmTest extends \PHPUnit_Framework_TestCase
+class AnimalFarmTest extends TestCase
 {

    /**
--- a/samples/openapi3/client/petstore/php/OpenAPIClient-php/test/Model/AnimalTest.php
+++ b/samples/openapi3/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 @@ namespace OpenAPI\Client;
 * @author      OpenAPI Generator team
 * @link        https://openapi-generator.tech
 */
-class AnimalTest extends \PHPUnit_Framework_TestCase
+class AnimalTest extends TestCase
 {

    /**
--- a/samples/openapi3/client/petstore/php/OpenAPIClient-php/test/Model/ApiResponseTest.php
+++ b/samples/openapi3/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 @@ namespace OpenAPI\Client;
 * @author      OpenAPI Generator team
 * @link        https://openapi-generator.tech
 */
-class ApiResponseTest extends \PHPUnit_Framework_TestCase
+class ApiResponseTest extends TestCase
 {

    /**
--- a/samples/openapi3/client/petstore/php/OpenAPIClient-php/test/Model/ArrayOfArrayOfNumberOnlyTest.php
+++ b/samples/openapi3/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 @@ namespace OpenAPI\Client;
 * @author      OpenAPI Generator team
 * @link        https://openapi-generator.tech
 */
-class ArrayOfArrayOfNumberOnlyTest extends \PHPUnit_Framework_TestCase
+class ArrayOfArrayOfNumberOnlyTest extends TestCase
 {

    /**
--- a/samples/openapi3/client/petstore/php/OpenAPIClient-php/test/Model/ArrayOfNumberOnlyTest.php
+++ b/samples/openapi3/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 @@ namespace OpenAPI\Client;
 * @author      OpenAPI Generator team
 * @link        https://openapi-generator.tech
 */
-class ArrayOfNumberOnlyTest extends \PHPUnit_Framework_TestCase
+class ArrayOfNumberOnlyTest extends TestCase
 {

    /**
--- a/samples/openapi3/client/petstore/php/OpenAPIClient-php/test/Model/ArrayTestTest.php
+++ b/samples/openapi3/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 @@ namespace OpenAPI\Client;
 * @author      OpenAPI Generator team
 * @link        https://openapi-generator.tech
 */
-class ArrayTestTest extends \PHPUnit_Framework_TestCase
+class ArrayTestTest extends TestCase
 {

    /**
--- a/samples/openapi3/client/petstore/php/OpenAPIClient-php/test/Model/CapitalizationTest.php
+++ b/samples/openapi3/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 @@ namespace OpenAPI\Client;
 * @author      OpenAPI Generator team
 * @link        https://openapi-generator.tech
 */
-class CapitalizationTest extends \PHPUnit_Framework_TestCase
+class CapitalizationTest extends TestCase
 {

    /**
--- a/samples/openapi3/client/petstore/php/OpenAPIClient-php/test/Model/CatTest.php
+++ b/samples/openapi3/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 @@ namespace OpenAPI\Client;
 * @author      OpenAPI Generator team
 * @link        https://openapi-generator.tech
 */
-class CatTest extends \PHPUnit_Framework_TestCase
+class CatTest extends TestCase
 {

    /**
--- a/samples/openapi3/client/petstore/php/OpenAPIClient-php/test/Model/CategoryTest.php
+++ b/samples/openapi3/client/petstore/php/OpenAPIClient-php/test/Model/CategoryTest.php
@ -29,6 +29,8 @@

 namespace OpenAPI\Client;

+use PHPUnit\Framework\TestCase;
+
 /**
 * CategoryTest Class Doc Comment
 *
@ -38,7 +40,7 @@ namespace OpenAPI\Client;
 * @author      OpenAPI Generator team
 * @link        https://openapi-generator.tech
 */
-class CategoryTest extends \PHPUnit_Framework_TestCase
+class CategoryTest extends TestCase
 {

    /**
--- a/samples/openapi3/client/petstore/php/OpenAPIClient-php/test/Model/ClassModelTest.php
+++ b/samples/openapi3/client/petstore/php/OpenAPIClient-php/test/Model/ClassModelTest.php
@ -29,6 +29,8 @@

 namespace OpenAPI\Client;

+use PHPUnit\Framework\TestCase;
+
 /**
 * ClassModelTest Class Doc Comment
 *
@ -38,7 +40,7 @@ namespace OpenAPI\Client;
 * @author      OpenAPI Generator team
 * @link        https://openapi-generator.tech
 */
-class ClassModelTest extends \PHPUnit_Framework_TestCase
+class ClassModelTest extends TestCase
 {

    /**
--- a/samples/openapi3/client/petstore/php/OpenAPIClient-php/test/Model/ClientTest.php
+++ b/samples/openapi3/client/petstore/php/OpenAPIClient-php/test/Model/ClientTest.php
@ -29,6 +29,8 @@

 namespace OpenAPI\Client;

+use PHPUnit\Framework\TestCase;
+
 /**
 * ClientTest Class Doc Comment
 *
@ -38,7 +40,7 @@ namespace OpenAPI\Client;
 * @author      OpenAPI Generator team
 * @link        https://openapi-generator.tech
 */
-class ClientTest extends \PHPUnit_Framework_TestCase
+class ClientTest extends TestCase
 {

    /**
--- a/samples/openapi3/client/petstore/php/OpenAPIClient-php/test/Model/DogTest.php
+++ b/samples/openapi3/client/petstore/php/OpenAPIClient-php/test/Model/DogTest.php
@ -29,6 +29,8 @@

 namespace OpenAPI\Client;

+use PHPUnit\Framework\TestCase;
+
 /**
 * DogTest Class Doc Comment
 *
@ -38,7 +40,7 @@ namespace OpenAPI\Client;
 * @author      OpenAPI Generator team
 * @link        https://openapi-generator.tech
 */
-class DogTest extends \PHPUnit_Framework_TestCase
+class DogTest extends TestCase
 {

    /**
--- a/samples/openapi3/client/petstore/php/OpenAPIClient-php/test/Model/EnumArraysTest.php
+++ b/samples/openapi3/client/petstore/php/OpenAPIClient-php/test/Model/EnumArraysTest.php
@ -29,6 +29,8 @@

 namespace OpenAPI\Client;

+use PHPUnit\Framework\TestCase;
+
 /**
 * EnumArraysTest Class Doc Comment
 *
@ -38,7 +40,7 @@ namespace OpenAPI\Client;
 * @author      OpenAPI Generator team
 * @link        https://openapi-generator.tech
 */
-class EnumArraysTest extends \PHPUnit_Framework_TestCase
+class EnumArraysTest extends TestCase
 {

    /**
--- a/samples/openapi3/client/petstore/php/OpenAPIClient-php/test/Model/EnumClassTest.php
+++ b/samples/openapi3/client/petstore/php/OpenAPIClient-php/test/Model/EnumClassTest.php
@ -29,6 +29,8 @@

 namespace OpenAPI\Client;

+use PHPUnit\Framework\TestCase;
+
 /**
 * EnumClassTest Class Doc Comment
 *
@ -38,7 +40,7 @@ namespace OpenAPI\Client;
 * @author      OpenAPI Generator team
 * @link        https://openapi-generator.tech
 */
-class EnumClassTest extends \PHPUnit_Framework_TestCase
+class EnumClassTest extends TestCase
 {

    /**
--- a/samples/openapi3/client/petstore/php/OpenAPIClient-php/test/Model/EnumTestTest.php
+++ b/samples/openapi3/client/petstore/php/OpenAPIClient-php/test/Model/EnumTestTest.php
@ -29,6 +29,8 @@

 namespace OpenAPI\Client;

+use PHPUnit\Framework\TestCase;
+
 /**
 * EnumTestTest Class Doc Comment
 *
@ -38,7 +40,7 @@ namespace OpenAPI\Client;
 * @author      OpenAPI Generator team
 * @link        https://openapi-generator.tech
 */
-class EnumTestTest extends \PHPUnit_Framework_TestCase
+class EnumTestTest extends TestCase
 {

    /**
--- a/samples/openapi3/client/petstore/php/OpenAPIClient-php/test/Model/FileSchemaTestClassTest.php
+++ b/samples/openapi3/client/petstore/php/OpenAPIClient-php/test/Model/FileSchemaTestClassTest.php
@ -29,6 +29,8 @@

 namespace OpenAPI\Client;

+use PHPUnit\Framework\TestCase;
+
 /**
 * FileSchemaTestClassTest Class Doc Comment
 *
@ -38,7 +40,7 @@ namespace OpenAPI\Client;
 * @author      OpenAPI Generator team
 * @link        https://openapi-generator.tech
 */
-class FileSchemaTestClassTest extends \PHPUnit_Framework_TestCase
+class FileSchemaTestClassTest extends TestCase
 {

    /**
--- a/samples/openapi3/client/petstore/php/OpenAPIClient-php/test/Model/FileTest.php
+++ b/samples/openapi3/client/petstore/php/OpenAPIClient-php/test/Model/FileTest.php
@ -29,6 +29,8 @@

 namespace OpenAPI\Client;

+use PHPUnit\Framework\TestCase;
+
 /**
 * FileTest Class Doc Comment
 *
@ -38,7 +40,7 @@ namespace OpenAPI\Client;
 * @author      OpenAPI Generator team
 * @link        https://openapi-generator.tech
 */
-class FileTest extends \PHPUnit_Framework_TestCase
+class FileTest extends TestCase
 {

    /**
--- a/samples/openapi3/client/petstore/php/OpenAPIClient-php/test/Model/FooTest.php
+++ b/samples/openapi3/client/petstore/php/OpenAPIClient-php/test/Model/FooTest.php
@ -29,6 +29,8 @@

 namespace OpenAPI\Client;

+use PHPUnit\Framework\TestCase;
+
 /**
 * FooTest Class Doc Comment
 *
@ -38,7 +40,7 @@ namespace OpenAPI\Client;
 * @author      OpenAPI Generator team
 * @link        https://openapi-generator.tech
 */
-class FooTest extends \PHPUnit_Framework_TestCase
+class FooTest extends TestCase
 {

    /**
--- a/Show More
+++ b/Show More