From 4526ceab6aa3825413e096bb7f478e1a10eb4a09 Mon Sep 17 00:00:00 2001
From: Dries Vints <dries@vints.io>
Date: Wed, 12 Jan 2022 19:02:43 +0100
Subject: [PATCH] Laravel 9 support (#1112)

---
 .github/workflows/tests.yml | 11 ++++++++---
 composer.json               | 12 ++++++------
 2 files changed, 14 insertions(+), 9 deletions(-)

diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
index f9388107..8723ee37 100644
--- a/.github/workflows/tests.yml
+++ b/.github/workflows/tests.yml
@@ -20,8 +20,13 @@ jobs:
     strategy:
       fail-fast: true
       matrix:
-        php: [7.3, 7.4, 8.0, 8.1]
-        laravel: [^8.0]
+        php: [7.3, 7.4, '8.0', 8.1]
+        laravel: [8, 9]
+        exclude:
+          - php: 7.3
+            laravel: 9
+          - php: 7.4
+            laravel: 9
 
     name: PHP ${{ matrix.php }} - Laravel ${{ matrix.laravel }}
 
@@ -38,7 +43,7 @@ jobs:
 
       - name: Install dependencies
         run: |
-           composer require "illuminate/contracts=${{ matrix.laravel }}" --no-update
+           composer require "illuminate/contracts=^${{ matrix.laravel }}" --no-update
            composer update --prefer-dist --no-interaction --no-progress
 
       - name: Execute tests
diff --git a/composer.json b/composer.json
index e9a4b195..042291bd 100644
--- a/composer.json
+++ b/composer.json
@@ -14,17 +14,17 @@
         "ext-json": "*",
         "ext-pcntl": "*",
         "ext-posix": "*",
-        "illuminate/contracts": "^8.17",
-        "illuminate/queue": "^8.17",
-        "illuminate/support": "^8.17",
+        "illuminate/contracts": "^8.17|^9.0",
+        "illuminate/queue": "^8.17|^9.0",
+        "illuminate/support": "^8.17|^9.0",
         "nesbot/carbon": "^2.17",
         "ramsey/uuid": "^4.0",
-        "symfony/process": "^5.0",
-        "symfony/error-handler": "^5.0"
+        "symfony/process": "^5.0|^6.0",
+        "symfony/error-handler": "^5.0|^6.0"
     },
     "require-dev": {
         "mockery/mockery": "^1.0",
-        "orchestra/testbench": "^6.0",
+        "orchestra/testbench": "^6.0|^7.0",
         "phpunit/phpunit": "^9.0",
         "predis/predis": "^1.1"
     },