From 95c5113408aa624d4f1d53ec7c3029c2e4b8a369 Mon Sep 17 00:00:00 2001
From: Duncan McClean <duncan@duncanmcclean.com>
Date: Fri, 29 Nov 2024 14:46:55 +0000
Subject: [PATCH] PHP 8.4 Support (#387)

* wip

* wip

* wip

* wip

* wip

* wip

* wip

* wip

* wip

* wip

* wip

* wip

* We can do without this.

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

diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
index f8bec4d8..05285188 100644
--- a/.github/workflows/tests.yml
+++ b/.github/workflows/tests.yml
@@ -12,14 +12,16 @@ jobs:
 
     strategy:
       matrix:
-        php: [8.1, 8.2, 8.3]
+        php: [8.1, 8.2, 8.3, 8.4]
         laravel: [10.*, 11.*]
-        dependency-version: [prefer-lowest, prefer-stable]
+        stability: [prefer-lowest, prefer-stable]
         exclude:
           - php: 8.1
             laravel: 11.*
+          - php: 8.4
+            laravel: 10.*
 
-    name: P${{ matrix.php }} - L${{ matrix.laravel }} - ${{ matrix.dependency-version }}
+    name: P${{ matrix.php }} - L${{ matrix.laravel }} - ${{ matrix.stability }}
 
     steps:
       - name: Checkout code
@@ -29,13 +31,13 @@ jobs:
         uses: shivammathur/setup-php@v2
         with:
           php-version: ${{ matrix.php }}
-          extension-csv: dom, curl, libxml, mbstring, zip, pcntl, pdo, sqlite, pdo_sqlite, bcmath, soap, intl, gd, exif, iconv, imagick
+          extensions: dom, curl, libxml, mbstring, zip, pcntl, pdo, sqlite, pdo_sqlite, bcmath, soap, intl, gd, exif, iconv, imagick
           coverage: none
 
       - name: Install dependencies
         run: |
           composer require "laravel/framework:${{ matrix.laravel }}" --no-interaction --no-update
-          composer update --${{ matrix.dependency-version }} --prefer-dist --no-interaction --no-suggest
+          composer update --${{ matrix.stability }} --prefer-dist --no-interaction --no-suggest
 
       - name: Execute tests
         run: vendor/bin/phpunit
diff --git a/composer.json b/composer.json
index 586f802b..7c6384b0 100644
--- a/composer.json
+++ b/composer.json
@@ -25,13 +25,13 @@
     },
     "require": {
         "php": "^8.1",
-        "statamic/cms": "^5.18"
+        "statamic/cms": "^5.41"
     },
     "require-dev": {
         "doctrine/dbal": "^3.8",
         "laravel/pint": "^1.0",
-        "orchestra/testbench": "^8.0 || ^9.0.2",
-        "phpunit/phpunit": "^9.4 || ^10.0 || ^11.0"
+        "orchestra/testbench": "^8.28 || ^9.6.1",
+        "phpunit/phpunit": "^10.5.35"
     },
     "scripts": {
         "test": "phpunit"