[2.6] Fix for #7068: EntityManager::find() with pessimistic lock should check for transaction#7291
Merged
Ocramius merged 1 commit intodoctrine:2.6from Jul 3, 2018
Merged
Conversation
…ould check for transaction
Ocramius
approved these changes
Jul 3, 2018
| * @throws OptimisticLockException | ||
| * @throws TransactionRequiredException | ||
| */ | ||
| private function checkLockRequirements(int $lockMode, ClassMetadata $class): void |
Member
There was a problem hiding this comment.
Nit: we use a space between ) and :. Not important though.
Contributor
Author
There was a problem hiding this comment.
Hmm, leftover from original PR.
Member
|
Thanks @Majkl578! |
Contributor
|
Why the intentional fallthrough here? It causes a BC break when using optimistic locking outside of a tx. I'm probably missing something, but it just bit me. |
Contributor
Author
|
I think you are right, the transaction shouldn't be required for an optimistic lock (documentation examples agree), at least not in 2.x. Do you want to submit a PR? 👍 |
Contributor
|
My pleasure: #7367 |
This file contains hidden or 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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
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.
Rebased and adjusted #7075 for 2.6.
Fixes #7068.