From b765ec87c1d43aeaed7b611fc62390de32457497 Mon Sep 17 00:00:00 2001 From: Steve Boyd Date: Tue, 23 Jun 2020 12:54:42 +1200 Subject: [PATCH] Travis 2.2 --- .travis.yml | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/.travis.yml b/.travis.yml index 6cfac10..8e807c0 100644 --- a/.travis.yml +++ b/.travis.yml @@ -13,11 +13,11 @@ env: matrix: include: - php: 7.1 - env: DB=MYSQL RECIPE_VERSION=4.2.x-dev PHPCS_TEST=1 PHPUNIT_TEST=1 + env: DB=MYSQL RECIPE_VERSION=4.5.x-dev PHPUNIT_TEST=1 PHPCS_TEST=1 PDO=1 - php: 7.2 - env: DB=PGSQL RECIPE_VERSION=4.2.x-dev PHPUNIT_TEST=1 + env: DB=PGSQL RECIPE_VERSION=4.6.x-dev PHPUNIT_COVERAGE_TEST=1 - php: 7.3 - env: DB=MYSQL RECIPE_VERSION=4.3.x-dev PHPUNIT_COVERAGE_TEST=1 + env: DB=MYSQL RECIPE_VERSION=4.6.x-dev PHPUNIT_TEST=1 - php: 7.4 env: DB=MYSQL RECIPE_VERSION=4.x-dev PHPUNIT_TEST=1 @@ -26,8 +26,10 @@ before_script: - phpenv config-rm xdebug.ini - composer validate - - composer require --no-update silverstripe/recipe-core:"$RECIPE_VERSION" - - if [[ $DB == PGSQL ]]; then composer require --no-update silverstripe/postgresql:2.x-dev; fi + - composer require --no-update silverstripe/recipe-core:$RECIPE_VERSION + # Fix for running phpunit 5 on php 7.4+ + - composer require --no-update sminnee/phpunit-mock-objects:^3 + - if [[ $DB == PGSQL ]]; then composer require --no-update silverstripe/postgresql:^2; fi - composer install --prefer-dist --no-interaction --no-progress --no-suggest --optimize-autoloader --verbose --profile script: