Skip to content

Commit

Permalink
Merge pull request #236 from laminas/2.34.x-merge-up-into-3.0.x_wKCeVAwQ
Browse files Browse the repository at this point in the history
Merge release 2.34.0 into 3.0.x
  • Loading branch information
gsteel authored Jan 25, 2024
2 parents fee5cd3 + 5a29b47 commit 15738e8
Show file tree
Hide file tree
Showing 29 changed files with 266 additions and 174 deletions.
18 changes: 9 additions & 9 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -38,23 +38,23 @@
"psr/container": "^1 || ^2"
},
"require-dev": {
"laminas/laminas-authentication": "^2.15",
"laminas/laminas-authentication": "^2.16",
"laminas/laminas-coding-standard": "~2.5.0",
"laminas/laminas-feed": "^2.22",
"laminas/laminas-filter": "^2.32",
"laminas/laminas-filter": "^2.34",
"laminas/laminas-http": "^2.19",
"laminas/laminas-i18n": "^2.23.1",
"laminas/laminas-i18n": "^2.26.0",
"laminas/laminas-modulemanager": "^2.15",
"laminas/laminas-mvc": "^3.6.1",
"laminas/laminas-mvc-i18n": "^1.7",
"laminas/laminas-navigation": "^2.18.1",
"laminas/laminas-paginator": "^2.17",
"laminas/laminas-mvc": "^3.7.0",
"laminas/laminas-mvc-i18n": "^1.8",
"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-uri": "^2.11",
"phpunit/phpunit": "^10.4.2",
"phpunit/phpunit": "^10.5.9",
"psalm/plugin-phpunit": "^0.18.4",
"vimeo/psalm": "^5.15"
"vimeo/psalm": "^5.20"
},
"conflict": {
"container-interop/container-interop": "<1.2",
Expand Down
Loading

0 comments on commit 15738e8

Please sign in to comment.