diff --git a/.travis.yml b/.travis.yml index 4c35e42..6b01038 100644 --- a/.travis.yml +++ b/.travis.yml @@ -13,6 +13,9 @@ matrix: - php: 7.3 - php: 7.3 env: SETUP=lowest + - php: 7.4 + - php: 7.4 + env: SETUP=lowest sudo: false diff --git a/VERSION b/VERSION index 276cbf9..197c4d5 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -2.3.0 +2.4.0 diff --git a/composer.json b/composer.json index c113c71..3a4206f 100644 --- a/composer.json +++ b/composer.json @@ -12,20 +12,24 @@ { "name": "Jimmy Puckett", "email": "jimmy.puckett@spinen.com" + }, + { + "name": "Stephen Finney", + "email": "stephen.finney@spinen.com" } ], "require": { "php": ">=7.2", - "illuminate/console": "~5.5|~6", - "illuminate/database": "~5.5|~6", - "illuminate/support": "~5.5|~6", + "illuminate/console": "~5.5|~6|~7", + "illuminate/database": "~5.5|~6|~7", + "illuminate/support": "~5.5|~6|~7", "nesbot/carbon": "~1.20|^2.0", "psr/log": "^1.0" }, "require-dev": { - "mockery/mockery": "^1", - "phpunit/phpunit": "~7.0.1|~8.0", - "psy/psysh": "^0.9.9", + "mockery/mockery": "^1.3.1", + "phpunit/phpunit": "^8.4|^9.0", + "psy/psysh": "^0.10", "symfony/thanks": "^1.1", "symfony/var-dumper": "~3.0|^4.2" }, diff --git a/phpunit.xml.dist b/phpunit.xml.dist index 07ddc80..dd407f9 100644 --- a/phpunit.xml.dist +++ b/phpunit.xml.dist @@ -14,7 +14,7 @@ convertErrorsToExceptions="true" convertNoticesToExceptions="true" convertWarningsToExceptions="true" - processIsolation="true" + processIsolation="false" stopOnFailure="false" verbose="true"> @@ -47,7 +47,6 @@ showOnlySummary="true" showUncoveredFiles="false"/> -