From 73016872229d545fb3d4615b9ec18c480a7e458c Mon Sep 17 00:00:00 2001
From: ADmad <admad.coder@gmail.com>
Date: Sat, 12 Oct 2024 10:46:48 +0530
Subject: [PATCH] Add support for PHP 8.4

Signed-off-by: ADmad <admad.coder@gmail.com>
---
 .laminas-ci.json |  3 +++
 composer.json    | 11 +++++++----
 composer.lock    | 16 ++++++++--------
 3 files changed, 18 insertions(+), 12 deletions(-)

diff --git a/.laminas-ci.json b/.laminas-ci.json
index f050f35e..075b6c0b 100644
--- a/.laminas-ci.json
+++ b/.laminas-ci.json
@@ -2,5 +2,8 @@
     "extensions": [
         "gd"
     ],
+    "ignore_php_platform_requirements": {
+        "8.4": true
+    },
     "backwardCompatibilityCheck": true
 }
diff --git a/composer.json b/composer.json
index abe4e81d..ff51e98c 100644
--- a/composer.json
+++ b/composer.json
@@ -34,8 +34,8 @@
         }
     },
     "require": {
-        "php": "~8.1.0 || ~8.2.0 || ~8.3.0",
-        "psr/http-factory": "^1.0.2",
+        "php": "~8.1.0 || ~8.2.0 || ~8.3.0 || ~8.4.0",
+        "psr/http-factory": "^1.1",
         "psr/http-message": "^1.1 || ^2.0"
     },
     "require-dev": {
@@ -46,9 +46,9 @@
         "http-interop/http-factory-tests": "^2.2.0",
         "laminas/laminas-coding-standard": "~2.5.0",
         "php-http/psr7-integration-tests": "^1.4.0",
-        "phpunit/phpunit": "^10.5.31",
+        "phpunit/phpunit": "^10.5.36",
         "psalm/plugin-phpunit": "^0.19.0",
-        "vimeo/psalm": "^5.25.0"
+        "vimeo/psalm": "^5.26.1"
     },
     "provide": {
         "psr/http-factory-implementation": "^1.0",
@@ -73,6 +73,9 @@
             "LaminasTest\\Diactoros\\": "test/"
         }
     },
+    "conflict": {
+        "amphp/amp": "<2.6.4"
+    },
     "scripts": {
         "check": [
             "@cs-check",
diff --git a/composer.lock b/composer.lock
index 88fcd795..31651d6d 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": "e5b673582a8569a858a0298c119d3a96",
+    "content-hash": "3977b4548a12421312674ea6336eeb5b",
     "packages": [
         {
             "name": "psr/http-factory",
@@ -1830,16 +1830,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": {
@@ -1911,7 +1911,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": [
                 {
@@ -1927,7 +1927,7 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2024-09-19T10:52:21+00:00"
+            "time": "2024-10-08T15:36:51+00:00"
         },
         {
             "name": "psalm/plugin-phpunit",
@@ -4211,7 +4211,7 @@
     "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": {
         "ext-curl": "*",