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

Remove conflict with doctrine/orm >= 2.16.0 #2687

Merged

Conversation

franmomu
Copy link
Collaborator

@franmomu franmomu commented Sep 3, 2023

Reverts #2661 (there was no release)

should we add a conflict with 2.16.0 and 2.16.1?

@franmomu franmomu requested a review from phansys September 3, 2023 20:37
@codecov
Copy link

codecov bot commented Sep 3, 2023

Codecov Report

Patch coverage has no change and project coverage change: +0.01% 🎉

Comparison is base (5502bae) 79.55% compared to head (cbcb4a1) 79.56%.
Report is 1 commits behind head on main.

Additional details and impacted files
@@            Coverage Diff             @@
##             main    #2687      +/-   ##
==========================================
+ Coverage   79.55%   79.56%   +0.01%     
==========================================
  Files         161      161              
  Lines        8409     8409              
==========================================
+ Hits         6690     6691       +1     
+ Misses       1719     1718       -1     

see 1 file with indirect coverage changes

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

@phansys
Copy link
Collaborator

phansys commented Sep 3, 2023

should we add a conflict with 2.16.0 and 2.16.1?

Sorry, I'm not following the history of the issue.
Is there a change in a 3rd party dependency that motivates this change or is it a improvement for the approach provided in #2661?

@franmomu
Copy link
Collaborator Author

franmomu commented Sep 3, 2023

should we add a conflict with 2.16.0 and 2.16.1?

Sorry, I'm not following the history of the issue. Is there a change in a 3rd party dependency that motivates this change

yeah, for reference: #2659

So in doctrine/orm 2.16.0 doctrine/orm#10547 cause multiple failures in our tests (apart from relying on autoincremental id) and after doctrine/orm#10915 (released in 2.16.2) these tests are passing green again, so there is no need for the conflict anymore.

@phansys
Copy link
Collaborator

phansys commented Sep 3, 2023

Thanks for the clear explanation.
I agree we should prevent the conflicting versions then. I guess we can update the constraint in the require section to disallow the offending versions.

@franmomu franmomu force-pushed the remove_doctrine_restriction branch from d6997fe to cbcb4a1 Compare September 3, 2023 21:57
@phansys phansys merged commit 1b1c715 into doctrine-extensions:main Sep 3, 2023
@phansys
Copy link
Collaborator

phansys commented Sep 3, 2023

Thank you @franmomu!

@franmomu franmomu deleted the remove_doctrine_restriction branch September 4, 2023 05:39
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants