@@ -19,16 +19,16 @@ |
||
19 | 19 | public function providerParameterTypeInferer() |
20 | 20 | { |
21 | 21 | $data = [ |
22 | - [1, Type::INTEGER], |
|
23 | - ['bar', ParameterType::STRING], |
|
24 | - ['1', ParameterType::STRING], |
|
25 | - [new DateTime(), Type::DATETIME], |
|
22 | + [1, Type::INTEGER], |
|
23 | + ['bar', ParameterType::STRING], |
|
24 | + ['1', ParameterType::STRING], |
|
25 | + [new DateTime(), Type::DATETIME], |
|
26 | 26 | [new DateInterval('P1D'), Type::DATEINTERVAL], |
27 | - [[2], Connection::PARAM_INT_ARRAY], |
|
28 | - [['foo'], Connection::PARAM_STR_ARRAY], |
|
29 | - [['1','2'], Connection::PARAM_STR_ARRAY], |
|
30 | - [[], Connection::PARAM_STR_ARRAY], |
|
31 | - [true, Type::BOOLEAN], |
|
27 | + [[2], Connection::PARAM_INT_ARRAY], |
|
28 | + [['foo'], Connection::PARAM_STR_ARRAY], |
|
29 | + [['1', '2'], Connection::PARAM_STR_ARRAY], |
|
30 | + [[], Connection::PARAM_STR_ARRAY], |
|
31 | + [true, Type::BOOLEAN], |
|
32 | 32 | ]; |
33 | 33 | |
34 | 34 | if (PHP_VERSION_ID >= 50500) { |
@@ -59,7 +59,7 @@ discard block |
||
59 | 59 | |
60 | 60 | protected function createRegion() |
61 | 61 | { |
62 | - $this->directory = sys_get_temp_dir() . '/doctrine_lock_' . uniqid(); |
|
62 | + $this->directory = sys_get_temp_dir().'/doctrine_lock_'.uniqid(); |
|
63 | 63 | |
64 | 64 | $region = new DefaultRegion('concurren_region_test', $this->cache); |
65 | 65 | |
@@ -262,7 +262,7 @@ discard block |
||
262 | 262 | $reflectionDirectory->setAccessible(true); |
263 | 263 | $reflectionDirectory->setValue($region, str_repeat('a', 10000)); |
264 | 264 | |
265 | - set_error_handler(static function () { |
|
265 | + set_error_handler(static function() { |
|
266 | 266 | }, E_WARNING); |
267 | 267 | self::assertTrue($region->evictAll()); |
268 | 268 | restore_error_handler(); |
@@ -275,7 +275,7 @@ discard block |
||
275 | 275 | { |
276 | 276 | $path = $path ?: $this->directory; |
277 | 277 | |
278 | - if (! is_dir($path)) { |
|
278 | + if ( ! is_dir($path)) { |
|
279 | 279 | return; |
280 | 280 | } |
281 | 281 |
@@ -173,7 +173,7 @@ discard block |
||
173 | 173 | ->expects(self::once()) |
174 | 174 | ->method('loadCollection') |
175 | 175 | ->with($this->collection) |
176 | - ->willReturnCallback(static function (PersistentCollection $persistentCollection) use ($persistedElement) : void { |
|
176 | + ->willReturnCallback(static function(PersistentCollection $persistentCollection) use ($persistedElement) : void { |
|
177 | 177 | $persistentCollection->unwrap()->add($persistedElement); |
178 | 178 | }); |
179 | 179 | |
@@ -210,7 +210,7 @@ discard block |
||
210 | 210 | ->expects(self::once()) |
211 | 211 | ->method('loadCollection') |
212 | 212 | ->with($this->collection) |
213 | - ->willReturnCallback(static function (PersistentCollection $persistentCollection) use ( |
|
213 | + ->willReturnCallback(static function(PersistentCollection $persistentCollection) use ( |
|
214 | 214 | $persistedElement, |
215 | 215 | $newElementThatIsAlsoPersisted |
216 | 216 | ) : void { |
@@ -252,7 +252,7 @@ discard block |
||
252 | 252 | ->expects(self::once()) |
253 | 253 | ->method('loadCollection') |
254 | 254 | ->with($this->collection) |
255 | - ->willReturnCallback(static function (PersistentCollection $persistentCollection) use ( |
|
255 | + ->willReturnCallback(static function(PersistentCollection $persistentCollection) use ( |
|
256 | 256 | $persistedElement, |
257 | 257 | $newElementThatIsAlsoPersisted |
258 | 258 | ) : void { |
@@ -35,6 +35,6 @@ |
||
35 | 35 | |
36 | 36 | public function __toString() |
37 | 37 | { |
38 | - return self::class . '[id=' . $this->id . ']'; |
|
38 | + return self::class.'[id='.$this->id.']'; |
|
39 | 39 | } |
40 | 40 | } |
@@ -15,20 +15,20 @@ |
||
15 | 15 | error_reporting(E_ALL | E_STRICT); |
16 | 16 | date_default_timezone_set('UTC'); |
17 | 17 | |
18 | -if (file_exists(__DIR__ . '/../../../vendor/autoload.php')) { |
|
18 | +if (file_exists(__DIR__.'/../../../vendor/autoload.php')) { |
|
19 | 19 | // dependencies were installed via composer - this is the main project |
20 | - require __DIR__ . '/../../../vendor/autoload.php'; |
|
21 | -} elseif (file_exists(__DIR__ . '/../../../../../autoload.php')) { |
|
20 | + require __DIR__.'/../../../vendor/autoload.php'; |
|
21 | +} elseif (file_exists(__DIR__.'/../../../../../autoload.php')) { |
|
22 | 22 | // installed as a dependency in `vendor` |
23 | - require __DIR__ . '/../../../../../autoload.php'; |
|
23 | + require __DIR__.'/../../../../../autoload.php'; |
|
24 | 24 | } else { |
25 | 25 | throw new Exception('Can\'t find autoload.php. Did you install dependencies via composer?'); |
26 | 26 | } |
27 | 27 | |
28 | -if (! file_exists(__DIR__ . '/Proxies') && ! mkdir(__DIR__ . '/Proxies')) { |
|
29 | - throw new Exception('Could not create ' . __DIR__ . '/Proxies Folder.'); |
|
28 | +if ( ! file_exists(__DIR__.'/Proxies') && ! mkdir(__DIR__.'/Proxies')) { |
|
29 | + throw new Exception('Could not create '.__DIR__.'/Proxies Folder.'); |
|
30 | 30 | } |
31 | 31 | |
32 | -if (! file_exists(__DIR__ . '/ORM/Proxy/generated') && ! mkdir(__DIR__ . '/ORM/Proxy/generated')) { |
|
33 | - throw new Exception('Could not create ' . __DIR__ . '/ORM/Proxy/generated Folder.'); |
|
32 | +if ( ! file_exists(__DIR__.'/ORM/Proxy/generated') && ! mkdir(__DIR__.'/ORM/Proxy/generated')) { |
|
33 | + throw new Exception('Could not create '.__DIR__.'/ORM/Proxy/generated Folder.'); |
|
34 | 34 | } |
@@ -305,8 +305,8 @@ discard block |
||
305 | 305 | |
306 | 306 | // FIXME: Order with composite keys might not be correct |
307 | 307 | $sql = 'SELECT ' . $columnName |
308 | - . ' FROM ' . $tableName |
|
309 | - . ' WHERE ' . implode(' = ? AND ', $identifier) . ' = ?'; |
|
308 | + . ' FROM ' . $tableName |
|
309 | + . ' WHERE ' . implode(' = ? AND ', $identifier) . ' = ?'; |
|
310 | 310 | |
311 | 311 | $flattenedId = $this->em->getIdentifierFlattener()->flattenIdentifier($versionedClass, $id); |
312 | 312 | $versionType = $versionProperty->getType(); |
@@ -519,8 +519,8 @@ discard block |
||
519 | 519 | } |
520 | 520 | |
521 | 521 | $sql = 'UPDATE ' . $quotedTableName |
522 | - . ' SET ' . implode(', ', $set) |
|
523 | - . ' WHERE ' . implode(' = ? AND ', $where) . ' = ?'; |
|
522 | + . ' SET ' . implode(', ', $set) |
|
523 | + . ' WHERE ' . implode(' = ? AND ', $where) . ' = ?'; |
|
524 | 524 | |
525 | 525 | $result = $this->conn->executeUpdate($sql, $params, $types); |
526 | 526 | |
@@ -1641,9 +1641,9 @@ discard block |
||
1641 | 1641 | $lock = $this->getLockTablesSql($lockMode); |
1642 | 1642 | $where = ($conditionSql ? ' WHERE ' . $conditionSql : '') . ' '; |
1643 | 1643 | $sql = 'SELECT 1 ' |
1644 | - . $lock |
|
1645 | - . $where |
|
1646 | - . $lockSql; |
|
1644 | + . $lock |
|
1645 | + . $where |
|
1646 | + . $lockSql; |
|
1647 | 1647 | |
1648 | 1648 | [$params, $types] = $this->expandParameters($criteria); |
1649 | 1649 | |
@@ -2112,8 +2112,8 @@ discard block |
||
2112 | 2112 | $alias = $this->getSQLTableAlias($this->class->getTableName()); |
2113 | 2113 | |
2114 | 2114 | $sql = 'SELECT 1 ' |
2115 | - . $this->getLockTablesSql(null) |
|
2116 | - . ' WHERE ' . $this->getSelectConditionSQL($criteria); |
|
2115 | + . $this->getLockTablesSql(null) |
|
2116 | + . ' WHERE ' . $this->getSelectConditionSQL($criteria); |
|
2117 | 2117 | |
2118 | 2118 | [$params, $types] = $this->expandParameters($criteria); |
2119 | 2119 |
@@ -295,16 +295,16 @@ discard block |
||
295 | 295 | $tableName = $versionedClass->table->getQuotedQualifiedName($this->platform); |
296 | 296 | $columnName = $this->platform->quoteIdentifier($versionProperty->getColumnName()); |
297 | 297 | $identifier = array_map( |
298 | - function ($columnName) { |
|
298 | + function($columnName) { |
|
299 | 299 | return $this->platform->quoteIdentifier($columnName); |
300 | 300 | }, |
301 | 301 | array_keys($versionedClass->getIdentifierColumns($this->em)) |
302 | 302 | ); |
303 | 303 | |
304 | 304 | // FIXME: Order with composite keys might not be correct |
305 | - $sql = 'SELECT ' . $columnName |
|
306 | - . ' FROM ' . $tableName |
|
307 | - . ' WHERE ' . implode(' = ? AND ', $identifier) . ' = ?'; |
|
305 | + $sql = 'SELECT '.$columnName |
|
306 | + . ' FROM '.$tableName |
|
307 | + . ' WHERE '.implode(' = ? AND ', $identifier).' = ?'; |
|
308 | 308 | |
309 | 309 | $flattenedId = $this->em->getIdentifierFlattener()->flattenIdentifier($versionedClass, $id); |
310 | 310 | $versionType = $versionProperty->getType(); |
@@ -343,13 +343,13 @@ discard block |
||
343 | 343 | $tableName = $this->class->getTableName(); |
344 | 344 | $updateData = $this->prepareUpdateData($entity); |
345 | 345 | |
346 | - if (! isset($updateData[$tableName])) { |
|
346 | + if ( ! isset($updateData[$tableName])) { |
|
347 | 347 | return; |
348 | 348 | } |
349 | 349 | |
350 | 350 | $data = $updateData[$tableName]; |
351 | 351 | |
352 | - if (! $data) { |
|
352 | + if ( ! $data) { |
|
353 | 353 | return; |
354 | 354 | } |
355 | 355 | |
@@ -401,7 +401,7 @@ discard block |
||
401 | 401 | |
402 | 402 | if ($value !== null) { |
403 | 403 | // @todo guilhermeblanco Make sure we do not have flat association values. |
404 | - if (! is_array($value)) { |
|
404 | + if ( ! is_array($value)) { |
|
405 | 405 | $value = [$targetClass->identifier[0] => $value]; |
406 | 406 | } |
407 | 407 | |
@@ -414,7 +414,7 @@ discard block |
||
414 | 414 | $referencedColumnName = $joinColumn->getReferencedColumnName(); |
415 | 415 | $targetField = $targetClass->fieldNames[$referencedColumnName]; |
416 | 416 | |
417 | - if (! $joinColumn->getType()) { |
|
417 | + if ( ! $joinColumn->getType()) { |
|
418 | 418 | $joinColumn->setType(PersisterHelper::getTypeOfColumn($referencedColumnName, $targetClass, $this->em)); |
419 | 419 | } |
420 | 420 | |
@@ -480,7 +480,7 @@ discard block |
||
480 | 480 | $quotedColumnName = $this->platform->quoteIdentifier($joinColumn->getColumnName()); |
481 | 481 | $referencedColumnName = $joinColumn->getReferencedColumnName(); |
482 | 482 | |
483 | - if (! $joinColumn->getType()) { |
|
483 | + if ( ! $joinColumn->getType()) { |
|
484 | 484 | $joinColumn->setType(PersisterHelper::getTypeOfColumn($referencedColumnName, $targetClass, $this->em)); |
485 | 485 | } |
486 | 486 | |
@@ -507,18 +507,18 @@ discard block |
||
507 | 507 | case Type::SMALLINT: |
508 | 508 | case Type::INTEGER: |
509 | 509 | case Type::BIGINT: |
510 | - $set[] = $versionColumnName . ' = ' . $versionColumnName . ' + 1'; |
|
510 | + $set[] = $versionColumnName.' = '.$versionColumnName.' + 1'; |
|
511 | 511 | break; |
512 | 512 | |
513 | 513 | case Type::DATETIME: |
514 | - $set[] = $versionColumnName . ' = CURRENT_TIMESTAMP'; |
|
514 | + $set[] = $versionColumnName.' = CURRENT_TIMESTAMP'; |
|
515 | 515 | break; |
516 | 516 | } |
517 | 517 | } |
518 | 518 | |
519 | - $sql = 'UPDATE ' . $quotedTableName |
|
520 | - . ' SET ' . implode(', ', $set) |
|
521 | - . ' WHERE ' . implode(' = ? AND ', $where) . ' = ?'; |
|
519 | + $sql = 'UPDATE '.$quotedTableName |
|
520 | + . ' SET '.implode(', ', $set) |
|
521 | + . ' WHERE '.implode(' = ? AND ', $where).' = ?'; |
|
522 | 522 | |
523 | 523 | $result = $this->conn->executeUpdate($sql, $params, $types); |
524 | 524 | |
@@ -535,7 +535,7 @@ discard block |
||
535 | 535 | protected function deleteJoinTableRecords($identifier) |
536 | 536 | { |
537 | 537 | foreach ($this->class->getPropertiesIterator() as $association) { |
538 | - if (! ($association instanceof ManyToManyAssociationMetadata)) { |
|
538 | + if ( ! ($association instanceof ManyToManyAssociationMetadata)) { |
|
539 | 539 | continue; |
540 | 540 | } |
541 | 541 | |
@@ -547,7 +547,7 @@ discard block |
||
547 | 547 | $otherKeys = []; |
548 | 548 | $keys = []; |
549 | 549 | |
550 | - if (! $owningAssociation->isOwningSide()) { |
|
550 | + if ( ! $owningAssociation->isOwningSide()) { |
|
551 | 551 | $class = $this->em->getClassMetadata($association->getTargetEntity()); |
552 | 552 | $owningAssociation = $class->getProperty($association->getMappedBy()); |
553 | 553 | } |
@@ -657,7 +657,7 @@ discard block |
||
657 | 657 | } |
658 | 658 | |
659 | 659 | // Only owning side of x-1 associations can have a FK column. |
660 | - if (! $property instanceof ToOneAssociationMetadata || ! $property->isOwningSide()) { |
|
660 | + if ( ! $property instanceof ToOneAssociationMetadata || ! $property->isOwningSide()) { |
|
661 | 661 | continue; |
662 | 662 | } |
663 | 663 | |
@@ -677,7 +677,7 @@ discard block |
||
677 | 677 | /** @var JoinColumnMetadata $joinColumn */ |
678 | 678 | $referencedColumnName = $joinColumn->getReferencedColumnName(); |
679 | 679 | |
680 | - if (! $joinColumn->getType()) { |
|
680 | + if ( ! $joinColumn->getType()) { |
|
681 | 681 | $joinColumn->setType(PersisterHelper::getTypeOfColumn($referencedColumnName, $targetClass, $this->em)); |
682 | 682 | } |
683 | 683 | |
@@ -704,7 +704,7 @@ discard block |
||
704 | 704 | $propertyName = $this->class->fieldNames[$columnName]; |
705 | 705 | $property = $this->class->getProperty($propertyName); |
706 | 706 | |
707 | - if (! $property) { |
|
707 | + if ( ! $property) { |
|
708 | 708 | return null; |
709 | 709 | } |
710 | 710 | |
@@ -723,7 +723,7 @@ discard block |
||
723 | 723 | /** @var JoinColumnMetadata $joinColumn */ |
724 | 724 | $referencedColumnName = $joinColumn->getReferencedColumnName(); |
725 | 725 | |
726 | - if (! $joinColumn->getType()) { |
|
726 | + if ( ! $joinColumn->getType()) { |
|
727 | 727 | $joinColumn->setType(PersisterHelper::getTypeOfColumn($referencedColumnName, $targetClass, $this->em)); |
728 | 728 | } |
729 | 729 | |
@@ -828,7 +828,7 @@ discard block |
||
828 | 828 | $sourceKeyColumn = $joinColumn->getReferencedColumnName(); |
829 | 829 | $targetKeyColumn = $joinColumn->getColumnName(); |
830 | 830 | |
831 | - if (! isset($sourceClass->fieldNames[$sourceKeyColumn])) { |
|
831 | + if ( ! isset($sourceClass->fieldNames[$sourceKeyColumn])) { |
|
832 | 832 | throw MappingException::joinColumnMustPointToMappedField( |
833 | 833 | $sourceClass->getClassName(), |
834 | 834 | $sourceKeyColumn |
@@ -929,7 +929,7 @@ discard block |
||
929 | 929 | foreach ($types as $type) { |
930 | 930 | [$field, $value, $operator] = $type; |
931 | 931 | $sqlType = $this->getTypes($field, $value, $this->class); |
932 | - if($operator === Comparison::CONTAINS && $sqlType[0] === Type::JSON) { |
|
932 | + if ($operator === Comparison::CONTAINS && $sqlType[0] === Type::JSON) { |
|
933 | 933 | $sqlType[0] = Type::STRING; |
934 | 934 | } |
935 | 935 | $sqlTypes = array_merge($sqlTypes, $sqlType); |
@@ -1059,7 +1059,7 @@ discard block |
||
1059 | 1059 | $criteria = []; |
1060 | 1060 | $parameters = []; |
1061 | 1061 | |
1062 | - if (! $association->isOwningSide()) { |
|
1062 | + if ( ! $association->isOwningSide()) { |
|
1063 | 1063 | $class = $this->em->getClassMetadata($association->getTargetEntity()); |
1064 | 1064 | $owningAssoc = $class->getProperty($association->getMappedBy()); |
1065 | 1065 | } |
@@ -1087,7 +1087,7 @@ discard block |
||
1087 | 1087 | $value = $value[$targetClass->identifier[0]]; |
1088 | 1088 | } |
1089 | 1089 | |
1090 | - $criteria[$joinTableName . '.' . $quotedColumnName] = $value; |
|
1090 | + $criteria[$joinTableName.'.'.$quotedColumnName] = $value; |
|
1091 | 1091 | $parameters[] = [ |
1092 | 1092 | 'value' => $value, |
1093 | 1093 | 'field' => $fieldName, |
@@ -1137,11 +1137,11 @@ discard block |
||
1137 | 1137 | |
1138 | 1138 | switch ($lockMode) { |
1139 | 1139 | case LockMode::PESSIMISTIC_READ: |
1140 | - $lockSql = ' ' . $this->platform->getReadLockSQL(); |
|
1140 | + $lockSql = ' '.$this->platform->getReadLockSQL(); |
|
1141 | 1141 | break; |
1142 | 1142 | |
1143 | 1143 | case LockMode::PESSIMISTIC_WRITE: |
1144 | - $lockSql = ' ' . $this->platform->getWriteLockSQL(); |
|
1144 | + $lockSql = ' '.$this->platform->getWriteLockSQL(); |
|
1145 | 1145 | break; |
1146 | 1146 | } |
1147 | 1147 | |
@@ -1152,14 +1152,14 @@ discard block |
||
1152 | 1152 | |
1153 | 1153 | if ($filterSql !== '') { |
1154 | 1154 | $conditionSql = $conditionSql |
1155 | - ? $conditionSql . ' AND ' . $filterSql |
|
1155 | + ? $conditionSql.' AND '.$filterSql |
|
1156 | 1156 | : $filterSql; |
1157 | 1157 | } |
1158 | 1158 | |
1159 | - $select = 'SELECT ' . $columnList; |
|
1160 | - $from = ' FROM ' . $tableName . ' ' . $tableAlias; |
|
1161 | - $join = $this->currentPersisterContext->selectJoinSql . $joinSql; |
|
1162 | - $where = ($conditionSql ? ' WHERE ' . $conditionSql : ''); |
|
1159 | + $select = 'SELECT '.$columnList; |
|
1160 | + $from = ' FROM '.$tableName.' '.$tableAlias; |
|
1161 | + $join = $this->currentPersisterContext->selectJoinSql.$joinSql; |
|
1162 | + $where = ($conditionSql ? ' WHERE '.$conditionSql : ''); |
|
1163 | 1163 | $lock = $this->platform->appendLockHint($from, $lockMode); |
1164 | 1164 | $query = $select |
1165 | 1165 | . $lock |
@@ -1167,7 +1167,7 @@ discard block |
||
1167 | 1167 | . $where |
1168 | 1168 | . $orderBySql; |
1169 | 1169 | |
1170 | - return $this->platform->modifyLimitQuery($query, $limit, $offset ?? 0) . $lockSql; |
|
1170 | + return $this->platform->modifyLimitQuery($query, $limit, $offset ?? 0).$lockSql; |
|
1171 | 1171 | } |
1172 | 1172 | |
1173 | 1173 | /** |
@@ -1186,13 +1186,13 @@ discard block |
||
1186 | 1186 | |
1187 | 1187 | if ($filterSql !== '') { |
1188 | 1188 | $conditionSql = $conditionSql |
1189 | - ? $conditionSql . ' AND ' . $filterSql |
|
1189 | + ? $conditionSql.' AND '.$filterSql |
|
1190 | 1190 | : $filterSql; |
1191 | 1191 | } |
1192 | 1192 | |
1193 | 1193 | return 'SELECT COUNT(*) ' |
1194 | - . 'FROM ' . $tableName . ' ' . $tableAlias |
|
1195 | - . (empty($conditionSql) ? '' : ' WHERE ' . $conditionSql); |
|
1194 | + . 'FROM '.$tableName.' '.$tableAlias |
|
1195 | + . (empty($conditionSql) ? '' : ' WHERE '.$conditionSql); |
|
1196 | 1196 | } |
1197 | 1197 | |
1198 | 1198 | /** |
@@ -1207,7 +1207,7 @@ discard block |
||
1207 | 1207 | */ |
1208 | 1208 | final protected function getOrderBySQL(array $orderBy, $baseTableAlias) |
1209 | 1209 | { |
1210 | - if (! $orderBy) { |
|
1210 | + if ( ! $orderBy) { |
|
1211 | 1211 | return ''; |
1212 | 1212 | } |
1213 | 1213 | |
@@ -1216,7 +1216,7 @@ discard block |
||
1216 | 1216 | foreach ($orderBy as $fieldName => $orientation) { |
1217 | 1217 | $orientation = strtoupper(trim($orientation)); |
1218 | 1218 | |
1219 | - if (! in_array($orientation, ['ASC', 'DESC'], true)) { |
|
1219 | + if ( ! in_array($orientation, ['ASC', 'DESC'], true)) { |
|
1220 | 1220 | throw InvalidOrientation::fromClassNameAndField($this->class->getClassName(), $fieldName); |
1221 | 1221 | } |
1222 | 1222 | |
@@ -1226,11 +1226,11 @@ discard block |
||
1226 | 1226 | $tableAlias = $this->getSQLTableAlias($property->getTableName()); |
1227 | 1227 | $columnName = $this->platform->quoteIdentifier($property->getColumnName()); |
1228 | 1228 | |
1229 | - $orderByList[] = $tableAlias . '.' . $columnName . ' ' . $orientation; |
|
1229 | + $orderByList[] = $tableAlias.'.'.$columnName.' '.$orientation; |
|
1230 | 1230 | |
1231 | 1231 | continue; |
1232 | 1232 | } elseif ($property instanceof AssociationMetadata) { |
1233 | - if (! $property->isOwningSide()) { |
|
1233 | + if ( ! $property->isOwningSide()) { |
|
1234 | 1234 | throw InvalidFindByCall::fromInverseSideUsage( |
1235 | 1235 | $this->class->getClassName(), |
1236 | 1236 | $fieldName |
@@ -1246,7 +1246,7 @@ discard block |
||
1246 | 1246 | /** @var JoinColumnMetadata $joinColumn */ |
1247 | 1247 | $quotedColumnName = $this->platform->quoteIdentifier($joinColumn->getColumnName()); |
1248 | 1248 | |
1249 | - $orderByList[] = $tableAlias . '.' . $quotedColumnName . ' ' . $orientation; |
|
1249 | + $orderByList[] = $tableAlias.'.'.$quotedColumnName.' '.$orientation; |
|
1250 | 1250 | } |
1251 | 1251 | |
1252 | 1252 | continue; |
@@ -1255,7 +1255,7 @@ discard block |
||
1255 | 1255 | throw UnrecognizedField::byName($fieldName); |
1256 | 1256 | } |
1257 | 1257 | |
1258 | - return ' ORDER BY ' . implode(', ', $orderByList); |
|
1258 | + return ' ORDER BY '.implode(', ', $orderByList); |
|
1259 | 1259 | } |
1260 | 1260 | |
1261 | 1261 | /** |
@@ -1297,7 +1297,7 @@ discard block |
||
1297 | 1297 | $isAssocToOneInverseSide = $property instanceof ToOneAssociationMetadata && ! $property->isOwningSide(); |
1298 | 1298 | $isAssocFromOneEager = ! $property instanceof ManyToManyAssociationMetadata && $property->getFetchMode() === FetchMode::EAGER; |
1299 | 1299 | |
1300 | - if (! ($isAssocFromOneEager || $isAssocToOneInverseSide)) { |
|
1300 | + if ( ! ($isAssocFromOneEager || $isAssocToOneInverseSide)) { |
|
1301 | 1301 | break; |
1302 | 1302 | } |
1303 | 1303 | |
@@ -1312,7 +1312,7 @@ discard block |
||
1312 | 1312 | break; // now this is why you shouldn't use inheritance |
1313 | 1313 | } |
1314 | 1314 | |
1315 | - $assocAlias = 'e' . ($eagerAliasCounter++); |
|
1315 | + $assocAlias = 'e'.($eagerAliasCounter++); |
|
1316 | 1316 | |
1317 | 1317 | $this->currentPersisterContext->rsm->addJoinedEntityResult($targetEntity, $assocAlias, 'r', $fieldName); |
1318 | 1318 | |
@@ -1340,14 +1340,14 @@ discard block |
||
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()); |
@@ -1371,7 +1371,7 @@ discard block |
||
1371 | 1371 | $joinCondition[] = $filterSql; |
1372 | 1372 | } |
1373 | 1373 | |
1374 | - $this->currentPersisterContext->selectJoinSql .= ' ' . $joinTableName . ' ' . $joinTableAlias . ' ON '; |
|
1374 | + $this->currentPersisterContext->selectJoinSql .= ' '.$joinTableName.' '.$joinTableAlias.' ON '; |
|
1375 | 1375 | $this->currentPersisterContext->selectJoinSql .= implode(' AND ', $joinCondition); |
1376 | 1376 | |
1377 | 1377 | break; |
@@ -1393,7 +1393,7 @@ discard block |
||
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 |
||
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 | |
@@ -1438,7 +1438,7 @@ discard block |
||
1438 | 1438 | $owningAssociation = $association; |
1439 | 1439 | $sourceTableAlias = $this->getSQLTableAlias($this->class->getTableName()); |
1440 | 1440 | |
1441 | - if (! $association->isOwningSide()) { |
|
1441 | + if ( ! $association->isOwningSide()) { |
|
1442 | 1442 | $targetEntity = $this->em->getClassMetadata($association->getTargetEntity()); |
1443 | 1443 | $owningAssociation = $targetEntity->getProperty($association->getMappedBy()); |
1444 | 1444 | } |
@@ -1459,7 +1459,7 @@ discard block |
||
1459 | 1459 | ); |
1460 | 1460 | } |
1461 | 1461 | |
1462 | - return ' INNER JOIN ' . $joinTableName . ' ON ' . implode(' AND ', $conditions); |
|
1462 | + return ' INNER JOIN '.$joinTableName.' ON '.implode(' AND ', $conditions); |
|
1463 | 1463 | } |
1464 | 1464 | |
1465 | 1465 | /** |
@@ -1553,7 +1553,7 @@ discard block |
||
1553 | 1553 | $columnName = $joinColumn->getColumnName(); |
1554 | 1554 | $referencedColumnName = $joinColumn->getReferencedColumnName(); |
1555 | 1555 | |
1556 | - if (! $joinColumn->getType()) { |
|
1556 | + if ( ! $joinColumn->getType()) { |
|
1557 | 1557 | $joinColumn->setType(PersisterHelper::getTypeOfColumn($referencedColumnName, $targetClass, $this->em)); |
1558 | 1558 | } |
1559 | 1559 | |
@@ -1592,7 +1592,7 @@ discard block |
||
1592 | 1592 | |
1593 | 1593 | $this->currentPersisterContext->rsm->addFieldResult($alias, $columnAlias, $field, $class->getClassName()); |
1594 | 1594 | |
1595 | - return $property->getType()->convertToPHPValueSQL($sql, $this->platform) . ' AS ' . $columnAlias; |
|
1595 | + return $property->getType()->convertToPHPValueSQL($sql, $this->platform).' AS '.$columnAlias; |
|
1596 | 1596 | } |
1597 | 1597 | |
1598 | 1598 | /** |
@@ -1606,14 +1606,14 @@ discard block |
||
1606 | 1606 | protected function getSQLTableAlias($tableName, $assocName = '') |
1607 | 1607 | { |
1608 | 1608 | if ($tableName) { |
1609 | - $tableName .= '#' . $assocName; |
|
1609 | + $tableName .= '#'.$assocName; |
|
1610 | 1610 | } |
1611 | 1611 | |
1612 | 1612 | if (isset($this->currentPersisterContext->sqlTableAliases[$tableName])) { |
1613 | 1613 | return $this->currentPersisterContext->sqlTableAliases[$tableName]; |
1614 | 1614 | } |
1615 | 1615 | |
1616 | - $tableAlias = 't' . $this->currentPersisterContext->sqlAliasCounter++; |
|
1616 | + $tableAlias = 't'.$this->currentPersisterContext->sqlAliasCounter++; |
|
1617 | 1617 | |
1618 | 1618 | $this->currentPersisterContext->sqlTableAliases[$tableName] = $tableAlias; |
1619 | 1619 | |
@@ -1639,7 +1639,7 @@ discard block |
||
1639 | 1639 | } |
1640 | 1640 | |
1641 | 1641 | $lock = $this->getLockTablesSql($lockMode); |
1642 | - $where = ($conditionSql ? ' WHERE ' . $conditionSql : '') . ' '; |
|
1642 | + $where = ($conditionSql ? ' WHERE '.$conditionSql : '').' '; |
|
1643 | 1643 | $sql = 'SELECT 1 ' |
1644 | 1644 | . $lock |
1645 | 1645 | . $where |
@@ -1662,7 +1662,7 @@ discard block |
||
1662 | 1662 | $tableName = $this->class->table->getQuotedQualifiedName($this->platform); |
1663 | 1663 | |
1664 | 1664 | return $this->platform->appendLockHint( |
1665 | - 'FROM ' . $tableName . ' ' . $this->getSQLTableAlias($this->class->getTableName()), |
|
1665 | + 'FROM '.$tableName.' '.$this->getSQLTableAlias($this->class->getTableName()), |
|
1666 | 1666 | $lockMode |
1667 | 1667 | ); |
1668 | 1668 | } |
@@ -1712,19 +1712,19 @@ discard block |
||
1712 | 1712 | |
1713 | 1713 | if ($comparison !== null) { |
1714 | 1714 | // special case null value handling |
1715 | - if (($comparison === Comparison::EQ || $comparison === Comparison::IS) && $value ===null) { |
|
1716 | - $selectedColumns[] = $column . ' IS NULL'; |
|
1715 | + if (($comparison === Comparison::EQ || $comparison === Comparison::IS) && $value === null) { |
|
1716 | + $selectedColumns[] = $column.' IS NULL'; |
|
1717 | 1717 | |
1718 | 1718 | continue; |
1719 | 1719 | } |
1720 | 1720 | |
1721 | 1721 | if ($comparison === Comparison::NEQ && $value === null) { |
1722 | - $selectedColumns[] = $column . ' IS NOT NULL'; |
|
1722 | + $selectedColumns[] = $column.' IS NOT NULL'; |
|
1723 | 1723 | |
1724 | 1724 | continue; |
1725 | 1725 | } |
1726 | 1726 | |
1727 | - $selectedColumns[] = $column . ' ' . sprintf(self::$comparisonMap[$comparison], $placeholder); |
|
1727 | + $selectedColumns[] = $column.' '.sprintf(self::$comparisonMap[$comparison], $placeholder); |
|
1728 | 1728 | |
1729 | 1729 | continue; |
1730 | 1730 | } |
@@ -1772,7 +1772,7 @@ discard block |
||
1772 | 1772 | $tableAlias = $this->getSQLTableAlias($property->getTableName()); |
1773 | 1773 | $columnName = $this->platform->quoteIdentifier($property->getColumnName()); |
1774 | 1774 | |
1775 | - return [$tableAlias . '.' . $columnName]; |
|
1775 | + return [$tableAlias.'.'.$columnName]; |
|
1776 | 1776 | } |
1777 | 1777 | |
1778 | 1778 | if ($property instanceof AssociationMetadata) { |
@@ -1781,7 +1781,7 @@ discard block |
||
1781 | 1781 | |
1782 | 1782 | // Many-To-Many requires join table check for joinColumn |
1783 | 1783 | if ($owningAssociation instanceof ManyToManyAssociationMetadata) { |
1784 | - if (! $owningAssociation->isOwningSide()) { |
|
1784 | + if ( ! $owningAssociation->isOwningSide()) { |
|
1785 | 1785 | $owningAssociation = $association; |
1786 | 1786 | } |
1787 | 1787 | |
@@ -1794,10 +1794,10 @@ discard block |
||
1794 | 1794 | foreach ($joinColumns as $joinColumn) { |
1795 | 1795 | $quotedColumnName = $this->platform->quoteIdentifier($joinColumn->getColumnName()); |
1796 | 1796 | |
1797 | - $columns[] = $joinTableName . '.' . $quotedColumnName; |
|
1797 | + $columns[] = $joinTableName.'.'.$quotedColumnName; |
|
1798 | 1798 | } |
1799 | 1799 | } else { |
1800 | - if (! $owningAssociation->isOwningSide()) { |
|
1800 | + if ( ! $owningAssociation->isOwningSide()) { |
|
1801 | 1801 | throw InvalidFindByCall::fromInverseSideUsage( |
1802 | 1802 | $this->class->getClassName(), |
1803 | 1803 | $field |
@@ -1812,7 +1812,7 @@ discard block |
||
1812 | 1812 | foreach ($owningAssociation->getJoinColumns() as $joinColumn) { |
1813 | 1813 | $quotedColumnName = $this->platform->quoteIdentifier($joinColumn->getColumnName()); |
1814 | 1814 | |
1815 | - $columns[] = $tableAlias . '.' . $quotedColumnName; |
|
1815 | + $columns[] = $tableAlias.'.'.$quotedColumnName; |
|
1816 | 1816 | } |
1817 | 1817 | } |
1818 | 1818 | |
@@ -1920,7 +1920,7 @@ discard block |
||
1920 | 1920 | $value = $value[$targetClass->identifier[0]]; |
1921 | 1921 | } |
1922 | 1922 | |
1923 | - $criteria[$tableAlias . '.' . $quotedColumnName] = $value; |
|
1923 | + $criteria[$tableAlias.'.'.$quotedColumnName] = $value; |
|
1924 | 1924 | $parameters[] = [ |
1925 | 1925 | 'value' => $value, |
1926 | 1926 | 'field' => $fieldName, |
@@ -2005,7 +2005,7 @@ discard block |
||
2005 | 2005 | case $property instanceof AssociationMetadata: |
2006 | 2006 | $class = $this->em->getClassMetadata($property->getTargetEntity()); |
2007 | 2007 | |
2008 | - if (! $property->isOwningSide()) { |
|
2008 | + if ( ! $property->isOwningSide()) { |
|
2009 | 2009 | $property = $class->getProperty($property->getMappedBy()); |
2010 | 2010 | $class = $this->em->getClassMetadata($property->getTargetEntity()); |
2011 | 2011 | } |
@@ -2018,7 +2018,7 @@ discard block |
||
2018 | 2018 | /** @var JoinColumnMetadata $joinColumn */ |
2019 | 2019 | $referencedColumnName = $joinColumn->getReferencedColumnName(); |
2020 | 2020 | |
2021 | - if (! $joinColumn->getType()) { |
|
2021 | + if ( ! $joinColumn->getType()) { |
|
2022 | 2022 | $joinColumn->setType(PersisterHelper::getTypeOfColumn($referencedColumnName, $class, $this->em)); |
2023 | 2023 | } |
2024 | 2024 | |
@@ -2033,7 +2033,7 @@ discard block |
||
2033 | 2033 | } |
2034 | 2034 | |
2035 | 2035 | if (is_array($value)) { |
2036 | - return array_map(static function ($type) { |
|
2036 | + return array_map(static function($type) { |
|
2037 | 2037 | return $type->getBindingType() + Connection::ARRAY_PARAM_OFFSET; |
2038 | 2038 | }, $types); |
2039 | 2039 | } |
@@ -2090,7 +2090,7 @@ discard block |
||
2090 | 2090 | */ |
2091 | 2091 | private function getIndividualValue($value) |
2092 | 2092 | { |
2093 | - if (! is_object($value) || ! $this->em->getMetadataFactory()->hasMetadataFor(StaticClassNameConverter::getClass($value))) { |
|
2093 | + if ( ! is_object($value) || ! $this->em->getMetadataFactory()->hasMetadataFor(StaticClassNameConverter::getClass($value))) { |
|
2094 | 2094 | return $value; |
2095 | 2095 | } |
2096 | 2096 | |
@@ -2104,7 +2104,7 @@ discard block |
||
2104 | 2104 | { |
2105 | 2105 | $criteria = $this->getIdentifier($entity); |
2106 | 2106 | |
2107 | - if (! $criteria) { |
|
2107 | + if ( ! $criteria) { |
|
2108 | 2108 | return false; |
2109 | 2109 | } |
2110 | 2110 | |
@@ -2112,12 +2112,12 @@ discard block |
||
2112 | 2112 | |
2113 | 2113 | $sql = 'SELECT 1 ' |
2114 | 2114 | . $this->getLockTablesSql(null) |
2115 | - . ' WHERE ' . $this->getSelectConditionSQL($criteria); |
|
2115 | + . ' WHERE '.$this->getSelectConditionSQL($criteria); |
|
2116 | 2116 | |
2117 | 2117 | [$params, $types] = $this->expandParameters($criteria); |
2118 | 2118 | |
2119 | 2119 | if ($extraConditions !== null) { |
2120 | - $sql .= ' AND ' . $this->getSelectConditionCriteriaSQL($extraConditions); |
|
2120 | + $sql .= ' AND '.$this->getSelectConditionCriteriaSQL($extraConditions); |
|
2121 | 2121 | [$criteriaParams, $criteriaTypes] = $this->expandCriteriaParameters($extraConditions); |
2122 | 2122 | |
2123 | 2123 | $params = array_merge($params, $criteriaParams); |
@@ -2127,7 +2127,7 @@ discard block |
||
2127 | 2127 | $filterSql = $this->generateFilterConditionSQL($this->class, $alias); |
2128 | 2128 | |
2129 | 2129 | if ($filterSql) { |
2130 | - $sql .= ' AND ' . $filterSql; |
|
2130 | + $sql .= ' AND '.$filterSql; |
|
2131 | 2131 | } |
2132 | 2132 | |
2133 | 2133 | return (bool) $this->conn->fetchColumn($sql, $params, 0, $types); |
@@ -2140,13 +2140,13 @@ discard block |
||
2140 | 2140 | */ |
2141 | 2141 | protected function getJoinSQLForAssociation(AssociationMetadata $association) |
2142 | 2142 | { |
2143 | - if (! $association->isOwningSide()) { |
|
2143 | + if ( ! $association->isOwningSide()) { |
|
2144 | 2144 | return 'LEFT JOIN'; |
2145 | 2145 | } |
2146 | 2146 | |
2147 | 2147 | // if one of the join columns is nullable, return left join |
2148 | 2148 | foreach ($association->getJoinColumns() as $joinColumn) { |
2149 | - if (! $joinColumn->isNullable()) { |
|
2149 | + if ( ! $joinColumn->isNullable()) { |
|
2150 | 2150 | continue; |
2151 | 2151 | } |
2152 | 2152 | |
@@ -2163,7 +2163,7 @@ discard block |
||
2163 | 2163 | */ |
2164 | 2164 | public function getSQLColumnAlias() |
2165 | 2165 | { |
2166 | - return $this->platform->getSQLResultCasing('c' . $this->currentPersisterContext->sqlAliasCounter++); |
|
2166 | + return $this->platform->getSQLResultCasing('c'.$this->currentPersisterContext->sqlAliasCounter++); |
|
2167 | 2167 | } |
2168 | 2168 | |
2169 | 2169 | /** |
@@ -2182,13 +2182,13 @@ discard block |
||
2182 | 2182 | $filterExpr = $filter->addFilterConstraint($targetEntity, $targetTableAlias); |
2183 | 2183 | |
2184 | 2184 | if ($filterExpr !== '') { |
2185 | - $filterClauses[] = '(' . $filterExpr . ')'; |
|
2185 | + $filterClauses[] = '('.$filterExpr.')'; |
|
2186 | 2186 | } |
2187 | 2187 | } |
2188 | 2188 | |
2189 | 2189 | $sql = implode(' AND ', $filterClauses); |
2190 | 2190 | |
2191 | - return $sql ? '(' . $sql . ')' : ''; // Wrap again to avoid "X or Y and FilterConditionSQL" |
|
2191 | + return $sql ? '('.$sql.')' : ''; // Wrap again to avoid "X or Y and FilterConditionSQL" |
|
2192 | 2192 | } |
2193 | 2193 | |
2194 | 2194 | /** |
@@ -85,10 +85,10 @@ discard block |
||
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 |
||
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 |
||
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 |
||
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 |
||
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 |
||
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 |
||
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 |
||
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 | |
@@ -259,22 +259,22 @@ discard block |
||
259 | 259 | } |
260 | 260 | |
261 | 261 | if ($oneToOne) { |
262 | - $this->resultPointers[$dqlAlias] =& $coll; |
|
262 | + $this->resultPointers[$dqlAlias] = & $coll; |
|
263 | 263 | |
264 | 264 | return; |
265 | 265 | } |
266 | 266 | |
267 | 267 | if ($index !== false) { |
268 | - $this->resultPointers[$dqlAlias] =& $coll[$index]; |
|
268 | + $this->resultPointers[$dqlAlias] = & $coll[$index]; |
|
269 | 269 | |
270 | 270 | return; |
271 | 271 | } |
272 | 272 | |
273 | - if (! $coll) { |
|
273 | + if ( ! $coll) { |
|
274 | 274 | return; |
275 | 275 | } |
276 | 276 | |
277 | 277 | end($coll); |
278 | - $this->resultPointers[$dqlAlias] =& $coll[key($coll)]; |
|
278 | + $this->resultPointers[$dqlAlias] = & $coll[key($coll)]; |
|
279 | 279 | } |
280 | 280 | } |
@@ -346,7 +346,7 @@ discard block |
||
346 | 346 | $conn = static::$sharedConn; |
347 | 347 | |
348 | 348 | // In case test is skipped, tearDown is called, but no setup may have run |
349 | - if (! $conn) { |
|
349 | + if ( ! $conn) { |
|
350 | 350 | return; |
351 | 351 | } |
352 | 352 | |
@@ -420,7 +420,7 @@ discard block |
||
420 | 420 | } |
421 | 421 | |
422 | 422 | if (isset($this->usedModelSets['directorytree'])) { |
423 | - $conn->executeUpdate('DELETE FROM ' . $platform->quoteIdentifier('file')); |
|
423 | + $conn->executeUpdate('DELETE FROM '.$platform->quoteIdentifier('file')); |
|
424 | 424 | // MySQL doesn't know deferred deletions therefore only executing the second query gives errors. |
425 | 425 | $conn->executeUpdate('DELETE FROM Directory WHERE parentDirectory_id IS NOT NULL'); |
426 | 426 | $conn->executeUpdate('DELETE FROM Directory'); |
@@ -513,12 +513,12 @@ discard block |
||
513 | 513 | ) |
514 | 514 | ); |
515 | 515 | |
516 | - $conn->executeUpdate('DELETE FROM ' . $platform->quoteIdentifier('quote-users-groups')); |
|
517 | - $conn->executeUpdate('DELETE FROM ' . $platform->quoteIdentifier('quote-group')); |
|
518 | - $conn->executeUpdate('DELETE FROM ' . $platform->quoteIdentifier('quote-phone')); |
|
519 | - $conn->executeUpdate('DELETE FROM ' . $platform->quoteIdentifier('quote-user')); |
|
520 | - $conn->executeUpdate('DELETE FROM ' . $platform->quoteIdentifier('quote-address')); |
|
521 | - $conn->executeUpdate('DELETE FROM ' . $platform->quoteIdentifier('quote-city')); |
|
516 | + $conn->executeUpdate('DELETE FROM '.$platform->quoteIdentifier('quote-users-groups')); |
|
517 | + $conn->executeUpdate('DELETE FROM '.$platform->quoteIdentifier('quote-group')); |
|
518 | + $conn->executeUpdate('DELETE FROM '.$platform->quoteIdentifier('quote-phone')); |
|
519 | + $conn->executeUpdate('DELETE FROM '.$platform->quoteIdentifier('quote-user')); |
|
520 | + $conn->executeUpdate('DELETE FROM '.$platform->quoteIdentifier('quote-address')); |
|
521 | + $conn->executeUpdate('DELETE FROM '.$platform->quoteIdentifier('quote-city')); |
|
522 | 522 | } |
523 | 523 | |
524 | 524 | if (isset($this->usedModelSets['vct_onetoone'])) { |
@@ -630,7 +630,7 @@ discard block |
||
630 | 630 | $classes = []; |
631 | 631 | |
632 | 632 | foreach ($classNames as $className) { |
633 | - if (! isset(static::$entityTablesCreated[$className])) { |
|
633 | + if ( ! isset(static::$entityTablesCreated[$className])) { |
|
634 | 634 | static::$entityTablesCreated[$className] = true; |
635 | 635 | $classes[] = $this->em->getClassMetadata($className); |
636 | 636 | } |
@@ -649,25 +649,25 @@ discard block |
||
649 | 649 | { |
650 | 650 | $this->setUpDBALTypes(); |
651 | 651 | |
652 | - if (! isset(static::$sharedConn)) { |
|
652 | + if ( ! isset(static::$sharedConn)) { |
|
653 | 653 | static::$sharedConn = TestUtil::getConnection(); |
654 | 654 | } |
655 | 655 | |
656 | 656 | if (isset($GLOBALS['DOCTRINE_MARK_SQL_LOGS'])) { |
657 | 657 | if (in_array(static::$sharedConn->getDatabasePlatform()->getName(), ['mysql', 'postgresql'], true)) { |
658 | - static::$sharedConn->executeQuery('SELECT 1 /*' . static::class . '*/'); |
|
658 | + static::$sharedConn->executeQuery('SELECT 1 /*'.static::class.'*/'); |
|
659 | 659 | } elseif (static::$sharedConn->getDatabasePlatform()->getName() === 'oracle') { |
660 | - static::$sharedConn->executeQuery('SELECT 1 /*' . static::class . '*/ FROM dual'); |
|
660 | + static::$sharedConn->executeQuery('SELECT 1 /*'.static::class.'*/ FROM dual'); |
|
661 | 661 | } |
662 | 662 | } |
663 | 663 | |
664 | - if (! $this->em) { |
|
664 | + if ( ! $this->em) { |
|
665 | 665 | $this->em = $this->getEntityManager(); |
666 | 666 | $this->schemaTool = new SchemaTool($this->em); |
667 | 667 | } |
668 | 668 | |
669 | 669 | foreach ($this->usedModelSets as $setName => $bool) { |
670 | - if (! isset(static::$tablesCreated[$setName])) { |
|
670 | + if ( ! isset(static::$tablesCreated[$setName])) { |
|
671 | 671 | $this->setUpEntitySchema(static::$modelSets[$setName]); |
672 | 672 | |
673 | 673 | static::$tablesCreated[$setName] = true; |
@@ -742,8 +742,8 @@ discard block |
||
742 | 742 | |
743 | 743 | $config->setMetadataDriverImpl( |
744 | 744 | $mappingDriver ?? $config->newDefaultAnnotationDriver([ |
745 | - realpath(__DIR__ . '/Models/Cache'), |
|
746 | - realpath(__DIR__ . '/Models/GeoNames'), |
|
745 | + realpath(__DIR__.'/Models/Cache'), |
|
746 | + realpath(__DIR__.'/Models/GeoNames'), |
|
747 | 747 | ]) |
748 | 748 | ); |
749 | 749 | |
@@ -791,13 +791,13 @@ discard block |
||
791 | 791 | |
792 | 792 | foreach ($last25queries as $i => $query) { |
793 | 793 | $params = array_map( |
794 | - static function ($p) { |
|
794 | + static function($p) { |
|
795 | 795 | return is_object($p) ? get_class($p) : var_export($p, true); |
796 | 796 | }, |
797 | 797 | $query['params'] ?: [] |
798 | 798 | ); |
799 | 799 | |
800 | - $queries .= $i . ". SQL: '" . $query['sql'] . "' Params: " . implode(', ', $params) . PHP_EOL; |
|
800 | + $queries .= $i.". SQL: '".$query['sql']."' Params: ".implode(', ', $params).PHP_EOL; |
|
801 | 801 | } |
802 | 802 | |
803 | 803 | $trace = $e->getTrace(); |
@@ -810,11 +810,11 @@ discard block |
||
810 | 810 | break; |
811 | 811 | } |
812 | 812 | |
813 | - $traceMsg .= $part['file'] . ':' . $part['line'] . PHP_EOL; |
|
813 | + $traceMsg .= $part['file'].':'.$part['line'].PHP_EOL; |
|
814 | 814 | } |
815 | 815 | } |
816 | 816 | |
817 | - $message = '[' . get_class($e) . '] ' . $e->getMessage() . PHP_EOL . PHP_EOL . 'With queries:' . PHP_EOL . $queries . PHP_EOL . 'Trace:' . PHP_EOL . $traceMsg; |
|
817 | + $message = '['.get_class($e).'] '.$e->getMessage().PHP_EOL.PHP_EOL.'With queries:'.PHP_EOL.$queries.PHP_EOL.'Trace:'.PHP_EOL.$traceMsg; |
|
818 | 818 | |
819 | 819 | throw new Exception($message, (int) $e->getCode(), $e); |
820 | 820 | } |
@@ -109,7 +109,7 @@ discard block |
||
109 | 109 | } |
110 | 110 | |
111 | 111 | foreach ($data as $columnName => $value) { |
112 | - if (! is_array($id) || ! isset($id[$columnName])) { |
|
112 | + if ( ! is_array($id) || ! isset($id[$columnName])) { |
|
113 | 113 | $type = $this->columns[$columnName]->getType(); |
114 | 114 | |
115 | 115 | $stmt->bindValue($paramIndex++, $value, $type); |
@@ -133,7 +133,7 @@ discard block |
||
133 | 133 | { |
134 | 134 | $updateData = $this->prepareUpdateData($entity); |
135 | 135 | |
136 | - if (! $updateData) { |
|
136 | + if ( ! $updateData) { |
|
137 | 137 | return; |
138 | 138 | } |
139 | 139 | |
@@ -151,7 +151,7 @@ discard block |
||
151 | 151 | $versionedClass = $this->class->versionProperty->getDeclaringClass(); |
152 | 152 | $versionedTable = $versionedClass->getTableName(); |
153 | 153 | |
154 | - if (! isset($updateData[$versionedTable])) { |
|
154 | + if ( ! isset($updateData[$versionedTable])) { |
|
155 | 155 | $tableName = $versionedClass->table->getQuotedQualifiedName($this->platform); |
156 | 156 | |
157 | 157 | $this->updateTable($entity, $tableName, [], true); |
@@ -232,7 +232,7 @@ discard block |
||
232 | 232 | |
233 | 233 | if ($filterSql) { |
234 | 234 | $conditionSql .= $conditionSql |
235 | - ? ' AND ' . $filterSql |
|
235 | + ? ' AND '.$filterSql |
|
236 | 236 | : $filterSql; |
237 | 237 | } |
238 | 238 | |
@@ -240,26 +240,26 @@ discard block |
||
240 | 240 | |
241 | 241 | switch ($lockMode) { |
242 | 242 | case LockMode::PESSIMISTIC_READ: |
243 | - $lockSql = ' ' . $this->platform->getReadLockSQL(); |
|
243 | + $lockSql = ' '.$this->platform->getReadLockSQL(); |
|
244 | 244 | break; |
245 | 245 | |
246 | 246 | case LockMode::PESSIMISTIC_WRITE: |
247 | - $lockSql = ' ' . $this->platform->getWriteLockSQL(); |
|
247 | + $lockSql = ' '.$this->platform->getWriteLockSQL(); |
|
248 | 248 | break; |
249 | 249 | } |
250 | 250 | |
251 | 251 | $tableName = $this->class->table->getQuotedQualifiedName($this->platform); |
252 | - $from = ' FROM ' . $tableName . ' ' . $baseTableAlias; |
|
253 | - $where = $conditionSql !== '' ? ' WHERE ' . $conditionSql : ''; |
|
252 | + $from = ' FROM '.$tableName.' '.$baseTableAlias; |
|
253 | + $where = $conditionSql !== '' ? ' WHERE '.$conditionSql : ''; |
|
254 | 254 | $lock = $this->platform->appendLockHint($from, $lockMode); |
255 | 255 | $columnList = $this->getSelectColumnsSQL(); |
256 | - $query = 'SELECT ' . $columnList |
|
256 | + $query = 'SELECT '.$columnList |
|
257 | 257 | . $lock |
258 | 258 | . $joinSql |
259 | 259 | . $where |
260 | 260 | . $orderBySql; |
261 | 261 | |
262 | - return $this->platform->modifyLimitQuery($query, $limit, $offset ?? 0) . $lockSql; |
|
262 | + return $this->platform->modifyLimitQuery($query, $limit, $offset ?? 0).$lockSql; |
|
263 | 263 | } |
264 | 264 | |
265 | 265 | /** |
@@ -281,14 +281,14 @@ discard block |
||
281 | 281 | |
282 | 282 | if ($filterSql !== '') { |
283 | 283 | $conditionSql = $conditionSql |
284 | - ? $conditionSql . ' AND ' . $filterSql |
|
284 | + ? $conditionSql.' AND '.$filterSql |
|
285 | 285 | : $filterSql; |
286 | 286 | } |
287 | 287 | |
288 | 288 | return 'SELECT COUNT(*) ' |
289 | - . 'FROM ' . $tableName . ' ' . $baseTableAlias |
|
289 | + . 'FROM '.$tableName.' '.$baseTableAlias |
|
290 | 290 | . $joinSql |
291 | - . (empty($conditionSql) ? '' : ' WHERE ' . $conditionSql); |
|
291 | + . (empty($conditionSql) ? '' : ' WHERE '.$conditionSql); |
|
292 | 292 | } |
293 | 293 | |
294 | 294 | /** |
@@ -307,18 +307,18 @@ discard block |
||
307 | 307 | $conditions = []; |
308 | 308 | $tableName = $parentClass->table->getQuotedQualifiedName($this->platform); |
309 | 309 | $tableAlias = $this->getSQLTableAlias($parentClass->getTableName()); |
310 | - $joinSql .= ' INNER JOIN ' . $tableName . ' ' . $tableAlias . ' ON '; |
|
310 | + $joinSql .= ' INNER JOIN '.$tableName.' '.$tableAlias.' ON '; |
|
311 | 311 | |
312 | 312 | foreach ($identifierColumns as $idColumn) { |
313 | 313 | $quotedColumnName = $this->platform->quoteIdentifier($idColumn->getColumnName()); |
314 | 314 | |
315 | - $conditions[] = $baseTableAlias . '.' . $quotedColumnName . ' = ' . $tableAlias . '.' . $quotedColumnName; |
|
315 | + $conditions[] = $baseTableAlias.'.'.$quotedColumnName.' = '.$tableAlias.'.'.$quotedColumnName; |
|
316 | 316 | } |
317 | 317 | |
318 | 318 | $joinSql .= implode(' AND ', $conditions); |
319 | 319 | } |
320 | 320 | |
321 | - return parent::getLockTablesSql($lockMode) . $joinSql; |
|
321 | + return parent::getLockTablesSql($lockMode).$joinSql; |
|
322 | 322 | } |
323 | 323 | |
324 | 324 | /** |
@@ -345,7 +345,7 @@ discard block |
||
345 | 345 | continue; |
346 | 346 | } |
347 | 347 | |
348 | - if (! ($property instanceof ToOneAssociationMetadata) || ! $property->isOwningSide()) { |
|
348 | + if ( ! ($property instanceof ToOneAssociationMetadata) || ! $property->isOwningSide()) { |
|
349 | 349 | continue; |
350 | 350 | } |
351 | 351 | |
@@ -355,7 +355,7 @@ discard block |
||
355 | 355 | /** @var JoinColumnMetadata $joinColumn */ |
356 | 356 | $referencedColumnName = $joinColumn->getReferencedColumnName(); |
357 | 357 | |
358 | - if (! $joinColumn->getType()) { |
|
358 | + if ( ! $joinColumn->getType()) { |
|
359 | 359 | $joinColumn->setType(PersisterHelper::getTypeOfColumn($referencedColumnName, $targetClass, $this->em)); |
360 | 360 | } |
361 | 361 | |
@@ -374,7 +374,7 @@ discard block |
||
374 | 374 | $this->currentPersisterContext->rsm->setDiscriminatorColumn('r', $resultColumnName); |
375 | 375 | $this->currentPersisterContext->rsm->addMetaResult('r', $resultColumnName, $discrColumnName, false, $discrColumnType); |
376 | 376 | |
377 | - $columnList[] = $discrColumnType->convertToDatabaseValueSQL($discrTableAlias . '.' . $quotedColumnName, $this->platform); |
|
377 | + $columnList[] = $discrColumnType->convertToDatabaseValueSQL($discrTableAlias.'.'.$quotedColumnName, $this->platform); |
|
378 | 378 | |
379 | 379 | // sub tables |
380 | 380 | foreach ($this->class->getSubClasses() as $subClassName) { |
@@ -398,7 +398,7 @@ discard block |
||
398 | 398 | /** @var JoinColumnMetadata $joinColumn */ |
399 | 399 | $referencedColumnName = $joinColumn->getReferencedColumnName(); |
400 | 400 | |
401 | - if (! $joinColumn->getType()) { |
|
401 | + if ( ! $joinColumn->getType()) { |
|
402 | 402 | $joinColumn->setType(PersisterHelper::getTypeOfColumn($referencedColumnName, $targetClass, $this->em)); |
403 | 403 | } |
404 | 404 | |
@@ -448,7 +448,7 @@ discard block |
||
448 | 448 | $columnName = $joinColumn->getColumnName(); |
449 | 449 | $referencedColumnName = $joinColumn->getReferencedColumnName(); |
450 | 450 | |
451 | - if (! $joinColumn->getType()) { |
|
451 | + if ( ! $joinColumn->getType()) { |
|
452 | 452 | $joinColumn->setType(PersisterHelper::getTypeOfColumn($referencedColumnName, $targetClass, $this->em)); |
453 | 453 | } |
454 | 454 | |
@@ -504,12 +504,12 @@ discard block |
||
504 | 504 | $conditions = []; |
505 | 505 | $tableName = $parentClass->table->getQuotedQualifiedName($this->platform); |
506 | 506 | $tableAlias = $this->getSQLTableAlias($parentClass->getTableName()); |
507 | - $joinSql .= ' INNER JOIN ' . $tableName . ' ' . $tableAlias . ' ON '; |
|
507 | + $joinSql .= ' INNER JOIN '.$tableName.' '.$tableAlias.' ON '; |
|
508 | 508 | |
509 | 509 | foreach ($identifierColumns as $idColumn) { |
510 | 510 | $quotedColumnName = $this->platform->quoteIdentifier($idColumn->getColumnName()); |
511 | 511 | |
512 | - $conditions[] = $baseTableAlias . '.' . $quotedColumnName . ' = ' . $tableAlias . '.' . $quotedColumnName; |
|
512 | + $conditions[] = $baseTableAlias.'.'.$quotedColumnName.' = '.$tableAlias.'.'.$quotedColumnName; |
|
513 | 513 | } |
514 | 514 | |
515 | 515 | $joinSql .= implode(' AND ', $conditions); |
@@ -521,12 +521,12 @@ discard block |
||
521 | 521 | $subClass = $this->em->getClassMetadata($subClassName); |
522 | 522 | $tableName = $subClass->table->getQuotedQualifiedName($this->platform); |
523 | 523 | $tableAlias = $this->getSQLTableAlias($subClass->getTableName()); |
524 | - $joinSql .= ' LEFT JOIN ' . $tableName . ' ' . $tableAlias . ' ON '; |
|
524 | + $joinSql .= ' LEFT JOIN '.$tableName.' '.$tableAlias.' ON '; |
|
525 | 525 | |
526 | 526 | foreach ($identifierColumns as $idColumn) { |
527 | 527 | $quotedColumnName = $this->platform->quoteIdentifier($idColumn->getColumnName()); |
528 | 528 | |
529 | - $conditions[] = $baseTableAlias . '.' . $quotedColumnName . ' = ' . $tableAlias . '.' . $quotedColumnName; |
|
529 | + $conditions[] = $baseTableAlias.'.'.$quotedColumnName.' = '.$tableAlias.'.'.$quotedColumnName; |
|
530 | 530 | } |
531 | 531 | |
532 | 532 | $joinSql .= implode(' AND ', $conditions); |