-
-
Notifications
You must be signed in to change notification settings - Fork 1.3k
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
fix EntityManager::create deprecations #2669
Conversation
You'd need to bump the minimum ORM version to 2.13, as well. In 2.12 and earlier, the constructor is protected, so those versions have to use the (now deprecated) |
Good catch, fixed. |
I assume phpunit hiccuped for no particular reason as I see no correlation to the changes in the PR. Would you trigger workflows again @phansys ? |
Well, I have no idea what php 7.2's problem is. |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
DriverManager::getConnection()
receives an EventManager
as third argument, I haven't checked why it only fails using the lowest dependencies.
composer.json
Outdated
@@ -56,7 +56,7 @@ | |||
"doctrine/dbal": "^2.13.1 || ^3.2", | |||
"doctrine/doctrine-bundle": "^2.3", | |||
"doctrine/mongodb-odm": "^2.3", | |||
"doctrine/orm": "^2.10.2", | |||
"doctrine/orm": "^2.13.0", |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I guess we should also change the conflict
section to set this version since we are not testing < 2.13.0 anymore and that would require a changelog and release it as a minor 🤔
Update: see #2669 (comment) |
apparently the third argument of the
Update: |
Bumped the minimum requirement and also added the conflict. I'd have never realised the third argument was only added in 2.14, thanks for looking into it. |
Codecov ReportPatch and project coverage have no change.
Additional details and impacted files@@ Coverage Diff @@
## main #2669 +/- ##
=======================================
Coverage 79.60% 79.60%
=======================================
Files 161 161
Lines 8415 8415
=======================================
Hits 6699 6699
Misses 1716 1716 ☔ View full report in Codecov by Sentry. 📢 Have feedback on the report? Share it here. |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
@phansys should we defer this to next minor version? we are dropping support of doctrine/orm
< 2.14 so I guess a changelog and a minor version is needed
Indeed. |
CHANGELOG.md
Outdated
@@ -18,6 +18,8 @@ a release. | |||
--- | |||
|
|||
## [Unreleased] | |||
### Removed | |||
- Support for `doctrine/orm` < 2.14 |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
IMO, if we are not dropping support for a major version, we don't need an entry here.
On the other hand, if these changes are intended to fix deprecations, I think we should add an entry in the Fixed
section explaining what deprecations are fixed.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
👍 in this case these deprecations are only triggered in tests
composer.json
Outdated
@@ -71,7 +71,7 @@ | |||
"conflict": { | |||
"doctrine/dbal": "<2.13.1 || ^3.0 <3.2", | |||
"doctrine/mongodb-odm": "<2.3", | |||
"doctrine/orm": "<2.10.2 || 2.16.0 || 2.16.1", | |||
"doctrine/orm": "<2.14.0 || 2.16.0 || 2.16.1", |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
"doctrine/orm": "<2.14.0 || 2.16.0 || 2.16.1", | |
"doctrine/orm": "2.16.0 || 2.16.1", |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Here we need at least I left the 2.14
to use the EntityManager
constructor.2.10.2
version since it was there because #2272.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
My bad, I didn't see that the "doctrine/orm": "^2.14.0"
constraint is in the require-dev
section.
I'm sorry, I think you can use your original approach.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
So what's the plan here, keep the 2.14 in the require, but <2.10.2 in the conflict? Anything I can do?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I should've kept the original <2.14
conflict 😞, but let's solve it in #2639
thanks @DubbleClick! |
You're most welcome :) |
No description provided.