From 6c96e7a69f2c434fac8f20f4fd37e15c5be6746f Mon Sep 17 00:00:00 2001 From: Garion Herman Date: Wed, 14 Oct 2020 14:25:49 +1300 Subject: [PATCH 1/2] MNT Add PHP 8 build --- .travis.yml | 6 ++++-- composer.json | 3 ++- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/.travis.yml b/.travis.yml index 674b66e..b2ecb3a 100644 --- a/.travis.yml +++ b/.travis.yml @@ -13,13 +13,15 @@ env: matrix: include: - php: 7.1 - env: DB=MYSQL + env: DB=MYSQL COMPOSER_ARG=--prefer-lowest - php: 7.2 env: DB=PGSQL - php: 7.3 env: DB=MYSQL - php: 7.4 env: DB=MYSQL + - php: nightly + env: DB=MYSQL COMPOSER_ARG=--ignore-platform-reqs before_script: - phpenv rehash @@ -28,7 +30,7 @@ before_script: - composer validate - composer require --no-update silverstripe-themes/simple:~3.2.0 - if [[ $DB == PGSQL ]]; then composer require silverstripe/postgresql:2.x-dev --no-update; fi - - composer install --prefer-source --no-interaction --no-progress --no-suggest --optimize-autoloader --verbose --profile + - composer update --prefer-source --no-interaction --no-progress --no-suggest --optimize-autoloader --verbose --profile $COMPOSER_ARG # Validate cow schema - composer global require silverstripe/cow ^2 diff --git a/composer.json b/composer.json index 5004ffc..c7c1cc8 100644 --- a/composer.json +++ b/composer.json @@ -5,6 +5,7 @@ "homepage": "http://silverstripe.org", "license": "BSD-3-Clause", "require": { + "php": "^7.1 || ^8", "silverstripe/recipe-plugin": "^1.2", "silverstripe/recipe-core": "4.x-dev", "silverstripe/admin": "1.x-dev", @@ -19,7 +20,7 @@ "silverstripe/versioned": "1.x-dev" }, "require-dev": { - "phpunit/phpunit": "^5.7", + "sminnee/phpunit": "^5.7", "sminnee/phpunit-mock-objects": "^3.4.5" }, "extra": { From 3ff3c8a196470a8e4ca7dc9f7a6be8702af00d57 Mon Sep 17 00:00:00 2001 From: Garion Herman Date: Fri, 16 Oct 2020 09:57:28 +1300 Subject: [PATCH 2/2] MNT Use latest build of silverstripe/cow --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index b2ecb3a..10d8b7c 100644 --- a/.travis.yml +++ b/.travis.yml @@ -33,7 +33,7 @@ before_script: - composer update --prefer-source --no-interaction --no-progress --no-suggest --optimize-autoloader --verbose --profile $COMPOSER_ARG # Validate cow schema - - composer global require silverstripe/cow ^2 + - composer global require silverstripe/cow dev-master $COMPOSER_ARG - ~/.config/composer/vendor/bin/cow schema:validate script: