diff --git a/.travis.yml b/.travis.yml index 13cd8da..61d284e 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,9 +1,9 @@ language: php php: +- '7.4' +- '7.3' - '7.2' - '7.1' -- '7.0' -- '5.6' - nightly install: make travis-install @@ -11,9 +11,13 @@ install: make travis-install script: make travis-test jobs: + allow_failures: + - php: nightly include: - stage: "Follow Up" name: "Test Coverage" + php: '7.1' script: travis_retry make travis-coverage - name: "Code Style" + php: '7.1' script: make travis-phpcs diff --git a/Makefile b/Makefile index 751879f..55732ac 100644 --- a/Makefile +++ b/Makefile @@ -18,10 +18,10 @@ vendor: composer.lock ${MAKE} install test: vendor - ${DRUN} php:5.6 ${PHPUNIT} - ${DRUN} php:7.0 ${PHPUNIT} ${DRUN} php:7.1 ${PHPUNIT} ${DRUN} php:7.2 ${PHPUNIT} + ${DRUN} php:7.3 ${PHPUNIT} + ${DRUN} php:7.4 ${PHPUNIT} ${DRUN} php:7 ${PHPUNIT} test-fast: vendor diff --git a/README.md b/README.md index 7094f2f..fbcf48f 100644 --- a/README.md +++ b/README.md @@ -28,12 +28,12 @@ echo WP_DEBUG_DISPLAY; Just run `make` to do everything -We use PHPUnit 5 because it has compatibility for PHP 5.6 +We use PHPUnit 7 because it has compatibility for PHP 7.1 -[PHPUnit Docs](https://phpunit.de/manual/5.7/en/index.html) +[PHPUnit Docs](https://phpunit.readthedocs.io/en/7.5/) There are 3 test commands -- `make test` run the full test suite from php 5.6 to 7.x +- `make test` run the full test suite from php to 7.1 to 7.4 - `make test-fast` run php 7 tests - `make test-coverage` generate an html test coverage report in `./coverage` diff --git a/composer.json b/composer.json index 73ebb05..72d2551 100644 --- a/composer.json +++ b/composer.json @@ -15,17 +15,12 @@ } }, "require": { - "php": ">=5.6" + "php": ">=7.1" }, "require-dev": { - "squizlabs/php_codesniffer": "^3.3", + "squizlabs/php_codesniffer": "^3.5", "roave/security-advisories": "dev-master", - "phpunit/phpunit": "^5.7", - "php-coveralls/php-coveralls": "^2.1" - }, - "config": { - "platform": { - "php": "5.6" - } + "phpunit/phpunit": "^7.5", + "php-coveralls/php-coveralls": "^2.2" } } diff --git a/tests/ConfigTest.php b/tests/ConfigTest.php index 80cb724..e190a04 100644 --- a/tests/ConfigTest.php +++ b/tests/ConfigTest.php @@ -2,13 +2,14 @@ namespace Roots\WPConfig; +use PHPUnit\Framework\TestCase; use Roots\WPConfig\Exceptions\ConstantAlreadyDefinedException; use Roots\WPConfig\Exceptions\UndefinedConfigKeyException; /** * @runTestsInSeparateProcesses */ -class ConfigTest extends \PHPUnit_Framework_TestCase +class ConfigTest extends TestCase { public function testDefineHappy() {