Completed
Pull Request — 2.6 (#8015)
by
unknown
06:46
created
lib/Doctrine/ORM/Tools/Console/Command/MappingDescribeCommand.php 2 patches
Indentation   +6 added lines, -6 removed lines patch added patch discarded remove patch
@@ -42,9 +42,9 @@  discard block
 block discarded – undo
42 42
     protected function configure()
43 43
     {
44 44
         $this->setName('orm:mapping:describe')
45
-             ->addArgument('entityName', InputArgument::REQUIRED, 'Full or partial name of entity')
46
-             ->setDescription('Display information about mapped objects')
47
-             ->setHelp(<<<EOT
45
+                ->addArgument('entityName', InputArgument::REQUIRED, 'Full or partial name of entity')
46
+                ->setDescription('Display information about mapped objects')
47
+                ->setHelp(<<<EOT
48 48
 The %command.full_name% command describes the metadata for the given full or partial entity class name.
49 49
 
50 50
     <info>%command.full_name%</info> My\Namespace\Entity\MyEntity
@@ -53,7 +53,7 @@  discard block
 block discarded – undo
53 53
 
54 54
     <info>%command.full_name%</info> MyEntity
55 55
 EOT
56
-             );
56
+                );
57 57
     }
58 58
 
59 59
     /**
@@ -134,8 +134,8 @@  discard block
 block discarded – undo
134 134
     private function getMappedEntities(EntityManagerInterface $entityManager)
135 135
     {
136 136
         $entityClassNames = $entityManager->getConfiguration()
137
-                                          ->getMetadataDriverImpl()
138
-                                          ->getAllClassNames();
137
+                                            ->getMetadataDriverImpl()
138
+                                            ->getAllClassNames();
139 139
 
140 140
         if ( ! $entityClassNames) {
141 141
             throw new \InvalidArgumentException(
Please login to merge, or discard this patch.
Spacing   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -165,8 +165,8 @@  discard block
 block discarded – undo
165 165
 
166 166
         $matches = array_filter(
167 167
             $this->getMappedEntities($entityManager),
168
-            function ($mappedEntity) use ($entityName) {
169
-                return preg_match('{' . preg_quote($entityName) . '}', $mappedEntity);
168
+            function($mappedEntity) use ($entityName) {
169
+                return preg_match('{'.preg_quote($entityName).'}', $mappedEntity);
170 170
             }
171 171
         );
172 172
 
@@ -205,7 +205,7 @@  discard block
 block discarded – undo
205 205
         }
206 206
 
207 207
         if (is_bool($value)) {
208
-            return '<comment>' . ($value ? 'True' : 'False') . '</comment>';
208
+            return '<comment>'.($value ? 'True' : 'False').'</comment>';
209 209
         }
210 210
 
211 211
         if (empty($value)) {
Please login to merge, or discard this patch.
tests/Doctrine/Tests/ORM/Functional/Ticket/GH6699Test.php 1 patch
Indentation   +12 added lines, -12 removed lines patch added patch discarded remove patch
@@ -20,11 +20,11 @@  discard block
 block discarded – undo
20 20
     public function testMixedParametersWithZeroNumber() : void
21 21
     {
22 22
         $query = $this->_em->createQueryBuilder()
23
-                           ->select('u')
24
-                           ->from(CmsUser::class, 'u')
25
-                           ->andWhere('u.username = :username')
26
-                           ->andWhere('u.id = ?0')
27
-                           ->getQuery();
23
+                            ->select('u')
24
+                            ->from(CmsUser::class, 'u')
25
+                            ->andWhere('u.username = :username')
26
+                            ->andWhere('u.id = ?0')
27
+                            ->getQuery();
28 28
 
29 29
         $query->setParameter('username', 'bar');
30 30
         $query->setParameter(0, 0);
@@ -39,13 +39,13 @@  discard block
 block discarded – undo
39 39
     public function testMixedParametersWithZeroNumberOnQueryBuilder() : void
40 40
     {
41 41
         $query = $this->_em->createQueryBuilder()
42
-                           ->select('u')
43
-                           ->from(CmsUser::class, 'u')
44
-                           ->andWhere('u.username = :username')
45
-                           ->andWhere('u.id = ?0')
46
-                           ->setParameter('username', 'bar')
47
-                           ->setParameter(0, 0)
48
-                           ->getQuery();
42
+                            ->select('u')
43
+                            ->from(CmsUser::class, 'u')
44
+                            ->andWhere('u.username = :username')
45
+                            ->andWhere('u.id = ?0')
46
+                            ->setParameter('username', 'bar')
47
+                            ->setParameter(0, 0)
48
+                            ->getQuery();
49 49
 
50 50
         $query->execute();
51 51
 
Please login to merge, or discard this patch.
lib/Doctrine/ORM/Query/Expr.php 1 patch
Spacing   +8 added lines, -8 removed lines patch added patch discarded remove patch
@@ -268,7 +268,7 @@  discard block
 block discarded – undo
268 268
      */
269 269
     public function countDistinct($x)
270 270
     {
271
-        return 'COUNT(DISTINCT ' . implode(', ', func_get_args()) . ')';
271
+        return 'COUNT(DISTINCT '.implode(', ', func_get_args()).')';
272 272
     }
273 273
 
274 274
     /**
@@ -450,7 +450,7 @@  discard block
 block discarded – undo
450 450
             }
451 451
         }
452 452
 
453
-        return new Expr\Func($x . ' IN', (array) $y);
453
+        return new Expr\Func($x.' IN', (array) $y);
454 454
     }
455 455
 
456 456
     /**
@@ -471,7 +471,7 @@  discard block
 block discarded – undo
471 471
             }
472 472
         }
473 473
 
474
-        return new Expr\Func($x . ' NOT IN', (array) $y);
474
+        return new Expr\Func($x.' NOT IN', (array) $y);
475 475
     }
476 476
 
477 477
     /**
@@ -483,7 +483,7 @@  discard block
 block discarded – undo
483 483
      */
484 484
     public function isNull($x)
485 485
     {
486
-        return $x . ' IS NULL';
486
+        return $x.' IS NULL';
487 487
     }
488 488
 
489 489
     /**
@@ -495,7 +495,7 @@  discard block
 block discarded – undo
495 495
      */
496 496
     public function isNotNull($x)
497 497
     {
498
-        return $x . ' IS NOT NULL';
498
+        return $x.' IS NOT NULL';
499 499
     }
500 500
 
501 501
     /**
@@ -613,13 +613,13 @@  discard block
 block discarded – undo
613 613
      */
614 614
     private function _quoteLiteral($literal)
615 615
     {
616
-        if (is_numeric($literal) && !is_string($literal)) {
616
+        if (is_numeric($literal) && ! is_string($literal)) {
617 617
             return (string) $literal;
618 618
         } else if (is_bool($literal)) {
619 619
             return $literal ? "true" : "false";
620 620
         }
621 621
 
622
-        return "'" . str_replace("'", "''", $literal) . "'";
622
+        return "'".str_replace("'", "''", $literal)."'";
623 623
     }
624 624
 
625 625
     /**
@@ -633,7 +633,7 @@  discard block
 block discarded – undo
633 633
      */
634 634
     public function between($val, $x, $y)
635 635
     {
636
-        return $val . ' BETWEEN ' . $x . ' AND ' . $y;
636
+        return $val.' BETWEEN '.$x.' AND '.$y;
637 637
     }
638 638
 
639 639
     /**
Please login to merge, or discard this patch.
lib/Doctrine/ORM/Tools/Pagination/LimitSubqueryWalker.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -100,7 +100,7 @@
 block discarded – undo
100 100
         foreach ($AST->orderByClause->orderByItems as $item) {
101 101
             if ($item->expression instanceof PathExpression) {
102 102
                 $AST->selectClause->selectExpressions[] = new SelectExpression(
103
-                    $this->createSelectExpressionItem($item->expression), '_dctrn_ord' . $this->_aliasCounter++
103
+                    $this->createSelectExpressionItem($item->expression), '_dctrn_ord'.$this->_aliasCounter++
104 104
                 );
105 105
 
106 106
                 continue;
Please login to merge, or discard this patch.
lib/Doctrine/ORM/Tools/Setup.php 1 patch
Spacing   +4 added lines, -4 removed lines patch added patch discarded remove patch
@@ -44,14 +44,14 @@  discard block
 block discarded – undo
44 44
      */
45 45
     public static function registerAutoloadDirectory($directory)
46 46
     {
47
-        if (!class_exists('Doctrine\Common\ClassLoader', false)) {
48
-            require_once $directory . "/Doctrine/Common/ClassLoader.php";
47
+        if ( ! class_exists('Doctrine\Common\ClassLoader', false)) {
48
+            require_once $directory."/Doctrine/Common/ClassLoader.php";
49 49
         }
50 50
 
51 51
         $loader = new ClassLoader("Doctrine", $directory);
52 52
         $loader->register();
53 53
 
54
-        $loader = new ClassLoader("Symfony\Component", $directory . "/Doctrine");
54
+        $loader = new ClassLoader("Symfony\Component", $directory."/Doctrine");
55 55
         $loader->register();
56 56
     }
57 57
 
@@ -150,7 +150,7 @@  discard block
 block discarded – undo
150 150
             $namespace .= ':';
151 151
         }
152 152
 
153
-        $cache->setNamespace($namespace . 'dc2_' . md5($proxyDir) . '_'); // to avoid collisions
153
+        $cache->setNamespace($namespace.'dc2_'.md5($proxyDir).'_'); // to avoid collisions
154 154
 
155 155
         return $cache;
156 156
     }
Please login to merge, or discard this patch.
lib/Doctrine/ORM/Tools/SchemaValidator.php 1 patch
Spacing   +58 added lines, -58 removed lines patch added patch discarded remove patch
@@ -89,66 +89,66 @@  discard block
 block discarded – undo
89 89
         $cmf = $this->em->getMetadataFactory();
90 90
 
91 91
         foreach ($class->fieldMappings as $fieldName => $mapping) {
92
-            if (!Type::hasType($mapping['type'])) {
93
-                $ce[] = "The field '" . $class->name . "#" . $fieldName."' uses a non-existent type '" . $mapping['type'] . "'.";
92
+            if ( ! Type::hasType($mapping['type'])) {
93
+                $ce[] = "The field '".$class->name."#".$fieldName."' uses a non-existent type '".$mapping['type']."'.";
94 94
             }
95 95
         }
96 96
 
97 97
         foreach ($class->associationMappings as $fieldName => $assoc) {
98
-            if (!class_exists($assoc['targetEntity']) || $cmf->isTransient($assoc['targetEntity'])) {
99
-                $ce[] = "The target entity '" . $assoc['targetEntity'] . "' specified on " . $class->name . '#' . $fieldName . ' is unknown or not an entity.';
98
+            if ( ! class_exists($assoc['targetEntity']) || $cmf->isTransient($assoc['targetEntity'])) {
99
+                $ce[] = "The target entity '".$assoc['targetEntity']."' specified on ".$class->name.'#'.$fieldName.' is unknown or not an entity.';
100 100
 
101 101
                 return $ce;
102 102
             }
103 103
 
104 104
             if ($assoc['mappedBy'] && $assoc['inversedBy']) {
105
-                $ce[] = "The association " . $class . "#" . $fieldName . " cannot be defined as both inverse and owning.";
105
+                $ce[] = "The association ".$class."#".$fieldName." cannot be defined as both inverse and owning.";
106 106
             }
107 107
 
108 108
             $targetMetadata = $cmf->getMetadataFor($assoc['targetEntity']);
109 109
 
110 110
             if (isset($assoc['id']) && $targetMetadata->containsForeignIdentifier) {
111
-                $ce[] = "Cannot map association '" . $class->name. "#". $fieldName ." as identifier, because " .
112
-                        "the target entity '". $targetMetadata->name . "' also maps an association as identifier.";
111
+                $ce[] = "Cannot map association '".$class->name."#".$fieldName." as identifier, because ".
112
+                        "the target entity '".$targetMetadata->name."' also maps an association as identifier.";
113 113
             }
114 114
 
115 115
             if ($assoc['mappedBy']) {
116 116
                 if ($targetMetadata->hasField($assoc['mappedBy'])) {
117
-                    $ce[] = "The association " . $class->name . "#" . $fieldName . " refers to the owning side ".
118
-                            "field " . $assoc['targetEntity'] . "#" . $assoc['mappedBy'] . " which is not defined as association, but as field.";
117
+                    $ce[] = "The association ".$class->name."#".$fieldName." refers to the owning side ".
118
+                            "field ".$assoc['targetEntity']."#".$assoc['mappedBy']." which is not defined as association, but as field.";
119 119
                 }
120
-                if (!$targetMetadata->hasAssociation($assoc['mappedBy'])) {
121
-                    $ce[] = "The association " . $class->name . "#" . $fieldName . " refers to the owning side ".
122
-                            "field " . $assoc['targetEntity'] . "#" . $assoc['mappedBy'] . " which does not exist.";
120
+                if ( ! $targetMetadata->hasAssociation($assoc['mappedBy'])) {
121
+                    $ce[] = "The association ".$class->name."#".$fieldName." refers to the owning side ".
122
+                            "field ".$assoc['targetEntity']."#".$assoc['mappedBy']." which does not exist.";
123 123
                 } elseif ($targetMetadata->associationMappings[$assoc['mappedBy']]['inversedBy'] == null) {
124
-                    $ce[] = "The field " . $class->name . "#" . $fieldName . " is on the inverse side of a ".
124
+                    $ce[] = "The field ".$class->name."#".$fieldName." is on the inverse side of a ".
125 125
                             "bi-directional relationship, but the specified mappedBy association on the target-entity ".
126
-                            $assoc['targetEntity'] . "#" . $assoc['mappedBy'] . " does not contain the required ".
127
-                            "'inversedBy=\"" . $fieldName . "\"' attribute.";
126
+                            $assoc['targetEntity']."#".$assoc['mappedBy']." does not contain the required ".
127
+                            "'inversedBy=\"".$fieldName."\"' attribute.";
128 128
                 } elseif ($targetMetadata->associationMappings[$assoc['mappedBy']]['inversedBy'] != $fieldName) {
129
-                    $ce[] = "The mappings " . $class->name . "#" . $fieldName . " and " .
130
-                            $assoc['targetEntity'] . "#" . $assoc['mappedBy'] . " are ".
129
+                    $ce[] = "The mappings ".$class->name."#".$fieldName." and ".
130
+                            $assoc['targetEntity']."#".$assoc['mappedBy']." are ".
131 131
                             "inconsistent with each other.";
132 132
                 }
133 133
             }
134 134
 
135 135
             if ($assoc['inversedBy']) {
136 136
                 if ($targetMetadata->hasField($assoc['inversedBy'])) {
137
-                    $ce[] = "The association " . $class->name . "#" . $fieldName . " refers to the inverse side ".
138
-                            "field " . $assoc['targetEntity'] . "#" . $assoc['inversedBy'] . " which is not defined as association.";
137
+                    $ce[] = "The association ".$class->name."#".$fieldName." refers to the inverse side ".
138
+                            "field ".$assoc['targetEntity']."#".$assoc['inversedBy']." which is not defined as association.";
139 139
                 }
140 140
 
141
-                if (!$targetMetadata->hasAssociation($assoc['inversedBy'])) {
142
-                    $ce[] = "The association " . $class->name . "#" . $fieldName . " refers to the inverse side ".
143
-                            "field " . $assoc['targetEntity'] . "#" . $assoc['inversedBy'] . " which does not exist.";
141
+                if ( ! $targetMetadata->hasAssociation($assoc['inversedBy'])) {
142
+                    $ce[] = "The association ".$class->name."#".$fieldName." refers to the inverse side ".
143
+                            "field ".$assoc['targetEntity']."#".$assoc['inversedBy']." which does not exist.";
144 144
                 } elseif ($targetMetadata->associationMappings[$assoc['inversedBy']]['mappedBy'] == null) {
145
-                    $ce[] = "The field " . $class->name . "#" . $fieldName . " is on the owning side of a ".
145
+                    $ce[] = "The field ".$class->name."#".$fieldName." is on the owning side of a ".
146 146
                             "bi-directional relationship, but the specified mappedBy association on the target-entity ".
147
-                            $assoc['targetEntity'] . "#" . $assoc['mappedBy'] . " does not contain the required ".
147
+                            $assoc['targetEntity']."#".$assoc['mappedBy']." does not contain the required ".
148 148
                             "'inversedBy' attribute.";
149 149
                 } elseif ($targetMetadata->associationMappings[$assoc['inversedBy']]['mappedBy'] != $fieldName) {
150
-                    $ce[] = "The mappings " . $class->name . "#" . $fieldName . " and " .
151
-                            $assoc['targetEntity'] . "#" . $assoc['inversedBy'] . " are ".
150
+                    $ce[] = "The mappings ".$class->name."#".$fieldName." and ".
151
+                            $assoc['targetEntity']."#".$assoc['inversedBy']." are ".
152 152
                             "inconsistent with each other.";
153 153
                 }
154 154
 
@@ -156,14 +156,14 @@  discard block
 block discarded – undo
156 156
                 if (array_key_exists($assoc['inversedBy'], $targetMetadata->associationMappings)) {
157 157
                     $targetAssoc = $targetMetadata->associationMappings[$assoc['inversedBy']];
158 158
                     if ($assoc['type'] == ClassMetadataInfo::ONE_TO_ONE && $targetAssoc['type'] !== ClassMetadataInfo::ONE_TO_ONE) {
159
-                        $ce[] = "If association " . $class->name . "#" . $fieldName . " is one-to-one, then the inversed " .
160
-                                "side " . $targetMetadata->name . "#" . $assoc['inversedBy'] . " has to be one-to-one as well.";
159
+                        $ce[] = "If association ".$class->name."#".$fieldName." is one-to-one, then the inversed ".
160
+                                "side ".$targetMetadata->name."#".$assoc['inversedBy']." has to be one-to-one as well.";
161 161
                     } elseif ($assoc['type'] == ClassMetadataInfo::MANY_TO_ONE && $targetAssoc['type'] !== ClassMetadataInfo::ONE_TO_MANY) {
162
-                        $ce[] = "If association " . $class->name . "#" . $fieldName . " is many-to-one, then the inversed " .
163
-                                "side " . $targetMetadata->name . "#" . $assoc['inversedBy'] . " has to be one-to-many.";
162
+                        $ce[] = "If association ".$class->name."#".$fieldName." is many-to-one, then the inversed ".
163
+                                "side ".$targetMetadata->name."#".$assoc['inversedBy']." has to be one-to-many.";
164 164
                     } elseif ($assoc['type'] == ClassMetadataInfo::MANY_TO_MANY && $targetAssoc['type'] !== ClassMetadataInfo::MANY_TO_MANY) {
165
-                        $ce[] = "If association " . $class->name . "#" . $fieldName . " is many-to-many, then the inversed " .
166
-                                "side " . $targetMetadata->name . "#" . $assoc['inversedBy'] . " has to be many-to-many as well.";
165
+                        $ce[] = "If association ".$class->name."#".$fieldName." is many-to-many, then the inversed ".
166
+                                "side ".$targetMetadata->name."#".$assoc['inversedBy']." has to be many-to-many as well.";
167 167
                     }
168 168
                 }
169 169
             }
@@ -172,8 +172,8 @@  discard block
 block discarded – undo
172 172
                 if ($assoc['type'] == ClassMetadataInfo::MANY_TO_MANY) {
173 173
                     $identifierColumns = $class->getIdentifierColumnNames();
174 174
                     foreach ($assoc['joinTable']['joinColumns'] as $joinColumn) {
175
-                        if (!in_array($joinColumn['referencedColumnName'], $identifierColumns)) {
176
-                            $ce[] = "The referenced column name '" . $joinColumn['referencedColumnName'] . "' " .
175
+                        if ( ! in_array($joinColumn['referencedColumnName'], $identifierColumns)) {
176
+                            $ce[] = "The referenced column name '".$joinColumn['referencedColumnName']."' ".
177 177
                                 "has to be a primary key column on the target entity class '".$class->name."'.";
178 178
                             break;
179 179
                         }
@@ -181,32 +181,32 @@  discard block
 block discarded – undo
181 181
 
182 182
                     $identifierColumns = $targetMetadata->getIdentifierColumnNames();
183 183
                     foreach ($assoc['joinTable']['inverseJoinColumns'] as $inverseJoinColumn) {
184
-                        if (! in_array($inverseJoinColumn['referencedColumnName'], $identifierColumns)) {
185
-                            $ce[] = "The referenced column name '" . $inverseJoinColumn['referencedColumnName'] . "' " .
186
-                                "has to be a primary key column on the target entity class '" .$targetMetadata->name . "'.";
184
+                        if ( ! in_array($inverseJoinColumn['referencedColumnName'], $identifierColumns)) {
185
+                            $ce[] = "The referenced column name '".$inverseJoinColumn['referencedColumnName']."' ".
186
+                                "has to be a primary key column on the target entity class '".$targetMetadata->name."'.";
187 187
                             break;
188 188
                         }
189 189
                     }
190 190
 
191 191
                     if (count($targetMetadata->getIdentifierColumnNames()) != count($assoc['joinTable']['inverseJoinColumns'])) {
192
-                        $ce[] = "The inverse join columns of the many-to-many table '" . $assoc['joinTable']['name'] . "' " .
193
-                                "have to contain to ALL identifier columns of the target entity '". $targetMetadata->name . "', " .
194
-                                "however '" . implode(", ", array_diff($targetMetadata->getIdentifierColumnNames(), array_values($assoc['relationToTargetKeyColumns']))) .
192
+                        $ce[] = "The inverse join columns of the many-to-many table '".$assoc['joinTable']['name']."' ".
193
+                                "have to contain to ALL identifier columns of the target entity '".$targetMetadata->name."', ".
194
+                                "however '".implode(", ", array_diff($targetMetadata->getIdentifierColumnNames(), array_values($assoc['relationToTargetKeyColumns']))).
195 195
                                 "' are missing.";
196 196
                     }
197 197
 
198 198
                     if (count($class->getIdentifierColumnNames()) != count($assoc['joinTable']['joinColumns'])) {
199
-                        $ce[] = "The join columns of the many-to-many table '" . $assoc['joinTable']['name'] . "' " .
200
-                                "have to contain to ALL identifier columns of the source entity '". $class->name . "', " .
201
-                                "however '" . implode(", ", array_diff($class->getIdentifierColumnNames(), array_values($assoc['relationToSourceKeyColumns']))) .
199
+                        $ce[] = "The join columns of the many-to-many table '".$assoc['joinTable']['name']."' ".
200
+                                "have to contain to ALL identifier columns of the source entity '".$class->name."', ".
201
+                                "however '".implode(", ", array_diff($class->getIdentifierColumnNames(), array_values($assoc['relationToSourceKeyColumns']))).
202 202
                                 "' are missing.";
203 203
                     }
204 204
 
205 205
                 } elseif ($assoc['type'] & ClassMetadataInfo::TO_ONE) {
206 206
                     $identifierColumns = $targetMetadata->getIdentifierColumnNames();
207 207
                     foreach ($assoc['joinColumns'] as $joinColumn) {
208
-                        if (!in_array($joinColumn['referencedColumnName'], $identifierColumns)) {
209
-                            $ce[] = "The referenced column name '" . $joinColumn['referencedColumnName'] . "' " .
208
+                        if ( ! in_array($joinColumn['referencedColumnName'], $identifierColumns)) {
209
+                            $ce[] = "The referenced column name '".$joinColumn['referencedColumnName']."' ".
210 210
                                     "has to be a primary key column on the target entity class '".$targetMetadata->name."'.";
211 211
                         }
212 212
                     }
@@ -218,9 +218,9 @@  discard block
 block discarded – undo
218 218
                             $ids[] = $joinColumn['name'];
219 219
                         }
220 220
 
221
-                        $ce[] = "The join columns of the association '" . $assoc['fieldName'] . "' " .
222
-                                "have to match to ALL identifier columns of the target entity '". $targetMetadata->name . "', " .
223
-                                "however '" . implode(", ", array_diff($targetMetadata->getIdentifierColumnNames(), $ids)) .
221
+                        $ce[] = "The join columns of the association '".$assoc['fieldName']."' ".
222
+                                "have to match to ALL identifier columns of the target entity '".$targetMetadata->name."', ".
223
+                                "however '".implode(", ", array_diff($targetMetadata->getIdentifierColumnNames(), $ids)).
224 224
                                 "' are missing.";
225 225
                     }
226 226
                 }
@@ -228,19 +228,19 @@  discard block
 block discarded – undo
228 228
 
229 229
             if (isset($assoc['orderBy']) && $assoc['orderBy'] !== null) {
230 230
                 foreach ($assoc['orderBy'] as $orderField => $orientation) {
231
-                    if (!$targetMetadata->hasField($orderField) && !$targetMetadata->hasAssociation($orderField)) {
232
-                        $ce[] = "The association " . $class->name."#".$fieldName." is ordered by a foreign field " .
233
-                                $orderField . " that is not a field on the target entity " . $targetMetadata->name . ".";
231
+                    if ( ! $targetMetadata->hasField($orderField) && ! $targetMetadata->hasAssociation($orderField)) {
232
+                        $ce[] = "The association ".$class->name."#".$fieldName." is ordered by a foreign field ".
233
+                                $orderField." that is not a field on the target entity ".$targetMetadata->name.".";
234 234
                         continue;
235 235
                     }
236 236
                     if ($targetMetadata->isCollectionValuedAssociation($orderField)) {
237
-                        $ce[] = "The association " . $class->name."#".$fieldName." is ordered by a field " .
238
-                                $orderField . " on " . $targetMetadata->name . " that is a collection-valued association.";
237
+                        $ce[] = "The association ".$class->name."#".$fieldName." is ordered by a field ".
238
+                                $orderField." on ".$targetMetadata->name." that is a collection-valued association.";
239 239
                         continue;
240 240
                     }
241 241
                     if ($targetMetadata->isAssociationInverseSide($orderField)) {
242
-                        $ce[] = "The association " . $class->name."#".$fieldName." is ordered by a field " .
243
-                                $orderField . " on " . $targetMetadata->name . " that is the inverse side of an association.";
242
+                        $ce[] = "The association ".$class->name."#".$fieldName." is ordered by a field ".
243
+                                $orderField." on ".$targetMetadata->name." that is the inverse side of an association.";
244 244
                         continue;
245 245
                     }
246 246
                 }
@@ -248,9 +248,9 @@  discard block
 block discarded – undo
248 248
         }
249 249
 
250 250
         foreach ($class->subClasses as $subClass) {
251
-            if (!in_array($class->name, class_parents($subClass))) {
252
-                $ce[] = "According to the discriminator map class '" . $subClass . "' has to be a child ".
253
-                        "of '" . $class->name . "' but these entities are not related through inheritance.";
251
+            if ( ! in_array($class->name, class_parents($subClass))) {
252
+                $ce[] = "According to the discriminator map class '".$subClass."' has to be a child ".
253
+                        "of '".$class->name."' but these entities are not related through inheritance.";
254 254
             }
255 255
         }
256 256
 
Please login to merge, or discard this patch.
tests/Doctrine/Tests/ORM/Functional/Ticket/GH6937Test.php 1 patch
Indentation   +10 added lines, -10 removed lines patch added patch discarded remove patch
@@ -50,11 +50,11 @@  discard block
 block discarded – undo
50 50
         $this->_em->clear();
51 51
 
52 52
         $persistedManager = $this->_em->getRepository(GH6937Person::class)
53
-                                      ->createQueryBuilder('e')
54
-                                      ->where('e.id = :id')
55
-                                      ->setParameter('id', $manager->id)
56
-                                      ->getQuery()
57
-                                      ->getOneOrNullResult(AbstractQuery::HYDRATE_SIMPLEOBJECT);
53
+                                        ->createQueryBuilder('e')
54
+                                        ->where('e.id = :id')
55
+                                        ->setParameter('id', $manager->id)
56
+                                        ->getQuery()
57
+                                        ->getOneOrNullResult(AbstractQuery::HYDRATE_SIMPLEOBJECT);
58 58
 
59 59
         self::assertSame('Kevin', $persistedManager->name);
60 60
         self::assertSame('555-5555', $persistedManager->phoneNumber);
@@ -73,11 +73,11 @@  discard block
 block discarded – undo
73 73
         $this->_em->clear();
74 74
 
75 75
         $persistedManager = $this->_em->getRepository(GH6937Person::class)
76
-                                      ->createQueryBuilder('e')
77
-                                      ->where('e.id = :id')
78
-                                      ->setParameter('id', $manager->id)
79
-                                      ->getQuery()
80
-                                      ->getOneOrNullResult();
76
+                                        ->createQueryBuilder('e')
77
+                                        ->where('e.id = :id')
78
+                                        ->setParameter('id', $manager->id)
79
+                                        ->getQuery()
80
+                                        ->getOneOrNullResult();
81 81
 
82 82
         self::assertSame('Kevin', $persistedManager->name);
83 83
         self::assertSame('555-5555', $persistedManager->phoneNumber);
Please login to merge, or discard this patch.
Doctrine/Tests/ORM/Functional/OneToOneInverseSideLoadAfterDqlQueryTest.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -20,7 +20,7 @@
 block discarded – undo
20 20
                 $this->_em->getClassMetadata(OwningSide::class),
21 21
                 $this->_em->getClassMetadata(InverseSide::class),
22 22
             ]);
23
-        } catch(ToolsException $e) {
23
+        } catch (ToolsException $e) {
24 24
             // ignored
25 25
         }
26 26
     }
Please login to merge, or discard this patch.
tests/Doctrine/Tests/ORM/Functional/Ticket/GH7286Test.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -36,7 +36,7 @@  discard block
 block discarded – undo
36 36
     {
37 37
         $query = $this->_em->createQuery(
38 38
             'SELECT CONCAT(e.type, MIN(e.version)) pair'
39
-            . ' FROM ' . GH7286Entity::class . ' e'
39
+            . ' FROM '.GH7286Entity::class.' e'
40 40
             . ' WHERE e.type IS NOT NULL'
41 41
             . ' GROUP BY e.type'
42 42
             . ' ORDER BY e.type'
@@ -60,7 +60,7 @@  discard block
 block discarded – undo
60 60
 
61 61
         $query = $this->_em->createQuery(
62 62
             'SELECT CC(e.type, MIN(e.version)) pair'
63
-            . ' FROM ' . GH7286Entity::class . ' e'
63
+            . ' FROM '.GH7286Entity::class.' e'
64 64
             . ' WHERE e.type IS NOT NULL AND e.type != :type'
65 65
             . ' GROUP BY e.type'
66 66
         );
Please login to merge, or discard this patch.