From 6a4826c26954b83f3c11e08c5b4a63867c36b0a0 Mon Sep 17 00:00:00 2001
From: Michael Dyrynda <michael@dyrynda.com.au>
Date: Wed, 26 Jan 2022 14:20:42 +1030
Subject: [PATCH] Laravel 9.x support, first pass

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

diff --git a/.github/workflows/run-tests.yml b/.github/workflows/run-tests.yml
index 74cb13d..311cff7 100644
--- a/.github/workflows/run-tests.yml
+++ b/.github/workflows/run-tests.yml
@@ -8,16 +8,19 @@ on:
 
 jobs:
   test:
-    runs-on: ${{ matrix.os }}
+    runs-on: ubuntu-latest
     strategy:
-      fail-fast: false
+      fail-fast: true
       matrix:
-        php: [8.0, 7.4, 7.3]
-        laravel: [^8.12]
-        dependency-version: [prefer-lowest, prefer-stable]
-        os: [ubuntu-latest]
+        php: [8.1,8.0, 7.4, 7.3]
+        laravel: [^8.12, ^9.0]
+        exclude:
+          - php: 7.3
+            laravel: '^9.0'
+          - php: 7.4
+            laravel: '^9.0'
 
-    name: P${{ matrix.php }} - L${{ matrix.laravel }} ${{ matrix.dependency-version }} - ${{ matrix.os }}
+    name: P${{ matrix.php }} - L${{ matrix.laravel }}
 
     steps:
       - name: Checkout code
@@ -38,7 +41,8 @@ jobs:
 
       - name: Install dependencies
         run: |
-          composer update --${{ matrix.dependency-version }} --prefer-dist --no-interaction --no-suggest
+          composer require "illuminate/contracts=${{ matrix.laravel }}" --prefer-dist --no-interaction --no-update
+          composer update --prefer-dist --no-interaction --no-progress
 
       - name: Execute tests
         run: vendor/bin/phpunit
diff --git a/composer.json b/composer.json
index 009ed5c..7e1261e 100644
--- a/composer.json
+++ b/composer.json
@@ -4,8 +4,8 @@
   "type": "utility",
   "require": {
     "php": "^7.3|^8.0",
-    "illuminate/database": "^8.12",
-    "illuminate/events": "^8.12"
+    "illuminate/database": "^8.12|^9.0",
+    "illuminate/events": "^8.12|^9.0"
   },
   "require-dev": {
     "phpunit/phpunit": "^9.3"