Skip to content

Commit

Permalink
Merge pull request #68 from laminas/3.13.x-merge-up-into-4.0.x_nbPKb0sj
Browse files Browse the repository at this point in the history
Merge release 3.13.0 into 4.1.x
  • Loading branch information
gsteel authored Oct 28, 2024
2 parents 26baa08 + 7416f91 commit 2d187f7
Show file tree
Hide file tree
Showing 5 changed files with 145 additions and 137 deletions.
7 changes: 6 additions & 1 deletion .laminas-ci.json
Original file line number Diff line number Diff line change
@@ -1 +1,6 @@
{}
{
"ignore_php_platform_requirements": {
"8.4": true
},
"backwardCompatibilityCheck": true
}
8 changes: 4 additions & 4 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@
},
"extra": {},
"require": {
"php": "~8.1.0 || ~8.2.0 || ~8.3.0",
"php": "~8.1.0 || ~8.2.0 || ~8.3.0 || ~8.4.0",
"fig/http-message-util": "^1.1",
"laminas/laminas-escaper": "^2.10.0",
"psr/http-factory": "^1.0.2",
Expand All @@ -39,10 +39,10 @@
},
"require-dev": {
"laminas/laminas-coding-standard": "~2.5.0",
"laminas/laminas-diactoros": "^2.25 || ^3.3.1",
"phpunit/phpunit": "^10.5.27",
"laminas/laminas-diactoros": "^2.25 || ^3.5.0",
"phpunit/phpunit": "^10.5.37",
"psalm/plugin-phpunit": "^0.19.0",
"vimeo/psalm": "^5.25.0"
"vimeo/psalm": "^5.26.1"
},
"conflict": {
"zendframework/zend-stratigility": "*"
Expand Down
Loading

0 comments on commit 2d187f7

Please sign in to comment.