Skip to content

Commit

Permalink
Merge pull request #81 from weierophinney/feature/php-8.1-support
Browse files Browse the repository at this point in the history
Provide PHP 8.1 support
  • Loading branch information
Xerkus authored Oct 13, 2021
2 parents 474bb92 + 60a52b5 commit 215d0ff
Show file tree
Hide file tree
Showing 4 changed files with 302 additions and 310 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
}
}
23 changes: 11 additions & 12 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -21,25 +21,24 @@
"extra": {
},
"require": {
"php": "^7.3 || ~8.0.0",
"php": "^7.3 || ~8.0.0 || ~8.1.0",
"container-interop/container-interop": "^1.2",
"laminas/laminas-eventmanager": "^3.2",
"laminas/laminas-http": "^2.7",
"laminas/laminas-eventmanager": "^3.4",
"laminas/laminas-http": "^2.15",
"laminas/laminas-modulemanager": "^2.8",
"laminas/laminas-router": "^3.0.2",
"laminas/laminas-servicemanager": "^3.3",
"laminas/laminas-stdlib": "^3.2.1",
"laminas/laminas-view": "^2.11.3",
"laminas/laminas-zendframework-bridge": "^1.0"
"laminas/laminas-router": "^3.5",
"laminas/laminas-servicemanager": "^3.7",
"laminas/laminas-stdlib": "^3.6",
"laminas/laminas-view": "^2.14"
},
"require-dev": {
"http-interop/http-middleware": "^0.4.1",
"laminas/laminas-coding-standard": "^1.0.0",
"laminas/laminas-json": "^2.6.1 || ^3.0",
"laminas/laminas-json": "^3.3",
"laminas/laminas-psr7bridge": "^1.0",
"laminas/laminas-stratigility": ">=2.0.1 <2.2",
"phpspec/prophecy-phpunit": "^2.0",
"phpunit/phpunit": "^9.4.2"
"phpunit/phpunit": "^9.5.5"
},
"suggest": {
"laminas/laminas-json": "(^2.6.1 || ^3.0) To auto-deserialize JSON body content in AbstractRestfulController extensions, when json_decode is unavailable",
Expand Down Expand Up @@ -77,7 +76,7 @@
"test": "phpunit --colors=always",
"test-coverage": "phpunit --colors=always --coverage-clover clover.xml"
},
"replace": {
"zendframework/zend-mvc": "^3.1.1"
"conflict": {
"zendframework/zend-mvc": "*"
}
}
Loading

0 comments on commit 215d0ff

Please sign in to comment.