Skip to content

Commit

Permalink
Merge pull request #143 from gsteel/merge-release-2.36.0-into-3.0.x
Browse files Browse the repository at this point in the history
Merge release 2.36.0 into 3.0.x
  • Loading branch information
gsteel authored Jun 13, 2024
2 parents 62217bf + 8860593 commit f8f7589
Show file tree
Hide file tree
Showing 17 changed files with 413 additions and 110 deletions.
7 changes: 4 additions & 3 deletions .laminas-ci.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
{
"ignore_php_platform_requirements": {
"8.3": true
}
"ignore_php_platform_requirements": {
"8.3": false
},
"backwardCompatibilityCheck": true
}
8 changes: 4 additions & 4 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -39,11 +39,11 @@
},
"require-dev": {
"laminas/laminas-coding-standard": "~2.5.0",
"pear/archive_tar": "^1.4.14",
"phpunit/phpunit": "^10.5.11",
"pear/archive_tar": "^1.5.0",
"phpunit/phpunit": "^10.5.20",
"psalm/plugin-phpunit": "^0.19.0",
"psr/http-factory": "^1.0.2",
"vimeo/psalm": "^5.22.2"
"psr/http-factory": "^1.1.0",
"vimeo/psalm": "^5.24.0"
},
"conflict": {
"laminas/laminas-validator": "<2.10.1",
Expand Down
Loading

0 comments on commit f8f7589

Please sign in to comment.