Skip to content

Commit

Permalink
Merge pull request #12 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 8d2367c + 1f82d6a commit 1e4aada
Show file tree
Hide file tree
Showing 3 changed files with 12 additions and 9 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: 3 additions & 6 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -28,8 +28,7 @@
}
},
"require": {
"php": "^7.3 || ~8.0.0",
"laminas/laminas-zendframework-bridge": "^1.0",
"php": "^7.3 || ~8.0.0 || ~8.1.0",
"mezzio/mezzio-authentication": "^1.0",
"psr/container": "^1.0",
"psr/http-message": "^1.0.1",
Expand All @@ -42,7 +41,8 @@
"phpunit/phpunit": "^9.3"
},
"conflict": {
"container-interop/container-interop": "<1.2.0"
"container-interop/container-interop": "<1.2.0",
"zendframework/zend-expressive-authorization": "*"
},
"suggest": {
"mezzio/mezzio-authorization-acl": "^1.0; provides a laminas-permissions-acl-backed adapter",
Expand All @@ -67,8 +67,5 @@
"cs-fix": "phpcbf",
"test": "phpunit --colors=always",
"test-coverage": "phpunit --colors=always --coverage-clover clover.xml"
},
"replace": {
"zendframework/zend-expressive-authorization": "^1.0.1"
}
}
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 1e4aada

Please sign in to comment.