Fix for BC break in 2.6.2 when calling EM::find() with LockMode::OPTIMISTIC outside of a TX#7367
Merged
Majkl578 merged 1 commit intodoctrine:2.6from Sep 23, 2018
Conversation
Member
|
@timdev does this also apply to |
Contributor
Author
|
@Ocramius - I haven't been following 3.0 closely so I'm not sure. @Majkl578 said "at least not in 2.x" in the initial discussion |
Majkl578
reviewed
Aug 22, 2018
Contributor
Majkl578
left a comment
There was a problem hiding this comment.
Thanks for providing a fix so fast!
Leaving just a few CS nitpicks, otherwise 👍.
| /** | ||
| * {@inheritDoc} | ||
| */ | ||
| protected function setUp(): void |
Contributor
There was a problem hiding this comment.
We use space in front of :.
| }catch(TransactionRequiredException $e){ | ||
| $this->fail('EntityManager::find() threw TransactionRequiredException with LockMode::OPTIMISTIC'); | ||
| } | ||
| $this->assertEquals('baz',$entity->getName()); |
Contributor
There was a problem hiding this comment.
self:: instead of $this-> here.
| try { | ||
| $entity = $this->_em->find(GH7366Entity::class, 1, LockMode::OPTIMISTIC); | ||
| }catch(TransactionRequiredException $e){ | ||
| $this->fail('EntityManager::find() threw TransactionRequiredException with LockMode::OPTIMISTIC'); |
Contributor
There was a problem hiding this comment.
self:: instead of $this-> here.
| { | ||
| try { | ||
| $entity = $this->_em->find(GH7366Entity::class, 1, LockMode::OPTIMISTIC); | ||
| }catch(TransactionRequiredException $e){ |
Contributor
There was a problem hiding this comment.
spacing: } catch(TransactionRequiredException $e) {
Contributor
I think we should fix it in master as well, in separate PR (some additional changes will be needed in the test - notably using |
…:OPTIMISTIC outside of a TX
b20226a to
3acfa50
Compare
Majkl578
approved these changes
Sep 23, 2018
This was referenced Sep 23, 2018
Contributor
|
Thanks @timdev. 🚢 |
ixarlie
added a commit
to surexdirect/doctrine2
that referenced
this pull request
Jul 10, 2019
v2.6.3 [](https://travis-ci.org/doctrine/doctrine2) This release provides fixes for many things, specially: - Regression in commit order calculation - BC-break in `EntityManager#find()` using optimistic lock outside of transaction - PHP 7.3 compatibility issues -------------------------------------------- - Total issues resolved: **8** - Total pull requests resolved: **26** - Total contributors: **26** Documentation ------------- - [7472: fix incorrect phpdoc typehint](doctrine#7472) thanks to @seferov - [7465: Fixes tiny typo in the 'Working with DateTime instances' documentation](doctrine#7465) thanks to @unguul - [7444: Fixed URLs of doctrine-mapping.xsd in docs](doctrine#7444) thanks to @Naitsirch - [7441: $hydrationMode throughout can be a string as well as int (for custom modes)](doctrine#7441) thanks to @asgrim - [7435: Fix a typo on Documentation](doctrine#7435) thanks to @oguzdumanoglu - [7434: Removed FAQ paragraph stating public variables are disallowed](doctrine#7434) thanks to @Naitsirch and @flaushi - [7423: Update association-mapping.rst](doctrine#7423) thanks to @ThomasLandauer - [7421: JIRA to Github issues on Limitations and Known Issues](doctrine#7421) thanks to @seferov - [7412: Some formatting improvements](doctrine#7412) thanks to @ThomasLandauer - [7411: Autoload error when following the Getting Started Guide](doctrine#7411) thanks to @ThomasLandauer - [7401: &doctrine#91;docs&doctrine#93; Fix docblock in `inheritance-mapping.rst`](doctrine#7401) thanks to @bobdenotter - [7397: Update getting-started.rst](doctrine#7397) thanks to @eibt - [7394: Class 'Doctrine\Common\Persistence\Mapping\Driver\AnnotationDriver' not found](doctrine#7394) thanks to @ekosynth - [7378: Typo fix](doctrine#7378) thanks to @BenMorel - [7377: Fix query andX doctype](doctrine#7377) thanks to @sserbin - [7374: Deprecation message in documentation for YAML](doctrine#7374) thanks to @SenseException and @iltar - [7360: Document getPartialReference() properly](doctrine#7360) thanks to @lcobucci Bug --- - [7471: Fix parameter value processing for objects with unloaded metadata](doctrine#7471) thanks to @alcaeus - [7367: Fix for BC break in 2.6.2 when calling EM::find() with LockMode::OPTIMISTIC outside of a TX](doctrine#7367) thanks to @timdev - [7328: Handle removed parameters by tree walker in Paginator](doctrine#7328) thanks to @plfort - [7325: Make code php 7.3 lint-compatible](doctrine#7325) thanks to @paxal - [7317: &doctrine#91;XML&doctrine#93; Fix default value of many-to-many order-by to ASC](doctrine#7317) thanks to @alexdenvir - [7260: Fix the handling of circular references in the commit order calculator](doctrine#7260) thanks to @stof - [6830: fix applying column options on foreign key columns](doctrine#6830) thanks to @Tobion Improvement ----------- - [7428: CI: Test against PHP 7.3](doctrine#7428) thanks to @Majkl578 - [7363: Fix compatibility with phan](doctrine#7363) thanks to @philippe-unitiz - [7345: Correct DOMDocument constructor in test](doctrine#7345) thanks to @guilliamxavier - [7307: Fix remaining usages of deprecated ClassLoader and Inflector from doctrine/common](doctrine#7307) thanks to @Majkl578 and @simonwelsh
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.
Addresses #7366