Merge pull request #30 from spinen/develop

Add PHP 7.4 to travis

.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
 

VERSION

@@ -1 +1 @@
-2.3.0
+2.4.0

composer.json

@@ -12,20 +12,24 @@
         {
             "name": "Jimmy Puckett",
             "email": "[email protected]"
+        },
+        {
+            "name": "Stephen Finney",
+            "email": "[email protected]"
         }
     ],
     "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"
     },

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"/>
         <log type="coverage-clover" target="build/phpunit/logs/clover.xml"/>
-        <log type="json" target="./build/phpunit/logs/logfile.json"/>
         <log type="junit" target="./build/phpunit/logs/junit.xml"/>
     </logging>
 </phpunit>