From 4d1d0f4677f4848384bac68eb780ad23dcd9f123 Mon Sep 17 00:00:00 2001
From: Duncan McClean <duncan@duncanmcclean.com>
Date: Thu, 21 Nov 2024 17:37:07 +0000
Subject: [PATCH 1/4] wip

---
 .github/workflows/tests.yml | 6 ++++--
 composer.json               | 5 +++--
 2 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
index a39de84..9764a85 100644
--- a/.github/workflows/tests.yml
+++ b/.github/workflows/tests.yml
@@ -12,7 +12,7 @@ jobs:
 
     strategy:
       matrix:
-        php: [8.1, 8.2, 8.3]
+        php: [8.1, 8.2, 8.3h, 8.4]
         laravel: [10.*, 11.*]
         stability: [prefer-lowest, prefer-stable]
         os: [ubuntu-latest]
@@ -28,6 +28,8 @@ jobs:
         exclude:
           - php: 8.1
             laravel: 11.*
+          - php: 8.4
+            laravel: 10.*
 
     name: P${{ matrix.php }} - L${{ matrix.laravel }} - ${{ matrix.stability }} - ${{ matrix.os }}
 
@@ -48,7 +50,7 @@ jobs:
           composer update --${{ matrix.stability }} --prefer-dist --no-interaction --no-suggest
 
       - name: Execute tests
-        run: vendor/bin/phpunit
+        run: vendor/bin/phpunit --display-deprecation ${{ matrix.stability == 'prefer-stable' && '--fail-on-deprecation' || '' }}
 
       - name: Send Slack notification
         uses: 8398a7/action-slack@v2
diff --git a/composer.json b/composer.json
index 6e78aef..7914f33 100644
--- a/composer.json
+++ b/composer.json
@@ -24,10 +24,11 @@
         }
     },
     "require": {
-        "statamic/cms": "^5.0.0"
+        "statamic/cms": "dev-php84"
     },
     "require-dev": {
-        "orchestra/testbench": "^8.0 || ^9.0"
+        "orchestra/testbench": "^8.28 || ^9.6.1",
+        "phpunit/phpunit": "^10.5.35"
     },
     "config": {
         "allow-plugins": {

From 454f34cb018f3e49fc395cec9738bf8532996a7d Mon Sep 17 00:00:00 2001
From: Duncan McClean <duncan@duncanmcclean.com>
Date: Thu, 28 Nov 2024 20:46:56 +0000
Subject: [PATCH 2/4] We can do without this.

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

diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
index 9764a85..271fb10 100644
--- a/.github/workflows/tests.yml
+++ b/.github/workflows/tests.yml
@@ -50,7 +50,7 @@ jobs:
           composer update --${{ matrix.stability }} --prefer-dist --no-interaction --no-suggest
 
       - name: Execute tests
-        run: vendor/bin/phpunit --display-deprecation ${{ matrix.stability == 'prefer-stable' && '--fail-on-deprecation' || '' }}
+        run: vendor/bin/phpunit
 
       - name: Send Slack notification
         uses: 8398a7/action-slack@v2

From 7bd62ccad6f4e730f9277bf4fd975dc813e0f4e4 Mon Sep 17 00:00:00 2001
From: Duncan McClean <duncan@duncanmcclean.com>
Date: Thu, 28 Nov 2024 20:47:05 +0000
Subject: [PATCH 3/4] Require Statamic 5.41

---
 composer.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/composer.json b/composer.json
index 7914f33..221cace 100644
--- a/composer.json
+++ b/composer.json
@@ -24,7 +24,7 @@
         }
     },
     "require": {
-        "statamic/cms": "dev-php84"
+        "statamic/cms": "^5.41"
     },
     "require-dev": {
         "orchestra/testbench": "^8.28 || ^9.6.1",

From 609bde6d24d0ebb04d1961c9117a348e8b65201a Mon Sep 17 00:00:00 2001
From: Duncan McClean <duncan@duncanmcclean.com>
Date: Fri, 29 Nov 2024 14:53:34 +0000
Subject: [PATCH 4/4] wip

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

diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
index 271fb10..6ad2656 100644
--- a/.github/workflows/tests.yml
+++ b/.github/workflows/tests.yml
@@ -12,7 +12,7 @@ jobs:
 
     strategy:
       matrix:
-        php: [8.1, 8.2, 8.3h, 8.4]
+        php: [8.1, 8.2, 8.3, 8.4]
         laravel: [10.*, 11.*]
         stability: [prefer-lowest, prefer-stable]
         os: [ubuntu-latest]