Completed
Pull Request — master (#7413)
by Michael
14:14
created
lib/Doctrine/ORM/Internal/Hydration/ArrayHydrator.php 1 patch
Spacing   +18 added lines, -18 removed lines patch added patch discarded remove patch
@@ -85,10 +85,10 @@  discard block
 block discarded – undo
85 85
                 // It's a joined result
86 86
 
87 87
                 $parent = $this->rsm->parentAliasMap[$dqlAlias];
88
-                $path   = $parent . '.' . $dqlAlias;
88
+                $path   = $parent.'.'.$dqlAlias;
89 89
 
90 90
                 // missing parent data, skipping as RIGHT JOIN hydration is not supported.
91
-                if (! isset($nonemptyComponents[$parent])) {
91
+                if ( ! isset($nonemptyComponents[$parent])) {
92 92
                     continue;
93 93
                 }
94 94
 
@@ -97,9 +97,9 @@  discard block
 block discarded – undo
97 97
                 if ($this->rsm->isMixed && isset($this->rootAliases[$parent])) {
98 98
                     $first = reset($this->resultPointers);
99 99
                     // TODO: Exception if $key === null ?
100
-                    $baseElement =& $this->resultPointers[$parent][key($first)];
100
+                    $baseElement = & $this->resultPointers[$parent][key($first)];
101 101
                 } elseif (isset($this->resultPointers[$parent])) {
102
-                    $baseElement =& $this->resultPointers[$parent];
102
+                    $baseElement = & $this->resultPointers[$parent];
103 103
                 } else {
104 104
                     unset($this->resultPointers[$dqlAlias]); // Ticket #1228
105 105
 
@@ -111,10 +111,10 @@  discard block
 block discarded – undo
111 111
                 $relation      = $parentClass->getProperty($relationAlias);
112 112
 
113 113
                 // Check the type of the relation (many or single-valued)
114
-                if (! $relation instanceof ToOneAssociationMetadata) {
114
+                if ( ! $relation instanceof ToOneAssociationMetadata) {
115 115
                     $oneToOne = false;
116 116
 
117
-                    if (! isset($baseElement[$relationAlias])) {
117
+                    if ( ! isset($baseElement[$relationAlias])) {
118 118
                         $baseElement[$relationAlias] = [];
119 119
                     }
120 120
 
@@ -123,7 +123,7 @@  discard block
 block discarded – undo
123 123
                         $index        = $indexExists ? $this->identifierMap[$path][$id[$parent]][$id[$dqlAlias]] : false;
124 124
                         $indexIsValid = $index !== false ? isset($baseElement[$relationAlias][$index]) : false;
125 125
 
126
-                        if (! $indexExists || ! $indexIsValid) {
126
+                        if ( ! $indexExists || ! $indexIsValid) {
127 127
                             $element = $data;
128 128
 
129 129
                             if (isset($this->rsm->indexByMap[$dqlAlias])) {
@@ -140,16 +140,16 @@  discard block
 block discarded – undo
140 140
                 } else {
141 141
                     $oneToOne = true;
142 142
 
143
-                    if (! isset($nonemptyComponents[$dqlAlias]) &&
143
+                    if ( ! isset($nonemptyComponents[$dqlAlias]) &&
144 144
                         ! isset($baseElement[$relationAlias])
145 145
                     ) {
146 146
                         $baseElement[$relationAlias] = null;
147
-                    } elseif (! isset($baseElement[$relationAlias])) {
147
+                    } elseif ( ! isset($baseElement[$relationAlias])) {
148 148
                         $baseElement[$relationAlias] = $data;
149 149
                     }
150 150
                 }
151 151
 
152
-                $coll =& $baseElement[$relationAlias];
152
+                $coll = & $baseElement[$relationAlias];
153 153
 
154 154
                 if (is_array($coll)) {
155 155
                     $this->updateResultPointer($coll, $index, $dqlAlias, $oneToOne);
@@ -161,7 +161,7 @@  discard block
 block discarded – undo
161 161
                 $entityKey                    = $this->rsm->entityMappings[$dqlAlias] ?: 0;
162 162
 
163 163
                 // if this row has a NULL value for the root result id then make it a null result.
164
-                if (! isset($nonemptyComponents[$dqlAlias])) {
164
+                if ( ! isset($nonemptyComponents[$dqlAlias])) {
165 165
                     $result[] = $this->rsm->isMixed
166 166
                         ? [$entityKey => null]
167 167
                         : null;
@@ -198,13 +198,13 @@  discard block
 block discarded – undo
198 198
             }
199 199
         }
200 200
 
201
-        if (! isset($resultKey)) {
201
+        if ( ! isset($resultKey)) {
202 202
             $this->resultCounter++;
203 203
         }
204 204
 
205 205
         // Append scalar values to mixed result sets
206 206
         if (isset($rowData['scalars'])) {
207
-            if (! isset($resultKey)) {
207
+            if ( ! isset($resultKey)) {
208 208
                 // this only ever happens when no object is fetched (scalar result only)
209 209
                 $resultKey = isset($this->rsm->indexByMap['scalars'])
210 210
                     ? $row[$this->rsm->indexByMap['scalars']]
@@ -218,7 +218,7 @@  discard block
 block discarded – undo
218 218
 
219 219
         // Append new object to mixed result sets
220 220
         if (isset($rowData['newObjects'])) {
221
-            if (! isset($resultKey)) {
221
+            if ( ! isset($resultKey)) {
222 222
                 $resultKey = $this->resultCounter - 1;
223 223
             }
224 224
 
@@ -260,22 +260,22 @@  discard block
 block discarded – undo
260 260
         }
261 261
 
262 262
         if ($oneToOne) {
263
-            $this->resultPointers[$dqlAlias] =& $coll;
263
+            $this->resultPointers[$dqlAlias] = & $coll;
264 264
 
265 265
             return;
266 266
         }
267 267
 
268 268
         if ($index !== false) {
269
-            $this->resultPointers[$dqlAlias] =& $coll[$index];
269
+            $this->resultPointers[$dqlAlias] = & $coll[$index];
270 270
 
271 271
             return;
272 272
         }
273 273
 
274
-        if (! $coll) {
274
+        if ( ! $coll) {
275 275
             return;
276 276
         }
277 277
 
278 278
         end($coll);
279
-        $this->resultPointers[$dqlAlias] =& $coll[key($coll)];
279
+        $this->resultPointers[$dqlAlias] = & $coll[key($coll)];
280 280
     }
281 281
 }
Please login to merge, or discard this patch.
lib/Doctrine/ORM/Internal/Hydration/ObjectHydrator.php 1 patch
Spacing   +24 added lines, -24 removed lines patch added patch discarded remove patch
@@ -53,7 +53,7 @@  discard block
 block discarded – undo
53 53
      */
54 54
     protected function prepare()
55 55
     {
56
-        if (! isset($this->hints[UnitOfWork::HINT_DEFEREAGERLOAD])) {
56
+        if ( ! isset($this->hints[UnitOfWork::HINT_DEFEREAGERLOAD])) {
57 57
             $this->hints[UnitOfWork::HINT_DEFEREAGERLOAD] = true;
58 58
         }
59 59
 
@@ -63,13 +63,13 @@  discard block
 block discarded – undo
63 63
 
64 64
             // Remember which associations are "fetch joined", so that we know where to inject
65 65
             // collection stubs or proxies and where not.
66
-            if (! isset($this->rsm->relationMap[$dqlAlias])) {
66
+            if ( ! isset($this->rsm->relationMap[$dqlAlias])) {
67 67
                 continue;
68 68
             }
69 69
 
70 70
             $parent = $this->rsm->parentAliasMap[$dqlAlias];
71 71
 
72
-            if (! isset($this->rsm->aliasMap[$parent])) {
72
+            if ( ! isset($this->rsm->aliasMap[$parent])) {
73 73
                 throw HydrationException::parentObjectOfRelationNotFound($dqlAlias, $parent);
74 74
             }
75 75
 
@@ -95,7 +95,7 @@  discard block
 block discarded – undo
95 95
                 $class        = $this->getClassMetadata($className);
96 96
                 $inverseAssoc = $class->getProperty($association->getInversedBy());
97 97
 
98
-                if (! ($inverseAssoc instanceof ToOneAssociationMetadata)) {
98
+                if ( ! ($inverseAssoc instanceof ToOneAssociationMetadata)) {
99 99
                     continue;
100 100
                 }
101 101
 
@@ -161,14 +161,14 @@  discard block
 block discarded – undo
161 161
         $value       = $association->getValue($entity);
162 162
         $oid         = spl_object_id($entity);
163 163
 
164
-        if (! $value instanceof PersistentCollection) {
164
+        if ( ! $value instanceof PersistentCollection) {
165 165
             $value = $association->wrap($entity, $value, $this->em);
166 166
 
167 167
             $association->setValue($entity, $value);
168 168
 
169 169
             $this->uow->setOriginalEntityProperty($oid, $fieldName, $value);
170 170
 
171
-            $this->initializedCollections[$oid . $fieldName] = $value;
171
+            $this->initializedCollections[$oid.$fieldName] = $value;
172 172
         } elseif (isset($this->hints[Query::HINT_REFRESH]) ||
173 173
             (isset($this->hints['fetched'][$parentDqlAlias][$fieldName]) && ! $value->isInitialized())
174 174
         ) {
@@ -177,10 +177,10 @@  discard block
 block discarded – undo
177 177
             $value->setInitialized(true);
178 178
             $value->unwrap()->clear();
179 179
 
180
-            $this->initializedCollections[$oid . $fieldName] = $value;
180
+            $this->initializedCollections[$oid.$fieldName] = $value;
181 181
         } else {
182 182
             // Is already PersistentCollection, and DON'T REFRESH or FETCH-JOIN!
183
-            $this->existingCollections[$oid . $fieldName] = $value;
183
+            $this->existingCollections[$oid.$fieldName] = $value;
184 184
         }
185 185
 
186 186
         return $value;
@@ -203,13 +203,13 @@  discard block
 block discarded – undo
203 203
         if (isset($this->rsm->discriminatorColumns[$dqlAlias])) {
204 204
             $fieldName = $this->rsm->discriminatorColumns[$dqlAlias];
205 205
 
206
-            if (! isset($this->rsm->metaMappings[$fieldName])) {
206
+            if ( ! isset($this->rsm->metaMappings[$fieldName])) {
207 207
                 throw HydrationException::missingDiscriminatorMetaMappingColumn($className, $fieldName, $dqlAlias);
208 208
             }
209 209
 
210 210
             $discrColumn = $this->rsm->metaMappings[$fieldName];
211 211
 
212
-            if (! isset($data[$discrColumn])) {
212
+            if ( ! isset($data[$discrColumn])) {
213 213
                 throw HydrationException::missingDiscriminatorColumn($className, $discrColumn, $dqlAlias);
214 214
             }
215 215
 
@@ -220,7 +220,7 @@  discard block
 block discarded – undo
220 220
             $discrMap           = $this->metadataCache[$className]->discriminatorMap;
221 221
             $discriminatorValue = (string) $data[$discrColumn];
222 222
 
223
-            if (! isset($discrMap[$discriminatorValue])) {
223
+            if ( ! isset($discrMap[$discriminatorValue])) {
224 224
                 throw HydrationException::invalidDiscriminatorValue($discriminatorValue, array_keys($discrMap));
225 225
             }
226 226
 
@@ -296,10 +296,10 @@  discard block
 block discarded – undo
296 296
                 $parentAlias = $this->rsm->parentAliasMap[$dqlAlias];
297 297
                 // we need the $path to save into the identifier map which entities were already
298 298
                 // seen for this parent-child relationship
299
-                $path = $parentAlias . '.' . $dqlAlias;
299
+                $path = $parentAlias.'.'.$dqlAlias;
300 300
 
301 301
                 // We have a RIGHT JOIN result here. Doctrine cannot hydrate RIGHT JOIN Object-Graphs
302
-                if (! isset($nonemptyComponents[$parentAlias])) {
302
+                if ( ! isset($nonemptyComponents[$parentAlias])) {
303 303
                     // TODO: Add special case code where we hydrate the right join objects into identity map at least
304 304
                     continue;
305 305
                 }
@@ -330,15 +330,15 @@  discard block
 block discarded – undo
330 330
                 $oid = spl_object_id($parentObject);
331 331
 
332 332
                 // Check the type of the relation (many or single-valued)
333
-                if (! ($association instanceof ToOneAssociationMetadata)) {
333
+                if ( ! ($association instanceof ToOneAssociationMetadata)) {
334 334
                     // PATH A: Collection-valued association
335 335
                     $reflFieldValue = $association->getValue($parentObject);
336 336
 
337 337
                     if (isset($nonemptyComponents[$dqlAlias])) {
338
-                        $collKey = $oid . $relationField;
338
+                        $collKey = $oid.$relationField;
339 339
                         if (isset($this->initializedCollections[$collKey])) {
340 340
                             $reflFieldValue = $this->initializedCollections[$collKey];
341
-                        } elseif (! isset($this->existingCollections[$collKey])) {
341
+                        } elseif ( ! isset($this->existingCollections[$collKey])) {
342 342
                             $reflFieldValue = $this->initRelatedCollection($parentObject, $parentClass, $relationField, $parentAlias);
343 343
                         }
344 344
 
@@ -346,7 +346,7 @@  discard block
 block discarded – undo
346 346
                         $index        = $indexExists ? $this->identifierMap[$path][$id[$parentAlias]][$id[$dqlAlias]] : false;
347 347
                         $indexIsValid = $index !== false ? isset($reflFieldValue[$index]) : false;
348 348
 
349
-                        if (! $indexExists || ! $indexIsValid) {
349
+                        if ( ! $indexExists || ! $indexIsValid) {
350 350
                             if (isset($this->existingCollections[$collKey])) {
351 351
                                 $element = $this->getEntityFromIdentityMap($entityName, $data);
352 352
 
@@ -375,7 +375,7 @@  discard block
 block discarded – undo
375 375
                             // Update result pointer
376 376
                             $this->resultPointers[$dqlAlias] = $reflFieldValue[$index];
377 377
                         }
378
-                    } elseif (! $reflFieldValue) {
378
+                    } elseif ( ! $reflFieldValue) {
379 379
                         $reflFieldValue = $this->initRelatedCollection($parentObject, $parentClass, $relationField, $parentAlias);
380 380
                     } elseif ($reflFieldValue instanceof PersistentCollection && $reflFieldValue->isInitialized() === false) {
381 381
                         $reflFieldValue->setInitialized(true);
@@ -384,7 +384,7 @@  discard block
 block discarded – undo
384 384
                     // PATH B: Single-valued association
385 385
                     $reflFieldValue = $association->getValue($parentObject);
386 386
 
387
-                    if (! $reflFieldValue || isset($this->hints[Query::HINT_REFRESH]) ||
387
+                    if ( ! $reflFieldValue || isset($this->hints[Query::HINT_REFRESH]) ||
388 388
                         ($reflFieldValue instanceof GhostObjectInterface && ! $reflFieldValue->isProxyInitialized())) {
389 389
                         // we only need to take action if this value is null,
390 390
                         // we refresh the entity or its an uninitialized proxy.
@@ -445,7 +445,7 @@  discard block
 block discarded – undo
445 445
                 $entityKey                    = $this->rsm->entityMappings[$dqlAlias] ?: 0;
446 446
 
447 447
                 // if this row has a NULL value for the root result id then make it a null result.
448
-                if (! isset($nonemptyComponents[$dqlAlias])) {
448
+                if ( ! isset($nonemptyComponents[$dqlAlias])) {
449 449
                     if ($this->rsm->isMixed) {
450 450
                         $result[] = [$entityKey => null];
451 451
                     } else {
@@ -457,7 +457,7 @@  discard block
 block discarded – undo
457 457
                 }
458 458
 
459 459
                 // check for existing result from the iterations before
460
-                if (! isset($this->identifierMap[$dqlAlias][$id[$dqlAlias]])) {
460
+                if ( ! isset($this->identifierMap[$dqlAlias][$id[$dqlAlias]])) {
461 461
                     $element = $this->getEntity($data, $dqlAlias);
462 462
 
463 463
                     if ($this->rsm->isMixed) {
@@ -500,13 +500,13 @@  discard block
 block discarded – undo
500 500
             }
501 501
         }
502 502
 
503
-        if (! isset($resultKey)) {
503
+        if ( ! isset($resultKey)) {
504 504
             $this->resultCounter++;
505 505
         }
506 506
 
507 507
         // Append scalar values to mixed result sets
508 508
         if (isset($rowData['scalars'])) {
509
-            if (! isset($resultKey)) {
509
+            if ( ! isset($resultKey)) {
510 510
                 $resultKey = isset($this->rsm->indexByMap['scalars'])
511 511
                     ? $row[$this->rsm->indexByMap['scalars']]
512 512
                     : $this->resultCounter - 1;
@@ -519,7 +519,7 @@  discard block
 block discarded – undo
519 519
 
520 520
         // Append new object to mixed result sets
521 521
         if (isset($rowData['newObjects'])) {
522
-            if (! isset($resultKey)) {
522
+            if ( ! isset($resultKey)) {
523 523
                 $resultKey = $this->resultCounter - 1;
524 524
             }
525 525
 
Please login to merge, or discard this patch.
lib/Doctrine/ORM/Proxy/Factory/StaticProxyFactory.php 1 patch
Spacing   +8 added lines, -8 removed lines patch added patch discarded remove patch
@@ -56,7 +56,7 @@  discard block
 block discarded – undo
56 56
      */
57 57
     public function generateProxyClasses(array $classes) : int
58 58
     {
59
-        $concreteClasses = array_filter($classes, static function (ClassMetadata $metadata) : bool {
59
+        $concreteClasses = array_filter($classes, static function(ClassMetadata $metadata) : bool {
60 60
             return ! ($metadata->isMappedSuperclass || $metadata->getReflectionClass()->isAbstract());
61 61
         });
62 62
 
@@ -65,7 +65,7 @@  discard block
 block discarded – undo
65 65
                 ->proxyFactory
66 66
                 ->createProxy(
67 67
                     $metadata->getClassName(),
68
-                    static function () {
68
+                    static function() {
69 69
                         // empty closure, serves its purpose, for now
70 70
                     },
71 71
                     $this->skippedFieldsFqns($metadata)
@@ -89,7 +89,7 @@  discard block
 block discarded – undo
89 89
                 ->getUnitOfWork()
90 90
                 ->getEntityPersister($metadata->getClassName());
91 91
 
92
-        $proxyInstance                                            = $this
92
+        $proxyInstance = $this
93 93
             ->proxyFactory
94 94
             ->createProxy(
95 95
                 $metadata->getClassName(),
@@ -108,7 +108,7 @@  discard block
 block discarded – undo
108 108
 
109 109
     private function makeInitializer(ClassMetadata $metadata, EntityPersister $persister) : Closure
110 110
     {
111
-        return static function (
111
+        return static function(
112 112
             GhostObjectInterface $ghostObject,
113 113
             string $method,
114 114
             // we don't care
@@ -126,7 +126,7 @@  discard block
 block discarded – undo
126 126
             $identifier = $persister->getIdentifier($ghostObject);
127 127
 
128 128
             // @TODO how do we use `$properties` in the persister? That would be a massive optimisation
129
-            if (! $persister->loadById($identifier, $ghostObject)) {
129
+            if ( ! $persister->loadById($identifier, $ghostObject)) {
130 130
                 $initializer = $originalInitializer;
131 131
 
132 132
                 throw EntityNotFoundException::fromClassNameAndIdentifier(
@@ -158,7 +158,7 @@  discard block
 block discarded – undo
158 158
         $transientFieldsFqns = [];
159 159
 
160 160
         foreach ($metadata->getDeclaredPropertiesIterator() as $name => $property) {
161
-            if (! $property instanceof TransientMetadata) {
161
+            if ( ! $property instanceof TransientMetadata) {
162 162
                 continue;
163 163
             }
164 164
 
@@ -196,11 +196,11 @@  discard block
 block discarded – undo
196 196
     private function propertyFqcn(ReflectionProperty $property) : string
197 197
     {
198 198
         if ($property->isPrivate()) {
199
-            return "\0" . $property->getDeclaringClass()->getName() . "\0" . $property->getName();
199
+            return "\0".$property->getDeclaringClass()->getName()."\0".$property->getName();
200 200
         }
201 201
 
202 202
         if ($property->isProtected()) {
203
-            return "\0*\0" . $property->getName();
203
+            return "\0*\0".$property->getName();
204 204
         }
205 205
 
206 206
         return $property->getName();
Please login to merge, or discard this patch.
lib/Doctrine/ORM/AbstractQuery.php 1 patch
Spacing   +10 added lines, -10 removed lines patch added patch discarded remove patch
@@ -300,7 +300,7 @@  discard block
 block discarded – undo
300 300
     public function getParameter($key)
301 301
     {
302 302
         $filteredParameters = $this->parameters->filter(
303
-            static function (Query\Parameter $parameter) use ($key) : bool {
303
+            static function(Query\Parameter $parameter) use ($key) : bool {
304 304
                 $parameterName = $parameter->getName();
305 305
 
306 306
                 return $key === $parameterName || (string) $key === (string) $parameterName;
@@ -716,7 +716,7 @@  discard block
 block discarded – undo
716 716
             return null;
717 717
         }
718 718
 
719
-        if (! is_array($result)) {
719
+        if ( ! is_array($result)) {
720 720
             return $result;
721 721
         }
722 722
 
@@ -750,7 +750,7 @@  discard block
 block discarded – undo
750 750
             throw new NoResultException();
751 751
         }
752 752
 
753
-        if (! is_array($result)) {
753
+        if ( ! is_array($result)) {
754 754
             return $result;
755 755
         }
756 756
 
@@ -840,7 +840,7 @@  discard block
 block discarded – undo
840 840
             $this->setHydrationMode($hydrationMode);
841 841
         }
842 842
 
843
-        if (! empty($parameters)) {
843
+        if ( ! empty($parameters)) {
844 844
             $this->setParameters($parameters);
845 845
         }
846 846
 
@@ -879,11 +879,11 @@  discard block
 block discarded – undo
879 879
             $this->setHydrationMode($hydrationMode);
880 880
         }
881 881
 
882
-        if (! empty($parameters)) {
882
+        if ( ! empty($parameters)) {
883 883
             $this->setParameters($parameters);
884 884
         }
885 885
 
886
-        $setCacheEntry = static function () {
886
+        $setCacheEntry = static function() {
887 887
         };
888 888
 
889 889
         if ($this->hydrationCacheProfile !== null) {
@@ -897,11 +897,11 @@  discard block
 block discarded – undo
897 897
                 return $result[$realCacheKey];
898 898
             }
899 899
 
900
-            if (! $result) {
900
+            if ( ! $result) {
901 901
                 $result = [];
902 902
             }
903 903
 
904
-            $setCacheEntry = static function ($data) use ($cache, $result, $cacheKey, $realCacheKey, $queryCacheProfile) {
904
+            $setCacheEntry = static function($data) use ($cache, $result, $cacheKey, $realCacheKey, $queryCacheProfile) {
905 905
                 $result[$realCacheKey] = $data;
906 906
 
907 907
                 $cache->save($cacheKey, $result, $queryCacheProfile->getLifetime());
@@ -1063,7 +1063,7 @@  discard block
 block discarded – undo
1063 1063
     {
1064 1064
         $query  = $this->getSQL();
1065 1065
         $hints  = $this->getHints();
1066
-        $params = array_map(function (Parameter $parameter) {
1066
+        $params = array_map(function(Parameter $parameter) {
1067 1067
             $value = $parameter->getValue();
1068 1068
 
1069 1069
             // Small optimization
@@ -1077,6 +1077,6 @@  discard block
 block discarded – undo
1077 1077
 
1078 1078
         ksort($hints);
1079 1079
 
1080
-        return sha1($query . '-' . serialize($params) . '-' . serialize($hints));
1080
+        return sha1($query.'-'.serialize($params).'-'.serialize($hints));
1081 1081
     }
1082 1082
 }
Please login to merge, or discard this patch.
lib/Doctrine/ORM/QueryBuilder.php 2 patches
Indentation   +15 added lines, -15 removed lines patch added patch discarded remove patch
@@ -1353,9 +1353,9 @@  discard block
 block discarded – undo
1353 1353
     private function getDQLForDelete()
1354 1354
     {
1355 1355
         return 'DELETE'
1356
-              . $this->getReducedDQLQueryPart('from', ['pre' => ' ', 'separator' => ', '])
1357
-              . $this->getReducedDQLQueryPart('where', ['pre' => ' WHERE '])
1358
-              . $this->getReducedDQLQueryPart('orderBy', ['pre' => ' ORDER BY ', 'separator' => ', ']);
1356
+                . $this->getReducedDQLQueryPart('from', ['pre' => ' ', 'separator' => ', '])
1357
+                . $this->getReducedDQLQueryPart('where', ['pre' => ' WHERE '])
1358
+                . $this->getReducedDQLQueryPart('orderBy', ['pre' => ' ORDER BY ', 'separator' => ', ']);
1359 1359
     }
1360 1360
 
1361 1361
     /**
@@ -1364,10 +1364,10 @@  discard block
 block discarded – undo
1364 1364
     private function getDQLForUpdate()
1365 1365
     {
1366 1366
         return 'UPDATE'
1367
-              . $this->getReducedDQLQueryPart('from', ['pre' => ' ', 'separator' => ', '])
1368
-              . $this->getReducedDQLQueryPart('set', ['pre' => ' SET ', 'separator' => ', '])
1369
-              . $this->getReducedDQLQueryPart('where', ['pre' => ' WHERE '])
1370
-              . $this->getReducedDQLQueryPart('orderBy', ['pre' => ' ORDER BY ', 'separator' => ', ']);
1367
+                . $this->getReducedDQLQueryPart('from', ['pre' => ' ', 'separator' => ', '])
1368
+                . $this->getReducedDQLQueryPart('set', ['pre' => ' SET ', 'separator' => ', '])
1369
+                . $this->getReducedDQLQueryPart('where', ['pre' => ' WHERE '])
1370
+                . $this->getReducedDQLQueryPart('orderBy', ['pre' => ' ORDER BY ', 'separator' => ', ']);
1371 1371
     }
1372 1372
 
1373 1373
     /**
@@ -1376,8 +1376,8 @@  discard block
 block discarded – undo
1376 1376
     private function getDQLForSelect()
1377 1377
     {
1378 1378
         $dql = 'SELECT'
1379
-             . ($this->dqlParts['distinct']===true ? ' DISTINCT' : '')
1380
-             . $this->getReducedDQLQueryPart('select', ['pre' => ' ', 'separator' => ', ']);
1379
+                . ($this->dqlParts['distinct']===true ? ' DISTINCT' : '')
1380
+                . $this->getReducedDQLQueryPart('select', ['pre' => ' ', 'separator' => ', ']);
1381 1381
 
1382 1382
         $fromParts   = $this->getDQLPart('from');
1383 1383
         $joinParts   = $this->getDQLPart('join');
@@ -1401,10 +1401,10 @@  discard block
 block discarded – undo
1401 1401
         }
1402 1402
 
1403 1403
         return $dql . implode(', ', $fromClauses)
1404
-              . $this->getReducedDQLQueryPart('where', ['pre' => ' WHERE '])
1405
-              . $this->getReducedDQLQueryPart('groupBy', ['pre' => ' GROUP BY ', 'separator' => ', '])
1406
-              . $this->getReducedDQLQueryPart('having', ['pre' => ' HAVING '])
1407
-              . $this->getReducedDQLQueryPart('orderBy', ['pre' => ' ORDER BY ', 'separator' => ', ']);
1404
+                . $this->getReducedDQLQueryPart('where', ['pre' => ' WHERE '])
1405
+                . $this->getReducedDQLQueryPart('groupBy', ['pre' => ' GROUP BY ', 'separator' => ', '])
1406
+                . $this->getReducedDQLQueryPart('having', ['pre' => ' HAVING '])
1407
+                . $this->getReducedDQLQueryPart('orderBy', ['pre' => ' ORDER BY ', 'separator' => ', ']);
1408 1408
     }
1409 1409
 
1410 1410
     /**
@@ -1422,8 +1422,8 @@  discard block
 block discarded – undo
1422 1422
         }
1423 1423
 
1424 1424
         return ($options['pre'] ?? '')
1425
-             . (is_array($queryPart) ? implode($options['separator'], $queryPart) : $queryPart)
1426
-             . ($options['post'] ?? '');
1425
+                . (is_array($queryPart) ? implode($options['separator'], $queryPart) : $queryPart)
1426
+                . ($options['post'] ?? '');
1427 1427
     }
1428 1428
 
1429 1429
     /**
Please login to merge, or discard this patch.
Spacing   +16 added lines, -16 removed lines patch added patch discarded remove patch
@@ -417,7 +417,7 @@  discard block
 block discarded – undo
417 417
     {
418 418
         $aliases = $this->getRootAliases();
419 419
 
420
-        if (! isset($aliases[0])) {
420
+        if ( ! isset($aliases[0])) {
421 421
             throw new RuntimeException('No alias was set before invoking getRootAlias().');
422 422
         }
423 423
 
@@ -600,7 +600,7 @@  discard block
 block discarded – undo
600 600
     public function getParameter($key)
601 601
     {
602 602
         $filteredParameters = $this->parameters->filter(
603
-            static function (Query\Parameter $parameter) use ($key) : bool {
603
+            static function(Query\Parameter $parameter) use ($key) : bool {
604 604
                 $parameterName = $parameter->getName();
605 605
 
606 606
                 return $key === $parameterName || (string) $key === (string) $parameterName;
@@ -676,7 +676,7 @@  discard block
 block discarded – undo
676 676
     {
677 677
         if ($append && ($dqlPartName === 'where' || $dqlPartName === 'having')) {
678 678
             throw new InvalidArgumentException(
679
-                "Using \$append = true does not have an effect with 'where' or 'having' " .
679
+                "Using \$append = true does not have an effect with 'where' or 'having' ".
680 680
                 'parts. See QueryBuilder#andWhere() for an example for correct usage.'
681 681
             );
682 682
         }
@@ -817,7 +817,7 @@  discard block
 block discarded – undo
817 817
     {
818 818
         $this->type = self::DELETE;
819 819
 
820
-        if (! $delete) {
820
+        if ( ! $delete) {
821 821
             return $this;
822 822
         }
823 823
 
@@ -844,7 +844,7 @@  discard block
 block discarded – undo
844 844
     {
845 845
         $this->type = self::UPDATE;
846 846
 
847
-        if (! $update) {
847
+        if ( ! $update) {
848 848
             return $this;
849 849
         }
850 850
 
@@ -899,7 +899,7 @@  discard block
 block discarded – undo
899 899
     {
900 900
         $rootAliases = $this->getRootAliases();
901 901
 
902
-        if (! in_array($alias, $rootAliases, true)) {
902
+        if ( ! in_array($alias, $rootAliases, true)) {
903 903
             throw new Query\QueryException(
904 904
                 sprintf('Specified root alias %s must be set before invoking indexBy().', $alias)
905 905
             );
@@ -1060,7 +1060,7 @@  discard block
 block discarded – undo
1060 1060
      */
1061 1061
     public function where($predicates)
1062 1062
     {
1063
-        if (! (func_num_args() === 1 && $predicates instanceof Expr\Composite)) {
1063
+        if ( ! (func_num_args() === 1 && $predicates instanceof Expr\Composite)) {
1064 1064
             $predicates = new Expr\Andx(func_get_args());
1065 1065
         }
1066 1066
 
@@ -1179,7 +1179,7 @@  discard block
 block discarded – undo
1179 1179
      */
1180 1180
     public function having($having)
1181 1181
     {
1182
-        if (! (func_num_args() === 1 && ($having instanceof Expr\Andx || $having instanceof Expr\Orx))) {
1182
+        if ( ! (func_num_args() === 1 && ($having instanceof Expr\Andx || $having instanceof Expr\Orx))) {
1183 1183
             $having = new Expr\Andx(func_get_args());
1184 1184
         }
1185 1185
 
@@ -1277,7 +1277,7 @@  discard block
 block discarded – undo
1277 1277
     public function addCriteria(Criteria $criteria)
1278 1278
     {
1279 1279
         $allAliases = $this->getAllAliases();
1280
-        if (! isset($allAliases[0])) {
1280
+        if ( ! isset($allAliases[0])) {
1281 1281
             throw new Query\QueryException('No aliases are set before invoking addCriteria().');
1282 1282
         }
1283 1283
 
@@ -1295,14 +1295,14 @@  discard block
 block discarded – undo
1295 1295
             foreach ($criteria->getOrderings() as $sort => $order) {
1296 1296
                 $hasValidAlias = false;
1297 1297
                 foreach ($allAliases as $alias) {
1298
-                    if (strpos($sort . '.', $alias . '.') === 0) {
1298
+                    if (strpos($sort.'.', $alias.'.') === 0) {
1299 1299
                         $hasValidAlias = true;
1300 1300
                         break;
1301 1301
                     }
1302 1302
                 }
1303 1303
 
1304
-                if (! $hasValidAlias) {
1305
-                    $sort = $allAliases[0] . '.' . $sort;
1304
+                if ( ! $hasValidAlias) {
1305
+                    $sort = $allAliases[0].'.'.$sort;
1306 1306
                 }
1307 1307
 
1308 1308
                 $this->addOrderBy($sort, $order);
@@ -1376,7 +1376,7 @@  discard block
 block discarded – undo
1376 1376
     private function getDQLForSelect()
1377 1377
     {
1378 1378
         $dql = 'SELECT'
1379
-             . ($this->dqlParts['distinct']===true ? ' DISTINCT' : '')
1379
+             . ($this->dqlParts['distinct'] === true ? ' DISTINCT' : '')
1380 1380
              . $this->getReducedDQLQueryPart('select', ['pre' => ' ', 'separator' => ', ']);
1381 1381
 
1382 1382
         $fromParts   = $this->getDQLPart('from');
@@ -1384,7 +1384,7 @@  discard block
 block discarded – undo
1384 1384
         $fromClauses = [];
1385 1385
 
1386 1386
         // Loop through all FROM clauses
1387
-        if (! empty($fromParts)) {
1387
+        if ( ! empty($fromParts)) {
1388 1388
             $dql .= ' FROM ';
1389 1389
 
1390 1390
             foreach ($fromParts as $from) {
@@ -1392,7 +1392,7 @@  discard block
 block discarded – undo
1392 1392
 
1393 1393
                 if ($from instanceof Expr\From && isset($joinParts[$from->getAlias()])) {
1394 1394
                     foreach ($joinParts[$from->getAlias()] as $join) {
1395
-                        $fromClause .= ' ' . ((string) $join);
1395
+                        $fromClause .= ' '.((string) $join);
1396 1396
                     }
1397 1397
                 }
1398 1398
 
@@ -1400,7 +1400,7 @@  discard block
 block discarded – undo
1400 1400
             }
1401 1401
         }
1402 1402
 
1403
-        return $dql . implode(', ', $fromClauses)
1403
+        return $dql.implode(', ', $fromClauses)
1404 1404
               . $this->getReducedDQLQueryPart('where', ['pre' => ' WHERE '])
1405 1405
               . $this->getReducedDQLQueryPart('groupBy', ['pre' => ' GROUP BY ', 'separator' => ', '])
1406 1406
               . $this->getReducedDQLQueryPart('having', ['pre' => ' HAVING '])
Please login to merge, or discard this patch.
lib/Doctrine/ORM/ORMInvalidArgumentException.php 1 patch
Spacing   +17 added lines, -17 removed lines patch added patch discarded remove patch
@@ -30,7 +30,7 @@  discard block
 block discarded – undo
30 30
      */
31 31
     public static function scheduleInsertForManagedEntity($entity)
32 32
     {
33
-        return new self('A managed+dirty entity ' . self::objToStr($entity) . ' can not be scheduled for insertion.');
33
+        return new self('A managed+dirty entity '.self::objToStr($entity).' can not be scheduled for insertion.');
34 34
     }
35 35
 
36 36
     /**
@@ -40,7 +40,7 @@  discard block
 block discarded – undo
40 40
      */
41 41
     public static function scheduleInsertForRemovedEntity($entity)
42 42
     {
43
-        return new self('Removed entity ' . self::objToStr($entity) . ' can not be scheduled for insertion.');
43
+        return new self('Removed entity '.self::objToStr($entity).' can not be scheduled for insertion.');
44 44
     }
45 45
 
46 46
     /**
@@ -50,7 +50,7 @@  discard block
 block discarded – undo
50 50
      */
51 51
     public static function scheduleInsertTwice($entity)
52 52
     {
53
-        return new self('Entity ' . self::objToStr($entity) . ' can not be scheduled for insertion twice.');
53
+        return new self('Entity '.self::objToStr($entity).' can not be scheduled for insertion twice.');
54 54
     }
55 55
 
56 56
     /**
@@ -62,7 +62,7 @@  discard block
 block discarded – undo
62 62
     public static function entityWithoutIdentity($className, $entity)
63 63
     {
64 64
         return new self(
65
-            "The given entity of type '" . $className . "' (" . self::objToStr($entity) . ') has no identity/no ' .
65
+            "The given entity of type '".$className."' (".self::objToStr($entity).') has no identity/no '.
66 66
             'id values set. It cannot be added to the identity map.'
67 67
         );
68 68
     }
@@ -74,7 +74,7 @@  discard block
 block discarded – undo
74 74
      */
75 75
     public static function readOnlyRequiresManagedEntity($entity)
76 76
     {
77
-        return new self('Only managed entities can be marked or checked as read only. But ' . self::objToStr($entity) . ' is not');
77
+        return new self('Only managed entities can be marked or checked as read only. But '.self::objToStr($entity).' is not');
78 78
     }
79 79
 
80 80
     /**
@@ -85,7 +85,7 @@  discard block
 block discarded – undo
85 85
     public static function newEntitiesFoundThroughRelationships($newEntitiesWithAssociations)
86 86
     {
87 87
         $errorMessages = array_map(
88
-            static function (array $newEntityWithAssociation) : string {
88
+            static function(array $newEntityWithAssociation) : string {
89 89
                 [$associationMetadata, $entity] = $newEntityWithAssociation;
90 90
 
91 91
                 return self::newEntityFoundThroughRelationshipMessage($associationMetadata, $entity);
@@ -154,7 +154,7 @@  discard block
 block discarded – undo
154 154
      */
155 155
     public static function entityNotManaged($entity)
156 156
     {
157
-        return new self('Entity ' . self::objToStr($entity) . ' is not managed. An entity is managed if its fetched ' .
157
+        return new self('Entity '.self::objToStr($entity).' is not managed. An entity is managed if its fetched '.
158 158
             'from the database or registered as new through EntityManager#persist');
159 159
     }
160 160
 
@@ -166,7 +166,7 @@  discard block
 block discarded – undo
166 166
      */
167 167
     public static function entityHasNoIdentity($entity, $operation)
168 168
     {
169
-        return new self('Entity has no identity, therefore ' . $operation . ' cannot be performed. ' . self::objToStr($entity));
169
+        return new self('Entity has no identity, therefore '.$operation.' cannot be performed. '.self::objToStr($entity));
170 170
     }
171 171
 
172 172
     /**
@@ -177,7 +177,7 @@  discard block
 block discarded – undo
177 177
      */
178 178
     public static function entityIsRemoved($entity, $operation)
179 179
     {
180
-        return new self('Entity is removed, therefore ' . $operation . ' cannot be performed. ' . self::objToStr($entity));
180
+        return new self('Entity is removed, therefore '.$operation.' cannot be performed. '.self::objToStr($entity));
181 181
     }
182 182
 
183 183
     /**
@@ -188,7 +188,7 @@  discard block
 block discarded – undo
188 188
      */
189 189
     public static function detachedEntityCannot($entity, $operation)
190 190
     {
191
-        return new self('Detached entity ' . self::objToStr($entity) . ' cannot be ' . $operation);
191
+        return new self('Detached entity '.self::objToStr($entity).' cannot be '.$operation);
192 192
     }
193 193
 
194 194
     /**
@@ -200,8 +200,8 @@  discard block
 block discarded – undo
200 200
      */
201 201
     public static function invalidObject($context, $given, $parameterIndex = 1)
202 202
     {
203
-        return new self($context . ' expects parameter ' . $parameterIndex .
204
-            ' to be an entity object, ' . gettype($given) . ' given.');
203
+        return new self($context.' expects parameter '.$parameterIndex.
204
+            ' to be an entity object, '.gettype($given).' given.');
205 205
     }
206 206
 
207 207
     /**
@@ -209,7 +209,7 @@  discard block
 block discarded – undo
209 209
      */
210 210
     public static function invalidCompositeIdentifier()
211 211
     {
212
-        return new self('Binding an entity with a composite primary key to a query is not supported. ' .
212
+        return new self('Binding an entity with a composite primary key to a query is not supported. '.
213 213
             'You should split the parameter into the explicit fields and bind them separately.');
214 214
     }
215 215
 
@@ -246,7 +246,7 @@  discard block
 block discarded – undo
246 246
      */
247 247
     private static function objToStr($obj) : string
248 248
     {
249
-        return method_exists($obj, '__toString') ? (string) $obj : get_class($obj) . '@' . spl_object_id($obj);
249
+        return method_exists($obj, '__toString') ? (string) $obj : get_class($obj).'@'.spl_object_id($obj);
250 250
     }
251 251
 
252 252
     /**
@@ -255,15 +255,15 @@  discard block
 block discarded – undo
255 255
     private static function newEntityFoundThroughRelationshipMessage(AssociationMetadata $association, $entity) : string
256 256
     {
257 257
         return 'A new entity was found through the relationship \''
258
-            . $association->getSourceEntity() . '#' . $association->getName() . '\' that was not'
259
-            . ' configured to cascade persist operations for entity: ' . self::objToStr($entity) . '.'
258
+            . $association->getSourceEntity().'#'.$association->getName().'\' that was not'
259
+            . ' configured to cascade persist operations for entity: '.self::objToStr($entity).'.'
260 260
             . ' To solve this issue: Either explicitly call EntityManager#persist()'
261 261
             . ' on this unknown entity or configure cascade persist'
262 262
             . ' this association in the mapping for example @ManyToOne(..,cascade={"persist"}).'
263 263
             . (method_exists($entity, '__toString')
264 264
                 ? ''
265 265
                 : ' If you cannot find out which entity causes the problem implement \''
266
-                . $association->getTargetEntity() . '#__toString()\' to get a clue.'
266
+                . $association->getTargetEntity().'#__toString()\' to get a clue.'
267 267
             );
268 268
     }
269 269
 }
Please login to merge, or discard this patch.
lib/Doctrine/ORM/Mapping/Factory/Autoloader.php 1 patch
Spacing   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -46,7 +46,7 @@  discard block
 block discarded – undo
46 46
         // remove namespace separators from remaining class name
47 47
         $fileName = str_replace('\\', '', $classNameRelativeToMetadataNamespace);
48 48
 
49
-        return $metadataDir . DIRECTORY_SEPARATOR . $fileName . '.php';
49
+        return $metadataDir.DIRECTORY_SEPARATOR.$fileName.'.php';
50 50
     }
51 51
 
52 52
     /**
@@ -63,7 +63,7 @@  discard block
 block discarded – undo
63 63
     ) : Closure {
64 64
         $metadataNamespace = ltrim($metadataNamespace, '\\');
65 65
 
66
-        if (! ($notFoundCallback === null || is_callable($notFoundCallback))) {
66
+        if ( ! ($notFoundCallback === null || is_callable($notFoundCallback))) {
67 67
             $type = is_object($notFoundCallback) ? get_class($notFoundCallback) : gettype($notFoundCallback);
68 68
 
69 69
             throw new InvalidArgumentException(
@@ -71,7 +71,7 @@  discard block
 block discarded – undo
71 71
             );
72 72
         }
73 73
 
74
-        $autoloader = static function ($className) use ($metadataDir, $metadataNamespace, $notFoundCallback) {
74
+        $autoloader = static function($className) use ($metadataDir, $metadataNamespace, $notFoundCallback) {
75 75
             if (strpos($className, $metadataNamespace) === 0) {
76 76
                 $file = Autoloader::resolveFile($metadataDir, $metadataNamespace, $className);
77 77
 
Please login to merge, or discard this patch.
ORM/Mapping/Factory/Strategy/FileWriterClassMetadataGeneratorStrategy.php 1 patch
Spacing   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -36,7 +36,7 @@  discard block
 block discarded – undo
36 36
 
37 37
         $this->ensureDirectoryIsReady(dirname($filePath));
38 38
 
39
-        $tmpFileName = $filePath . '.' . uniqid('', true);
39
+        $tmpFileName = $filePath.'.'.uniqid('', true);
40 40
 
41 41
         file_put_contents($tmpFileName, $sourceCode);
42 42
         @chmod($tmpFileName, 0664);
@@ -50,11 +50,11 @@  discard block
 block discarded – undo
50 50
      */
51 51
     private function ensureDirectoryIsReady(string $directory)
52 52
     {
53
-        if (! is_dir($directory) && (@mkdir($directory, 0775, true) === false)) {
53
+        if ( ! is_dir($directory) && (@mkdir($directory, 0775, true) === false)) {
54 54
             throw new RuntimeException(sprintf('Your metadata directory "%s" must be writable', $directory));
55 55
         }
56 56
 
57
-        if (! is_writable($directory)) {
57
+        if ( ! is_writable($directory)) {
58 58
             throw new RuntimeException(sprintf('Your proxy directory "%s" must be writable', $directory));
59 59
         }
60 60
     }
Please login to merge, or discard this patch.
lib/Doctrine/ORM/Mapping/DefaultEntityListenerResolver.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -42,7 +42,7 @@
 block discarded – undo
42 42
      */
43 43
     public function register($object)
44 44
     {
45
-        if (! is_object($object)) {
45
+        if ( ! is_object($object)) {
46 46
             throw new InvalidArgumentException(sprintf('An object was expected, but got "%s".', gettype($object)));
47 47
         }
48 48
 
Please login to merge, or discard this patch.