From 2396a6424b8ccc6eb7e6185e542dd327e7f2b0ae Mon Sep 17 00:00:00 2001
From: "Daniel S. Billing" <daniel@izy.no>
Date: Wed, 21 Dec 2022 13:28:51 +0100
Subject: [PATCH 1/5] Add Laravel 9 support, drop anything below 8

---
 composer.json | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/composer.json b/composer.json
index 0d4a226..9f0167d 100644
--- a/composer.json
+++ b/composer.json
@@ -20,8 +20,8 @@
     ],
     "require": {
         "php": "^8.0",
-        "spatie/laravel-package-tools": "^1.9.2",
-        "illuminate/contracts": "^8.73"
+        "spatie/laravel-package-tools": "^1.13.0",
+        "illuminate/contracts": "^8.0|^9.0"
     },
     "require-dev": {
         "nunomaduro/collision": "^5.10",

From 83ac957acb2b0749b3aa1e5fcc9bc920c06ed070 Mon Sep 17 00:00:00 2001
From: "Daniel S. Billing" <daniel@izy.no>
Date: Wed, 21 Dec 2022 13:33:55 +0100
Subject: [PATCH 2/5] Update run-tests.yml

---
 .github/workflows/run-tests.yml | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/.github/workflows/run-tests.yml b/.github/workflows/run-tests.yml
index 59e9d7f..5fd4cdc 100644
--- a/.github/workflows/run-tests.yml
+++ b/.github/workflows/run-tests.yml
@@ -12,12 +12,12 @@ jobs:
     strategy:
       fail-fast: true
       matrix:
-        os: [ubuntu-latest, windows-latest]
-        php: [8.0]
-        laravel: [8.*]
-        stability: [prefer-lowest, prefer-stable]
+        os: [ ubuntu-latest, windows-latest ]
+        php: [ 8.0, 8.1 ]
+        laravel: [ 8.*, 9.* ]
+        stability: [ prefer-stable ]
         include:
-          - laravel: 8.*
+          - laravel: 8.*, 9.*
             testbench: ^6.23
 
     name: P${{ matrix.php }} - L${{ matrix.laravel }} - ${{ matrix.stability }} - ${{ matrix.os }}

From b8feaeb2a5358a1bd7a5739cf5291694f13cbc9d Mon Sep 17 00:00:00 2001
From: "Daniel S. Billing" <daniel@izy.no>
Date: Wed, 21 Dec 2022 13:42:01 +0100
Subject: [PATCH 3/5] Update run-tests.yml

---
 .github/workflows/run-tests.yml | 20 ++++++++------------
 1 file changed, 8 insertions(+), 12 deletions(-)

diff --git a/.github/workflows/run-tests.yml b/.github/workflows/run-tests.yml
index 5fd4cdc..8d7fa70 100644
--- a/.github/workflows/run-tests.yml
+++ b/.github/workflows/run-tests.yml
@@ -1,10 +1,6 @@
-name: run-tests
+name: Tests
 
-on:
-  push:
-    branches: [main]
-  pull_request:
-    branches: [main]
+on: [push, pull_request]
 
 jobs:
   test:
@@ -12,13 +8,13 @@ jobs:
     strategy:
       fail-fast: true
       matrix:
-        os: [ ubuntu-latest, windows-latest ]
-        php: [ 8.0, 8.1 ]
-        laravel: [ 8.*, 9.* ]
-        stability: [ prefer-stable ]
+        os: [ubuntu-latest, windows-latest]
+        php: [8.0, 8.1, 8.2]
+        laravel: [9.*]
+        stability: [prefer-lowest, prefer-stable]
         include:
-          - laravel: 8.*, 9.*
-            testbench: ^6.23
+          - laravel: 9.*
+            testbench: 7.*
 
     name: P${{ matrix.php }} - L${{ matrix.laravel }} - ${{ matrix.stability }} - ${{ matrix.os }}
 

From cb1ae1d0d347f4a4e07fd9d4f3ce696a31f28856 Mon Sep 17 00:00:00 2001
From: "Daniel S. Billing" <daniel@izy.no>
Date: Wed, 21 Dec 2022 13:49:13 +0100
Subject: [PATCH 4/5] Update composer.json

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

diff --git a/composer.json b/composer.json
index 9f0167d..771a155 100644
--- a/composer.json
+++ b/composer.json
@@ -24,8 +24,8 @@
         "illuminate/contracts": "^8.0|^9.0"
     },
     "require-dev": {
-        "nunomaduro/collision": "^5.10",
-        "orchestra/testbench": "^6.22",
+        "nunomaduro/collision": "^5.10|^6.0",
+        "orchestra/testbench": "^6.22|^7.0",
         "pestphp/pest": "^1.21",
         "pestphp/pest-plugin-laravel": "^1.1",
         "phpunit/phpunit": "^9.5",
@@ -48,7 +48,10 @@
         "test-coverage": "vendor/bin/pest --coverage"
     },
     "config": {
-        "sort-packages": true
+        "sort-packages": true,
+        "allow-plugins": {
+            "pestphp/pest-plugin": true
+        }
     },
     "extra": {
         "laravel": {

From d01ff49a41714a955a9bc3bd77c4ba17964043c1 Mon Sep 17 00:00:00 2001
From: "Daniel S. Billing" <daniel@izy.no>
Date: Wed, 21 Dec 2022 13:51:27 +0100
Subject: [PATCH 5/5] Not fully supported by PHP 8.2 yet, removed from test

---
 .github/workflows/run-tests.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/run-tests.yml b/.github/workflows/run-tests.yml
index 8d7fa70..b56ff24 100644
--- a/.github/workflows/run-tests.yml
+++ b/.github/workflows/run-tests.yml
@@ -9,7 +9,7 @@ jobs:
       fail-fast: true
       matrix:
         os: [ubuntu-latest, windows-latest]
-        php: [8.0, 8.1, 8.2]
+        php: [8.0, 8.1]
         laravel: [9.*]
         stability: [prefer-lowest, prefer-stable]
         include: