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

Replace container-interop/container-interop with psr/container #96

Merged
merged 14 commits into from
Dec 30, 2021
Merged

Replace container-interop/container-interop with psr/container #96

Show file tree
Hide file tree
Changes from 10 commits
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
8661725
Conflict with interop container prior to 1.2
gsteel Dec 17, 2021
c858dcc
Remove resolved psalm errors from baseline
gsteel Dec 17, 2021
c439bf3
Update psalm baseline with newly discovered errors due to more recent…
gsteel Dec 17, 2021
740d5fa
Replaces interop usage with psr and removes factory inheritance with …
gsteel Dec 17, 2021
af32abf
v2 service manager can no longer be installed so the initializer can …
gsteel Dec 17, 2021
1e83aed
Disregard v2 service manager branch.
gsteel Dec 17, 2021
5c0ecf5
A bump to Service Manager ^3.4 is required because AbstractPluginMana…
gsteel Dec 17, 2021
79f2db4
Locks latest deps
gsteel Dec 17, 2021
4d86c20
It doesn't appear to be possible to provide a type annotation here.
gsteel Dec 17, 2021
c338c27
Suppress usage of @internal method from test context
gsteel Dec 17, 2021
4a2d16f
Revert BC break in factory signatures
gsteel Dec 20, 2021
e8b8104
Correct types for aliases and factories even though they conflict wit…
gsteel Dec 30, 2021
62ee98f
Adds `NonInvariantDocblockPropertyType` errors in plugin managers to …
gsteel Dec 30, 2021
b12b5b8
Drop docblock type for $factories in order to inherit from SM and upd…
gsteel Dec 30, 2021
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
3 changes: 2 additions & 1 deletion composer.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@
"laminas/laminas-paginator": "^2.5",
"laminas/laminas-permissions-acl": "^2.6",
"laminas/laminas-router": "^3.0.1",
"laminas/laminas-servicemanager": "^3.3",
"laminas/laminas-servicemanager": "^3.4",
"laminas/laminas-session": "^2.12",
"laminas/laminas-uri": "^2.5",
"phpspec/prophecy": "^1.12",
Expand All @@ -54,6 +54,7 @@
"vimeo/psalm": "^4.10"
},
"conflict": {
"container-interop/container-interop": "<1.2",
Ocramius marked this conversation as resolved.
Show resolved Hide resolved
"laminas/laminas-servicemanager": "<3.3",
"laminas/laminas-router": "<3.0.1",
"zendframework/zend-view": "*"
Expand Down
Loading