From 8eb66bc2ebdf6fadfc90724a804d86df9e49f4da Mon Sep 17 00:00:00 2001 From: Robbie Averill Date: Wed, 24 Jul 2019 12:37:26 +0200 Subject: [PATCH] Update Travis builds to include PHP 7, update PHPUnit to 5.7 --- .travis.yml | 35 +++++++++++++---------------------- composer.json | 3 +++ 2 files changed, 16 insertions(+), 22 deletions(-) diff --git a/.travis.yml b/.travis.yml index 62bfe15..b38514c 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,34 +1,25 @@ -# See https://github.com/silverstripe-labs/silverstripe-travis-support for setup details - -sudo: false +# See https://github.com/silverstripe/silverstripe-travis-support for setup details language: php -dist: precise - -php: - - 5.4 - - 5.5 - - 5.6 - -env: - - DB=MYSQL CORE_RELEASE=3.2 +dist: trusty matrix: include: - - php: 5.6 - env: DB=MYSQL CORE_RELEASE=3 - - php: 5.6 - env: DB=PGSQL CORE_RELEASE=3.1 - - php: 5.6 - env: DB=PGSQL CORE_RELEASE=3.3 - - php: 5.6 - env: DB=PGSQL CORE_RELEASE=3.4 - fast_finish: true + - php: '5.6' + env: DB=MYSQL CORE_RELEASE=3.6 + - php: '7.0' + env: DB=PGSQL CORE_RELEASE=3.7 + - php: '7.1' + env: DB=MYSQL CORE_RELEASE=3.7 + - php: '7.2' + env: DB=MYSQL CORE_RELEASE=3.7 + - php: '7.3' + env: DB=MYSQL CORE_RELEASE=3.7 before_script: - composer self-update || true - - git clone git://github.com/silverstripe-labs/silverstripe-travis-support.git ~/travis-support + - git clone git://github.com/silverstripe/silverstripe-travis-support.git ~/travis-support - php ~/travis-support/travis_setup.php --source `pwd` --target ~/builds/ss - cd ~/builds/ss - composer install diff --git a/composer.json b/composer.json index 0421c76..ef5238d 100644 --- a/composer.json +++ b/composer.json @@ -21,6 +21,9 @@ "require": { "silverstripe/framework": "~3.1" }, + "require-dev": { + "phpunit/phpunit": "^5.7" + }, "extra": { "installer-name": "gridfieldextensions", "screenshots": [