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

#3 Ported 279 from ZF repository - fixes merging of duplicate delegator factory definitions #43

Merged
merged 5 commits into from
Jun 12, 2020
Merged

#3 Ported 279 from ZF repository - fixes merging of duplicate delegator factory definitions #43

merged 5 commits into from
Jun 12, 2020

Conversation

GeeH
Copy link
Contributor

@GeeH GeeH commented Jun 5, 2020

Q A
Documentation no
Bugfix yes
BC Break no
New Feature no
RFC no
QA no

Description

Bug fix from old repostiory at zendframework/zend-servicemanager#280

Thanks @thomasvargiu

Fixes #3

GeeH added 2 commits June 5, 2020 12:46
Signed-off-by: Gary Hockin <[email protected]>
@GeeH GeeH self-assigned this Jun 5, 2020
@GeeH GeeH added the Bug Something isn't working label Jun 5, 2020
@GeeH GeeH added this to the 3.5.0 milestone Jun 5, 2020
Signed-off-by: Gary Hockin <[email protected]>
@GeeH
Copy link
Contributor Author

GeeH commented Jun 5, 2020

Closes #3

@GeeH GeeH mentioned this pull request Jun 5, 2020
src/ServiceManager.php Outdated Show resolved Hide resolved
src/ServiceManager.php Show resolved Hide resolved
test/ServiceManagerTest.php Outdated Show resolved Hide resolved
test/ServiceManagerTest.php Show resolved Hide resolved
test/ServiceManagerTest.php Outdated Show resolved Hide resolved
test/ServiceManagerTest.php Show resolved Hide resolved
test/ServiceManagerTest.php Show resolved Hide resolved
Signed-off-by: Gary Hockin <[email protected]>
@GeeH
Copy link
Contributor Author

GeeH commented Jun 8, 2020

Ready for re-review/merge thanks both.

src/ServiceManager.php Outdated Show resolved Hide resolved
@GeeH
Copy link
Contributor Author

GeeH commented Jun 12, 2020

ping @Ocramius ?

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 👍

@Ocramius Ocramius changed the title Ported 279 from old repository closes #3 #3 Ported 279 from ZF repository - fixes merging of duplicate delegator factory definitions Jun 12, 2020
@Ocramius Ocramius merged commit cc4c218 into laminas:develop Jun 12, 2020
boesing added a commit to boesing/laminas-servicemanager that referenced this pull request Dec 2, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Bug Something isn't working
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants