From 04be1ecb348cf7995762d4266fc51f45d6702621 Mon Sep 17 00:00:00 2001 From: Robbie Averill Date: Tue, 23 Jul 2019 15:51:51 +0200 Subject: [PATCH] Add PHP 7.3 to Travis builds --- .travis.yml | 33 +++++++++++++-------------------- composer.json | 9 ++++++--- 2 files changed, 19 insertions(+), 23 deletions(-) diff --git a/.travis.yml b/.travis.yml index 3ceeea2..16764d3 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,32 +1,25 @@ -# See https://github.com/silverstripe-labs/silverstripe-travis-support for setup details +# See https://github.com/silverstripe/silverstripe-travis-support for setup details -sudo: false +dist: trusty language: php -php: - - 5.4 - - 5.5 - - 5.6 - - 7.0 - -env: - - DB=MYSQL CORE_RELEASE=3.2 - 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 - allow_failures: - - php: 7.0 + - 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 - - 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 b75231e..9a9ddab 100644 --- a/composer.json +++ b/composer.json @@ -16,8 +16,11 @@ } ], "require": { - "silverstripe/framework": ">=3.1", - "silverstripe/cms": ">=3.1" + "silverstripe/framework": "^3.1", + "silverstripe/cms": "^3.1" + }, + "require-dev": { + "phpunit/phpunit": "^5.7" }, "extra": [] -} \ No newline at end of file +}