From 0cb5833de4db73b8aaed65c9ccdcf0e0f1762ae3 Mon Sep 17 00:00:00 2001
From: Adriaan Zonnenberg <amz@adriaan.xyz>
Date: Wed, 9 Sep 2020 20:22:52 +0200
Subject: [PATCH 1/4] Add support for Laravel 8

---
 composer.json | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/composer.json b/composer.json
index a8ba2da..138f944 100755
--- a/composer.json
+++ b/composer.json
@@ -19,7 +19,7 @@
     ],
     "require": {
         "php": "^7.2",
-        "illuminate/support": "~5.5.0 || ~5.6.0 || ~5.7.0 || ~5.8.0 || ^6.0 || ^7.0",
+        "illuminate/support": "~5.5.0 || ~5.6.0 || ~5.7.0 || ~5.8.0 || ^6.0 || ^7.0 || ^8.0",
         "jaybizzle/crawler-detect": "^1.2",
         "spatie/laravel-referer": "^1.6",
         "torann/geoip": "^1.0"
@@ -28,9 +28,9 @@
         "doctrine/dbal": "^2.5.2",
         "phpunit/phpunit": "^8.5",
         "fzaninotto/faker": "^1.6",
-        "illuminate/support": "~5.5.0 || ~5.6.0 || ~5.7.0 || ~5.8.0 || ^6.0 || ^7.0",
+        "illuminate/support": "~5.5.0 || ~5.6.0 || ~5.7.0 || ~5.8.0 || ^6.0 || ^7.0 || ^8.0",
         "mockery/mockery": "^1.3",
-        "orchestra/testbench": "^3.5 || ^3.6 || ^3.7 || ^3.8 || ^4.0 || ^5.0",
+        "orchestra/testbench": "^3.5 || ^3.6 || ^3.7 || ^3.8 || ^4.0 || ^5.0 || ^6.0",
         "predis/predis": "^1.1"
     },
     "suggest": {

From be6d7ace3e0a9d162680ae264700e4dad83b4c38 Mon Sep 17 00:00:00 2001
From: Adriaan Zonnenberg <amz@adriaan.xyz>
Date: Thu, 10 Sep 2020 20:53:33 +0200
Subject: [PATCH 2/4] Add Laravel 8 to test matrix

---
 .github/workflows/run-tests.yml | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/run-tests.yml b/.github/workflows/run-tests.yml
index 67689c3..73bce3c 100644
--- a/.github/workflows/run-tests.yml
+++ b/.github/workflows/run-tests.yml
@@ -10,9 +10,11 @@ jobs:
             fail-fast: true
             matrix:
                 php: [7.2, 7.3, 7.4]
-                laravel: [6.*, 7.*]
+                laravel: [6.*, 7.*, 8.*]
                 dependency-version: [prefer-lowest, prefer-stable]
                 include:
+                    -   laravel: 8.*
+                        testbench: 6.*
                     -   laravel: 7.*
                         testbench: 5.*
                     -   laravel: 6.*

From 0498a3d2d6baec6f8bfdc65c8803026f1f232b75 Mon Sep 17 00:00:00 2001
From: Adriaan Zonnenberg <amz@adriaan.xyz>
Date: Sun, 13 Sep 2020 18:52:58 +0200
Subject: [PATCH 3/4] Remove support for PHP 7.2

---
 .github/workflows/run-tests.yml | 2 +-
 composer.json                   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/run-tests.yml b/.github/workflows/run-tests.yml
index 73bce3c..c37f59d 100644
--- a/.github/workflows/run-tests.yml
+++ b/.github/workflows/run-tests.yml
@@ -9,7 +9,7 @@ jobs:
         strategy:
             fail-fast: true
             matrix:
-                php: [7.2, 7.3, 7.4]
+                php: [7.3, 7.4]
                 laravel: [6.*, 7.*, 8.*]
                 dependency-version: [prefer-lowest, prefer-stable]
                 include:
diff --git a/composer.json b/composer.json
index 138f944..d0d5682 100755
--- a/composer.json
+++ b/composer.json
@@ -18,7 +18,7 @@
         }
     ],
     "require": {
-        "php": "^7.2",
+        "php": "^7.3",
         "illuminate/support": "~5.5.0 || ~5.6.0 || ~5.7.0 || ~5.8.0 || ^6.0 || ^7.0 || ^8.0",
         "jaybizzle/crawler-detect": "^1.2",
         "spatie/laravel-referer": "^1.6",

From 52faa0337f76f2710dbce9cd32823f52f3d57f79 Mon Sep 17 00:00:00 2001
From: Adriaan Zonnenberg <amz@adriaan.xyz>
Date: Sun, 13 Sep 2020 19:02:47 +0200
Subject: [PATCH 4/4] Update PHPUnit to version 9

Updated phpunit.xml using `phpunit --migrate-configuration`
---
 composer.json |  2 +-
 phpunit.xml   | 38 +++++++++++++++-----------------------
 2 files changed, 16 insertions(+), 24 deletions(-)

diff --git a/composer.json b/composer.json
index d0d5682..00563d1 100755
--- a/composer.json
+++ b/composer.json
@@ -26,11 +26,11 @@
     },
     "require-dev": {
         "doctrine/dbal": "^2.5.2",
-        "phpunit/phpunit": "^8.5",
         "fzaninotto/faker": "^1.6",
         "illuminate/support": "~5.5.0 || ~5.6.0 || ~5.7.0 || ~5.8.0 || ^6.0 || ^7.0 || ^8.0",
         "mockery/mockery": "^1.3",
         "orchestra/testbench": "^3.5 || ^3.6 || ^3.7 || ^3.8 || ^4.0 || ^5.0 || ^6.0",
+        "phpunit/phpunit": "^9.3",
         "predis/predis": "^1.1"
     },
     "suggest": {
diff --git a/phpunit.xml b/phpunit.xml
index 59d69e4..7274c1e 100755
--- a/phpunit.xml
+++ b/phpunit.xml
@@ -1,24 +1,16 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<phpunit backupGlobals="false"
-         backupStaticAttributes="false"
-         bootstrap="./vendor/autoload.php"
-         colors="true"
-         convertErrorsToExceptions="true"
-         convertNoticesToExceptions="true"
-         convertWarningsToExceptions="true"
-         processIsolation="false"
-         stopOnFailure="false">
-    <testsuites>
-        <testsuite name="Unit">
-            <directory>./tests/Unit</directory>
-        </testsuite>
-        <testsuite name="Feature">
-            <directory>./tests/Feature</directory>
-        </testsuite>
-    </testsuites>
-    <filter>
-        <whitelist processUncoveredFilesFromWhitelist="true">
-            <directory suffix=".php">./src</directory>
-        </whitelist>
-    </filter>
-</phpunit>
\ No newline at end of file
+<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" backupGlobals="false" backupStaticAttributes="false" bootstrap="./vendor/autoload.php" colors="true" convertErrorsToExceptions="true" convertNoticesToExceptions="true" convertWarningsToExceptions="true" processIsolation="false" stopOnFailure="false" xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/9.3/phpunit.xsd">
+  <coverage processUncoveredFiles="true">
+    <include>
+      <directory suffix=".php">./src</directory>
+    </include>
+  </coverage>
+  <testsuites>
+    <testsuite name="Unit">
+      <directory>./tests/Unit</directory>
+    </testsuite>
+    <testsuite name="Feature">
+      <directory>./tests/Feature</directory>
+    </testsuite>
+  </testsuites>
+</phpunit>