From 2a33b120d670306cffc5ab1f87b86cef32fa94aa Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?L=C3=A1szl=C3=B3=20G=C3=B6r=C3=B6g?= <contact@nergal.xyz>
Date: Wed, 4 Mar 2020 20:51:59 +0100
Subject: [PATCH 1/2] Add Laravel 7 support

---
 .travis.yml   | 38 +++++++++++++++++++++++---------------
 composer.json |  2 +-
 2 files changed, 24 insertions(+), 16 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index d1f0621..d29677a 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -4,22 +4,30 @@ cache:
   directories:
     - $HOME/.composer/cache
 
-php:
-  - 7.1
-  - 7.2
-  - 7.3
-
-env:
-  - ILLUMINATE_VERSION=5.5.*
-  - ILLUMINATE_VERSION=5.7.*
-  - ILLUMINATE_VERSION=5.6.*
-  - ILLUMINATE_VERSION=5.8.*
-  - ILLUMINATE_VERSION=^6.0
-
-matrix:    # Laravel 6.0 does not support PHP 7.1
-  exclude:
+jobs:
+  include:
+    - php: 7.1
+      env: ILLUMINATE_VERSION=5.1.*
+    - php: 7.1
+      env: ILLUMINATE_VERSION=5.2.*
+    - php: 7.1
+      env: ILLUMINATE_VERSION=5.3.*
     - php: 7.1
-      env: ILLUMINATE_VERSION=^6.0
+      env: ILLUMINATE_VERSION=5.4.*
+    - php: 7.1
+      env: ILLUMINATE_VERSION=5.5.*
+    - php: 7.1
+      env: ILLUMINATE_VERSION=5.6.*
+    - php: 7.1
+      env: ILLUMINATE_VERSION=5.7.*
+    - php: 7.1
+      env: ILLUMINATE_VERSION=5.8.*
+    - php: 7.2
+      env: ILLUMINATE_VERSION=6.*
+    - php: 7.2
+      env: ILLUMINATE_VERSION=7.*
+
+dist: xenial
 
 before_install:
   - composer require illuminate/support:${ILLUMINATE_VERSION} illuminate/http:${ILLUMINATE_VERSION} --no-update
diff --git a/composer.json b/composer.json
index ca41112..2a4f4c4 100644
--- a/composer.json
+++ b/composer.json
@@ -23,7 +23,7 @@
         "illuminate/http": "^5.5 || ^6.0"
     },
     "require-dev": {
-        "orchestra/testbench": "^3.5 || ^4.0",
+        "orchestra/testbench": "^3.5 || ^4.0 || ^5.0",
         "phpunit/phpunit": "^6.0 || ^7.0 || ^8.0",
         "mockery/mockery": "^1.0"
     },

From 751d5cdfecb6c530e5619c4a51ee28305b45f382 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?L=C3=A1szl=C3=B3=20G=C3=B6r=C3=B6g?= <contact@nergal.xyz>
Date: Wed, 4 Mar 2020 21:02:32 +0100
Subject: [PATCH 2/2] Change travis config

---
 .travis.yml | 32 ++++++++++----------------------
 1 file changed, 10 insertions(+), 22 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index d29677a..f867429 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -4,28 +4,16 @@ cache:
   directories:
     - $HOME/.composer/cache
 
-jobs:
-  include:
-    - php: 7.1
-      env: ILLUMINATE_VERSION=5.1.*
-    - php: 7.1
-      env: ILLUMINATE_VERSION=5.2.*
-    - php: 7.1
-      env: ILLUMINATE_VERSION=5.3.*
-    - php: 7.1
-      env: ILLUMINATE_VERSION=5.4.*
-    - php: 7.1
-      env: ILLUMINATE_VERSION=5.5.*
-    - php: 7.1
-      env: ILLUMINATE_VERSION=5.6.*
-    - php: 7.1
-      env: ILLUMINATE_VERSION=5.7.*
-    - php: 7.1
-      env: ILLUMINATE_VERSION=5.8.*
-    - php: 7.2
-      env: ILLUMINATE_VERSION=6.*
-    - php: 7.2
-      env: ILLUMINATE_VERSION=7.*
+php:
+  - 7.2
+
+env:
+  - ILLUMINATE_VERSION=5.5.*
+  - ILLUMINATE_VERSION=5.7.*
+  - ILLUMINATE_VERSION=5.6.*
+  - ILLUMINATE_VERSION=5.8.*
+  - ILLUMINATE_VERSION=^6.0
+  - ILLUMINATE_VERSION=^7.0
 
 dist: xenial