Remove unnecessary else #6714
Merged
Remove unnecessary else #6714
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
Ocramius
reviewed
Sep 21, 2017
lib/Doctrine/ORM/Query/SqlWalker.php
Outdated
| @@ -751,7 +751,8 @@ public function walkSelectClause($selectClause) | |||
| foreach ($class->associationMappings as $assoc) { | |||
| if ( ! ($assoc['isOwningSide'] && $assoc['type'] & ClassMetadata::TO_ONE)) { | |||
| continue; | |||
| } else if ( !$addMetaColumns && !isset($assoc['id'])) { | |||
| } | |||
| if ( !$addMetaColumns && !isset($assoc['id'])) { | |||
There was a problem hiding this comment.
Add an empty line between logical blocks
There was a problem hiding this comment.
@Ocramius thanks, done!
lcobucci
suggested changes
Sep 21, 2017
lib/Doctrine/ORM/Query/SqlWalker.php
Outdated
| } else if ( !$addMetaColumns && !isset($assoc['id'])) { | ||
| } | ||
|
|
||
| if ( !$addMetaColumns && !isset($assoc['id'])) { |
There was a problem hiding this comment.
@guiajlopes according to our CS we need spaces before AND after the negation operator, so this should be:
if ( ! $addMetaColumns && ! isset($assoc['id'])) {There was a problem hiding this comment.
Does it make sense to turn this into a single IF with an OR instead? Like:
if ( ! ($assoc['isOwningSide'] && $assoc['type'] & ClassMetadata::TO_ONE)
|| ( ! $addMetaColumns && ! isset($assoc['id']))) {I mean, both are fine... just wondering 😜
There was a problem hiding this comment.
@lcobucci thanks for your review, make sense to turn in the same if statement
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.
Just a small improvement in the code since the else is unnecessary on this case