Test Failed
Pull Request — develop (#6854)
by
unknown
61:16
created
lib/Doctrine/ORM/Cache/Region/DefaultMultiGetRegion.php 2 patches
Doc Comments   +1 added lines patch added patch discarded remove patch
@@ -45,6 +45,7 @@
 block discarded – undo
45 45
      * {@inheritDoc}
46 46
      *
47 47
      * @param MultiGetCache $cache
48
+     * @param string $name
48 49
      */
49 50
     public function __construct($name, MultiGetCache $cache, $lifetime = 0)
50 51
     {
Please login to merge, or discard this patch.
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -1,7 +1,7 @@
 block discarded – undo
1 1
 <?php
2 2
 
3 3
 
4
-declare(strict_types=1);
4
+declare(strict_types = 1);
5 5
 
6 6
 namespace Doctrine\ORM\Cache\Region;
7 7
 
Please login to merge, or discard this patch.
lib/Doctrine/ORM/Internal/Hydration/ArrayHydrator.php 2 patches
Unused Use Statements   -1 removed lines patch added patch discarded remove patch
@@ -23,7 +23,6 @@
 block discarded – undo
23 23
 
24 24
 use Doctrine\ORM\Mapping\ToOneAssociationMetadata;
25 25
 use PDO;
26
-use Doctrine\ORM\Mapping\ClassMetadata;
27 26
 
28 27
 /**
29 28
  * The ArrayHydrator produces a nested array "graph" that is often (not always)
Please login to merge, or discard this patch.
Spacing   +12 added lines, -12 removed lines patch added patch discarded remove patch
@@ -1,6 +1,6 @@  discard block
 block discarded – undo
1 1
 <?php
2 2
 
3
-declare(strict_types=1);
3
+declare(strict_types = 1);
4 4
 
5 5
 namespace Doctrine\ORM\Internal\Hydration;
6 6
 
@@ -97,10 +97,10 @@  discard block
 block discarded – undo
97 97
                 // It's a joined result
98 98
 
99 99
                 $parent = $this->rsm->parentAliasMap[$dqlAlias];
100
-                $path   = $parent . '.' . $dqlAlias;
100
+                $path   = $parent.'.'.$dqlAlias;
101 101
 
102 102
                 // missing parent data, skipping as RIGHT JOIN hydration is not supported.
103
-                if ( ! isset($nonemptyComponents[$parent]) ) {
103
+                if ( ! isset($nonemptyComponents[$parent])) {
104 104
                     continue;
105 105
                 }
106 106
 
@@ -109,9 +109,9 @@  discard block
 block discarded – undo
109 109
                 if ($this->rsm->isMixed && isset($this->rootAliases[$parent])) {
110 110
                     $first = reset($this->resultPointers);
111 111
                     // TODO: Exception if $key === null ?
112
-                    $baseElement =& $this->resultPointers[$parent][key($first)];
112
+                    $baseElement = & $this->resultPointers[$parent][key($first)];
113 113
                 } else if (isset($this->resultPointers[$parent])) {
114
-                    $baseElement =& $this->resultPointers[$parent];
114
+                    $baseElement = & $this->resultPointers[$parent];
115 115
                 } else {
116 116
                     unset($this->resultPointers[$dqlAlias]); // Ticket #1228
117 117
 
@@ -123,7 +123,7 @@  discard block
 block discarded – undo
123 123
                 $relation      = $parentClass->getProperty($relationAlias);
124 124
 
125 125
                 // Check the type of the relation (many or single-valued)
126
-                if (! $relation instanceof ToOneAssociationMetadata) {
126
+                if ( ! $relation instanceof ToOneAssociationMetadata) {
127 127
                     $oneToOne = false;
128 128
 
129 129
                     if ( ! isset($baseElement[$relationAlias])) {
@@ -162,7 +162,7 @@  discard block
 block discarded – undo
162 162
                     }
163 163
                 }
164 164
 
165
-                $coll =& $baseElement[$relationAlias];
165
+                $coll = & $baseElement[$relationAlias];
166 166
 
167 167
                 if (is_array($coll)) {
168 168
                     $this->updateResultPointer($coll, $index, $dqlAlias, $oneToOne);
@@ -174,7 +174,7 @@  discard block
 block discarded – undo
174 174
                 $entityKey = $this->rsm->entityMappings[$dqlAlias] ?: 0;
175 175
 
176 176
                 // if this row has a NULL value for the root result id then make it a null result.
177
-                if ( ! isset($nonemptyComponents[$dqlAlias]) ) {
177
+                if ( ! isset($nonemptyComponents[$dqlAlias])) {
178 178
                     $result[] = $this->rsm->isMixed
179 179
                         ? [$entityKey => null]
180 180
                         : null;
@@ -235,7 +235,7 @@  discard block
 block discarded – undo
235 235
                 $resultKey = $this->resultCounter - 1;
236 236
             }
237 237
 
238
-            $scalarCount = (isset($rowData['scalars'])? count($rowData['scalars']): 0);
238
+            $scalarCount = (isset($rowData['scalars']) ? count($rowData['scalars']) : 0);
239 239
             $onlyOneRootAlias = 0 === $scalarCount && 1 === count($rowData['newObjects']);
240 240
 
241 241
             foreach ($rowData['newObjects'] as $objIndex => $newObject) {
@@ -274,13 +274,13 @@  discard block
 block discarded – undo
274 274
         }
275 275
 
276 276
         if ($oneToOne) {
277
-            $this->resultPointers[$dqlAlias] =& $coll;
277
+            $this->resultPointers[$dqlAlias] = & $coll;
278 278
 
279 279
             return;
280 280
         }
281 281
 
282 282
         if ($index !== false) {
283
-            $this->resultPointers[$dqlAlias] =& $coll[$index];
283
+            $this->resultPointers[$dqlAlias] = & $coll[$index];
284 284
 
285 285
             return;
286 286
         }
@@ -290,7 +290,7 @@  discard block
 block discarded – undo
290 290
         }
291 291
 
292 292
         end($coll);
293
-        $this->resultPointers[$dqlAlias] =& $coll[key($coll)];
293
+        $this->resultPointers[$dqlAlias] = & $coll[key($coll)];
294 294
 
295 295
         return;
296 296
     }
Please login to merge, or discard this patch.
lib/Doctrine/ORM/ORMInvalidArgumentException.php 2 patches
Doc Comments   -1 removed lines patch added patch discarded remove patch
@@ -207,7 +207,6 @@
 block discarded – undo
207 207
 
208 208
     /**
209 209
      * @param ClassMetadata $targetClass
210
-     * @param array         $assoc
211 210
      * @param mixed         $actualValue
212 211
      *
213 212
      * @return self
Please login to merge, or discard this patch.
Spacing   +13 added lines, -13 removed lines patch added patch discarded remove patch
@@ -1,6 +1,6 @@  discard block
 block discarded – undo
1 1
 <?php
2 2
 
3
-declare(strict_types=1);
3
+declare(strict_types = 1);
4 4
 
5 5
 namespace Doctrine\ORM;
6 6
 use Doctrine\ORM\Mapping\AssociationMetadata;
@@ -21,7 +21,7 @@  discard block
 block discarded – undo
21 21
      */
22 22
     static public function scheduleInsertForManagedEntity($entity)
23 23
     {
24
-        return new self("A managed+dirty entity " . self::objToStr($entity) . " can not be scheduled for insertion.");
24
+        return new self("A managed+dirty entity ".self::objToStr($entity)." can not be scheduled for insertion.");
25 25
     }
26 26
 
27 27
     /**
@@ -31,7 +31,7 @@  discard block
 block discarded – undo
31 31
      */
32 32
     static public function scheduleInsertForRemovedEntity($entity)
33 33
     {
34
-        return new self("Removed entity " . self::objToStr($entity) . " can not be scheduled for insertion.");
34
+        return new self("Removed entity ".self::objToStr($entity)." can not be scheduled for insertion.");
35 35
     }
36 36
 
37 37
     /**
@@ -41,7 +41,7 @@  discard block
 block discarded – undo
41 41
      */
42 42
     static public function scheduleInsertTwice($entity)
43 43
     {
44
-        return new self("Entity " . self::objToStr($entity) . " can not be scheduled for insertion twice.");
44
+        return new self("Entity ".self::objToStr($entity)." can not be scheduled for insertion twice.");
45 45
     }
46 46
 
47 47
     /**
@@ -53,7 +53,7 @@  discard block
 block discarded – undo
53 53
     static public function entityWithoutIdentity($className, $entity)
54 54
     {
55 55
         return new self(
56
-            "The given entity of type '" . $className . "' (".self::objToStr($entity).") has no identity/no " .
56
+            "The given entity of type '".$className."' (".self::objToStr($entity).") has no identity/no ".
57 57
             "id values set. It cannot be added to the identity map."
58 58
         );
59 59
     }
@@ -65,7 +65,7 @@  discard block
 block discarded – undo
65 65
      */
66 66
     static public function readOnlyRequiresManagedEntity($entity)
67 67
     {
68
-        return new self("Only managed entities can be marked or checked as read only. But " . self::objToStr($entity) . " is not");
68
+        return new self("Only managed entities can be marked or checked as read only. But ".self::objToStr($entity)." is not");
69 69
     }
70 70
 
71 71
     /**
@@ -121,7 +121,7 @@  discard block
 block discarded – undo
121 121
      */
122 122
     static public function entityNotManaged($entity)
123 123
     {
124
-        return new self("Entity " . self::objToStr($entity) . " is not managed. An entity is managed if its fetched " .
124
+        return new self("Entity ".self::objToStr($entity)." is not managed. An entity is managed if its fetched ".
125 125
             "from the database or registered as new through EntityManager#persist");
126 126
     }
127 127
 
@@ -133,7 +133,7 @@  discard block
 block discarded – undo
133 133
      */
134 134
     static public function entityHasNoIdentity($entity, $operation)
135 135
     {
136
-        return new self("Entity has no identity, therefore " . $operation ." cannot be performed. " . self::objToStr($entity));
136
+        return new self("Entity has no identity, therefore ".$operation." cannot be performed. ".self::objToStr($entity));
137 137
     }
138 138
 
139 139
     /**
@@ -144,7 +144,7 @@  discard block
 block discarded – undo
144 144
      */
145 145
     static public function entityIsRemoved($entity, $operation)
146 146
     {
147
-        return new self("Entity is removed, therefore " . $operation ." cannot be performed. " . self::objToStr($entity));
147
+        return new self("Entity is removed, therefore ".$operation." cannot be performed. ".self::objToStr($entity));
148 148
     }
149 149
 
150 150
     /**
@@ -155,7 +155,7 @@  discard block
 block discarded – undo
155 155
      */
156 156
     static public function detachedEntityCannot($entity, $operation)
157 157
     {
158
-        return new self("Detached entity " . self::objToStr($entity) . " cannot be " . $operation);
158
+        return new self("Detached entity ".self::objToStr($entity)." cannot be ".$operation);
159 159
     }
160 160
 
161 161
     /**
@@ -167,8 +167,8 @@  discard block
 block discarded – undo
167 167
      */
168 168
     public static function invalidObject($context, $given, $parameterIndex = 1)
169 169
     {
170
-        return new self($context . ' expects parameter ' . $parameterIndex .
171
-            ' to be an entity object, '. gettype($given) . ' given.');
170
+        return new self($context.' expects parameter '.$parameterIndex.
171
+            ' to be an entity object, '.gettype($given).' given.');
172 172
     }
173 173
 
174 174
     /**
@@ -176,7 +176,7 @@  discard block
 block discarded – undo
176 176
      */
177 177
     public static function invalidCompositeIdentifier()
178 178
     {
179
-        return new self("Binding an entity with a composite primary key to a query is not supported. " .
179
+        return new self("Binding an entity with a composite primary key to a query is not supported. ".
180 180
             "You should split the parameter into the explicit fields and bind them separately.");
181 181
     }
182 182
 
Please login to merge, or discard this patch.
lib/Doctrine/ORM/PersistentObject.php 2 patches
Doc Comments   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -120,7 +120,7 @@  discard block
 block discarded – undo
120 120
      * @param string $field
121 121
      * @param array  $args
122 122
      *
123
-     * @return object
123
+     * @return PersistentObject
124 124
      *
125 125
      * @throws \BadMethodCallException   When no persistent field exists by that name.
126 126
      * @throws \InvalidArgumentException When the wrong target object type is passed to an association.
@@ -207,7 +207,7 @@  discard block
 block discarded – undo
207 207
      * @param string $field
208 208
      * @param array  $args
209 209
      *
210
-     * @return object
210
+     * @return PersistentObject
211 211
      *
212 212
      * @throws \BadMethodCallException
213 213
      * @throws \InvalidArgumentException
Please login to merge, or discard this patch.
Spacing   +10 added lines, -10 removed lines patch added patch discarded remove patch
@@ -1,6 +1,6 @@  discard block
 block discarded – undo
1 1
 <?php
2 2
 
3
-declare(strict_types=1);
3
+declare(strict_types = 1);
4 4
 
5 5
 namespace Doctrine\ORM;
6 6
 
@@ -89,7 +89,7 @@  discard block
 block discarded – undo
89 89
     {
90 90
         if ($entityManager !== self::$entityManager) {
91 91
             throw new \RuntimeException(
92
-                "Trying to use PersistentObject with different EntityManager instances. " .
92
+                "Trying to use PersistentObject with different EntityManager instances. ".
93 93
                 "Was PersistentObject::setEntityManager() called?"
94 94
             );
95 95
         }
@@ -114,7 +114,7 @@  discard block
 block discarded – undo
114 114
 
115 115
         $property = $this->cm->getProperty($field);
116 116
 
117
-        if (! $property) {
117
+        if ( ! $property) {
118 118
             throw new \BadMethodCallException("no field with name '".$field."' exists on '".$this->cm->getClassName()."'");
119 119
         }
120 120
 
@@ -153,7 +153,7 @@  discard block
 block discarded – undo
153 153
 
154 154
         $property = $this->cm->getProperty($field);
155 155
 
156
-        if (! $property) {
156
+        if ( ! $property) {
157 157
             throw new \BadMethodCallException("no field with name '".$field."' exists on '".$this->cm->getClassName()."'");
158 158
         }
159 159
 
@@ -179,7 +179,7 @@  discard block
 block discarded – undo
179 179
         $mappedByField    = $property->getMappedBy();
180 180
         $targetMetadata   = self::$entityManager->getClassMetadata($property->getTargetEntity());
181 181
         $targetProperty   = $targetMetadata->getProperty($mappedByField);
182
-        $setterMethodName = ($targetProperty instanceof ToManyAssociationMetadata ? 'add' : 'set') . $mappedByField;
182
+        $setterMethodName = ($targetProperty instanceof ToManyAssociationMetadata ? 'add' : 'set').$mappedByField;
183 183
 
184 184
         $targetObject->$setterMethodName($this);
185 185
     }
@@ -201,21 +201,21 @@  discard block
 block discarded – undo
201 201
 
202 202
         $property = $this->cm->getProperty($field);
203 203
 
204
-        if (! $property) {
204
+        if ( ! $property) {
205 205
             throw new \BadMethodCallException("no field with name '".$field."' exists on '".$this->cm->getClassName()."'");
206 206
         }
207 207
 
208
-        if (! ($property instanceof ToManyAssociationMetadata)) {
208
+        if ( ! ($property instanceof ToManyAssociationMetadata)) {
209 209
             throw new \BadMethodCallException("There is no method add".$field."() on ".$this->cm->getClassName());
210 210
         }
211 211
 
212 212
         $targetClassName = $property->getTargetEntity();
213 213
 
214
-        if (! ($args[0] instanceof $targetClassName)) {
214
+        if ( ! ($args[0] instanceof $targetClassName)) {
215 215
             throw new \InvalidArgumentException("Expected persistent object of type '".$targetClassName."'");
216 216
         }
217 217
 
218
-        if (! ($this->$field instanceof Collection)) {
218
+        if ( ! ($this->$field instanceof Collection)) {
219 219
             $this->$field = new ArrayCollection($this->$field ?: []);
220 220
         }
221 221
 
@@ -239,7 +239,7 @@  discard block
 block discarded – undo
239 239
             return;
240 240
         }
241 241
 
242
-        if (!self::$entityManager) {
242
+        if ( ! self::$entityManager) {
243 243
             throw new \RuntimeException("No runtime entity manager set. Call PersistentObject#setEntityManager().");
244 244
         }
245 245
 
Please login to merge, or discard this patch.
lib/Doctrine/ORM/Persisters/Collection/OneToManyPersister.php 3 patches
Unused Use Statements   -1 removed lines patch added patch discarded remove patch
@@ -22,7 +22,6 @@
 block discarded – undo
22 22
 namespace Doctrine\ORM\Persisters\Collection;
23 23
 
24 24
 use Doctrine\Common\Collections\Criteria;
25
-use Doctrine\ORM\Mapping\ColumnMetadata;
26 25
 use Doctrine\ORM\Mapping\InheritanceType;
27 26
 use Doctrine\ORM\Mapping\ToManyAssociationMetadata;
28 27
 use Doctrine\ORM\PersistentCollection;
Please login to merge, or discard this patch.
Indentation   +4 added lines, -4 removed lines patch added patch discarded remove patch
@@ -145,9 +145,9 @@  discard block
 block discarded – undo
145 145
         return (bool) $persister->count($criteria);
146 146
     }
147 147
 
148
-     /**
149
-     * {@inheritdoc}
150
-     */
148
+        /**
149
+         * {@inheritdoc}
150
+         */
151 151
     public function contains(PersistentCollection $collection, $element)
152 152
     {
153 153
         if ( ! $this->isValidEntityState($element)) {
@@ -265,7 +265,7 @@  discard block
 block discarded – undo
265 265
 
266 266
         // 2) Build insert table records into temporary table
267 267
         $dql   = ' SELECT t0.' . implode(', t0.', $rootClass->getIdentifierFieldNames())
268
-               . ' FROM ' . $targetClass->getClassName() . ' t0 WHERE t0.' . $association->getMappedBy() . ' = :owner';
268
+                . ' FROM ' . $targetClass->getClassName() . ' t0 WHERE t0.' . $association->getMappedBy() . ' = :owner';
269 269
         $query = $this->em->createQuery($dql)->setParameter('owner', $collection->getOwner());
270 270
 
271 271
         $statement  = 'INSERT INTO ' . $tempTable . ' (' . $idColumnNameList . ') ' . $query->getSQL();
Please login to merge, or discard this patch.
Spacing   +14 added lines, -14 removed lines patch added patch discarded remove patch
@@ -1,6 +1,6 @@  discard block
 block discarded – undo
1 1
 <?php
2 2
 
3
-declare(strict_types=1);
3
+declare(strict_types = 1);
4 4
 
5 5
 namespace Doctrine\ORM\Persisters\Collection;
6 6
 
@@ -30,7 +30,7 @@  discard block
 block discarded – undo
30 30
         // the entire collection with a new would trigger this operation.
31 31
         $association = $collection->getMapping();
32 32
 
33
-        if (! $association->isOrphanRemoval()) {
33
+        if ( ! $association->isOrphanRemoval()) {
34 34
             // Handling non-orphan removal should never happen, as @OneToMany
35 35
             // can only be inverse side. For owning side one to many, it is
36 36
             // required to have a join table, which would classify as a ManyToManyPersister.
@@ -62,7 +62,7 @@  discard block
 block discarded – undo
62 62
     {
63 63
         $association = $collection->getMapping();
64 64
 
65
-        if (! ($association instanceof ToManyAssociationMetadata && $association->getIndexedBy())) {
65
+        if ( ! ($association instanceof ToManyAssociationMetadata && $association->getIndexedBy())) {
66 66
             throw new \BadMethodCallException("Selecting a collection by index is only supported on indexed collections.");
67 67
         }
68 68
 
@@ -111,7 +111,7 @@  discard block
 block discarded – undo
111 111
     {
112 112
         $association = $collection->getMapping();
113 113
 
114
-        if (! ($association instanceof ToManyAssociationMetadata && $association->getIndexedBy())) {
114
+        if ( ! ($association instanceof ToManyAssociationMetadata && $association->getIndexedBy())) {
115 115
             throw new \BadMethodCallException("Selecting a collection by index is only supported on indexed collections.");
116 116
         }
117 117
 
@@ -120,7 +120,7 @@  discard block
 block discarded – undo
120 120
         // only works with single id identifier entities. Will throw an
121 121
         // exception in Entity Persisters if that is not the case for the
122 122
         // 'mappedBy' field.
123
-        $criteria  = [
123
+        $criteria = [
124 124
             $association->getMappedBy()  => $collection->getOwner(),
125 125
             $association->getIndexedBy() => $key,
126 126
         ];
@@ -157,12 +157,12 @@  discard block
 block discarded – undo
157 157
     {
158 158
         $association = $collection->getMapping();
159 159
 
160
-        if (! $association->isOrphanRemoval()) {
160
+        if ( ! $association->isOrphanRemoval()) {
161 161
             // no-op: this is not the owning side, therefore no operations should be applied
162 162
             return false;
163 163
         }
164 164
 
165
-        if (! $this->isValidEntityState($element)) {
165
+        if ( ! $this->isValidEntityState($element)) {
166 166
             return false;
167 167
         }
168 168
 
@@ -202,7 +202,7 @@  discard block
 block discarded – undo
202 202
         }
203 203
 
204 204
         $tableName = $targetClass->table->getQuotedQualifiedName($this->platform);
205
-        $statement = 'DELETE FROM ' . $tableName . ' WHERE ' . implode(' = ? AND ', $columns) . ' = ?';
205
+        $statement = 'DELETE FROM '.$tableName.' WHERE '.implode(' = ? AND ', $columns).' = ?';
206 206
 
207 207
         return $this->conn->executeUpdate($statement, $parameters);
208 208
     }
@@ -241,17 +241,17 @@  discard block
 block discarded – undo
241 241
             ];
242 242
         }
243 243
 
244
-        $statement = $this->platform->getCreateTemporaryTableSnippetSQL() . ' ' . $tempTable
245
-            . ' (' . $this->platform->getColumnDeclarationListSQL($columnDefinitions) . ')';
244
+        $statement = $this->platform->getCreateTemporaryTableSnippetSQL().' '.$tempTable
245
+            . ' ('.$this->platform->getColumnDeclarationListSQL($columnDefinitions).')';
246 246
 
247 247
         $this->conn->executeUpdate($statement);
248 248
 
249 249
         // 2) Build insert table records into temporary table
250
-        $dql   = ' SELECT t0.' . implode(', t0.', $rootClass->getIdentifierFieldNames())
251
-               . ' FROM ' . $targetClass->getClassName() . ' t0 WHERE t0.' . $association->getMappedBy() . ' = :owner';
250
+        $dql   = ' SELECT t0.'.implode(', t0.', $rootClass->getIdentifierFieldNames())
251
+               . ' FROM '.$targetClass->getClassName().' t0 WHERE t0.'.$association->getMappedBy().' = :owner';
252 252
         $query = $this->em->createQuery($dql)->setParameter('owner', $collection->getOwner());
253 253
 
254
-        $statement  = 'INSERT INTO ' . $tempTable . ' (' . $idColumnNameList . ') ' . $query->getSQL();
254
+        $statement  = 'INSERT INTO '.$tempTable.' ('.$idColumnNameList.') '.$query->getSQL();
255 255
         $parameters = array_values($sourcePersister->getIdentifier($collection->getOwner()));
256 256
         $numDeleted = $this->conn->executeUpdate($statement, $parameters);
257 257
 
@@ -266,7 +266,7 @@  discard block
 block discarded – undo
266 266
         // 4) Delete records on each table in the hierarchy
267 267
         $hierarchyClasses = array_merge(
268 268
             array_map(
269
-                function ($className) { return $this->em->getClassMetadata($className); },
269
+                function($className) { return $this->em->getClassMetadata($className); },
270 270
                 array_reverse($targetClass->getSubClasses())
271 271
             ),
272 272
             [$targetClass],
Please login to merge, or discard this patch.
lib/Doctrine/ORM/Persisters/Entity/BasicEntityPersister.php 3 patches
Doc Comments   -1 removed lines patch added patch discarded remove patch
@@ -1409,7 +1409,6 @@
 block discarded – undo
1409 1409
      * Gets the SQL join fragment used when selecting entities from a
1410 1410
      * many-to-many association.
1411 1411
      *
1412
-     * @param ManyToManyAssociationMetadata $manyToMany
1413 1412
      *
1414 1413
      * @return string
1415 1414
      */
Please login to merge, or discard this patch.
Indentation   +12 added lines, -12 removed lines patch added patch discarded remove patch
@@ -323,8 +323,8 @@  discard block
 block discarded – undo
323 323
 
324 324
         // FIXME: Order with composite keys might not be correct
325 325
         $sql = 'SELECT ' . $columnName
326
-             . ' FROM '  . $tableName
327
-             . ' WHERE ' . implode(' = ? AND ', $identifier) . ' = ?';
326
+                . ' FROM '  . $tableName
327
+                . ' WHERE ' . implode(' = ? AND ', $identifier) . ' = ?';
328 328
 
329 329
         $flattenedId = $this->em->getIdentifierFlattener()->flattenIdentifier($versionedClass, $id);
330 330
         $versionType = $versionProperty->getType();
@@ -457,8 +457,8 @@  discard block
 block discarded – undo
457 457
         }
458 458
 
459 459
         $sql = 'UPDATE ' . $quotedTableName
460
-             . ' SET ' . implode(', ', $set)
461
-             . ' WHERE ' . implode(' = ? AND ', $where) . ' = ?';
460
+                . ' SET ' . implode(', ', $set)
461
+                . ' WHERE ' . implode(' = ? AND ', $where) . ' = ?';
462 462
 
463 463
         $result = $this->conn->executeUpdate($sql, $params, $types);
464 464
 
@@ -1626,9 +1626,9 @@  discard block
 block discarded – undo
1626 1626
         $lock  = $this->getLockTablesSql($lockMode);
1627 1627
         $where = ($conditionSql ? ' WHERE ' . $conditionSql : '') . ' ';
1628 1628
         $sql = 'SELECT 1 '
1629
-             . $lock
1630
-             . $where
1631
-             . $lockSql;
1629
+                . $lock
1630
+                . $where
1631
+                . $lockSql;
1632 1632
 
1633 1633
         list($params, $types) = $this->expandParameters($criteria);
1634 1634
 
@@ -2107,8 +2107,8 @@  discard block
 block discarded – undo
2107 2107
         $alias = $this->getSQLTableAlias($this->class->getTableName());
2108 2108
 
2109 2109
         $sql = 'SELECT 1 '
2110
-             . $this->getLockTablesSql(null)
2111
-             . ' WHERE ' . $this->getSelectConditionSQL($criteria);
2110
+                . $this->getLockTablesSql(null)
2111
+                . ' WHERE ' . $this->getSelectConditionSQL($criteria);
2112 2112
 
2113 2113
         list($params, $types) = $this->expandParameters($criteria);
2114 2114
 
@@ -2142,9 +2142,9 @@  discard block
 block discarded – undo
2142 2142
 
2143 2143
         // if one of the join columns is nullable, return left join
2144 2144
         foreach ($association->getJoinColumns() as $joinColumn) {
2145
-             if (! $joinColumn->isNullable()) {
2146
-                 continue;
2147
-             }
2145
+                if (! $joinColumn->isNullable()) {
2146
+                    continue;
2147
+                }
2148 2148
 
2149 2149
             return 'LEFT JOIN';
2150 2150
         }
Please login to merge, or discard this patch.
Spacing   +76 added lines, -76 removed lines patch added patch discarded remove patch
@@ -1,6 +1,6 @@  discard block
 block discarded – undo
1 1
 <?php
2 2
 
3
-declare(strict_types=1);
3
+declare(strict_types = 1);
4 4
 
5 5
 namespace Doctrine\ORM\Persisters\Entity;
6 6
 
@@ -300,14 +300,14 @@  discard block
 block discarded – undo
300 300
         $tableName      = $versionedClass->table->getQuotedQualifiedName($this->platform);
301 301
         $columnName     = $this->platform->quoteIdentifier($versionProperty->getColumnName());
302 302
         $identifier     = array_map(
303
-            function ($columnName) { return $this->platform->quoteIdentifier($columnName); },
303
+            function($columnName) { return $this->platform->quoteIdentifier($columnName); },
304 304
             array_keys($versionedClass->getIdentifierColumns($this->em))
305 305
         );
306 306
 
307 307
         // FIXME: Order with composite keys might not be correct
308
-        $sql = 'SELECT ' . $columnName
309
-             . ' FROM '  . $tableName
310
-             . ' WHERE ' . implode(' = ? AND ', $identifier) . ' = ?';
308
+        $sql = 'SELECT '.$columnName
309
+             . ' FROM '.$tableName
310
+             . ' WHERE '.implode(' = ? AND ', $identifier).' = ?';
311 311
 
312 312
         $flattenedId = $this->em->getIdentifierFlattener()->flattenIdentifier($versionedClass, $id);
313 313
         $versionType = $versionProperty->getType();
@@ -393,7 +393,7 @@  discard block
 block discarded – undo
393 393
 
394 394
             if (($value = $identifier[$field]) !== null) {
395 395
                 // @todo guilhermeblanco Make sure we do not have flat association values.
396
-                if (! is_array($value)) {
396
+                if ( ! is_array($value)) {
397 397
                     $value = [$targetClass->identifier[0] => $value];
398 398
                 }
399 399
 
@@ -406,7 +406,7 @@  discard block
 block discarded – undo
406 406
                 $referencedColumnName = $joinColumn->getReferencedColumnName();
407 407
                 $targetField          = $targetClass->fieldNames[$referencedColumnName];
408 408
 
409
-                if (! $joinColumn->getType()) {
409
+                if ( ! $joinColumn->getType()) {
410 410
                     $joinColumn->setType(PersisterHelper::getTypeOfColumn($referencedColumnName, $targetClass, $this->em));
411 411
                 }
412 412
 
@@ -474,7 +474,7 @@  discard block
 block discarded – undo
474 474
                         $quotedColumnName     = $this->platform->quoteIdentifier($joinColumn->getColumnName());
475 475
                         $referencedColumnName = $joinColumn->getReferencedColumnName();
476 476
 
477
-                        if (! $joinColumn->getType()) {
477
+                        if ( ! $joinColumn->getType()) {
478 478
                             $joinColumn->setType(PersisterHelper::getTypeOfColumn($referencedColumnName, $targetClass, $this->em));
479 479
                         }
480 480
 
@@ -501,18 +501,18 @@  discard block
 block discarded – undo
501 501
                 case Type::SMALLINT:
502 502
                 case Type::INTEGER:
503 503
                 case Type::BIGINT:
504
-                    $set[] = $versionColumnName . ' = ' . $versionColumnName . ' + 1';
504
+                    $set[] = $versionColumnName.' = '.$versionColumnName.' + 1';
505 505
                     break;
506 506
 
507 507
                 case Type::DATETIME:
508
-                    $set[] = $versionColumnName . ' = CURRENT_TIMESTAMP';
508
+                    $set[] = $versionColumnName.' = CURRENT_TIMESTAMP';
509 509
                     break;
510 510
             }
511 511
         }
512 512
 
513
-        $sql = 'UPDATE ' . $quotedTableName
514
-             . ' SET ' . implode(', ', $set)
515
-             . ' WHERE ' . implode(' = ? AND ', $where) . ' = ?';
513
+        $sql = 'UPDATE '.$quotedTableName
514
+             . ' SET '.implode(', ', $set)
515
+             . ' WHERE '.implode(' = ? AND ', $where).' = ?';
516 516
 
517 517
         $result = $this->conn->executeUpdate($sql, $params, $types);
518 518
 
@@ -531,7 +531,7 @@  discard block
 block discarded – undo
531 531
     protected function deleteJoinTableRecords($identifier)
532 532
     {
533 533
         foreach ($this->class->getDeclaredPropertiesIterator() as $association) {
534
-            if (! ($association instanceof ManyToManyAssociationMetadata)) {
534
+            if ( ! ($association instanceof ManyToManyAssociationMetadata)) {
535 535
                 continue;
536 536
             }
537 537
 
@@ -544,7 +544,7 @@  discard block
 block discarded – undo
544 544
             $keys              = [];
545 545
 
546 546
             if ( ! $owningAssociation->isOwningSide()) {
547
-                $class       = $this->em->getClassMetadata($association->getTargetEntity());
547
+                $class = $this->em->getClassMetadata($association->getTargetEntity());
548 548
                 $owningAssociation = $class->getProperty($association->getMappedBy());
549 549
             }
550 550
 
@@ -656,7 +656,7 @@  discard block
 block discarded – undo
656 656
             }
657 657
 
658 658
             // Only owning side of x-1 associations can have a FK column.
659
-            if (! $property instanceof ToOneAssociationMetadata || ! $property->isOwningSide()) {
659
+            if ( ! $property instanceof ToOneAssociationMetadata || ! $property->isOwningSide()) {
660 660
                 continue;
661 661
             }
662 662
 
@@ -676,7 +676,7 @@  discard block
 block discarded – undo
676 676
                 /** @var JoinColumnMetadata $joinColumn */
677 677
                 $referencedColumnName = $joinColumn->getReferencedColumnName();
678 678
 
679
-                if (! $joinColumn->getType()) {
679
+                if ( ! $joinColumn->getType()) {
680 680
                     $joinColumn->setType(PersisterHelper::getTypeOfColumn($referencedColumnName, $targetClass, $this->em));
681 681
                 }
682 682
 
@@ -705,7 +705,7 @@  discard block
 block discarded – undo
705 705
         $propertyName = $this->class->fieldNames[$columnName];
706 706
         $property     = $this->class->getProperty($propertyName);
707 707
 
708
-        if (! $property) {
708
+        if ( ! $property) {
709 709
             return null;
710 710
         }
711 711
 
@@ -724,7 +724,7 @@  discard block
 block discarded – undo
724 724
             /** @var JoinColumnMetadata $joinColumn */
725 725
             $referencedColumnName = $joinColumn->getReferencedColumnName();
726 726
 
727
-            if (! $joinColumn->getType()) {
727
+            if ( ! $joinColumn->getType()) {
728 728
                 $joinColumn->setType(PersisterHelper::getTypeOfColumn($referencedColumnName, $targetClass, $this->em));
729 729
             }
730 730
 
@@ -841,7 +841,7 @@  discard block
 block discarded – undo
841 841
             // unset the old value and set the new sql aliased value here. By definition
842 842
             // unset($identifier[$targetKeyColumn] works here with how UnitOfWork::createEntity() calls this method.
843 843
             // @todo guilhermeblanco In master we have: $identifier[$targetClass->getFieldForColumn($targetKeyColumn)] =
844
-            $identifier[$targetTableAlias . "." . $targetKeyColumn] = $value;
844
+            $identifier[$targetTableAlias.".".$targetKeyColumn] = $value;
845 845
 
846 846
             unset($identifier[$targetKeyColumn]);
847 847
         }
@@ -1061,7 +1061,7 @@  discard block
 block discarded – undo
1061 1061
         $criteria       = [];
1062 1062
         $parameters     = [];
1063 1063
 
1064
-        if (! $association->isOwningSide()) {
1064
+        if ( ! $association->isOwningSide()) {
1065 1065
             $class       = $this->em->getClassMetadata($association->getTargetEntity());
1066 1066
             $owningAssoc = $class->getProperty($association->getMappedBy());
1067 1067
         }
@@ -1089,7 +1089,7 @@  discard block
 block discarded – undo
1089 1089
                 $value = $value[$targetClass->identifier[0]];
1090 1090
             }
1091 1091
 
1092
-            $criteria[$joinTableName . '.' . $quotedColumnName] = $value;
1092
+            $criteria[$joinTableName.'.'.$quotedColumnName] = $value;
1093 1093
             $parameters[] = [
1094 1094
                 'value' => $value,
1095 1095
                 'field' => $fieldName,
@@ -1140,11 +1140,11 @@  discard block
 block discarded – undo
1140 1140
 
1141 1141
         switch ($lockMode) {
1142 1142
             case LockMode::PESSIMISTIC_READ:
1143
-                $lockSql = ' ' . $this->platform->getReadLockSQL();
1143
+                $lockSql = ' '.$this->platform->getReadLockSQL();
1144 1144
                 break;
1145 1145
 
1146 1146
             case LockMode::PESSIMISTIC_WRITE:
1147
-                $lockSql = ' ' . $this->platform->getWriteLockSQL();
1147
+                $lockSql = ' '.$this->platform->getWriteLockSQL();
1148 1148
                 break;
1149 1149
         }
1150 1150
 
@@ -1155,14 +1155,14 @@  discard block
 block discarded – undo
1155 1155
 
1156 1156
         if ('' !== $filterSql) {
1157 1157
             $conditionSql = $conditionSql
1158
-                ? $conditionSql . ' AND ' . $filterSql
1158
+                ? $conditionSql.' AND '.$filterSql
1159 1159
                 : $filterSql;
1160 1160
         }
1161 1161
 
1162
-        $select = 'SELECT ' . $columnList;
1163
-        $from   = ' FROM ' . $tableName . ' '. $tableAlias;
1164
-        $join   = $this->currentPersisterContext->selectJoinSql . $joinSql;
1165
-        $where  = ($conditionSql ? ' WHERE ' . $conditionSql : '');
1162
+        $select = 'SELECT '.$columnList;
1163
+        $from   = ' FROM '.$tableName.' '.$tableAlias;
1164
+        $join   = $this->currentPersisterContext->selectJoinSql.$joinSql;
1165
+        $where  = ($conditionSql ? ' WHERE '.$conditionSql : '');
1166 1166
         $lock   = $this->platform->appendLockHint($from, $lockMode);
1167 1167
         $query  = $select
1168 1168
             . $lock
@@ -1170,7 +1170,7 @@  discard block
 block discarded – undo
1170 1170
             . $where
1171 1171
             . $orderBySql;
1172 1172
 
1173
-        return $this->platform->modifyLimitQuery($query, $limit, $offset) . $lockSql;
1173
+        return $this->platform->modifyLimitQuery($query, $limit, $offset).$lockSql;
1174 1174
     }
1175 1175
 
1176 1176
     /**
@@ -1189,13 +1189,13 @@  discard block
 block discarded – undo
1189 1189
 
1190 1190
         if ('' !== $filterSql) {
1191 1191
             $conditionSql = $conditionSql
1192
-                ? $conditionSql . ' AND ' . $filterSql
1192
+                ? $conditionSql.' AND '.$filterSql
1193 1193
                 : $filterSql;
1194 1194
         }
1195 1195
 
1196 1196
         $sql = 'SELECT COUNT(*) '
1197
-            . 'FROM ' . $tableName . ' ' . $tableAlias
1198
-            . (empty($conditionSql) ? '' : ' WHERE ' . $conditionSql);
1197
+            . 'FROM '.$tableName.' '.$tableAlias
1198
+            . (empty($conditionSql) ? '' : ' WHERE '.$conditionSql);
1199 1199
 
1200 1200
         return $sql;
1201 1201
     }
@@ -1212,7 +1212,7 @@  discard block
 block discarded – undo
1212 1212
      */
1213 1213
     protected final function getOrderBySQL(array $orderBy, $baseTableAlias)
1214 1214
     {
1215
-        if (! $orderBy) {
1215
+        if ( ! $orderBy) {
1216 1216
             return '';
1217 1217
         }
1218 1218
 
@@ -1221,7 +1221,7 @@  discard block
 block discarded – undo
1221 1221
         foreach ($orderBy as $fieldName => $orientation) {
1222 1222
             $orientation = strtoupper(trim($orientation));
1223 1223
 
1224
-            if (! in_array($orientation, ['ASC', 'DESC'])) {
1224
+            if ( ! in_array($orientation, ['ASC', 'DESC'])) {
1225 1225
                 throw ORMException::invalidOrientation($this->class->getClassName(), $fieldName);
1226 1226
             }
1227 1227
 
@@ -1231,11 +1231,11 @@  discard block
 block discarded – undo
1231 1231
                 $tableAlias = $this->getSQLTableAlias($property->getTableName());
1232 1232
                 $columnName = $this->platform->quoteIdentifier($property->getColumnName());
1233 1233
 
1234
-                $orderByList[] = $tableAlias . '.' . $columnName . ' ' . $orientation;
1234
+                $orderByList[] = $tableAlias.'.'.$columnName.' '.$orientation;
1235 1235
 
1236 1236
                 continue;
1237 1237
             } else if ($property instanceof AssociationMetadata) {
1238
-                if (! $property->isOwningSide()) {
1238
+                if ( ! $property->isOwningSide()) {
1239 1239
                     throw ORMException::invalidFindByInverseAssociation($this->class->getClassName(), $fieldName);
1240 1240
                 }
1241 1241
 
@@ -1248,7 +1248,7 @@  discard block
 block discarded – undo
1248 1248
                     /* @var JoinColumnMetadata $joinColumn */
1249 1249
                     $quotedColumnName = $this->platform->quoteIdentifier($joinColumn->getColumnName());
1250 1250
 
1251
-                    $orderByList[] = $tableAlias . '.' . $quotedColumnName . ' ' . $orientation;
1251
+                    $orderByList[] = $tableAlias.'.'.$quotedColumnName.' '.$orientation;
1252 1252
                 }
1253 1253
 
1254 1254
                 continue;
@@ -1257,7 +1257,7 @@  discard block
 block discarded – undo
1257 1257
             throw ORMException::unrecognizedField($fieldName);
1258 1258
         }
1259 1259
 
1260
-        return ' ORDER BY ' . implode(', ', $orderByList);
1260
+        return ' ORDER BY '.implode(', ', $orderByList);
1261 1261
     }
1262 1262
 
1263 1263
     /**
@@ -1279,7 +1279,7 @@  discard block
 block discarded – undo
1279 1279
 
1280 1280
 
1281 1281
         $this->currentPersisterContext->rsm->addEntityResult($this->class->getClassName(), 'r'); // r for root
1282
-        $this->currentPersisterContext->selectJoinSql    = '';
1282
+        $this->currentPersisterContext->selectJoinSql = '';
1283 1283
 
1284 1284
         $eagerAliasCounter = 0;
1285 1285
         $columnList        = [];
@@ -1315,7 +1315,7 @@  discard block
 block discarded – undo
1315 1315
                         break; // now this is why you shouldn't use inheritance
1316 1316
                     }
1317 1317
 
1318
-                    $assocAlias = 'e' . ($eagerAliasCounter++);
1318
+                    $assocAlias = 'e'.($eagerAliasCounter++);
1319 1319
 
1320 1320
                     $this->currentPersisterContext->rsm->addJoinedEntityResult($targetEntity, $assocAlias, 'r', $fieldName);
1321 1321
 
@@ -1340,14 +1340,14 @@  discard block
 block discarded – undo
1340 1340
                         $this->currentPersisterContext->rsm->addIndexBy($assocAlias, $property->getIndexedBy());
1341 1341
                     }
1342 1342
 
1343
-                    if (! $property->isOwningSide()) {
1343
+                    if ( ! $property->isOwningSide()) {
1344 1344
                         $owningAssociation = $eagerEntity->getProperty($property->getMappedBy());
1345 1345
                     }
1346 1346
 
1347 1347
                     $joinTableAlias = $this->getSQLTableAlias($eagerEntity->getTableName(), $assocAlias);
1348 1348
                     $joinTableName  = $eagerEntity->table->getQuotedQualifiedName($this->platform);
1349 1349
 
1350
-                    $this->currentPersisterContext->selectJoinSql .= ' ' . $this->getJoinSQLForAssociation($property);
1350
+                    $this->currentPersisterContext->selectJoinSql .= ' '.$this->getJoinSQLForAssociation($property);
1351 1351
 
1352 1352
                     $sourceClass      = $this->em->getClassMetadata($owningAssociation->getSourceEntity());
1353 1353
                     $targetClass      = $this->em->getClassMetadata($owningAssociation->getTargetEntity());
@@ -1369,7 +1369,7 @@  discard block
 block discarded – undo
1369 1369
                         $joinCondition[] = $filterSql;
1370 1370
                     }
1371 1371
 
1372
-                    $this->currentPersisterContext->selectJoinSql .= ' ' . $joinTableName . ' ' . $joinTableAlias . ' ON ';
1372
+                    $this->currentPersisterContext->selectJoinSql .= ' '.$joinTableName.' '.$joinTableAlias.' ON ';
1373 1373
                     $this->currentPersisterContext->selectJoinSql .= implode(' AND ', $joinCondition);
1374 1374
 
1375 1375
                     break;
@@ -1393,7 +1393,7 @@  discard block
 block discarded – undo
1393 1393
      */
1394 1394
     protected function getSelectColumnAssociationSQL($field, AssociationMetadata $association, ClassMetadata $class, $alias = 'r')
1395 1395
     {
1396
-        if (! ($association->isOwningSide() && $association instanceof ToOneAssociationMetadata)) {
1396
+        if ( ! ($association->isOwningSide() && $association instanceof ToOneAssociationMetadata)) {
1397 1397
             return '';
1398 1398
         }
1399 1399
 
@@ -1408,7 +1408,7 @@  discard block
 block discarded – undo
1408 1408
             $referencedColumnName = $joinColumn->getReferencedColumnName();
1409 1409
             $resultColumnName     = $this->getSQLColumnAlias();
1410 1410
 
1411
-            if (! $joinColumn->getType()) {
1411
+            if ( ! $joinColumn->getType()) {
1412 1412
                 $joinColumn->setType(PersisterHelper::getTypeOfColumn($referencedColumnName, $targetClass, $this->em));
1413 1413
             }
1414 1414
 
@@ -1440,7 +1440,7 @@  discard block
 block discarded – undo
1440 1440
         $owningAssociation = $association;
1441 1441
         $sourceTableAlias  = $this->getSQLTableAlias($this->class->getTableName());
1442 1442
 
1443
-        if (! $association->isOwningSide()) {
1443
+        if ( ! $association->isOwningSide()) {
1444 1444
             $targetEntity      = $this->em->getClassMetadata($association->getTargetEntity());
1445 1445
             $owningAssociation = $targetEntity->getProperty($association->getMappedBy());
1446 1446
         }
@@ -1462,7 +1462,7 @@  discard block
 block discarded – undo
1462 1462
             );
1463 1463
         }
1464 1464
 
1465
-        return ' INNER JOIN ' . $joinTableName . ' ON ' . implode(' AND ', $conditions);
1465
+        return ' INNER JOIN '.$joinTableName.' ON '.implode(' AND ', $conditions);
1466 1466
     }
1467 1467
 
1468 1468
     /**
@@ -1557,7 +1557,7 @@  discard block
 block discarded – undo
1557 1557
                             $columnName           = $joinColumn->getColumnName();
1558 1558
                             $referencedColumnName = $joinColumn->getReferencedColumnName();
1559 1559
 
1560
-                            if (! $joinColumn->getType()) {
1560
+                            if ( ! $joinColumn->getType()) {
1561 1561
                                 $joinColumn->setType(PersisterHelper::getTypeOfColumn($referencedColumnName, $targetClass, $this->em));
1562 1562
                             }
1563 1563
 
@@ -1596,7 +1596,7 @@  discard block
 block discarded – undo
1596 1596
 
1597 1597
         $this->currentPersisterContext->rsm->addFieldResult($alias, $columnAlias, $field, $class->getClassName());
1598 1598
 
1599
-        return $property->getType()->convertToPHPValueSQL($sql, $this->platform) . ' AS ' . $columnAlias;
1599
+        return $property->getType()->convertToPHPValueSQL($sql, $this->platform).' AS '.$columnAlias;
1600 1600
     }
1601 1601
 
1602 1602
     /**
@@ -1610,14 +1610,14 @@  discard block
 block discarded – undo
1610 1610
     protected function getSQLTableAlias($tableName, $assocName = '')
1611 1611
     {
1612 1612
         if ($tableName) {
1613
-            $tableName .= '#' . $assocName;
1613
+            $tableName .= '#'.$assocName;
1614 1614
         }
1615 1615
 
1616 1616
         if (isset($this->currentPersisterContext->sqlTableAliases[$tableName])) {
1617 1617
             return $this->currentPersisterContext->sqlTableAliases[$tableName];
1618 1618
         }
1619 1619
 
1620
-        $tableAlias = 't' . $this->currentPersisterContext->sqlAliasCounter++;
1620
+        $tableAlias = 't'.$this->currentPersisterContext->sqlAliasCounter++;
1621 1621
 
1622 1622
         $this->currentPersisterContext->sqlTableAliases[$tableName] = $tableAlias;
1623 1623
 
@@ -1644,7 +1644,7 @@  discard block
 block discarded – undo
1644 1644
         }
1645 1645
 
1646 1646
         $lock  = $this->getLockTablesSql($lockMode);
1647
-        $where = ($conditionSql ? ' WHERE ' . $conditionSql : '') . ' ';
1647
+        $where = ($conditionSql ? ' WHERE '.$conditionSql : '').' ';
1648 1648
         $sql = 'SELECT 1 '
1649 1649
              . $lock
1650 1650
              . $where
@@ -1667,7 +1667,7 @@  discard block
 block discarded – undo
1667 1667
         $tableName = $this->class->table->getQuotedQualifiedName($this->platform);
1668 1668
 
1669 1669
         return $this->platform->appendLockHint(
1670
-            'FROM ' . $tableName . ' ' . $this->getSQLTableAlias($this->class->getTableName()),
1670
+            'FROM '.$tableName.' '.$this->getSQLTableAlias($this->class->getTableName()),
1671 1671
             $lockMode
1672 1672
         );
1673 1673
     }
@@ -1720,19 +1720,19 @@  discard block
 block discarded – undo
1720 1720
 
1721 1721
             if (null !== $comparison) {
1722 1722
                 // special case null value handling
1723
-                if (($comparison === Comparison::EQ || $comparison === Comparison::IS) && null ===$value) {
1724
-                    $selectedColumns[] = $column . ' IS NULL';
1723
+                if (($comparison === Comparison::EQ || $comparison === Comparison::IS) && null === $value) {
1724
+                    $selectedColumns[] = $column.' IS NULL';
1725 1725
 
1726 1726
                     continue;
1727 1727
                 }
1728 1728
 
1729 1729
                 if ($comparison === Comparison::NEQ && null === $value) {
1730
-                    $selectedColumns[] = $column . ' IS NOT NULL';
1730
+                    $selectedColumns[] = $column.' IS NOT NULL';
1731 1731
 
1732 1732
                     continue;
1733 1733
                 }
1734 1734
 
1735
-                $selectedColumns[] = $column . ' ' . sprintf(self::$comparisonMap[$comparison], $placeholder);
1735
+                $selectedColumns[] = $column.' '.sprintf(self::$comparisonMap[$comparison], $placeholder);
1736 1736
 
1737 1737
                 continue;
1738 1738
             }
@@ -1781,7 +1781,7 @@  discard block
 block discarded – undo
1781 1781
             $tableAlias = $this->getSQLTableAlias($property->getTableName());
1782 1782
             $columnName = $this->platform->quoteIdentifier($property->getColumnName());
1783 1783
 
1784
-            return [$tableAlias . '.' . $columnName];
1784
+            return [$tableAlias.'.'.$columnName];
1785 1785
         }
1786 1786
 
1787 1787
         if ($property instanceof AssociationMetadata) {
@@ -1790,7 +1790,7 @@  discard block
 block discarded – undo
1790 1790
 
1791 1791
             // Many-To-Many requires join table check for joinColumn
1792 1792
             if ($owningAssociation instanceof ManyToManyAssociationMetadata) {
1793
-                if (! $owningAssociation->isOwningSide()) {
1793
+                if ( ! $owningAssociation->isOwningSide()) {
1794 1794
                     $owningAssociation = $association;
1795 1795
                 }
1796 1796
 
@@ -1804,15 +1804,15 @@  discard block
 block discarded – undo
1804 1804
                 foreach ($joinColumns as $joinColumn) {
1805 1805
                     $quotedColumnName = $this->platform->quoteIdentifier($joinColumn->getColumnName());
1806 1806
 
1807
-                    $columns[] = $joinTableName . '.' . $quotedColumnName;
1807
+                    $columns[] = $joinTableName.'.'.$quotedColumnName;
1808 1808
                 }
1809 1809
 
1810 1810
             } else {
1811
-                if (! $owningAssociation->isOwningSide()) {
1811
+                if ( ! $owningAssociation->isOwningSide()) {
1812 1812
                     throw ORMException::invalidFindByInverseAssociation($this->class->getClassName(), $field);
1813 1813
                 }
1814 1814
 
1815
-                $class      = $this->class->isInheritedProperty($field)
1815
+                $class = $this->class->isInheritedProperty($field)
1816 1816
                     ? $owningAssociation->getDeclaringClass()
1817 1817
                     : $this->class
1818 1818
                 ;
@@ -1821,7 +1821,7 @@  discard block
 block discarded – undo
1821 1821
                 foreach ($owningAssociation->getJoinColumns() as $joinColumn) {
1822 1822
                     $quotedColumnName = $this->platform->quoteIdentifier($joinColumn->getColumnName());
1823 1823
 
1824
-                    $columns[] = $tableAlias . '.' . $quotedColumnName;
1824
+                    $columns[] = $tableAlias.'.'.$quotedColumnName;
1825 1825
                 }
1826 1826
             }
1827 1827
 
@@ -1934,7 +1934,7 @@  discard block
 block discarded – undo
1934 1934
                 $value = $value[$targetClass->identifier[0]];
1935 1935
             }
1936 1936
 
1937
-            $criteria[$tableAlias . "." . $quotedColumnName] = $value;
1937
+            $criteria[$tableAlias.".".$quotedColumnName] = $value;
1938 1938
             $parameters[] = [
1939 1939
                 'value' => $value,
1940 1940
                 'field' => $fieldName,
@@ -2021,7 +2021,7 @@  discard block
 block discarded – undo
2021 2021
             case ($property instanceof AssociationMetadata):
2022 2022
                 $class = $this->em->getClassMetadata($property->getTargetEntity());
2023 2023
 
2024
-                if (! $property->isOwningSide()) {
2024
+                if ( ! $property->isOwningSide()) {
2025 2025
                     $property = $class->getProperty($property->getMappedBy());
2026 2026
                     $class    = $this->em->getClassMetadata($property->getTargetEntity());
2027 2027
                 }
@@ -2035,7 +2035,7 @@  discard block
 block discarded – undo
2035 2035
                     /** @var JoinColumnMetadata $joinColumn */
2036 2036
                     $referencedColumnName = $joinColumn->getReferencedColumnName();
2037 2037
 
2038
-                    if (! $joinColumn->getType()) {
2038
+                    if ( ! $joinColumn->getType()) {
2039 2039
                         $joinColumn->setType(PersisterHelper::getTypeOfColumn($referencedColumnName, $class, $this->em));
2040 2040
                     }
2041 2041
 
@@ -2050,7 +2050,7 @@  discard block
 block discarded – undo
2050 2050
         }
2051 2051
 
2052 2052
         if (is_array($value)) {
2053
-            return array_map(function ($type) {
2053
+            return array_map(function($type) {
2054 2054
                 return $type->getBindingType() + Connection::ARRAY_PARAM_OFFSET;
2055 2055
             }, $types);
2056 2056
         }
@@ -2129,12 +2129,12 @@  discard block
 block discarded – undo
2129 2129
 
2130 2130
         $sql = 'SELECT 1 '
2131 2131
              . $this->getLockTablesSql(null)
2132
-             . ' WHERE ' . $this->getSelectConditionSQL($criteria);
2132
+             . ' WHERE '.$this->getSelectConditionSQL($criteria);
2133 2133
 
2134 2134
         list($params, $types) = $this->expandParameters($criteria);
2135 2135
 
2136 2136
         if (null !== $extraConditions) {
2137
-            $sql                                 .= ' AND ' . $this->getSelectConditionCriteriaSQL($extraConditions);
2137
+            $sql                                 .= ' AND '.$this->getSelectConditionCriteriaSQL($extraConditions);
2138 2138
             list($criteriaParams, $criteriaTypes) = $this->expandCriteriaParameters($extraConditions);
2139 2139
 
2140 2140
             $params = array_merge($params, $criteriaParams);
@@ -2142,7 +2142,7 @@  discard block
 block discarded – undo
2142 2142
         }
2143 2143
 
2144 2144
         if ($filterSql = $this->generateFilterConditionSQL($this->class, $alias)) {
2145
-            $sql .= ' AND ' . $filterSql;
2145
+            $sql .= ' AND '.$filterSql;
2146 2146
         }
2147 2147
 
2148 2148
         return (bool) $this->conn->fetchColumn($sql, $params, 0, $types);
@@ -2157,13 +2157,13 @@  discard block
 block discarded – undo
2157 2157
      */
2158 2158
     protected function getJoinSQLForAssociation(AssociationMetadata $association)
2159 2159
     {
2160
-        if (! $association->isOwningSide()) {
2160
+        if ( ! $association->isOwningSide()) {
2161 2161
             return 'LEFT JOIN';
2162 2162
         }
2163 2163
 
2164 2164
         // if one of the join columns is nullable, return left join
2165 2165
         foreach ($association->getJoinColumns() as $joinColumn) {
2166
-             if (! $joinColumn->isNullable()) {
2166
+             if ( ! $joinColumn->isNullable()) {
2167 2167
                  continue;
2168 2168
              }
2169 2169
 
@@ -2180,7 +2180,7 @@  discard block
 block discarded – undo
2180 2180
      */
2181 2181
     public function getSQLColumnAlias()
2182 2182
     {
2183
-        return $this->platform->getSQLResultCasing('c' . $this->currentPersisterContext->sqlAliasCounter++);
2183
+        return $this->platform->getSQLResultCasing('c'.$this->currentPersisterContext->sqlAliasCounter++);
2184 2184
     }
2185 2185
 
2186 2186
     /**
@@ -2197,13 +2197,13 @@  discard block
 block discarded – undo
2197 2197
 
2198 2198
         foreach ($this->em->getFilters()->getEnabledFilters() as $filter) {
2199 2199
             if ('' !== $filterExpr = $filter->addFilterConstraint($targetEntity, $targetTableAlias)) {
2200
-                $filterClauses[] = '(' . $filterExpr . ')';
2200
+                $filterClauses[] = '('.$filterExpr.')';
2201 2201
             }
2202 2202
         }
2203 2203
 
2204 2204
         $sql = implode(' AND ', $filterClauses);
2205 2205
 
2206
-        return $sql ? "(" . $sql . ")" : ""; // Wrap again to avoid "X or Y and FilterConditionSQL"
2206
+        return $sql ? "(".$sql.")" : ""; // Wrap again to avoid "X or Y and FilterConditionSQL"
2207 2207
     }
2208 2208
 
2209 2209
     /**
Please login to merge, or discard this patch.
lib/Doctrine/ORM/Query/Exec/MultiTableDeleteExecutor.php 2 patches
Unused Use Statements   -2 removed lines patch added patch discarded remove patch
@@ -22,9 +22,7 @@
 block discarded – undo
22 22
 namespace Doctrine\ORM\Query\Exec;
23 23
 
24 24
 use Doctrine\DBAL\Connection;
25
-use Doctrine\ORM\Mapping\ColumnMetadata;
26 25
 use Doctrine\ORM\Query\AST;
27
-use Doctrine\ORM\Utility\PersisterHelper;
28 26
 
29 27
 /**
30 28
  * Executes the SQL statements for bulk DQL DELETE statements on classes in
Please login to merge, or discard this patch.
Spacing   +6 added lines, -6 removed lines patch added patch discarded remove patch
@@ -1,6 +1,6 @@  discard block
 block discarded – undo
1 1
 <?php
2 2
 
3
-declare(strict_types=1);
3
+declare(strict_types = 1);
4 4
 
5 5
 namespace Doctrine\ORM\Query\Exec;
6 6
 
@@ -61,8 +61,8 @@  discard block
 block discarded – undo
61 61
         // 1. Create an INSERT INTO temptable ... SELECT identifiers WHERE $AST->getWhereClause()
62 62
         $sqlWalker->setSQLTableAlias($primaryClass->getTableName(), 'i0', $primaryDqlAlias);
63 63
 
64
-        $this->insertSql = 'INSERT INTO ' . $tempTable . ' (' . $idColumnNameList . ')'
65
-                . ' SELECT i0.' . implode(', i0.', array_keys($idColumns));
64
+        $this->insertSql = 'INSERT INTO '.$tempTable.' ('.$idColumnNameList.')'
65
+                . ' SELECT i0.'.implode(', i0.', array_keys($idColumns));
66 66
 
67 67
         $rangeDecl = new AST\RangeVariableDeclaration($primaryClass->getClassName(), $primaryDqlAlias);
68 68
         $fromClause = new AST\FromClause([new AST\IdentificationVariableDeclaration($rangeDecl, null, [])]);
@@ -84,7 +84,7 @@  discard block
 block discarded – undo
84 84
         // 3. Create and store DELETE statements
85 85
         $hierarchyClasses = array_merge(
86 86
             array_map(
87
-                function ($className) use ($em) { return $em->getClassMetadata($className); },
87
+                function($className) use ($em) { return $em->getClassMetadata($className); },
88 88
                 array_reverse($primaryClass->getSubClasses())
89 89
             ),
90 90
             [$primaryClass],
@@ -105,8 +105,8 @@  discard block
 block discarded – undo
105 105
             ];
106 106
         }
107 107
 
108
-        $this->createTempTableSql = $platform->getCreateTemporaryTableSnippetSQL() . ' ' . $tempTable . ' ('
109
-                . $platform->getColumnDeclarationListSQL($columnDefinitions) . ')';
108
+        $this->createTempTableSql = $platform->getCreateTemporaryTableSnippetSQL().' '.$tempTable.' ('
109
+                . $platform->getColumnDeclarationListSQL($columnDefinitions).')';
110 110
 
111 111
         $this->dropTempTableSql = $platform->getDropTemporaryTableSQL($tempTable);
112 112
     }
Please login to merge, or discard this patch.
lib/Doctrine/ORM/Query/Exec/MultiTableUpdateExecutor.php 2 patches
Unused Use Statements   -2 removed lines patch added patch discarded remove patch
@@ -22,10 +22,8 @@
 block discarded – undo
22 22
 namespace Doctrine\ORM\Query\Exec;
23 23
 
24 24
 use Doctrine\DBAL\Connection;
25
-use Doctrine\ORM\Mapping\ColumnMetadata;
26 25
 use Doctrine\ORM\Query\AST;
27 26
 use Doctrine\ORM\Query\ParameterTypeInferer;
28
-use Doctrine\ORM\Utility\PersisterHelper;
29 27
 
30 28
 /**
31 29
  * Executes the SQL statements for bulk DQL UPDATE statements on classes in
Please login to merge, or discard this patch.
Spacing   +6 added lines, -6 removed lines patch added patch discarded remove patch
@@ -1,6 +1,6 @@  discard block
 block discarded – undo
1 1
 <?php
2 2
 
3
-declare(strict_types=1);
3
+declare(strict_types = 1);
4 4
 
5 5
 namespace Doctrine\ORM\Query\Exec;
6 6
 
@@ -72,8 +72,8 @@  discard block
 block discarded – undo
72 72
         // 1. Create an INSERT INTO temptable ... SELECT identifiers WHERE $AST->getWhereClause()
73 73
         $sqlWalker->setSQLTableAlias($primaryClass->getTableName(), 'i0', $updateClause->aliasIdentificationVariable);
74 74
 
75
-        $this->insertSql = 'INSERT INTO ' . $tempTable . ' (' . $idColumnNameList . ')'
76
-                . ' SELECT i0.' . implode(', i0.', array_keys($idColumns));
75
+        $this->insertSql = 'INSERT INTO '.$tempTable.' ('.$idColumnNameList.')'
76
+                . ' SELECT i0.'.implode(', i0.', array_keys($idColumns));
77 77
 
78 78
         $rangeDecl = new AST\RangeVariableDeclaration($primaryClass->getClassName(), $updateClause->aliasIdentificationVariable);
79 79
         $fromClause = new AST\FromClause([new AST\IdentificationVariableDeclaration($rangeDecl, null, [])]);
@@ -91,7 +91,7 @@  discard block
 block discarded – undo
91 91
         // 3. Create and store UPDATE statements
92 92
         $hierarchyClasses = array_merge(
93 93
             array_map(
94
-                function ($className) use ($em) { return $em->getClassMetadata($className); },
94
+                function($className) use ($em) { return $em->getClassMetadata($className); },
95 95
                 array_reverse($primaryClass->getSubClasses())
96 96
             ),
97 97
             [$primaryClass],
@@ -145,8 +145,8 @@  discard block
 block discarded – undo
145 145
             ];
146 146
         }
147 147
 
148
-        $this->createTempTableSql = $platform->getCreateTemporaryTableSnippetSQL() . ' ' . $tempTable . ' ('
149
-                . $platform->getColumnDeclarationListSQL($columnDefinitions) . ')';
148
+        $this->createTempTableSql = $platform->getCreateTemporaryTableSnippetSQL().' '.$tempTable.' ('
149
+                . $platform->getColumnDeclarationListSQL($columnDefinitions).')';
150 150
 
151 151
         $this->dropTempTableSql = $platform->getDropTemporaryTableSQL($tempTable);
152 152
     }
Please login to merge, or discard this patch.
lib/Doctrine/ORM/Tools/Console/Command/MappingDescribeCommand.php 3 patches
Doc Comments   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -165,7 +165,7 @@  discard block
 block discarded – undo
165 165
      * @param string                 $entityName    Full or partial entity name
166 166
      * @param EntityManagerInterface $entityManager
167 167
      *
168
-     * @return \Doctrine\ORM\Mapping\ClassMetadata
168
+     * @return \Doctrine\Common\Persistence\Mapping\ClassMetadata
169 169
      */
170 170
     private function getClassMetadata($entityName, EntityManagerInterface $entityManager)
171 171
     {
@@ -248,7 +248,7 @@  discard block
 block discarded – undo
248 248
      * @param string $label Label for the value
249 249
      * @param mixed  $value A Value to show
250 250
      *
251
-     * @return array
251
+     * @return string[]
252 252
      */
253 253
     private function formatField($label, $value)
254 254
     {
@@ -347,7 +347,7 @@  discard block
 block discarded – undo
347 347
      *
348 348
      * @param array $entityListeners
349 349
      *
350
-     * @return array
350
+     * @return string[]
351 351
      */
352 352
     private function formatEntityListeners(array $entityListeners)
353 353
     {
Please login to merge, or discard this patch.
Braces   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -298,7 +298,7 @@
 block discarded – undo
298 298
 
299 299
             if ($property instanceof FieldMetadata) {
300 300
                 $output = array_merge($output, $this->formatColumn($property));
301
-            }  else if ($property instanceof AssociationMetadata) {
301
+            } else if ($property instanceof AssociationMetadata) {
302 302
                 // @todo guilhermeblanco Fix me! We are trying to iterate through an AssociationMetadata instance
303 303
                 foreach ($property as $field => $value) {
304 304
                     $output[] = $this->formatField(sprintf('    %s', $field), $this->formatValue($value));
Please login to merge, or discard this patch.
Spacing   +7 added lines, -7 removed lines patch added patch discarded remove patch
@@ -1,6 +1,6 @@  discard block
 block discarded – undo
1 1
 <?php
2 2
 
3
-declare(strict_types=1);
3
+declare(strict_types = 1);
4 4
 
5 5
 namespace Doctrine\ORM\Tools\Console\Command;
6 6
 
@@ -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
 
@@ -223,7 +223,7 @@  discard block
 block discarded – undo
223 223
 
224 224
             $output[] = $this->formatField(
225 225
                 sprintf('  %s', $parentClass->getParent()),
226
-                ($parentClass->isRootEntity() ? '(Root) ' : '') . $this->formatValue($attributes)
226
+                ($parentClass->isRootEntity() ? '(Root) ' : '').$this->formatValue($attributes)
227 227
             );
228 228
         }
229 229
 
@@ -248,7 +248,7 @@  discard block
 block discarded – undo
248 248
         }
249 249
 
250 250
         if (is_bool($value)) {
251
-            return '<comment>' . ($value ? 'True' : 'False') . '</comment>';
251
+            return '<comment>'.($value ? 'True' : 'False').'</comment>';
252 252
         }
253 253
 
254 254
         if (empty($value)) {
@@ -330,7 +330,7 @@  discard block
 block discarded – undo
330 330
 
331 331
             if ($property instanceof FieldMetadata) {
332 332
                 $output = array_merge($output, $this->formatColumn($property));
333
-            }  else if ($property instanceof AssociationMetadata) {
333
+            } else if ($property instanceof AssociationMetadata) {
334 334
                 // @todo guilhermeblanco Fix me! We are trying to iterate through an AssociationMetadata instance
335 335
                 foreach ($property as $field => $value) {
336 336
                     $output[] = $this->formatField(sprintf('    %s', $field), $this->formatValue($value));
@@ -386,7 +386,7 @@  discard block
 block discarded – undo
386 386
         return $this->formatField(
387 387
             'Entity listeners',
388 388
             array_map(
389
-                function ($entityListener) {
389
+                function($entityListener) {
390 390
                     return get_class($entityListener);
391 391
                 },
392 392
                 $entityListeners
Please login to merge, or discard this patch.