Skip to content

Commit

Permalink
Merge pull request #30 from gsteel/drop-php-8.0-update-phpunit
Browse files Browse the repository at this point in the history
Drop support for PHP 8.0, Upgrade PHPUnit to 10.x
  • Loading branch information
Ocramius committed Apr 6, 2023
2 parents 6cb513a + e95da63 commit 0c0d0c5
Show file tree
Hide file tree
Showing 10 changed files with 455 additions and 553 deletions.
5 changes: 4 additions & 1 deletion .gitattributes
@@ -1,4 +1,3 @@
/.coveralls.yml export-ignore
/.gitattributes export-ignore
/.github/ export-ignore
/.gitignore export-ignore
Expand All @@ -8,3 +7,7 @@
/phpunit.xml.dist export-ignore
/test/ export-ignore
/psalm.xml.dist export-ignore
/psalm-baseline.xml export-ignore
/renovate.json export-ignore
/composer.lock export-ignore
/.laminas-ci.json export-ignore
4 changes: 1 addition & 3 deletions .gitignore
@@ -1,7 +1,5 @@
/.phpcs-cache
/.phpunit.result.cache
/clover.xml
/coveralls-upload.json
/.phpunit.cache
/docs/html/
/laminas-mkdoc-theme.tgz
/laminas-mkdoc-theme/
Expand Down
9 changes: 4 additions & 5 deletions composer.json
Expand Up @@ -25,7 +25,7 @@
"composer/package-versions-deprecated": true
},
"platform": {
"php": "8.0.99"
"php": "8.1.99"
}
},
"extra": {
Expand All @@ -34,7 +34,7 @@
}
},
"require": {
"php": "~8.0.0 || ~8.1.0 || ~8.2.0",
"php": "~8.1.0 || ~8.2.0",
"laminas/laminas-permissions-rbac": "^3.0",
"mezzio/mezzio-authorization": "^1.0",
"mezzio/mezzio-router": "^3.0",
Expand All @@ -44,13 +44,12 @@
"require-dev": {
"laminas/laminas-coding-standard": "~2.5.0",
"laminas/laminas-servicemanager": "^3.20",
"phpunit/phpunit": "^9.5.28",
"phpunit/phpunit": "^10.0.19",
"psalm/plugin-phpunit": "^0.18.4",
"vimeo/psalm": "^5.4"
"vimeo/psalm": "^5.9"
},
"conflict": {
"container-interop/container-interop": "<1.2.0",
"phpspec/prophecy": "<1.10.2",
"zendframework/zend-expressive-authorization-rbac": "*"
},
"autoload": {
Expand Down

0 comments on commit 0c0d0c5

Please sign in to comment.