Skip to content

Commit 2d187f7

Browse files
authored
Merge pull request #68 from laminas/3.13.x-merge-up-into-4.0.x_nbPKb0sj
Merge release 3.13.0 into 4.1.x
2 parents 26baa08 + 7416f91 commit 2d187f7

File tree

5 files changed

+145
-137
lines changed

5 files changed

+145
-137
lines changed

.laminas-ci.json

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1,6 @@
1-
{}
1+
{
2+
"ignore_php_platform_requirements": {
3+
"8.4": true
4+
},
5+
"backwardCompatibilityCheck": true
6+
}

composer.json

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@
3030
},
3131
"extra": {},
3232
"require": {
33-
"php": "~8.1.0 || ~8.2.0 || ~8.3.0",
33+
"php": "~8.1.0 || ~8.2.0 || ~8.3.0 || ~8.4.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": "~2.5.0",
42-
"laminas/laminas-diactoros": "^2.25 || ^3.3.1",
43-
"phpunit/phpunit": "^10.5.27",
42+
"laminas/laminas-diactoros": "^2.25 || ^3.5.0",
43+
"phpunit/phpunit": "^10.5.37",
4444
"psalm/plugin-phpunit": "^0.19.0",
45-
"vimeo/psalm": "^5.25.0"
45+
"vimeo/psalm": "^5.26.1"
4646
},
4747
"conflict": {
4848
"zendframework/zend-stratigility": "*"

0 commit comments

Comments
 (0)