Skip to content

Commit

Permalink
Merge pull request #14 from boesing/feature/php81
Browse files Browse the repository at this point in the history
PHP 8.1 support
  • Loading branch information
Ocramius authored Sep 14, 2021
2 parents 47230dc + 37aca21 commit c9b754f
Show file tree
Hide file tree
Showing 3 changed files with 13 additions and 8 deletions.
5 changes: 5 additions & 0 deletions .laminas-ci.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
{
"ignore_php_platform_requirements": {
"8.1": true
}
}
9 changes: 4 additions & 5 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -26,16 +26,15 @@
}
},
"require": {
"php": "^7.3 || ~8.0.0",
"php": "^7.3 || ~8.0.0 || ~8.1.0",
"laminas-api-tools/api-tools-api-problem": "^1.3",
"laminas-api-tools/api-tools-content-negotiation": "^1.5",
"laminas/laminas-eventmanager": "^3.3",
"laminas/laminas-http": "^2.14",
"laminas/laminas-mvc": "^3.2",
"laminas/laminas-servicemanager": "^3.6",
"laminas/laminas-stdlib": "^3.3",
"laminas/laminas-view": "^2.12",
"laminas/laminas-zendframework-bridge": "^1.2"
"laminas/laminas-view": "^2.12"
},
"require-dev": {
"laminas/laminas-coding-standard": "~2.3.0",
Expand Down Expand Up @@ -64,7 +63,7 @@
"test": "phpunit --colors=always",
"test-coverage": "phpunit --colors=always --coverage-clover clover.xml"
},
"replace": {
"zfcampus/zf-rpc": "^1.4.2"
"conflict": {
"zfcampus/zf-rpc": "*"
}
}
7 changes: 4 additions & 3 deletions composer.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

0 comments on commit c9b754f

Please sign in to comment.