Fix missing null check on AbstractQuery#setResultCacheProfile()#6748
Merged
Conversation
Member
|
While the failure is trivial, we still need a test case for this |
Contributor
Author
|
@Ocramius done |
jwage
reviewed
Oct 4, 2017
| { | ||
| $query = $this->_em->createQuery('SELECT u FROM ' . CmsUser::class . ' u'); | ||
| $result = $query->setResultCacheProfile(null); | ||
| self::assertEquals($result, $query); |
Member
There was a problem hiding this comment.
I think we should be using $this instead of self:: like the rest of the code base right?
Member
Member
There was a problem hiding this comment.
Shouldn't we assert that the cache profile was NOT configured?
Contributor
Author
lcobucci
suggested changes
Oct 8, 2017
| /** | ||
| * setResultCacheProfile should works correct with null | ||
| */ | ||
| public function testSetResultCacheProfile() |
Member
There was a problem hiding this comment.
| public function testSetResultCacheProfile() | ||
| { | ||
| $query = $this->_em->createQuery('SELECT u FROM ' . CmsUser::class . ' u'); | ||
| $result = $query->setResultCacheProfile(null); |
Member
There was a problem hiding this comment.
This is a bit misleading, $result is not the query result but rather the query
| { | ||
| $query = $this->_em->createQuery('SELECT u FROM ' . CmsUser::class . ' u'); | ||
| $result = $query->setResultCacheProfile(null); | ||
| self::assertEquals($result, $query); |
Member
There was a problem hiding this comment.
Shouldn't we assert that the cache profile was NOT configured?
Contributor
|
Linking #6861 fixing the same bug, but missing tests. |
To ensure that `AbstractQuery#setResultCacheProfile()` doesn't raise errors when being called with `null`.
lcobucci
approved these changes
Dec 17, 2017
lcobucci
added a commit
to lcobucci/doctrine2
that referenced
this pull request
Dec 17, 2017
AbstractQuery#setResultCacheProfile()
Member
|
@KonstantinKuklin 🚢 and backported via 56ebf4b, thanks for your contribution! |
BourotBenjamin
added a commit
to BourotBenjamin/doctrine2
that referenced
this pull request
Dec 21, 2017
v2.5.14 This version backports bugfixes related to the generation of queries with joins and configuration of the result set cache profile of a query. Total issues resolved: **2** Bug - [6748: Fix missing null check on `AbstractQuery#setResultCacheProfile()`](doctrine#6748) thanks to @KonstantinKuklin - [6812: Fix syntax error when join unrelated entity with discriminator entity](doctrine#6812) thanks to @Deltachaos
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
6 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.
subject