From 86fb0ca9edf36fa3403fe17692d819c68b97dc28 Mon Sep 17 00:00:00 2001
From: Duncan McClean <duncan@duncanmcclean.com>
Date: Fri, 29 Nov 2024 10:41:01 +0000
Subject: [PATCH] PHP 8.4 Support (#41)

* wip

* wip

* wip

* wip

* wip

* Revert "wip"

This reverts commit c975ec4668abd99985efe2d93f44489321dd6142.

* wip

* wip

* wip

* We can do without this.

* Require Statamic 5.41
---
 .github/workflows/tests.yml | 15 +++++++++------
 composer.json               |  8 ++++----
 2 files changed, 13 insertions(+), 10 deletions(-)

diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
index 27ef2e6..41f4d67 100644
--- a/.github/workflows/tests.yml
+++ b/.github/workflows/tests.yml
@@ -12,12 +12,15 @@ jobs:
 
     strategy:
       matrix:
-        php: [8.3, 8.2]
+        php: [8.2, 8.3, 8.4]
         laravel: [10.*, 11.*]
-        statamic: [^5.0]
+        stability: [prefer-lowest, prefer-stable]
         os: [ubuntu-latest]
+        exclude:
+          - php: 8.4
+            laravel: 10.*
 
-    name: ${{ matrix.php }} - ${{ matrix.statamic }} - ${{ matrix.laravel }}
+    name: P${{ matrix.php }} - L${{ matrix.laravel }} - ${{ matrix.stability }}
 
     steps:
       - name: Checkout code
@@ -31,8 +34,8 @@ jobs:
 
       - name: Install dependencies
         run: |
-          composer require "laravel/framework:${{ matrix.laravel }}" "statamic/cms:${{ matrix.statamic }}" --no-interaction --no-update
-          composer install --no-interaction
+          composer require "illuminate/contracts:${{ matrix.laravel }}" --no-interaction --no-update
+          composer update --${{ matrix.stability }} --prefer-dist --no-interaction --no-suggest
 
       - name: Run PHPUnit
-        run: vendor/bin/phpunit
\ No newline at end of file
+        run: vendor/bin/phpunit
diff --git a/composer.json b/composer.json
index b4a2a8e..dda361c 100644
--- a/composer.json
+++ b/composer.json
@@ -12,16 +12,16 @@
         }
     },
     "require": {
-        "statamic/cms": "^5.38",
+        "statamic/cms": "^5.41",
         "spatie/simple-excel": "^3.7",
         "symfony/dom-crawler": "^7.1",
         "pixelfear/composer-dist-plugin": "^0.1.5",
-        "laravel/framework": "11.*"
+        "symfony/css-selector": "^7.1"
     },
     "require-dev": {
         "laravel/pint": "^1.18",
-        "orchestra/testbench": "^8.0 || ^9.5.6",
-        "phpunit/phpunit": "^10.0"
+        "orchestra/testbench": "^8.28 || ^9.6.1",
+        "phpunit/phpunit": "^10.5.35"
     },
     "config": {
         "allow-plugins": {