Merge pull request #249 from laminas/2.35.x-merge-up-into-3.0.x_ycpcjD6g

Merge release 2.35.0 into 3.0.x
laminas · Jun 4, 2024 · 3caa5e3 · 3caa5e3
2 parents ab2c6f9 + 1647515
commit 3caa5e3
Show file tree

Hide file tree

Showing 10 changed files with 1,707 additions and 1,385 deletions.
diff --git a/composer.json b/composer.json
@@ -50,11 +50,11 @@
  "laminas/laminas-navigation": "^2.19.1",
  "laminas/laminas-paginator": "^2.18.1",
  "laminas/laminas-permissions-acl": "^2.16",
- "laminas/laminas-router": "^3.12.0",
+ "laminas/laminas-router": "^3.13.0",
  "laminas/laminas-uri": "^2.11",
- "phpunit/phpunit": "^10.5.9",
- "psalm/plugin-phpunit": "^0.18.4",
- "vimeo/psalm": "^5.20"
+ "phpunit/phpunit": "^10.5.13",
+ "psalm/plugin-phpunit": "^0.19.0",
+ "vimeo/psalm": "^5.23.1"
  },
  "conflict": {
  "container-interop/container-interop": "<1.2",