Merge pull request #127 from laminas/2.35.x-merge-up-into-3.0.x_204QXu4K

Merge release 2.35.0 into 3.0.x
laminas · Apr 1, 2024 · 80d8310 · 80d8310
2 parents 3577a59 + d5433f2
commit 80d8310
Show file tree

Hide file tree

Showing 24 changed files with 757 additions and 768 deletions.
diff --git a/composer.json b/composer.json
@@ -39,13 +39,13 @@
     },
     "require-dev": {
         "laminas/laminas-coding-standard": "~2.5.0",
-        "laminas/laminas-i18n": "^2.25.0",
+        "laminas/laminas-i18n": "^2.26.0",
         "laminas/laminas-uri": "^2.11.0",
         "pear/archive_tar": "^1.4.14",
-        "phpunit/phpunit": "^10.5.5",
-        "psalm/plugin-phpunit": "^0.18.4",
+        "phpunit/phpunit": "^10.5.11",
+        "psalm/plugin-phpunit": "^0.19.0",
         "psr/http-factory": "^1.0.2",
-        "vimeo/psalm": "^5.18.0"
+        "vimeo/psalm": "^5.22.2"
     },
     "conflict": {
         "laminas/laminas-validator": "<2.10.1",

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