Merge pull request #58 from laminas/2.17.x-merge-up-into-3.0.x_4dePSd8f

Merge release 2.17.0 into 3.0.x
laminas · Nov 25, 2024 · 2927d76 · 2927d76
2 parents fd0397b + 23aa36c
commit 2927d76
Show file tree

Hide file tree

Showing 5 changed files with 478 additions and 394 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
@@ -29,15 +29,15 @@
         "zendframework/zend-permissions-acl": "*"
     },
     "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.0",
+        "laminas/laminas-coding-standard": "^3.0.1",
         "laminas/laminas-servicemanager": "^4.0",
         "phpbench/phpbench": "^1.2.15",
-        "phpunit/phpunit": "^10.5.11",
-        "psalm/plugin-phpunit": "^0.18.4",
-        "vimeo/psalm": "^5.22.2"
+        "phpunit/phpunit": "^10.5.38",
+        "psalm/plugin-phpunit": "^0.19.0",
+        "vimeo/psalm": "^5.26.1"
     },
     "suggest": {
         "laminas/laminas-servicemanager": "To support Laminas\\Permissions\\Acl\\Assertion\\AssertionManager plugin manager usage"