Skip to content

Commit

Permalink
Merge pull request #246 from laminas/3.23.x-merge-up-into-4.0.x_4XHhBTeB
Browse files Browse the repository at this point in the history
Merge release 3.23.0 into 4.3.x
  • Loading branch information
gsteel authored Nov 4, 2024
2 parents e61572c + d41c0a6 commit f600e9f
Show file tree
Hide file tree
Showing 11 changed files with 355 additions and 327 deletions.
3 changes: 2 additions & 1 deletion .laminas-ci.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
{
"ignore_php_platform_requirements": {
"8.3": true
"8.3": true,
"8.4": true
}
}
16 changes: 8 additions & 8 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -28,9 +28,9 @@
}
},
"require": {
"php": "~8.1.0 || ~8.2.0 || ~8.3.0",
"php": "~8.1.0 || ~8.2.0 || ~8.3.0 || ~8.4.0",
"brick/varexporter": "^0.3.8 || ^0.4.0 || ^0.5.0",
"laminas/laminas-stdlib": "^3.17",
"laminas/laminas-stdlib": "^3.19",
"psr/container": "^1.1 || ^2.0"
},
"extra": {
Expand All @@ -42,17 +42,17 @@
"require-dev": {
"boesing/psalm-plugin-stringf": "^1.4",
"composer/package-versions-deprecated": "^1.11.99.5",
"friendsofphp/proxy-manager-lts": "^1",
"friendsofphp/proxy-manager-lts": "^1.0.18",
"laminas/laminas-cli": "^1.8",
"laminas/laminas-coding-standard": "~2.5.0",
"laminas/laminas-container-config-test": "^1.0",
"lctrs/psalm-psr-container-plugin": "^1.9",
"mikey179/vfsstream": "^1.6.11@alpha",
"phpbench/phpbench": "^1.2.7",
"phpunit/phpunit": "^10.4",
"psalm/plugin-phpunit": "^0.18.4",
"mikey179/vfsstream": "^1.6.12",
"phpbench/phpbench": "^1.3.1",
"phpunit/phpunit": "^10.5.36",
"psalm/plugin-phpunit": "^0.19.0",
"symfony/console": "^6.0",
"vimeo/psalm": "^5.22"
"vimeo/psalm": "^5.26.1"
},
"provide": {
"psr/container-implementation": "^1.0 || ^2.0"
Expand Down
Loading

0 comments on commit f600e9f

Please sign in to comment.