From 72d77a00c251cafe07098e89706689a95301488c Mon Sep 17 00:00:00 2001 From: Robbie Averill Date: Wed, 24 Jul 2019 12:35:21 +0200 Subject: [PATCH] Update Travis builds to include PHP 7, update PHPUnit to 5.7 --- .travis.yml | 25 ++++++++++--------------- composer.json | 4 ++-- 2 files changed, 12 insertions(+), 17 deletions(-) diff --git a/.travis.yml b/.travis.yml index 4dc6a8f..24b2236 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,26 +1,21 @@ # See https://github.com/silverstripe/silverstripe-travis-support for setup details -sudo: false +dist: trusty language: php -php: - - 5.4 - - 5.5 - -env: - - DB=MYSQL CORE_RELEASE=3.5 - matrix: include: - - php: 5.6 - env: DB=MYSQL CORE_RELEASE=3 - - php: 5.6 - env: DB=MYSQL CORE_RELEASE=3.1 - - php: 5.6 - env: DB=PGSQL CORE_RELEASE=3.2 - - php: 7.1 + - php: '5.6' env: DB=MYSQL CORE_RELEASE=3.6 + - php: '7.0' + env: DB=MYSQL CORE_RELEASE=3.7 + - php: '7.1' + env: DB=PGSQL 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 diff --git a/composer.json b/composer.json index fad8165..5d74b35 100644 --- a/composer.json +++ b/composer.json @@ -21,10 +21,10 @@ }, "require-dev": { "hafriedlander/silverstripe-phockito": "*", - "phpunit/PHPUnit": "~3.7@stable" + "phpunit/phpunit": "^5.7" }, "suggest": { "silverstripe/queuedjobs": "Speeds up running the job for Content Editors fropm the report" }, "extra": [] -} \ No newline at end of file +}