Skip to content

Commit 1622f41

Browse files
authored
Merge pull request #76 from mezzio/2.19.x-merge-up-into-3.0.x_bAF21R3A
Merge release 2.19.0 into 3.0.x
2 parents 2742c6f + 215e46b commit 1622f41

File tree

5 files changed

+738
-489
lines changed

5 files changed

+738
-489
lines changed

.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
@@ -25,7 +25,7 @@
2525
"dealerdirect/phpcodesniffer-composer-installer": true
2626
},
2727
"platform": {
28-
"php": "8.1.99"
28+
"php": "8.2.99"
2929
}
3030
},
3131
"extra": {
@@ -34,7 +34,7 @@
3434
}
3535
},
3636
"require": {
37-
"php": "~8.1.0 || ~8.2.0 || ~8.3.0 || ~8.4.0",
37+
"php": "~8.2.0 || ~8.3.0 || ~8.4.0 || ~8.5.0",
3838
"laminas/laminas-servicemanager": "^3.21.0",
3939
"laminas/laminas-view": "^2.27.0",
4040
"mezzio/mezzio-helpers": "^5.15.0",
@@ -44,10 +44,10 @@
4444
"psr/http-message": "^1.0.1 || ^2.0.0"
4545
},
4646
"require-dev": {
47-
"laminas/laminas-coding-standard": "~3.0.1",
48-
"phpunit/phpunit": "^10.5.45",
47+
"laminas/laminas-coding-standard": "~3.1.0",
48+
"phpunit/phpunit": "^11.5.42",
4949
"psalm/plugin-phpunit": "^0.19.5",
50-
"vimeo/psalm": "^6.10.1"
50+
"vimeo/psalm": "^6.13.1"
5151
},
5252
"conflict": {
5353
"container-interop/container-interop": "<1.2.0",

0 commit comments

Comments
 (0)