Skip to content

Commit

Permalink
Merge pull request #53 from snapshotpl/php-8.1
Browse files Browse the repository at this point in the history
Allow PHP 8.1
  • Loading branch information
Ocramius authored Jun 8, 2022
2 parents 6e29404 + 53bb2c0 commit 0c63fe1
Show file tree
Hide file tree
Showing 4 changed files with 1,754 additions and 1,994 deletions.
5 changes: 4 additions & 1 deletion .laminas-ci.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,8 @@
{
"exclude": [
{"name": "PHPUnit on PHP 7.3 with locked dependencies"}
]
],
"ignore_php_platform_requirements": {
"8.0": false
}
}
20 changes: 11 additions & 9 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -28,25 +28,27 @@
}
},
"require": {
"php": "^7.3 || ~8.0.0",
"laminas-api-tools/api-tools": "^1.4",
"php": "^7.3 || ~8.0.0 || ~8.1.0",
"laminas-api-tools/api-tools": "^1.6.0",
"laminas-api-tools/api-tools-content-negotiation": "^1.6.0",
"laminas-api-tools/api-tools-documentation": "^1.3",
"laminas-api-tools/api-tools-rest": "^1.6.1",
"laminas/laminas-component-installer": "^2.1.1",
"laminas/laminas-development-mode": "^3.2",
"laminas/laminas-zendframework-bridge": "^1.0"
},
"require-dev": {
"laminas-api-tools/api-tools-admin": "^1.6",
"laminas-api-tools/api-tools-admin": "^2.0.1",
"laminas-api-tools/api-tools-asset-manager": "^1.2",
"laminas/laminas-cli": "^1.2",
"laminas/laminas-coding-standard": "~2.3.0",
"laminas/laminas-composer-autoloading": "^2.1",
"laminas/laminas-developer-tools": "^1.2.1",
"laminas/laminas-test": "^3.5",
"phpunit/phpunit": "^9.5",
"laminas/laminas-composer-autoloading": "^3.1",
"laminas/laminas-developer-tools": "^2.3",
"laminas/laminas-test": "^4.0",
"phpunit/phpunit": "^9.5.20",
"psalm/plugin-phpunit": "^0.16.1",
"roave/security-advisories": "dev-master",
"vimeo/psalm": "^4.10",
"zfcampus/zf-deploy": "^1.3"
"vimeo/psalm": "^4.10"
},
"conflict": {
"laminas/laminas-hydrator": "<2.0",
Expand Down
Loading

0 comments on commit 0c63fe1

Please sign in to comment.