From 5058e3475aa770fc129e996465d46430c5cf002f Mon Sep 17 00:00:00 2001
From: craig410 <craig@netchaos.net>
Date: Wed, 23 Jul 2025 08:32:56 +0100
Subject: [PATCH] Support PHP 8.4

---
 .github/workflows/ci.yaml         | 4 ++--
 CHANGELOG.md                      | 4 ++++
 composer.json                     | 6 +++---
 src/Processor/ImageOperations.php | 2 +-
 4 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
index 4228926..ad920af 100644
--- a/.github/workflows/ci.yaml
+++ b/.github/workflows/ci.yaml
@@ -3,8 +3,8 @@ on:
   push:
 
 env:
-  DOCKER_IMAGE: ghcr.io/ingenerator/ingenerator-php:8.3
-  PHP_VERSION: 8.3
+  DOCKER_IMAGE: ghcr.io/ingenerator/ingenerator-php:8.4
+  PHP_VERSION: 8.4
 
 jobs:
   unit-tests:
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 63f7d3d..5a645c7 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,9 @@
 ### Unreleased
 
+### v2.3.0 (2025-07-23)
+
+* Support PHP 8.4
+
 * Testsuite is now run on Github Actions rather than Google Cloud Build 
   in order to easily access the test runner image
 
diff --git a/composer.json b/composer.json
index 70334ca..c3661d4 100644
--- a/composer.json
+++ b/composer.json
@@ -10,7 +10,7 @@
     }
   ],
   "require": {
-    "php": "~8.3.0",
+    "php": "~8.4.0",
     "ext-ffi": "*",
     "ingenerator/php-utils": "^1.17 || ^2.0",
     "jcupitt/vips": "^2.1",
@@ -33,8 +33,8 @@
   },
   "config": {
     "platform": {
-      "php": "8.3",
-      "ext-ffi": "8.3"
+      "php": "8.4",
+      "ext-ffi": "8.4"
     },
     "preferred-install": "dist",
     "sort-packages": true
diff --git a/src/Processor/ImageOperations.php b/src/Processor/ImageOperations.php
index 93e78c3..040b6be 100644
--- a/src/Processor/ImageOperations.php
+++ b/src/Processor/ImageOperations.php
@@ -205,7 +205,7 @@ private function hexToRgb(string $hex): array
 
     private function setCacheOptions(
         ?int $concurrency = NULL,
-        int  $max_cache_operations = NULL,
+        ?int $max_cache_operations = NULL,
         ?int $max_mem = NULL,
         ?int $max_files = NULL): void
     {