Don't merge PersistentCollection orderBy with criteria in matching() #7850
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
paxuclus
force-pushed
the
nlx-lars/bugfix/7836-dont-merge-criteria
branch
from
dc452c4
to
cfb357f
Compare
lcobucci
suggested changes
Oct 1, 2019
There was a problem hiding this comment.
@nlx-lars thank you for this well-crafted changeset! Not merging arrays is indeed a more sensible option since it removes potential WTFs (thanks @SenseException).
I just have this tiny request 👍
|
|
||
| $children = $parent->getChildren()->matching(Criteria::create()); | ||
|
|
||
| self::assertEquals(100, $children[0]->position); |
There was a problem hiding this comment.
Please use self::assertSame() to be a bit more strict (yay strictness 🤘)
If no orderings are given to PersistentCollection::matching(), the orderBy annotation will be used if present. If the criteria contains orderings, those will be used without merging them with the orderBy. See doctrine#7836
paxuclus
force-pushed
the
nlx-lars/bugfix/7836-dont-merge-criteria
branch
from
cfb357f
to
79a7ecc
Compare
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.
If no orderings are given to PersistentCollection::matching(), the
orderBy annotation will be used if present. If the criteria contains
orderings, those will be used without merging them with the orderBy.
See #7836