Skip to content

Commit

Permalink
Merge pull request #28 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 15, 2021
2 parents b5cf45e + b194176 commit 9ecf2d4
Show file tree
Hide file tree
Showing 5 changed files with 345 additions and 314 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
}
}
13 changes: 6 additions & 7 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -27,18 +27,17 @@
}
},
"require": {
"php": "^7.3 || ~8.0.0",
"php": "^7.3 || ~8.0.0 || ~8.1.0",
"dflydev/fig-cookies": "^2.0.1 || ^3.0",
"laminas/laminas-zendframework-bridge": "^1.0",
"psr/container": "^1.0",
"psr/http-server-middleware": "^1.0"
},
"require-dev": {
"laminas/laminas-coding-standard": "~2.2.0",
"laminas/laminas-diactoros": "^2.2",
"phpunit/phpunit": "^9.3",
"psalm/plugin-phpunit": "^0.12.2",
"vimeo/psalm": "^3.16"
"phpunit/phpunit": "^9.5",
"psalm/plugin-phpunit": "^0.16.1",
"vimeo/psalm": "^4.10"
},
"suggest": {
"mezzio/mezzio-csrf": "^1.0 || ^1.0-dev for CSRF protection capabilities",
Expand Down Expand Up @@ -66,7 +65,7 @@
"test": "phpunit --colors=always",
"test-coverage": "phpunit --colors=always --coverage-clover clover.xml"
},
"replace": {
"zendframework/zend-expressive-session": "^1.3.0"
"conflict": {
"zendframework/zend-expressive-session": "*"
}
}
Loading

0 comments on commit 9ecf2d4

Please sign in to comment.