Merge pull request #42 from laminas/1.9.x-merge-up-into-2.0.x_Yz7kORb9

Merge release 1.9.0 into 2.0.x
laminas · Oct 11, 2024 · 106daa5 · 106daa5
2 parents 8069c46 + 433e71e
commit 106daa5
Show file tree

Hide file tree

Showing 3 changed files with 51 additions and 51 deletions.
diff --git a/.laminas-ci.json b/.laminas-ci.json
@@ -1,5 +1,5 @@
 {
     "ignore_php_platform_requirements": {
-        "8.3": true
+        "8.4": true
     }
 }
diff --git a/composer.json b/composer.json
@@ -32,7 +32,7 @@
         }
     },
     "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-intl": "*",
         "container-interop/container-interop": "^1.1",
         "laminas/laminas-i18n": "^2.13.0",
@@ -45,7 +45,7 @@
         "laminas/laminas-coding-standard": "~2.5.0",
         "phpspec/prophecy-phpunit": "^2.0.2",
         "phpunit/phpunit": "^9.6.13",
-        "psalm/plugin-phpunit": "^0.18.4",
+        "psalm/plugin-phpunit": "^0.19.0",
         "vimeo/psalm": "^5.15"
     },
     "conflict": {

diff --git a/composer.lock b/composer.lock