From ae6a6795805618ecbe6ff69f7f970a7a45333009 Mon Sep 17 00:00:00 2001
From: Matt McDonald <matt@wildside.uk>
Date: Tue, 3 Mar 2020 08:27:03 +0000
Subject: [PATCH] Support Laravel 7

---
 .styleci.yml  |  4 ----
 .travis.yml   | 14 ++++++++++++--
 composer.json |  8 ++++----
 3 files changed, 16 insertions(+), 10 deletions(-)

diff --git a/.styleci.yml b/.styleci.yml
index 444c592..0285f17 100644
--- a/.styleci.yml
+++ b/.styleci.yml
@@ -1,5 +1 @@
 preset: laravel
-enabled:
-  - alpha_ordered_imports
-disabled:
-  - length_ordered_imports
diff --git a/.travis.yml b/.travis.yml
index abc9375..e5b176b 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -48,13 +48,23 @@ matrix:
     - php: 7.2
       env: LARAVEL='5.8.*' PHPUNIT='^7.0' TESTBENCH='3.8.*'
     - php: 7.2
-      env: LARAVEL='6.*' PHPUNIT='^8.3' TESTBENCH='4.*'
+      env: LARAVEL='6.*' PHPUNIT='^8.4' TESTBENCH='4.*'
+    - php: 7.2
+      env: LARAVEL='7.*' PHPUNIT='^8.4' TESTBENCH='5.*'
     - php: 7.3
       env: LARAVEL='5.7.*' PHPUNIT='^7.0' TESTBENCH='3.7.*'
     - php: 7.3
       env: LARAVEL='5.8.*' PHPUNIT='^7.0' TESTBENCH='3.8.*'
     - php: 7.3
-      env: LARAVEL='6.*' PHPUNIT='^8.3' TESTBENCH='4.*'
+      env: LARAVEL='6.*' PHPUNIT='^8.4' TESTBENCH='4.*'
+    - php: 7.3
+      env: LARAVEL='7.*' PHPUNIT='^8.4' TESTBENCH='5.*'
+    - php: 7.4
+      env: LARAVEL='5.8.*' PHPUNIT='^7.0' TESTBENCH='3.8.*'
+    - php: 7.4
+      env: LARAVEL='6.*' PHPUNIT='^8.4' TESTBENCH='4.*'
+    - php: 7.4
+      env: LARAVEL='7.*' PHPUNIT='^8.4' TESTBENCH='5.*'
 
 before_install:
   - travis_retry composer self-update
diff --git a/composer.json b/composer.json
index 0164470..5565cfa 100644
--- a/composer.json
+++ b/composer.json
@@ -19,12 +19,12 @@
     ],
     "require": {
         "php": ">=5.5.9",
-        "illuminate/support": "^5.1|^6.0"
+        "illuminate/support": "^5.2|^6.0|^7.0"
     },
     "require-dev": {
-        "illuminate/database": "^5.1|^6.0",
-        "orchestra/testbench": "^3.1|^4.0",
-        "phpunit/phpunit": "^5.0|^6.0|^7.0|^8.3"
+        "illuminate/database": "^5.2|^6.0|^7.0",
+        "orchestra/testbench": "^3.1|^4.0|^5.0",
+        "phpunit/phpunit": "^5.0|^6.0|^7.0|^8.4|^9.0"
     },
     "autoload": {
         "psr-4": {