Skip to content

Commit 3413771

Browse files
authored
Merge pull request #78 from gsteel/php8.5
Drop support for PHP 8.1, add support for PHP 8.5
2 parents 06d8a39 + e15c733 commit 3413771

File tree

6 files changed

+392
-321
lines changed

6 files changed

+392
-321
lines changed

.github/workflows/continuous-integration.yml

Lines changed: 0 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -9,25 +9,3 @@ on:
99
jobs:
1010
ci:
1111
uses: laminas/workflow-continuous-integration/.github/workflows/[email protected]
12-
13-
phpunit11:
14-
name: "Forward Compatibility Tests on PHPUnit 11"
15-
runs-on: ubuntu-latest
16-
steps:
17-
- uses: actions/[email protected]
18-
- uses: shivammathur/[email protected]
19-
with:
20-
php-version: 8.3
21-
ini-values: zend.assertions=1, assert.active=1, assert.exception=1
22-
- uses: "ramsey/[email protected]"
23-
with:
24-
dependency-versions: "highest"
25-
26-
- run: composer remove --dev psalm/plugin-phpunit
27-
- run: composer remove --dev vimeo/psalm
28-
- run: composer remove --dev phpunit/phpunit
29-
- run: composer update
30-
- run: composer require -W --dev --ignore-platform-req=php phpunit/phpunit ^11
31-
# Ignore --migrate-configuration exit code
32-
- run: vendor/bin/phpunit --migrate-configuration || true
33-
- run: vendor/bin/phpunit

.laminas-ci.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"ignore_php_platform_requirements": {
3-
"8.4": true
3+
"8.5": true
44
},
55
"backwardCompatibilityCheck": true
66
}

composer.json

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -22,15 +22,15 @@
2222
"config": {
2323
"sort-packages": true,
2424
"platform": {
25-
"php": "8.1.99"
25+
"php": "8.2.99"
2626
},
2727
"allow-plugins": {
2828
"dealerdirect/phpcodesniffer-composer-installer": true
2929
}
3030
},
3131
"extra": {},
3232
"require": {
33-
"php": "~8.1.0 || ~8.2.0 || ~8.3.0 || ~8.4.0",
33+
"php": "~8.2.0 || ~8.3.0 || ~8.4.0 || ~8.5.0",
3434
"fig/http-message-util": "^1.1",
3535
"laminas/laminas-escaper": "^2.10.0",
3636
"psr/http-factory": "^1.0.2",
@@ -39,10 +39,10 @@
3939
},
4040
"require-dev": {
4141
"laminas/laminas-coding-standard": "~3.1.0",
42-
"laminas/laminas-diactoros": "^2.25 || ^3.6.0",
43-
"phpunit/phpunit": "^10.5.46",
42+
"laminas/laminas-diactoros": "^2.25 || ^3.8.0",
43+
"phpunit/phpunit": "^11.5.42",
4444
"psalm/plugin-phpunit": "^0.19.5",
45-
"vimeo/psalm": "^6.10.3"
45+
"vimeo/psalm": "^6.13.1"
4646
},
4747
"conflict": {
4848
"zendframework/zend-stratigility": "*"

0 commit comments

Comments
 (0)