diff --git a/.travis.yml b/.travis.yml index c1323b0..dd5a58a 100644 --- a/.travis.yml +++ b/.travis.yml @@ -8,32 +8,27 @@ env: - REQUIRE_RECIPE_TESTING="^2" - REQUIRE_FRAMEWORKTEST="^0.4.2" # vfsstream is a dev dependency of the assets module - - REQUIRE_EXTRA="mikey179/vfsstream:^1.6" + - REQUIRE_EXTRA="mikey179/vfsstream:^1.6.10" matrix: fast_finish: true include: # Core php tests - - php: 7.3 + - php: 7.4 env: - DB=MYSQL - PHPUNIT_TEST=1 - PHPUNIT_SUITE="core" - PDO=1 - COMPOSER_INSTALL_ARG="--prefer-lowest" - - php: 7.3 + - php: 7.4 env: - DB=MYSQL - PHPUNIT_TEST=1 - PHPUNIT_SUITE="framework" - - php: 7.3 - env: - - DB=PGSQL - - PHPUNIT_TEST=1 - - PHPUNIT_SUITE="core" - php: 7.4 env: - - DB=MYSQL + - DB=PGSQL - PHPUNIT_TEST=1 - PHPUNIT_SUITE="core" - php: 8.0 @@ -41,23 +36,22 @@ matrix: - DB=MYSQL - PHPUNIT_TEST=1 - PHPUNIT_SUITE="core" - - COMPOSER_INSTALL_ARG="--ignore-platform-reqs" + - php: 8.1.0 + env: + - DB=MYSQL + - PHPUNIT_TEST=1 + - PHPUNIT_SUITE="core" # admin php tests - - php: 7.3 + - php: 7.4 env: - DB=MYSQL - PHPUNIT_TEST=1 - PHPUNIT_SUITE="admin" - PDO=1 - COMPOSER_INSTALL_ARG="--prefer-lowest" - - php: 7.3 - env: - - DB=PGSQL - - PHPUNIT_TEST=1 - - PHPUNIT_SUITE="admin" - php: 7.4 env: - - DB=MYSQL + - DB=PGSQL - PHPUNIT_TEST=1 - PHPUNIT_SUITE="admin" - php: 8.0 @@ -65,14 +59,18 @@ matrix: - DB=MYSQL - PHPUNIT_TEST=1 - PHPUNIT_SUITE="admin" - - COMPOSER_INSTALL_ARG="--ignore-platform-reqs" + - php: 8.1.0 + env: + - DB=MYSQL + - PHPUNIT_TEST=1 + - PHPUNIT_SUITE="admin" # behat tests - - php: 7.3 + - php: 7.4 env: - DB=MYSQL - BEHAT_TEST=1 - BEHAT_SUITE="admin" - - php: 7.3 + - php: 7.4 env: - DB=MYSQL - BEHAT_TEST=1 @@ -82,3 +80,5 @@ matrix: - DB=MYSQL - BEHAT_TEST=1 - BEHAT_SUITE="asset-admin" + allow_failures: + - php: 8.1.0 diff --git a/composer.json b/composer.json index d1ac07c..b6ef1b4 100644 --- a/composer.json +++ b/composer.json @@ -3,7 +3,7 @@ "type": "silverstripe-recipe", "description": "The SilverStripe Framework Installer", "require": { - "php": "^7.3 || ^8.0", + "php": "^7.4 || ^8.0", "silverstripe/recipe-plugin": "^1.2", "silverstripe/recipe-cms": "4.x-dev", "silverstripe-themes/simple": "~3.2.0",