From 30b24b3880cb48edb8e6219be129575274cd3d19 Mon Sep 17 00:00:00 2001
From: George Steel <george@net-glue.co.uk>
Date: Fri, 11 Oct 2024 15:08:15 +0100
Subject: [PATCH 1/2] Add support for PHP 8.4

- Bump dev deps
- Ignore platform reqs

Signed-off-by: George Steel <george@net-glue.co.uk>
---
 .laminas-ci.json |  2 +-
 composer.json    |  8 ++++----
 composer.lock    | 20 ++++++++++----------
 3 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/.laminas-ci.json b/.laminas-ci.json
index 4fc72c5..6238f6f 100644
--- a/.laminas-ci.json
+++ b/.laminas-ci.json
@@ -1,6 +1,6 @@
 {
     "ignore_php_platform_requirements": {
-        "8.2": false
+        "8.4": true
     },
     "backwardCompatibilityCheck": true
 }
diff --git a/composer.json b/composer.json
index a17b1a6..4403022 100644
--- a/composer.json
+++ b/composer.json
@@ -10,7 +10,7 @@
     ],
     "license": "BSD-3-Clause",
     "require": {
-        "php": "~8.1.0 || ~8.2.0 || ~8.3.0",
+        "php": "~8.1.0 || ~8.2.0 || ~8.3.0 || ~8.4.0",
         "fig/http-message-util": "^1.1",
         "mezzio/mezzio-router": "^3.1",
         "psr/container": "^1.0 || ^2.0",
@@ -22,10 +22,10 @@
     },
     "require-dev": {
         "laminas/laminas-coding-standard": "~2.5.0",
-        "laminas/laminas-diactoros": "^3.3.1",
-        "phpunit/phpunit": "^10.5.11",
+        "laminas/laminas-diactoros": "^3.4.0",
+        "phpunit/phpunit": "^10.5.36",
         "psalm/plugin-phpunit": "^0.19.0",
-        "vimeo/psalm": "^5.22.2"
+        "vimeo/psalm": "^5.26.1"
     },
     "config": {
         "preferred-install": "dist",
diff --git a/composer.lock b/composer.lock
index f84edd8..6bddbf0 100644
--- a/composer.lock
+++ b/composer.lock
@@ -4,7 +4,7 @@
         "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
         "This file is @generated automatically"
     ],
-    "content-hash": "5da6c60278c633709c5e80719d9fda94",
+    "content-hash": "9cb210250b65e46673e290969fffe20a",
     "packages": [
         {
             "name": "fig/http-message-util",
@@ -2169,16 +2169,16 @@
         },
         {
             "name": "phpunit/phpunit",
-            "version": "10.5.35",
+            "version": "10.5.36",
             "source": {
                 "type": "git",
                 "url": "https://github.com/sebastianbergmann/phpunit.git",
-                "reference": "7ac8b4e63f456046dcb4c9787da9382831a1874b"
+                "reference": "aa0a8ce701ea7ee314b0dfaa8970dc94f3f8c870"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/7ac8b4e63f456046dcb4c9787da9382831a1874b",
-                "reference": "7ac8b4e63f456046dcb4c9787da9382831a1874b",
+                "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/aa0a8ce701ea7ee314b0dfaa8970dc94f3f8c870",
+                "reference": "aa0a8ce701ea7ee314b0dfaa8970dc94f3f8c870",
                 "shasum": ""
             },
             "require": {
@@ -2250,7 +2250,7 @@
             "support": {
                 "issues": "https://github.com/sebastianbergmann/phpunit/issues",
                 "security": "https://github.com/sebastianbergmann/phpunit/security/policy",
-                "source": "https://github.com/sebastianbergmann/phpunit/tree/10.5.35"
+                "source": "https://github.com/sebastianbergmann/phpunit/tree/10.5.36"
             },
             "funding": [
                 {
@@ -2266,7 +2266,7 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2024-09-19T10:52:21+00:00"
+            "time": "2024-10-08T15:36:51+00:00"
         },
         {
             "name": "psalm/plugin-phpunit",
@@ -4435,13 +4435,13 @@
     ],
     "aliases": [],
     "minimum-stability": "stable",
-    "stability-flags": {},
+    "stability-flags": [],
     "prefer-stable": false,
     "prefer-lowest": false,
     "platform": {
-        "php": "~8.1.0 || ~8.2.0 || ~8.3.0"
+        "php": "~8.1.0 || ~8.2.0 || ~8.3.0 || ~8.4.0"
     },
-    "platform-dev": {},
+    "platform-dev": [],
     "platform-overrides": {
         "php": "8.1.99"
     },

From 0c874aef8f25f09e1fa11f319f293eb2abbe9a0f Mon Sep 17 00:00:00 2001
From: George Steel <george@net-glue.co.uk>
Date: Fri, 11 Oct 2024 15:12:29 +0100
Subject: [PATCH 2/2] Bump minimum mezzio-router requirement to avoid implicit
 nullables

Signed-off-by: George Steel <george@net-glue.co.uk>
---
 composer.json | 2 +-
 composer.lock | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/composer.json b/composer.json
index 4403022..1a14330 100644
--- a/composer.json
+++ b/composer.json
@@ -12,7 +12,7 @@
     "require": {
         "php": "~8.1.0 || ~8.2.0 || ~8.3.0 || ~8.4.0",
         "fig/http-message-util": "^1.1",
-        "mezzio/mezzio-router": "^3.1",
+        "mezzio/mezzio-router": "^3.5",
         "psr/container": "^1.0 || ^2.0",
         "psr/http-factory": "^1.0",
         "psr/http-message": "^1.0 || ^2.0",
diff --git a/composer.lock b/composer.lock
index 6bddbf0..e0ef2d1 100644
--- a/composer.lock
+++ b/composer.lock
@@ -4,7 +4,7 @@
         "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
         "This file is @generated automatically"
     ],
-    "content-hash": "9cb210250b65e46673e290969fffe20a",
+    "content-hash": "d2b591af495310725c100e70ef54dbf3",
     "packages": [
         {
             "name": "fig/http-message-util",