diff --git a/.travis.yml b/.travis.yml index c9e508b..5567a82 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,5 +1,4 @@ language: php - dist: trusty matrix: @@ -9,6 +8,7 @@ matrix: - php: 7.4 env: ANALYSIS='true' - php: nightly + allow_failures: - php: nightly diff --git a/composer.json b/composer.json index bea90df..dffe690 100644 --- a/composer.json +++ b/composer.json @@ -18,13 +18,13 @@ } ], "require": { - "php": "^7.2", + "php": "^7.2 || ^8.0", "psr/http-message": "^1.0", "psr/http-server-middleware": "^1.0" }, "require-dev": { + "phpunit/phpunit": "^8.5.13 || ^9.3.8", "slim/psr7": "^1.1", - "phpunit/phpunit": "^8.5", "squizlabs/php_codesniffer": "^3.5", "phpstan/phpstan": "^0.12.28" }, diff --git a/phpunit.xml.dist b/phpunit.xml.dist index 1f1adc7..515752f 100644 --- a/phpunit.xml.dist +++ b/phpunit.xml.dist @@ -1,6 +1,6 @@ ./tests/ - - + + ./src/ - - - - - + + + + + + diff --git a/src/Cache.php b/src/Cache.php index 4f0c147..769d8ee 100644 --- a/src/Cache.php +++ b/src/Cache.php @@ -2,7 +2,7 @@ /** * Slim Framework (https://www.slimframework.com) * - * @license https://github.com/slimphp/Slim-HttpCache/blob/master/LICENSE.md (MIT License) + * @license https://github.com/slimphp/Slim-HttpCache/blob/master/LICENSE.md (MIT License) */ declare(strict_types=1); diff --git a/src/CacheProvider.php b/src/CacheProvider.php index 17d46af..e2381cb 100644 --- a/src/CacheProvider.php +++ b/src/CacheProvider.php @@ -2,7 +2,7 @@ /** * Slim Framework (https://www.slimframework.com) * - * @license https://github.com/slimphp/Slim-HttpCache/blob/master/LICENSE.md (MIT License) + * @license https://github.com/slimphp/Slim-HttpCache/blob/master/LICENSE.md (MIT License) */ declare(strict_types=1); diff --git a/tests/CacheProviderTest.php b/tests/CacheProviderTest.php index 8c3907f..bc7847c 100644 --- a/tests/CacheProviderTest.php +++ b/tests/CacheProviderTest.php @@ -2,7 +2,7 @@ /** * Slim Framework (https://www.slimframework.com) * - * @license https://github.com/slimphp/Slim-HttpCache/blob/master/LICENSE.md (MIT License) + * @license https://github.com/slimphp/Slim-HttpCache/blob/master/LICENSE.md (MIT License) */ declare(strict_types=1); @@ -10,7 +10,6 @@ namespace Slim\HttpCache\Tests; use InvalidArgumentException; -use PHPUnit\Framework\TestCase; use Psr\Http\Message\ResponseInterface; use Slim\HttpCache\CacheProvider; use Slim\Psr7\Factory\ResponseFactory; diff --git a/tests/CacheTest.php b/tests/CacheTest.php index e8b4d57..64fab81 100644 --- a/tests/CacheTest.php +++ b/tests/CacheTest.php @@ -2,14 +2,13 @@ /** * Slim Framework (https://www.slimframework.com) * - * @license https://github.com/slimphp/Slim-HttpCache/blob/master/LICENSE.md (MIT License) + * @license https://github.com/slimphp/Slim-HttpCache/blob/master/LICENSE.md (MIT License) */ declare(strict_types=1); namespace Slim\HttpCache\Tests; -use PHPUnit\Framework\TestCase; use Psr\Http\Message\ResponseInterface; use Psr\Http\Message\ServerRequestInterface; use Psr\Http\Server\RequestHandlerInterface; diff --git a/tests/TestCase.php b/tests/TestCase.php new file mode 100644 index 0000000..f0b2b67 --- /dev/null +++ b/tests/TestCase.php @@ -0,0 +1,16 @@ +