allow to use Doctrine/Persistence:^2 #1305
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
Contributor
jkabat
commented
Oct 29, 2020
jkabat
commented
| Q | A |
|---|---|
| Branch? | 2.0 |
| Bug fix? | yes |
| New feature? | no |
| BC breaks? | no |
| Deprecations? | no |
| Tests pass? | yes |
| License | MIT |
fbourigault
reviewed
Dec 15, 2020
| $omClassName = LegacyObjectManager::class; | ||
| } elseif (interface_exists(ObjectManager::class)) { | ||
| $omClassName = ObjectManager::class; | ||
| } else { | ||
| $this->markTestSkipped('Requires the doctrine/orm package.'); |
There was a problem hiding this comment.
As doctrine/orm is in require-dev it will always be installed when running tests.Therefore you can remove the else statement.
composer.json
Outdated
| @@ -35,6 +35,7 @@ | |||
| "aws/aws-sdk-php": "^2.4", | |||
| "doctrine/cache": "^1.1", | |||
| "doctrine/orm": "^2.3", | |||
There was a problem hiding this comment.
I think this require-dev entry is useless. There isn't any code in this bundle which depends on Doctrine\\ORM!
We should remove it and keep doctrine/persistence as the true optional dependency thus we only provide an AbstractDoctrineLoader to help developers to implement their own doctrine ORM/ODM loader.
|
I just merged #1337 |
|
Could you rebase? #1337 replaced the |
|
@fbourigault Ill do that today/tomorrow. |
jkabat
force-pushed
the
fix-doctrine-persistance
branch
from
2cd9a7d to
949996d
Compare
|
rebased and fixed based on suggestions |
|
thank you! |
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.