Skip to content
This repository has been archived by the owner on Nov 22, 2024. It is now read-only.

Commit

Permalink
Merge pull request #18 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 Sep 3, 2021
2 parents dca2f31 + 1cac0dc commit 02cc861
Show file tree
Hide file tree
Showing 18 changed files with 2,398 additions and 741 deletions.
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
/.phpcs-cache
/.phpunit.result.cache
/clover.xml
/coveralls-upload.json
Expand Down
9 changes: 3 additions & 6 deletions .laminas-ci.json
Original file line number Diff line number Diff line change
@@ -1,8 +1,5 @@
{
"exclude": [
{"name": "PHPUnit on PHP 5.6 with locked dependencies"},
{"name": "PHPUnit on PHP 7.0 with locked dependencies"},
{"name": "PHPUnit on PHP 7.1 with locked dependencies"},
{"name": "PHPUnit on PHP 7.2 with locked dependencies"}
]
"ignore_php_platform_requirements": {
"8.1": true
}
}
16 changes: 9 additions & 7 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -19,13 +19,12 @@
"sort-packages": true
},
"require": {
"php": "^7.3 || ~8.0.0",
"laminas/laminas-stdlib": "^2.7 || ^3.0",
"laminas/laminas-zendframework-bridge": "^1.0"
"php": "^7.3 || ~8.0.0 || ~8.1.0",
"laminas/laminas-stdlib": "^2.7 || ^3.0"
},
"require-dev": {
"laminas/laminas-coding-standard": "~1.0.0",
"laminas/laminas-mail": "^2.6",
"laminas/laminas-coding-standard": "~2.2.1",
"laminas/laminas-mail": "^2.12",
"phpunit/phpunit": "^9.3"
},
"suggest": {
Expand All @@ -37,6 +36,9 @@
}
},
"autoload-dev": {
"files": [
"test/TestAsset/Mail/Headers.php"
],
"psr-4": {
"LaminasTest\\Mime\\": "test/"
}
Expand All @@ -51,7 +53,7 @@
"test": "phpunit --colors=always",
"test-coverage": "phpunit --colors=always --coverage-clover clover.xml"
},
"replace": {
"zendframework/zend-mime": "^2.7.2"
"conflict": {
"zendframework/zend-mime": "*"
}
}
Loading

0 comments on commit 02cc861

Please sign in to comment.