Merge pull request #67 from laminas/2.5.x-merge-up-into-3.0.x_HHu0QXls

Merge release 2.5.0 into 3.0.x
laminas · Jan 23, 2025 · c22d327 · c22d327
2 parents 5cc3ee5 + 9f6750a
commit c22d327
Show file tree

Hide file tree

Showing 5 changed files with 303 additions and 273 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1,4 +1,4 @@
-/.phpunit.result.cache
+/.phpunit.cache
 /.psalm-cache
 /docs/html/
 /laminas-mkdoc-theme.tgz

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
@@ -7,17 +7,18 @@
   ],
   "license": "BSD-3-Clause",
   "require": {
-    "php": "~8.1.0 || ~8.2.0 || ~8.3.0",
-    "laminas/laminas-cache": "^4.0"
+    "php": "~8.1.0 || ~8.2.0 || ~8.3.0 || ~8.4.0",
+    "laminas/laminas-cache": "^4.1"
   },
   "provide": {
     "laminas/laminas-cache-storage-implementation": "2.0"
   },
   "require-dev": {
-    "laminas/laminas-cache-storage-adapter-test": "^4.0",
+    "laminas/laminas-cache-storage-adapter-test": "^4.1",
     "laminas/laminas-coding-standard": "~2.5.0",
+    "phpunit/phpunit": "^10.5.41",
     "psalm/plugin-phpunit": "^0.19.0",
-    "vimeo/psalm": "^5.18"
+    "vimeo/psalm": "^5.26.1"
   },
   "config": {
     "sort-packages": true,