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

Allow doctrine/persistence 2.x #2204

Merged
merged 1 commit into from Jun 28, 2020
Merged

Allow doctrine/persistence 2.x #2204

merged 1 commit into from Jun 28, 2020

Conversation

fruitwasp
Copy link
Contributor

@fruitwasp fruitwasp commented Jun 25, 2020

Q A
Type improvement
BC Break yes
Fixed issues

Summary

Adds support for doctrine/persistence 2.x

@malarzm
Copy link
Member

malarzm commented Jun 25, 2020

BC break in 2.x is a no go. But this is not a lost cause, IIRC migration plan for doctrine/common was for libraries to require 1.x || 2.x to allow smooth transition for the ecosystem. Sadly I never had time to fully grasp the idea but there are better informed people :) @greg0ire would you mind chiming in?

@greg0ire
Copy link
Member

You're correct, || ^2.0 can be added on the stable branch, here is how you should probably do that: doctrine/orm#8158

After that, people will have an upgrade path, and you can drop the ^1.0 || part (and the weird code artefacts I added in #2150 ), like this: doctrine/orm#8166

@fruitwasp fruitwasp changed the base branch from master to 2.1.x June 27, 2020 12:57
@fruitwasp
Copy link
Contributor Author

fruitwasp commented Jun 27, 2020

done; targets the 2.1.x branch now too. Thanks for the guidance

@malarzm malarzm changed the title Bumps doctrine/persistence to 2.x Allow doctrine/persistence 2.x Jun 28, 2020
@malarzm
Copy link
Member

malarzm commented Jun 28, 2020

Thanks @fruitwasp!

@malarzm malarzm merged commit 785ac03 into doctrine:2.1.x Jun 28, 2020
@malarzm malarzm added the Task label Jun 28, 2020
@malarzm malarzm added this to In progress in ODM 2.1 via automation Jun 28, 2020
@malarzm malarzm added this to the 2.1.2 milestone Jun 28, 2020
@malarzm malarzm moved this from In progress to Done in ODM 2.1 Jun 28, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
No open projects
ODM 2.1
  
Done
Development

Successfully merging this pull request may close these issues.

None yet

3 participants