Merge pull request #122 from laminas/3.20.x-merge-up-into-4.0.x_K1OTfTRq

Merge release 3.20.0 into 4.0.x
laminas · Oct 29, 2024 · fbcfc10 · fbcfc10
2 parents cb0f0b2 + 8974a12
commit fbcfc10
Show file tree

Hide file tree

Showing 6 changed files with 435 additions and 417 deletions.
diff --git a/.laminas-ci.json b/.laminas-ci.json
@@ -0,0 +1,5 @@
+{
+    "ignore_php_platform_requirements": {
+        "8.4": true
+    }
+}
diff --git a/composer.json b/composer.json
@@ -27,14 +27,14 @@
     "extra": {
     },
     "require": {
-        "php": "~8.1.0 || ~8.2.0 || ~8.3.0"
+        "php": "~8.1.0 || ~8.2.0 || ~8.3.0 || ~8.4.0"
     },
     "require-dev": {
-        "laminas/laminas-coding-standard": "^2.5",
-        "phpbench/phpbench": "^1.2.15",
-        "phpunit/phpunit": "^10.5.8",
-        "psalm/plugin-phpunit": "^0.18.4",
-        "vimeo/psalm": "^5.20.0"
+        "laminas/laminas-coding-standard": "^3.0",
+        "phpbench/phpbench": "^1.3.1",
+        "phpunit/phpunit": "^10.5.38",
+        "psalm/plugin-phpunit": "^0.19.0",
+        "vimeo/psalm": "^5.26.1"
     },
     "autoload": {
         "psr-4": {