Merge pull request #6714 from guiajlopes/master

Remove unnecessary else
doctrine · Sep 21, 2017 · 1d5c87e · 1d5c87e
2 parents f96dc3b + df1250e
commit 1d5c87e
Showing 1 changed file with 2 additions and 3 deletions.
diff --git a/lib/Doctrine/ORM/Query/SqlWalker.php b/lib/Doctrine/ORM/Query/SqlWalker.php
@@ -749,9 +749,8 @@ public function walkSelectClause($selectClause)
 
             // Add foreign key columns of class and also parent classes
             foreach ($class->associationMappings as $assoc) {
-                if ( ! ($assoc['isOwningSide'] && $assoc['type'] & ClassMetadata::TO_ONE)) {
-                    continue;
-                } else if ( !$addMetaColumns && !isset($assoc['id'])) {
+                if ( ! ($assoc['isOwningSide'] && $assoc['type'] & ClassMetadata::TO_ONE)
+                    || ( ! $addMetaColumns && !isset($assoc['id']))) {
                     continue;
                 }