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.

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

Conversation

gsteel
Copy link
Member

@gsteel gsteel commented Dec 17, 2021

Q A
Bugfix yes
BC Break maybe
QA yes

Description

With reference to this comment from @boesing, this pull removes all mention of Interop\Container

It doesn't appear that it is currently possible to have interop <1.2 installed due to SM >3.3 so the conflict in composer.json is largely irrelevant.

Because the lock file is updated, and newer version of psalm is installed, a number of non-trivial, new psalm errors emerged - I've added these initial errors to the baseline for now (A lot of them are due to the deprecated and to be removed flash messenger).

WRT to BC, although types have changed from Interop to Psr, it wouldn't have been possible for any type to not implement Psr prior to this patch would it?

The minimum version of laminas-servicemanager is 3.3 which in turn requires interop ^1.2 therefore this change should have no effect on consumers, but guarantees that we will have a Psr compatible container.

Signed-off-by: George Steel <george@net-glue.co.uk>
Signed-off-by: George Steel <george@net-glue.co.uk>
… version of psalm

Signed-off-by: George Steel <george@net-glue.co.uk>
…the deprecated FactoryInterface

Signed-off-by: George Steel <george@net-glue.co.uk>
…be simplified

Signed-off-by: George Steel <george@net-glue.co.uk>
Also the creation context will very likely be decorated with a Psr Decorator which will cause the test to fail if so.

The instance we're looking for is still there.

Signed-off-by: George Steel <george@net-glue.co.uk>
…ger must accept a Psr Container

Signed-off-by: George Steel <george@net-glue.co.uk>
Signed-off-by: George Steel <george@net-glue.co.uk>
Signed-off-by: George Steel <george@net-glue.co.uk>
Signed-off-by: George Steel <george@net-glue.co.uk>
@gsteel gsteel changed the title Container interop Replace Container Interop usage with Psr Container Dec 17, 2021
src/Helper/Navigation/AbstractHelper.php Outdated Show resolved Hide resolved
src/Helper/Navigation/PluginManager.php Outdated Show resolved Hide resolved
src/Helper/Navigation/PluginManager.php Outdated Show resolved Hide resolved
src/Helper/Service/AssetFactory.php Outdated Show resolved Hide resolved
Signed-off-by: George Steel <george@net-glue.co.uk>
@gsteel gsteel requested review from boesing and Ocramius December 20, 2021 13:04
Copy link
Member

@Ocramius Ocramius left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

composer.json Show resolved Hide resolved
psalm-baseline.xml Show resolved Hide resolved
src/Helper/Navigation/PluginManager.php Outdated Show resolved Hide resolved
src/HelperPluginManager.php Outdated Show resolved Hide resolved
@Ocramius Ocramius added this to the 2.16.0 milestone Dec 21, 2021
…h ServiceManager

Signed-off-by: George Steel <george@net-glue.co.uk>
…the baseline

Signed-off-by: George Steel <george@net-glue.co.uk>
…ate baseline

Signed-off-by: George Steel <george@net-glue.co.uk>
Copy link
Member

@Ocramius Ocramius left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

🚢 as-is

Further type refinements can be done later, but:

  • already reduces baseline
  • already upgrades to psr/container

I'd say the added value is here, and further discussions are mostly bike-shedding, and should be deferred to new patches.

@Ocramius Ocramius self-assigned this Dec 30, 2021
@Ocramius Ocramius changed the title Replace Container Interop usage with Psr Container Replace container-interop/container-interop with psr/container Dec 30, 2021
@Ocramius Ocramius merged commit f3a3011 into laminas:2.16.x Dec 30, 2021
@Ocramius
Copy link
Member

thanks @gsteel!

@gsteel gsteel deleted the container-interop branch December 30, 2021 12:32
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants