From 4247371fa8b6963d660404587801f7e9bc1b7742 Mon Sep 17 00:00:00 2001 From: Max Date: Fri, 13 Mar 2020 00:30:18 +1100 Subject: [PATCH 1/2] Laravel 7 related compat changes --- .travis.yml | 11 ++++++----- composer.json | 4 ++-- 2 files changed, 8 insertions(+), 7 deletions(-) diff --git a/.travis.yml b/.travis.yml index 4727125..dc3626e 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,10 +1,9 @@ language: php -dist: trusty - php: - - 7.1 - 7.2 + - 7.3 + - 7.4 sudo: false @@ -13,10 +12,12 @@ env: - setup=basic matrix: include: - - php: 7.1 - env: setup=lowest - php: 7.2 env: setup=stable + - php: 7.3 + env: setup=stable + - php: 7.4 + env: setup=stable install: - if [[ $setup = 'basic' ]]; then travis_retry composer install --no-interaction --prefer-source; fi diff --git a/composer.json b/composer.json index a62e51a..3c65315 100644 --- a/composer.json +++ b/composer.json @@ -10,7 +10,7 @@ } ], "require": { - "php": "^7.1", + "php": "^7.2.5", "illuminate/support": "^5.5 || ^6.0 || ^7.0", "illuminate/filesystem": "^5.5 || ^6.0 || ^7.0", "doctrine/annotations": "~1.2", @@ -18,7 +18,7 @@ }, "require-dev": { "squizlabs/php_codesniffer": "~2.0", - "phpunit/phpunit": "^4.8.35 || ^5.4.3 || ^6.5" + "phpunit/phpunit": "^6.5" }, "autoload": { "psr-4": { From bbf15966a1576c7747a45d45814143af892b2552 Mon Sep 17 00:00:00 2001 From: Max Date: Fri, 13 Mar 2020 00:33:21 +1100 Subject: [PATCH 2/2] Prevent double up of tests --- .travis.yml | 5 ----- 1 file changed, 5 deletions(-) diff --git a/.travis.yml b/.travis.yml index dc3626e..ba0bec3 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,10 +1,5 @@ language: php -php: - - 7.2 - - 7.3 - - 7.4 - sudo: false env: