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.
The conflict against
doctrine/orm:^2.10
has been unnecessary since thegedmo/doctrine-extensions
3.2 release. In fact, the actual conflict was between the extensions package and the ORM, Sylius was never directly conflicted against it. Now that newer versions of the extensions package either have the appropriate conflict or fixed the conflict and now require newer ORM versions, Sylius no longer needs to have this conflict.