@@ -741,9 +741,9 @@ discard block |
||
| 741 | 741 | } |
| 742 | 742 | |
| 743 | 743 | /** |
| 744 | - * @param iterable $paths (string[]) |
|
| 744 | + * @param iterable|null $paths (string[]) |
|
| 745 | 745 | * |
| 746 | - * @return iterable |
|
| 746 | + * @return Generator |
|
| 747 | 747 | */ |
| 748 | 748 | private static function getPaths(iterable $paths): iterable |
| 749 | 749 | { |
@@ -1331,7 +1331,7 @@ discard block |
||
| 1331 | 1331 | * @param string $modelClass |
| 1332 | 1332 | * @param string $keyColumnName |
| 1333 | 1333 | * |
| 1334 | - * @return iterable |
|
| 1334 | + * @return Generator |
|
| 1335 | 1335 | */ |
| 1336 | 1336 | private function fetchResourcesWithoutRelationships( |
| 1337 | 1337 | QueryBuilder $builder, |
@@ -1425,7 +1425,7 @@ discard block |
||
| 1425 | 1425 | * @param null|string $index |
| 1426 | 1426 | * @param iterable $attributes |
| 1427 | 1427 | * |
| 1428 | - * @return iterable |
|
| 1428 | + * @return Generator |
|
| 1429 | 1429 | */ |
| 1430 | 1430 | protected function filterAttributesOnCreate(?string $index, iterable $attributes): iterable |
| 1431 | 1431 | { |
@@ -1445,7 +1445,7 @@ discard block |
||
| 1445 | 1445 | /** |
| 1446 | 1446 | * @param iterable $attributes |
| 1447 | 1447 | * |
| 1448 | - * @return iterable |
|
| 1448 | + * @return Generator |
|
| 1449 | 1449 | */ |
| 1450 | 1450 | protected function filterAttributesOnUpdate(iterable $attributes): iterable |
| 1451 | 1451 | { |
@@ -1634,10 +1634,10 @@ discard block |
||
| 1634 | 1634 | |
| 1635 | 1635 | /** |
| 1636 | 1636 | * @param iterable $attributes |
| 1637 | - * @param array $typeNames |
|
| 1637 | + * @param Type[] $typeNames |
|
| 1638 | 1638 | * @param AbstractPlatform $platform |
| 1639 | 1639 | * |
| 1640 | - * @return iterable |
|
| 1640 | + * @return Generator |
|
| 1641 | 1641 | */ |
| 1642 | 1642 | private function readTypedAttributes(iterable $attributes, array $typeNames, AbstractPlatform $platform): iterable |
| 1643 | 1643 | { |
@@ -673,7 +673,7 @@ discard block |
||
| 673 | 673 | $classAtPath = new ArrayObject(); |
| 674 | 674 | $idsAtPath = new ArrayObject(); |
| 675 | 675 | |
| 676 | - $registerModelAtRoot = function ($model) use ($modelStorage, $modelsAtPath, $idsAtPath): void { |
|
| 676 | + $registerModelAtRoot = function($model) use ($modelStorage, $modelsAtPath, $idsAtPath): void { |
|
| 677 | 677 | self::registerModelAtPath( |
| 678 | 678 | $model, |
| 679 | 679 | static::ROOT_PATH, |
@@ -761,7 +761,7 @@ discard block |
||
| 761 | 761 | assert(is_string($pathPiece)); |
| 762 | 762 | $parent = $tmpPath; |
| 763 | 763 | $tmpPath = empty($tmpPath) === true ? |
| 764 | - $pathPiece : $tmpPath . static::PATH_SEPARATOR . $pathPiece; |
|
| 764 | + $pathPiece : $tmpPath.static::PATH_SEPARATOR.$pathPiece; |
|
| 765 | 765 | $normalizedPaths[$tmpPath] = [$parent, $pathPiece]; |
| 766 | 766 | $pathsDepths[$parent] = $parentDepth++; |
| 767 | 767 | } |
@@ -933,8 +933,7 @@ discard block |
||
| 933 | 933 | $filters = $this->getFilters(); |
| 934 | 934 | $sorts = $this->getSorts(); |
| 935 | 935 | $this->areFiltersWithAnd() ? |
| 936 | - $builder->addRelationshipFiltersAndSortsWithAnd($reverseRelName, $filters, $sorts) : |
|
| 937 | - $builder->addRelationshipFiltersAndSortsWithOr($reverseRelName, $filters, $sorts); |
|
| 936 | + $builder->addRelationshipFiltersAndSortsWithAnd($reverseRelName, $filters, $sorts) : $builder->addRelationshipFiltersAndSortsWithOr($reverseRelName, $filters, $sorts); |
|
| 938 | 937 | } |
| 939 | 938 | // ... and the input filters to actual data we select |
| 940 | 939 | if ($relationshipFilters !== null) { |
@@ -1053,7 +1052,7 @@ discard block |
||
| 1053 | 1052 | |
| 1054 | 1053 | $this->clearFetchParameters(); |
| 1055 | 1054 | |
| 1056 | - return (int)$deleted; |
|
| 1055 | + return (int) $deleted; |
|
| 1057 | 1056 | } |
| 1058 | 1057 | |
| 1059 | 1058 | /** |
@@ -1067,7 +1066,7 @@ discard block |
||
| 1067 | 1066 | |
| 1068 | 1067 | $this->clearFetchParameters(); |
| 1069 | 1068 | |
| 1070 | - return (int)$deleted > 0; |
|
| 1069 | + return (int) $deleted > 0; |
|
| 1071 | 1070 | } |
| 1072 | 1071 | |
| 1073 | 1072 | /** |
@@ -1088,7 +1087,7 @@ discard block |
||
| 1088 | 1087 | |
| 1089 | 1088 | $this->clearBuilderParameters()->clearFetchParameters(); |
| 1090 | 1089 | |
| 1091 | - $this->inTransaction(function () use ($saveMain, $toMany, &$index) { |
|
| 1090 | + $this->inTransaction(function() use ($saveMain, $toMany, &$index) { |
|
| 1092 | 1091 | $saveMain->execute(); |
| 1093 | 1092 | |
| 1094 | 1093 | // if no index given will use last insert ID as index |
@@ -1104,7 +1103,7 @@ discard block |
||
| 1104 | 1103 | ->prepareCreateInToManyRelationship($relationshipName, $index, $secondaryIdBindName) |
| 1105 | 1104 | ); |
| 1106 | 1105 | foreach ($secondaryIds as $secondaryId) { |
| 1107 | - $inserted += (int)$saveToMany->setParameter($secondaryIdBindName, $secondaryId)->execute(); |
|
| 1106 | + $inserted += (int) $saveToMany->setParameter($secondaryIdBindName, $secondaryId)->execute(); |
|
| 1108 | 1107 | } |
| 1109 | 1108 | } |
| 1110 | 1109 | }); |
@@ -1133,12 +1132,12 @@ discard block |
||
| 1133 | 1132 | ->createBuilder($this->getModelClass()) |
| 1134 | 1133 | ->updateModels($allowedChanges) |
| 1135 | 1134 | ->addFiltersWithAndToTable($filters); |
| 1136 | - $saveMain = $this->builderSaveResourceOnUpdate($saveMain); |
|
| 1135 | + $saveMain = $this->builderSaveResourceOnUpdate($saveMain); |
|
| 1137 | 1136 | $saveMain->getSQL(); // prepare |
| 1138 | 1137 | |
| 1139 | 1138 | $this->clearBuilderParameters()->clearFetchParameters(); |
| 1140 | 1139 | |
| 1141 | - $this->inTransaction(function () use ($saveMain, $toMany, $index, &$updated) { |
|
| 1140 | + $this->inTransaction(function() use ($saveMain, $toMany, $index, &$updated) { |
|
| 1142 | 1141 | $updated = $saveMain->execute(); |
| 1143 | 1142 | |
| 1144 | 1143 | foreach ($toMany as $relationshipName => $secondaryIds) { |
@@ -1158,12 +1157,12 @@ discard block |
||
| 1158 | 1157 | ->prepareCreateInToManyRelationship($relationshipName, $index, $secondaryIdBindName) |
| 1159 | 1158 | ); |
| 1160 | 1159 | foreach ($secondaryIds as $secondaryId) { |
| 1161 | - $updated += (int)$saveToMany->setParameter($secondaryIdBindName, $secondaryId)->execute(); |
|
| 1160 | + $updated += (int) $saveToMany->setParameter($secondaryIdBindName, $secondaryId)->execute(); |
|
| 1162 | 1161 | } |
| 1163 | 1162 | } |
| 1164 | 1163 | }); |
| 1165 | 1164 | |
| 1166 | - return (int)$updated; |
|
| 1165 | + return (int) $updated; |
|
| 1167 | 1166 | } |
| 1168 | 1167 | |
| 1169 | 1168 | /** |
@@ -1247,7 +1246,7 @@ discard block |
||
| 1247 | 1246 | /** |
| 1248 | 1247 | * @inheritdoc |
| 1249 | 1248 | */ |
| 1250 | - public function fetchRow(QueryBuilder $builder, string $modelClass): ?array |
|
| 1249 | + public function fetchRow(QueryBuilder $builder, string $modelClass): ? array |
|
| 1251 | 1250 | { |
| 1252 | 1251 | $model = null; |
| 1253 | 1252 | |
@@ -1427,7 +1426,7 @@ discard block |
||
| 1427 | 1426 | * |
| 1428 | 1427 | * @return iterable |
| 1429 | 1428 | */ |
| 1430 | - protected function filterAttributesOnCreate(?string $index, iterable $attributes): iterable |
|
| 1429 | + protected function filterAttributesOnCreate(?string $index, iterable $attributes) : iterable |
|
| 1431 | 1430 | { |
| 1432 | 1431 | if ($index !== null) { |
| 1433 | 1432 | $pkName = $this->getModelSchemes()->getPrimaryKey($this->getModelClass()); |
@@ -1487,7 +1486,7 @@ discard block |
||
| 1487 | 1486 | |
| 1488 | 1487 | $pkName = $this->getModelSchemes()->getPrimaryKey($parentClass); |
| 1489 | 1488 | |
| 1490 | - $registerModelAtPath = function ($model, string $path) use ($deDup, $modelsAtPath, $idsAtPath) { |
|
| 1489 | + $registerModelAtPath = function($model, string $path) use ($deDup, $modelsAtPath, $idsAtPath) { |
|
| 1491 | 1490 | return self::registerModelAtPath( |
| 1492 | 1491 | $model, |
| 1493 | 1492 | $path, |
@@ -1499,7 +1498,7 @@ discard block |
||
| 1499 | 1498 | }; |
| 1500 | 1499 | |
| 1501 | 1500 | foreach ($childRelationships as $name) { |
| 1502 | - $childrenPath = $parentsPath !== static::ROOT_PATH ? $parentsPath . static::PATH_SEPARATOR . $name : $name; |
|
| 1501 | + $childrenPath = $parentsPath !== static::ROOT_PATH ? $parentsPath.static::PATH_SEPARATOR.$name : $name; |
|
| 1503 | 1502 | |
| 1504 | 1503 | $relationshipType = $this->getModelSchemes()->getRelationshipType($parentClass, $name); |
| 1505 | 1504 | list ($targetModelClass, $reverseRelName) = |
@@ -1549,7 +1548,7 @@ discard block |
||
| 1549 | 1548 | [$pkName => [FilterParameterInterface::OPERATION_EQUALS => [$parent->{$pkName}]]], |
| 1550 | 1549 | [] |
| 1551 | 1550 | ); |
| 1552 | - $children = $this->fetchPaginatedResourcesWithoutRelationships( |
|
| 1551 | + $children = $this->fetchPaginatedResourcesWithoutRelationships( |
|
| 1553 | 1552 | $clonedBuilder, |
| 1554 | 1553 | $clonedBuilder->getModelClass() |
| 1555 | 1554 | ); |