Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Merge release 2.28.0 into 3.0.x #206

Merged
merged 9 commits into from
May 30, 2023
Merged

Merge release 2.28.0 into 3.0.x #206

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
198f594
Lock file maintenance
renovate[bot] Feb 14, 2023
0b48370
Lock file maintenance
renovate[bot] Feb 20, 2023
3d6c02a
qa: Fix minor psalm issues to keep CI green and bump dev deps
gsteel May 29, 2023
1f6aa86
Remove support for PHP 8.0. Bump ServiceManager to 3.21.x
gsteel May 29, 2023
375dad3
Bump dev deps for 8.1 and refresh lock
gsteel May 29, 2023
2e7b60d
Revert potential BC break in protected method
gsteel May 30, 2023
c43dd9f
Merge pull request #205 from gsteel/drop-php-8.0
Ocramius May 30, 2023
5c07ceb
Merge remote-tracking branch 'upstream/3.0.x' into 2.28.x-merge-up-in…
gsteel May 30, 2023
3c2426a
Refresh lock and baseline post merge-up
gsteel May 30, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 9 additions & 9 deletions composer.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,43 +18,43 @@
"config": {
"sort-packages": true,
"platform": {
"php": "8.0.99"
"php": "8.1.99"
},
"allow-plugins": {
"dealerdirect/phpcodesniffer-composer-installer": true,
"composer/package-versions-deprecated": true
}
},
"require": {
"php": "~8.0.0 || ~8.1.0 || ~8.2.0",
"php": "~8.1.0 || ~8.2.0",
"ext-dom": "*",
"ext-filter": "*",
"ext-json": "*",
"laminas/laminas-escaper": "^2.5",
"laminas/laminas-eventmanager": "^3.4",
"laminas/laminas-json": "^3.3",
"laminas/laminas-servicemanager": "^3.14.0",
"laminas/laminas-servicemanager": "^3.21.0",
"laminas/laminas-stdlib": "^3.10.1",
"psr/container": "^1 || ^2"
},
"require-dev": {
"laminas/laminas-authentication": "^2.13",
"laminas/laminas-coding-standard": "~2.5.0",
"laminas/laminas-feed": "^2.20",
"laminas/laminas-filter": "^2.31",
"laminas/laminas-filter": "^2.32",
"laminas/laminas-http": "^2.18",
"laminas/laminas-i18n": "^2.21",
"laminas/laminas-i18n": "^2.23",
"laminas/laminas-modulemanager": "^2.14",
"laminas/laminas-mvc": "^3.6",
"laminas/laminas-mvc": "^3.6.1",
"laminas/laminas-mvc-i18n": "^1.7",
"laminas/laminas-navigation": "^2.18.1",
"laminas/laminas-paginator": "^2.17",
"laminas/laminas-permissions-acl": "^2.13",
"laminas/laminas-permissions-acl": "^2.14",
"laminas/laminas-router": "^3.11.1",
"laminas/laminas-uri": "^2.10",
"phpunit/phpunit": "^9.5.28",
"phpunit/phpunit": "^9.6.8",
"psalm/plugin-phpunit": "^0.18.4",
"vimeo/psalm": "^5.4"
"vimeo/psalm": "^5.12"
},
"conflict": {
"container-interop/container-interop": "<1.2",
Expand Down
Loading