From 3314f95da600f75eca79da450e4e1054f2f51259 Mon Sep 17 00:00:00 2001 From: Serge Latyntcev Date: Fri, 9 Oct 2020 10:09:13 +1300 Subject: [PATCH] MNT PHP8 support --- .travis.yml | 8 +++++--- composer.json | 2 +- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/.travis.yml b/.travis.yml index 3773b9ec..1060389b 100644 --- a/.travis.yml +++ b/.travis.yml @@ -19,13 +19,15 @@ matrix: fast_finish: true include: - php: 7.1 - env: DB=MYSQL PHPUNIT_TEST=1 PHPCS_TEST=1 + env: DB=MYSQL PHPUNIT_TEST=1 COMPOSER_ARG=--prefer-lowest - php: 7.2 - env: DB=MYSQL PHPUNIT_TEST=1 + env: DB=MYSQL PHPUNIT_TEST=1 PHPCS_TEST=1 - php: 7.3 env: DB=MYSQL PDO=1 PHPUNIT_COVERAGE_TEST=1 - php: 7.4 env: DB=MYSQL PHPUNIT_TEST=1 + - php: nightly + env: PHPUNIT_TEST=1 COMPOSER_ARG=--ignore-platform-reqs before_script: # Init PHP @@ -39,7 +41,7 @@ before_script: - if [[ $DB == SQLITE ]]; then composer require silverstripe/sqlite3:2.x-dev --no-update; fi - composer require silverstripe/recipe-core:4.x-dev silverstripe/admin:1.x-dev silverstripe/versioned:1.x-dev --no-update - if [[ $PHPCS_TEST ]]; then composer global require squizlabs/php_codesniffer:^3 --prefer-dist --no-interaction --no-progress --no-suggest -o; fi - - composer install --prefer-dist --no-interaction --no-progress --no-suggest --optimize-autoloader --verbose --profile + - composer update --prefer-dist --no-interaction --no-progress --no-suggest --optimize-autoloader --verbose --profile $COMPOSER_ARG script: - if [[ $PHPUNIT_TEST ]]; then vendor/bin/phpunit tests; fi diff --git a/composer.json b/composer.json index f09c958d..93a963a3 100644 --- a/composer.json +++ b/composer.json @@ -28,7 +28,7 @@ "silverstripe/vendor-plugin": "^1" }, "require-dev": { - "phpunit/phpunit": "^5.7" + "sminnee/phpunit": "^5.7" }, "extra": { "expose": [