Merge pull request #74 from mezzio/1.16.x-merge-up-into-2.0.x_erEwdNDz

Merge release 1.16.0 into 2.0.x
mezzio · Oct 16, 2024 · 3f7a38b · 3f7a38b
2 parents 9c6d475 + b58dc7a
commit 3f7a38b
Show file tree

Hide file tree

Showing 5 changed files with 196 additions and 188 deletions.
diff --git a/.laminas-ci.json b/.laminas-ci.json
@@ -1,3 +1,6 @@
 {
+    "ignore_php_platform_requirements": {
+        "8.4": true
+    },
     "backwardCompatibilityCheck": true
 }
diff --git a/composer.json b/composer.json
@@ -33,18 +33,18 @@
         }
     },
     "require": {
-        "php": "~8.1.0 || ~8.2.0 || ~8.3.0",
+        "php": "~8.1.0 || ~8.2.0 || ~8.3.0 || ~8.4.0",
         "ext-json": "*",
         "dflydev/fig-cookies": "^3.0",
         "psr/container": "^1.0 || ^2.0",
         "psr/http-server-middleware": "^1.0"
     },
     "require-dev": {
         "laminas/laminas-coding-standard": "~2.5.0",
-        "laminas/laminas-diactoros": "^3.3.0",
-        "phpunit/phpunit": "^10.5.10",
+        "laminas/laminas-diactoros": "^3.4.0",
+        "phpunit/phpunit": "^10.5.36",
         "psalm/plugin-phpunit": "^0.19.0",
-        "vimeo/psalm": "^5.21.1"
+        "vimeo/psalm": "^5.26.1"
     },
     "suggest": {
         "mezzio/mezzio-csrf": "^1.0 || ^1.0-dev for CSRF protection capabilities",