Skip to content

Commit

Permalink
Merge pull request #31 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 Oct 14, 2021
2 parents f4cff07 + bac8cbb commit b1245a0
Show file tree
Hide file tree
Showing 57 changed files with 1,896 additions and 1,786 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
Expand Up @@ -2,10 +2,7 @@
"extensions": [
"soap"
],
"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
}
}
22 changes: 11 additions & 11 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -19,20 +19,19 @@
"sort-packages": true
},
"require": {
"php": "^7.3 || ~8.0.0",
"php": "~7.4.0 || ~8.0.0 || ~8.1.0",
"ext-dom": "*",
"ext-soap": "*",
"laminas/laminas-server": "^2.9",
"laminas/laminas-stdlib": "^3.3",
"laminas/laminas-uri": "^2.8",
"laminas/laminas-zendframework-bridge": "^1.1.0"
"laminas/laminas-server": "^2.11",
"laminas/laminas-stdlib": "^3.6",
"laminas/laminas-uri": "^2.9.1"
},
"require-dev": {
"laminas/laminas-coding-standard": "~1.0.0",
"laminas/laminas-config": "^3.4",
"laminas/laminas-http": "^2.14",
"laminas/laminas-coding-standard": "~2.2.1",
"laminas/laminas-config": "^3.7",
"laminas/laminas-http": "^2.15",
"phpspec/prophecy-phpunit": "^2.0.1",
"phpunit/phpunit": "^9.4.3"
"phpunit/phpunit": "^9.5.5"
},
"suggest": {
"ext-curl": "Curl is required when .NET compatibility is required",
Expand Down Expand Up @@ -62,7 +61,8 @@
"test": "phpunit",
"test-coverage": "phpunit --coverage-clover clover.xml"
},
"replace": {
"zendframework/zend-soap": "^2.8.0"
"conflict": {
"laminas/laminas-code": "<4.4",
"zendframework/zend-soap": "*"
}
}
Loading

0 comments on commit b1245a0

Please sign in to comment.