@@ -101,8 +101,7 @@ |
||
101 | 101 | } |
102 | 102 | |
103 | 103 | $reply = $count > 0 ? |
104 | - BlockReplies::createSuccessReply($value) : |
|
105 | - BlockReplies::createErrorReply($context, $value, ErrorCodes::EXIST_IN_DATABASE_SINGLE); |
|
104 | + BlockReplies::createSuccessReply($value) : BlockReplies::createErrorReply($context, $value, ErrorCodes::EXIST_IN_DATABASE_SINGLE); |
|
106 | 105 | |
107 | 106 | return $reply; |
108 | 107 | } |
@@ -54,22 +54,22 @@ discard block |
||
54 | 54 | |
55 | 55 | $container[FactoryInterface::class] = $factory; |
56 | 56 | |
57 | - $container[JsonSchemesInterface::class] = function (PsrContainerInterface $container) use ($factory) { |
|
57 | + $container[JsonSchemesInterface::class] = function(PsrContainerInterface $container) use ($factory) { |
|
58 | 58 | $settings = $container->get(SettingsProviderInterface::class)->get(FluteSettings::class); |
59 | 59 | $modelSchemes = $container->get(ModelSchemeInfoInterface::class); |
60 | 60 | |
61 | 61 | return $factory->createJsonSchemes($settings[FluteSettings::KEY_MODEL_TO_SCHEME_MAP], $modelSchemes); |
62 | 62 | }; |
63 | 63 | |
64 | - $container[QueryParserInterface::class] = function (PsrContainerInterface $container) { |
|
64 | + $container[QueryParserInterface::class] = function(PsrContainerInterface $container) { |
|
65 | 65 | return new QueryParser($container->get(PaginationStrategyInterface::class)); |
66 | 66 | }; |
67 | 67 | |
68 | - $container[ParametersMapperInterface::class] = function (PsrContainerInterface $container) { |
|
68 | + $container[ParametersMapperInterface::class] = function(PsrContainerInterface $container) { |
|
69 | 69 | return new ParametersMapper($container->get(JsonSchemesInterface::class)); |
70 | 70 | }; |
71 | 71 | |
72 | - $container[EncoderInterface::class] = function (PsrContainerInterface $container) use ($factory) { |
|
72 | + $container[EncoderInterface::class] = function(PsrContainerInterface $container) use ($factory) { |
|
73 | 73 | /** @var JsonSchemesInterface $jsonSchemes */ |
74 | 74 | $jsonSchemes = $container->get(JsonSchemesInterface::class); |
75 | 75 | $settings = $container->get(SettingsProviderInterface::class)->get(FluteSettings::class); |
@@ -84,7 +84,7 @@ discard block |
||
84 | 84 | return $encoder; |
85 | 85 | }; |
86 | 86 | |
87 | - $container[PaginationStrategyInterface::class] = function (PsrContainerInterface $container) { |
|
87 | + $container[PaginationStrategyInterface::class] = function(PsrContainerInterface $container) { |
|
88 | 88 | $settings = $container->get(SettingsProviderInterface::class)->get(FluteSettings::class); |
89 | 89 | |
90 | 90 | return new PaginationStrategy( |
@@ -93,19 +93,19 @@ discard block |
||
93 | 93 | ); |
94 | 94 | }; |
95 | 95 | |
96 | - $container[JsonApiValidatorFactoryInterface::class] = function (PsrContainerInterface $container) { |
|
96 | + $container[JsonApiValidatorFactoryInterface::class] = function(PsrContainerInterface $container) { |
|
97 | 97 | $factory = new JsonApiValidatorFactory($container); |
98 | 98 | |
99 | 99 | return $factory; |
100 | 100 | }; |
101 | 101 | |
102 | - $container[FormValidatorFactoryInterface::class] = function (PsrContainerInterface $container) { |
|
102 | + $container[FormValidatorFactoryInterface::class] = function(PsrContainerInterface $container) { |
|
103 | 103 | $factory = new FormValidatorFactory($container); |
104 | 104 | |
105 | 105 | return $factory; |
106 | 106 | }; |
107 | 107 | |
108 | - $container[QueryValidatorFactoryInterface::class] = function (PsrContainerInterface $container) { |
|
108 | + $container[QueryValidatorFactoryInterface::class] = function(PsrContainerInterface $container) { |
|
109 | 109 | /** @var PaginationStrategyInterface $paginationStrategy */ |
110 | 110 | $paginationStrategy = $container->get(PaginationStrategyInterface::class); |
111 | 111 | $settings = $container->get(SettingsProviderInterface::class)->get(FluteSettings::class); |
@@ -137,7 +137,7 @@ discard block |
||
137 | 137 | */ |
138 | 138 | public static function configureExceptionHandler(LimoncelloContainerInterface $container) |
139 | 139 | { |
140 | - $container[ThrowableHandlerInterface::class] = function (PsrContainerInterface $container) { |
|
140 | + $container[ThrowableHandlerInterface::class] = function(PsrContainerInterface $container) { |
|
141 | 141 | /** @var CacheSettingsProviderInterface $provider */ |
142 | 142 | $provider = $container->get(CacheSettingsProviderInterface::class); |
143 | 143 | $appConfig = $provider->getApplicationConfiguration(); |
@@ -147,10 +147,10 @@ |
||
147 | 147 | ); |
148 | 148 | assert(empty($queryValFileMask) === false, "Invalid Query Validators file mask `$queryValFileMask`."); |
149 | 149 | |
150 | - $schemesPath = $schemesFolder . DIRECTORY_SEPARATOR . $schemesFileMask; |
|
151 | - $jsonValidatorsPath = $jsonValFolder . DIRECTORY_SEPARATOR . $jsonValFileMask; |
|
152 | - $formsValidatorsPath = $formsValFolder . DIRECTORY_SEPARATOR . $formsValFileMask; |
|
153 | - $queryValidatorsPath = $queryValFolder . DIRECTORY_SEPARATOR . $queryValFileMask; |
|
150 | + $schemesPath = $schemesFolder.DIRECTORY_SEPARATOR.$schemesFileMask; |
|
151 | + $jsonValidatorsPath = $jsonValFolder.DIRECTORY_SEPARATOR.$jsonValFileMask; |
|
152 | + $formsValidatorsPath = $formsValFolder.DIRECTORY_SEPARATOR.$formsValFileMask; |
|
153 | + $queryValidatorsPath = $queryValFolder.DIRECTORY_SEPARATOR.$queryValFileMask; |
|
154 | 154 | |
155 | 155 | $requireUniqueTypes = $defaults[static::KEY_SCHEMES_REQUIRE_UNIQUE_TYPES] ?? true; |
156 | 156 |
@@ -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 | ); |
@@ -755,9 +755,9 @@ discard block |
||
755 | 755 | } |
756 | 756 | |
757 | 757 | /** |
758 | - * @param iterable $paths (string[]) |
|
758 | + * @param iterable|null $paths (string[]) |
|
759 | 759 | * |
760 | - * @return iterable |
|
760 | + * @return Generator |
|
761 | 761 | */ |
762 | 762 | private static function getPaths(iterable $paths): iterable |
763 | 763 | { |
@@ -1355,7 +1355,7 @@ discard block |
||
1355 | 1355 | * @param string $modelClass |
1356 | 1356 | * @param string $keyColumnName |
1357 | 1357 | * |
1358 | - * @return iterable |
|
1358 | + * @return Generator |
|
1359 | 1359 | * |
1360 | 1360 | * @throws DBALException |
1361 | 1361 | */ |
@@ -1455,7 +1455,7 @@ discard block |
||
1455 | 1455 | * @param null|string $index |
1456 | 1456 | * @param iterable $attributes |
1457 | 1457 | * |
1458 | - * @return iterable |
|
1458 | + * @return Generator |
|
1459 | 1459 | */ |
1460 | 1460 | protected function filterAttributesOnCreate(?string $index, iterable $attributes): iterable |
1461 | 1461 | { |
@@ -1475,7 +1475,7 @@ discard block |
||
1475 | 1475 | /** |
1476 | 1476 | * @param iterable $attributes |
1477 | 1477 | * |
1478 | - * @return iterable |
|
1478 | + * @return Generator |
|
1479 | 1479 | */ |
1480 | 1480 | protected function filterAttributesOnUpdate(iterable $attributes): iterable |
1481 | 1481 | { |
@@ -1673,10 +1673,10 @@ discard block |
||
1673 | 1673 | |
1674 | 1674 | /** |
1675 | 1675 | * @param iterable $attributes |
1676 | - * @param array $typeNames |
|
1676 | + * @param Type[] $typeNames |
|
1677 | 1677 | * @param AbstractPlatform $platform |
1678 | 1678 | * |
1679 | - * @return iterable |
|
1679 | + * @return Generator |
|
1680 | 1680 | * |
1681 | 1681 | * @throws DBALException |
1682 | 1682 | */ |
@@ -62,7 +62,7 @@ discard block |
||
62 | 62 | /** |
63 | 63 | * @inheritdoc |
64 | 64 | */ |
65 | - public function parseParameters(?array $parameters): array |
|
65 | + public function parseParameters(? array $parameters) : array |
|
66 | 66 | { |
67 | 67 | if ($parameters === null) { |
68 | 68 | return [0, $this->getDefaultPageSize()]; |
@@ -75,7 +75,7 @@ discard block |
||
75 | 75 | 0, |
76 | 76 | PHP_INT_MAX |
77 | 77 | ); |
78 | - $size = $this->getValue( |
|
78 | + $size = $this->getValue( |
|
79 | 79 | $parameters, |
80 | 80 | static::PARAM_PAGING_LIMIT, |
81 | 81 | $this->getDefaultPageSize(), |
@@ -125,7 +125,7 @@ discard block |
||
125 | 125 | |
126 | 126 | parse_str($this->getOriginalUri()->getQuery(), $queryParams); |
127 | 127 | |
128 | - return function ($offset) use ($pageSize, $queryParams) { |
|
128 | + return function($offset) use ($pageSize, $queryParams) { |
|
129 | 129 | $paramsWithPaging = array_merge($queryParams, [ |
130 | 130 | QueryParametersParserInterface::PARAM_PAGE => [ |
131 | 131 | PaginationStrategyInterface::PARAM_PAGING_OFFSET => $offset, |
@@ -133,7 +133,7 @@ discard block |
||
133 | 133 | ], |
134 | 134 | ]); |
135 | 135 | $newUri = $this->getOriginalUri()->withQuery(http_build_query($paramsWithPaging)); |
136 | - $fullUrl = (string)$newUri; |
|
136 | + $fullUrl = (string) $newUri; |
|
137 | 137 | $link = $this->getFactory()->createLink($fullUrl, null, true); |
138 | 138 | |
139 | 139 | return $link; |
@@ -212,12 +212,12 @@ |
||
212 | 212 | return [static::DATA => $data->getData()]; |
213 | 213 | } |
214 | 214 | |
215 | - $buildUrl = function ($offset) use ($data, $uri) { |
|
215 | + $buildUrl = function($offset) use ($data, $uri) { |
|
216 | 216 | $paramsWithPaging = [ |
217 | 217 | PaginationStrategyInterface::PARAM_PAGING_OFFSET => $offset, |
218 | 218 | PaginationStrategyInterface::PARAM_PAGING_LIMIT => $data->getLimit(), |
219 | 219 | ]; |
220 | - $fullUrl = $uri . '?' . http_build_query($paramsWithPaging); |
|
220 | + $fullUrl = $uri.'?'.http_build_query($paramsWithPaging); |
|
221 | 221 | |
222 | 222 | return $fullUrl; |
223 | 223 | }; |
@@ -160,7 +160,7 @@ discard block |
||
160 | 160 | } |
161 | 161 | |
162 | 162 | /** |
163 | - * @param iterable $attributes |
|
163 | + * @param Generator $attributes |
|
164 | 164 | * |
165 | 165 | * @return self |
166 | 166 | * |
@@ -182,7 +182,7 @@ discard block |
||
182 | 182 | } |
183 | 183 | |
184 | 184 | /** |
185 | - * @param iterable $attributes |
|
185 | + * @param Generator $attributes |
|
186 | 186 | * |
187 | 187 | * @return self |
188 | 188 | * |
@@ -205,7 +205,7 @@ discard block |
||
205 | 205 | * @param string $modelClass |
206 | 206 | * @param iterable $attributes |
207 | 207 | * |
208 | - * @return iterable |
|
208 | + * @return Generator |
|
209 | 209 | * |
210 | 210 | * @SuppressWarnings(PHPMD.StaticAccess) |
211 | 211 | * |
@@ -288,7 +288,7 @@ discard block |
||
288 | 288 | } |
289 | 289 | |
290 | 290 | /** |
291 | - * @param iterable $filters |
|
291 | + * @param \Limoncello\Flute\Api\iterable|null $filters |
|
292 | 292 | * |
293 | 293 | * @return self |
294 | 294 | * |
@@ -300,7 +300,7 @@ discard block |
||
300 | 300 | } |
301 | 301 | |
302 | 302 | /** |
303 | - * @param iterable $filters |
|
303 | + * @param \Limoncello\Flute\Api\iterable|null $filters |
|
304 | 304 | * |
305 | 305 | * @return self |
306 | 306 | * |
@@ -312,7 +312,7 @@ discard block |
||
312 | 312 | } |
313 | 313 | |
314 | 314 | /** |
315 | - * @param iterable $filters |
|
315 | + * @param \Limoncello\Flute\Api\iterable|null $filters |
|
316 | 316 | * |
317 | 317 | * @return self |
318 | 318 | * |
@@ -361,7 +361,7 @@ discard block |
||
361 | 361 | |
362 | 362 | /** |
363 | 363 | * @param string $relationshipName |
364 | - * @param iterable $relationshipFilters |
|
364 | + * @param \Limoncello\Flute\Api\iterable|null $relationshipFilters |
|
365 | 365 | * @param iterable|null $relationshipSorts |
366 | 366 | * |
367 | 367 | * @return self |
@@ -384,7 +384,7 @@ discard block |
||
384 | 384 | } |
385 | 385 | |
386 | 386 | /** |
387 | - * @param iterable $sortParameters |
|
387 | + * @param \Limoncello\Flute\Api\iterable|null $sortParameters |
|
388 | 388 | * |
389 | 389 | * @return self |
390 | 390 | */ |
@@ -336,7 +336,7 @@ discard block |
||
336 | 336 | string $relationshipName, |
337 | 337 | iterable $relationshipFilters, |
338 | 338 | ?iterable $relationshipSorts |
339 | - ): self { |
|
339 | + ) : self { |
|
340 | 340 | $joinWith = $this->expr()->andX(); |
341 | 341 | |
342 | 342 | return $this->addRelationshipFiltersAndSorts( |
@@ -372,7 +372,7 @@ discard block |
||
372 | 372 | string $relationshipName, |
373 | 373 | iterable $relationshipFilters, |
374 | 374 | ?iterable $relationshipSorts |
375 | - ): self { |
|
375 | + ) : self { |
|
376 | 376 | $joinWith = $this->expr()->orX(); |
377 | 377 | |
378 | 378 | return $this->addRelationshipFiltersAndSorts( |
@@ -437,7 +437,7 @@ discard block |
||
437 | 437 | CompositeExpression $filterLink, |
438 | 438 | iterable $relationshipFilters, |
439 | 439 | ?iterable $relationshipSorts |
440 | - ): self { |
|
440 | + ) : self { |
|
441 | 441 | $relationshipType = $this->getModelSchemes()->getRelationshipType($this->getModelClass(), $relationshipName); |
442 | 442 | switch ($relationshipType) { |
443 | 443 | case RelationshipTypes::BELONGS_TO: |
@@ -512,7 +512,7 @@ discard block |
||
512 | 512 | CompositeExpression $filterLink, |
513 | 513 | iterable $relationshipFilters, |
514 | 514 | ?iterable $relationshipSorts |
515 | - ): self { |
|
515 | + ) : self { |
|
516 | 516 | $foreignKey = $this->getModelSchemes()->getForeignKey($this->getModelClass(), $relationshipName); |
517 | 517 | list($onePrimaryKey, $oneTable) = |
518 | 518 | $this->getModelSchemes()->getReversePrimaryKey($this->getModelClass(), $relationshipName); |
@@ -548,7 +548,7 @@ discard block |
||
548 | 548 | CompositeExpression $filterLink, |
549 | 549 | iterable $relationshipFilters, |
550 | 550 | ?iterable $relationshipSorts |
551 | - ): self { |
|
551 | + ) : self { |
|
552 | 552 | $primaryKey = $this->getModelSchemes()->getPrimaryKey($this->getModelClass()); |
553 | 553 | list($manyForeignKey, $manyTable) = |
554 | 554 | $this->getModelSchemes()->getReverseForeignKey($this->getModelClass(), $relationshipName); |
@@ -584,7 +584,7 @@ discard block |
||
584 | 584 | CompositeExpression $targetFilterLink, |
585 | 585 | iterable $relationshipFilters, |
586 | 586 | ?iterable $relationshipSorts |
587 | - ): self { |
|
587 | + ) : self { |
|
588 | 588 | $primaryKey = $this->getModelSchemes()->getPrimaryKey($this->getModelClass()); |
589 | 589 | list ($intermediateTable, $intermediatePk, $intermediateFk) = |
590 | 590 | $this->getModelSchemes()->getBelongsToManyRelationship($this->getModelClass(), $relationshipName); |
@@ -636,9 +636,9 @@ discard block |
||
636 | 636 | ?CompositeExpression $targetFilterLink, |
637 | 637 | ?iterable $targetFilterParams, |
638 | 638 | ?iterable $relationshipSorts |
639 | - ): string { |
|
639 | + ) : string { |
|
640 | 640 | $targetAlias = $this->createAlias($targetTable); |
641 | - $joinCondition = $this->buildColumnName($fromAlias, $fromColumn) . '=' . |
|
641 | + $joinCondition = $this->buildColumnName($fromAlias, $fromColumn).'='. |
|
642 | 642 | $this->buildColumnName($targetAlias, $targetColumn); |
643 | 643 | |
644 | 644 | $this->innerJoin( |
@@ -699,7 +699,7 @@ discard block |
||
699 | 699 | ?CompositeExpression $targetFilterLink, |
700 | 700 | ?iterable $targetFilterParams, |
701 | 701 | ?iterable $targetSortParams |
702 | - ): string { |
|
702 | + ) : string { |
|
703 | 703 | $intNoSorting = null; |
704 | 704 | $intAlias = $this->innerJoinOneTable( |
705 | 705 | $fromAlias, |
@@ -710,7 +710,7 @@ discard block |
||
710 | 710 | $intFilterParams, |
711 | 711 | $intNoSorting |
712 | 712 | ); |
713 | - $targetAlias = $this->innerJoinOneTable( |
|
713 | + $targetAlias = $this->innerJoinOneTable( |
|
714 | 714 | $intAlias, |
715 | 715 | $intToTargetColumn, |
716 | 716 | $targetTable, |
@@ -730,7 +730,7 @@ discard block |
||
730 | 730 | */ |
731 | 731 | private function createAlias(string $tableName): string |
732 | 732 | { |
733 | - $alias = $tableName . (++$this->aliasIdCounter); |
|
733 | + $alias = $tableName.(++$this->aliasIdCounter); |
|
734 | 734 | $this->knownAliases[$tableName] = $alias; |
735 | 735 | |
736 | 736 | return $alias; |
@@ -933,7 +933,7 @@ discard block |
||
933 | 933 | if ($this->dtToDbConverter === null) { |
934 | 934 | $type = $this->getDbalType(DateTimeType::DATETIME); |
935 | 935 | $platform = $this->getConnection()->getDatabasePlatform(); |
936 | - $this->dtToDbConverter = function (DateTimeInterface $dateTime) use ($type, $platform) : string { |
|
936 | + $this->dtToDbConverter = function(DateTimeInterface $dateTime) use ($type, $platform) : string { |
|
937 | 937 | return $type->convertToDatabaseValue($dateTime, $platform); |
938 | 938 | }; |
939 | 939 | } |
@@ -959,7 +959,7 @@ discard block |
||
959 | 959 | } else { |
960 | 960 | assert( |
961 | 961 | $value !== null, |
962 | - 'It seems you are trying to use `null` with =, >, <, or etc operator. ' . |
|
962 | + 'It seems you are trying to use `null` with =, >, <, or etc operator. '. |
|
963 | 963 | 'Use `is null` or `not null` instead.' |
964 | 964 | ); |
965 | 965 | assert(is_string($value), "Only strings, booleans and integers are supported."); |