Skip to content

Commit

Permalink
Merge pull request #131 from fezfez/update
Browse files Browse the repository at this point in the history
Allow php 8.4 + composer bump --dev-only + laminas/laminas-coding-standard:^3
  • Loading branch information
gsteel authored Nov 21, 2024
2 parents ab90e62 + a2940f6 commit 6309e11
Show file tree
Hide file tree
Showing 9 changed files with 623 additions and 533 deletions.
2 changes: 1 addition & 1 deletion .laminas-ci.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"ignore_php_platform_requirements": {
"8.3": true
"8.4": true
}
}
15 changes: 9 additions & 6 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -27,21 +27,21 @@
}
},
"require": {
"php": "~8.1.0 || ~8.2.0 || ~8.3.0",
"php": "~8.1.0 || ~8.2.0 || ~8.3.0 || ~8.4.0",
"composer-runtime-api": "^2.0.0",
"psr/container": "^1.0 || ^2.0",
"symfony/console": "^6.0 || ^7.0",
"symfony/event-dispatcher": "^6.0 || ^7.0",
"webmozart/assert": "^1.10"
},
"require-dev": {
"laminas/laminas-coding-standard": "~2.5.0",
"laminas/laminas-mvc": "^3.7.0",
"laminas/laminas-servicemanager": "^3.22.1",
"laminas/laminas-coding-standard": "^3.0.1",
"laminas/laminas-mvc": "^3.8.0",
"laminas/laminas-servicemanager": "^3.23.0",
"mikey179/vfsstream": "2.0.x-dev",
"phpunit/phpunit": "^10.5.5",
"phpunit/phpunit": "^10.5.38",
"psalm/plugin-phpunit": "^0.19.0",
"vimeo/psalm": "^5.18"
"vimeo/psalm": "^5.26.1"
},
"autoload": {
"psr-4": {
Expand All @@ -68,5 +68,8 @@
"static-analysis": "psalm --shepherd --stats",
"test": "phpunit --colors=always",
"test-coverage": "phpunit --colors=always --coverage-clover clover.xml"
},
"conflict": {
"amphp/amp":"<2.6.4"
}
}
Loading

0 comments on commit 6309e11

Please sign in to comment.