Completed
Pull Request — 2.5 (#7639)
by
unknown
03:04
created
lib/Doctrine/ORM/Query/AST/Functions/SizeFunction.php 1 patch
Braces   +10 added lines, -2 removed lines patch added patch discarded remove patch
@@ -67,7 +67,11 @@  discard block
 block discarded – undo
67 67
             $first = true;
68 68
 
69 69
             foreach ($owningAssoc['targetToSourceKeyColumns'] as $targetColumn => $sourceColumn) {
70
-                if ($first) $first = false; else $sql .= ' AND ';
70
+                if ($first) {
71
+                    $first = false;
72
+                } else {
73
+                    $sql .= ' AND ';
74
+                }
71 75
 
72 76
                 $sql .= $targetTableAlias . '.' . $sourceColumn
73 77
                       . ' = '
@@ -93,7 +97,11 @@  discard block
 block discarded – undo
93 97
             $first = true;
94 98
 
95 99
             foreach ($joinColumns as $joinColumn) {
96
-                if ($first) $first = false; else $sql .= ' AND ';
100
+                if ($first) {
101
+                    $first = false;
102
+                } else {
103
+                    $sql .= ' AND ';
104
+                }
97 105
 
98 106
                 $sourceColumnName = $quoteStrategy->getColumnName(
99 107
                     $class->fieldNames[$joinColumn['referencedColumnName']], $class, $platform
Please login to merge, or discard this patch.
lib/Doctrine/ORM/Query/ResultSetMapping.php 1 patch
Braces   +3 added lines, -1 removed lines patch added patch discarded remove patch
@@ -227,7 +227,9 @@
 block discarded – undo
227 227
         $found = false;
228 228
 
229 229
         foreach (array_merge($this->metaMappings, $this->fieldMappings) as $columnName => $columnFieldName) {
230
-            if ( ! ($columnFieldName === $fieldName && $this->columnOwnerMap[$columnName] === $alias)) continue;
230
+            if ( ! ($columnFieldName === $fieldName && $this->columnOwnerMap[$columnName] === $alias)) {
231
+                continue;
232
+            }
231 233
 
232 234
             $this->addIndexByColumn($alias, $columnName);
233 235
             $found = true;
Please login to merge, or discard this patch.
lib/Doctrine/ORM/Tools/EntityGenerator.php 1 patch
Braces   +15 added lines, -5 removed lines patch added patch discarded remove patch
@@ -1524,11 +1524,21 @@
 block discarded – undo
1524 1524
             if ($associationMapping['cascade']) {
1525 1525
                 $cascades = array();
1526 1526
 
1527
-                if ($associationMapping['isCascadePersist']) $cascades[] = '"persist"';
1528
-                if ($associationMapping['isCascadeRemove']) $cascades[] = '"remove"';
1529
-                if ($associationMapping['isCascadeDetach']) $cascades[] = '"detach"';
1530
-                if ($associationMapping['isCascadeMerge']) $cascades[] = '"merge"';
1531
-                if ($associationMapping['isCascadeRefresh']) $cascades[] = '"refresh"';
1527
+                if ($associationMapping['isCascadePersist']) {
1528
+                    $cascades[] = '"persist"';
1529
+                }
1530
+                if ($associationMapping['isCascadeRemove']) {
1531
+                    $cascades[] = '"remove"';
1532
+                }
1533
+                if ($associationMapping['isCascadeDetach']) {
1534
+                    $cascades[] = '"detach"';
1535
+                }
1536
+                if ($associationMapping['isCascadeMerge']) {
1537
+                    $cascades[] = '"merge"';
1538
+                }
1539
+                if ($associationMapping['isCascadeRefresh']) {
1540
+                    $cascades[] = '"refresh"';
1541
+                }
1532 1542
 
1533 1543
                 if (count($cascades) === 5) {
1534 1544
                     $cascades = array('"all"');
Please login to merge, or discard this patch.
lib/Doctrine/ORM/Query/SqlWalker.php 1 patch
Braces   +9 added lines, -3 removed lines patch added patch discarded remove patch
@@ -443,7 +443,9 @@  discard block
 block discarded – undo
443 443
         foreach ($dqlAliases as $dqlAlias) {
444 444
             $class = $this->queryComponents[$dqlAlias]['metadata'];
445 445
 
446
-            if ( ! $class->isInheritanceTypeSingleTable()) continue;
446
+            if ( ! $class->isInheritanceTypeSingleTable()) {
447
+                continue;
448
+            }
447 449
 
448 450
             $conn   = $this->em->getConnection();
449 451
             $values = array();
@@ -783,9 +785,13 @@  discard block
 block discarded – undo
783 785
 
784 786
                 foreach ($subClass->associationMappings as $assoc) {
785 787
                     // Skip if association is inherited
786
-                    if (isset($assoc['inherited'])) continue;
788
+                    if (isset($assoc['inherited'])) {
789
+                        continue;
790
+                    }
787 791
 
788
-                    if ( ! ($assoc['isOwningSide'] && $assoc['type'] & ClassMetadata::TO_ONE)) continue;
792
+                    if ( ! ($assoc['isOwningSide'] && $assoc['type'] & ClassMetadata::TO_ONE)) {
793
+                        continue;
794
+                    }
789 795
 
790 796
                     foreach ($assoc['targetToSourceKeyColumns'] as $srcColumn) {
791 797
                         $columnAlias = $this->getSQLColumnAlias($srcColumn);
Please login to merge, or discard this patch.
lib/Doctrine/ORM/Query/ResultSetMappingBuilder.php 1 patch
Braces   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -388,7 +388,7 @@
 block discarded – undo
388 388
 
389 389
                         $this->addJoinedEntityResult($associationMapping['targetEntity'], $joinAlias, $parentAlias, $relation);
390 390
                         $this->addFieldResult($joinAlias, $field['column'], $fieldName);
391
-                    }else {
391
+                    } else {
392 392
                         $this->addFieldResult($alias, $field['column'], $fieldName, $classMetadata->name);
393 393
                     }
394 394
                 } else {
Please login to merge, or discard this patch.
lib/Doctrine/ORM/Cache/DefaultEntityHydrator.php 1 patch
Braces   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -102,7 +102,7 @@
 block discarded – undo
102 102
                                 $data[$localColumn] = $fieldValue;
103 103
                             }
104 104
                         }
105
-                    }else{
105
+                    } else{
106 106
                         $data[$assoc['targetToSourceKeyColumns'][$targetClassMetadata->columnNames[$fieldName]]] = $fieldValue;
107 107
                     }
108 108
                 }
Please login to merge, or discard this patch.