fix: add conflict for doctrine/orm >= 2.16.0 #2661
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Codecov ReportPatch and project coverage have no change.
❗ Your organization is not using the GitHub App Integration. As a result you may experience degraded service beginning May 15th. Please install the Github App Integration for your organization. Read more. Additional details and impacted files@@ Coverage Diff @@
## main #2661 +/- ##
=======================================
Coverage 79.22% 79.22%
=======================================
Files 161 161
Lines 8415 8415
=======================================
Hits 6667 6667
Misses 1748 1748 ☔ View full report in Codecov by Sentry. |
franmomu
approved these changes
Aug 2, 2023
|
There are ongoing new issues if these latest changes in 2.16 are BC breaks or not. Maybe they will revert some changes? But this repo needs to change some code. |
Chris53897
force-pushed
the
fix-add-conflict-with-doctrine-rom-2-16
branch
from
716a22d
to
e8d0a6f
Compare
|
Let's merge this since it would unblock other PRs and leave #2659 open since I don't think it would be easy to fix. thanks @Chris53897! |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
#2659
This helps to get the ci green.
But does not prevent the installation on userside of older versions with 3.12.0 and doctrine-orm >= 2.16.0