Skip to content

Commit

Permalink
Merge pull request #77 from mezzio/3.18.x-merge-up-into-4.0.x_H3RjIw3Y
Browse files Browse the repository at this point in the history
Merge release 3.18.0 into 4.0.x
  • Loading branch information
gsteel authored Oct 16, 2024
2 parents 0cc4c8d + 75e9a3e commit f1f3c25
Show file tree
Hide file tree
Showing 3 changed files with 14 additions and 8 deletions.
6 changes: 6 additions & 0 deletions .laminas-ci.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
{
"ignore_php_platform_requirements": {
"8.4": true
},
"backwardCompatibilityCheck": true
}
12 changes: 6 additions & 6 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@
}
},
"require": {
"php": "~8.1.0 || ~8.2.0 || ~8.3.0",
"php": "~8.1.0 || ~8.2.0 || ~8.3.0 || ~8.4.0",
"fig/http-message-util": "^1.1.5",
"psr/container": "^1.1.2 || ^2.0",
"psr/http-factory": "^1.0.2",
Expand All @@ -49,12 +49,12 @@
},
"require-dev": {
"laminas/laminas-coding-standard": "~2.5.0",
"laminas/laminas-diactoros": "^3.3.1",
"laminas/laminas-servicemanager": "^4.0.0",
"laminas/laminas-stratigility": "^4.0.0",
"phpunit/phpunit": "^10.5.11",
"laminas/laminas-diactoros": "^3.4.0",
"laminas/laminas-servicemanager": "^4.2.0",
"laminas/laminas-stratigility": "^4.0.2",
"phpunit/phpunit": "^10.5.36",
"psalm/plugin-phpunit": "^0.19.0",
"vimeo/psalm": "^5.22.2"
"vimeo/psalm": "^5.26.1"
},
"suggest": {
"mezzio/mezzio-aurarouter": "^3.0 to use the Aura.Router routing adapter",
Expand Down
4 changes: 2 additions & 2 deletions composer.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

0 comments on commit f1f3c25

Please sign in to comment.