Skip to content

Commit

Permalink
Merge pull request #74 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
Ocramius authored Dec 1, 2021
2 parents 628721c + 3f7b5bf commit e72d8c1
Show file tree
Hide file tree
Showing 12 changed files with 192 additions and 141 deletions.
5 changes: 4 additions & 1 deletion .laminas-ci.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,5 +2,8 @@
"extensions": [
"inotify",
"swoole"
]
],
"ignore_php_platform_requirements": {
"8.1": true
}
}
9 changes: 5 additions & 4 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@
"extra": {
},
"require": {
"php": "^7.4 || ~8.0.0",
"php": "^7.4 || ~8.0.0 || ~8.1.0",
"composer/package-versions-deprecated": "^1.11",
"dflydev/fig-cookies": "^2.0.1 || ^3.0",
"laminas/laminas-cli": "^0.1.5 || ^1.0",
Expand All @@ -48,7 +48,7 @@
"filp/whoops": "^2.1",
"laminas/laminas-coding-standard": "~2.2.0",
"laminas/laminas-servicemanager": "^3.3",
"phpunit/phpunit": "^9.3.10",
"phpunit/phpunit": "^9.5.5",
"psalm/plugin-phpunit": "^0.13.0",
"swoole/ide-helper": "^4.5.5",
"vimeo/psalm": "^4.0"
Expand Down Expand Up @@ -79,7 +79,8 @@
"test": "phpunit --colors=always",
"test-coverage": "phpunit --colors=always --coverage-clover clover.xml"
},
"replace": {
"zendframework/zend-expressive-swoole": "^2.5.0"
"conflict": {
"symfony/console": "<5.3.11",
"zendframework/zend-expressive-swoole": "*"
}
}
Loading

0 comments on commit e72d8c1

Please sign in to comment.