limoncello-php-dist / flute

src/Http/Query/QueryValidator.php

Doc Comments +2 added lines, -2 removed lines

@@ -270,7 +270,7 @@ 
      * @param string   $name
      * @param iterable $operationsAndArgs
      *
-     * @return iterable
+     * @return \Generator
      */
     private function getValidatedOperationsAndArguments(
         int $blockIndex,
@@ -287,7 +287,7 @@ 
      * @param string   $name
      * @param iterable $arguments
      *
-     * @return iterable
+     * @return \Generator
      */
     private function getValidatedArguments(int $blockIndex, string $name, iterable $arguments): iterable
     {

Spacing +1 added lines, -1 removed lines

@@ -378,7 +378,7 @@
     /**
      * @return int[]|null
      */
-    private function getAttributeRules(): ?array
+    private function getAttributeRules(): ? array
     {
         return $this->attributeRules;
     }

src/Http/Query/ParametersMapper.php

Spacing +3 added lines, -3 removed lines

@@ -245,7 +245,7 @@ 
     public function getMappedIncludes(): iterable
     {
         $fromScheme        = $this->getRootScheme();
-        $getMappedRelLinks = function (iterable $links) use ($fromScheme) : iterable {
+        $getMappedRelLinks = function(iterable $links) use ($fromScheme) : iterable {
             foreach ($links as $link) {
                 assert(is_string($link));
                 $fromSchemaClass = get_class($fromScheme);
@@ -289,14 +289,14 @@ 
         //     ['rel2_name1', ],
         //     ['rel3_name1', 'rel3_name2', 'rel3_name3', ],
         // ]
-        $includeAsModelNames = function (iterable $relationships): iterable {
+        $includeAsModelNames = function(iterable $relationships): iterable {
             foreach ($relationships as $relationship) {
                 assert($relationship instanceof RelationshipInterface);
                 yield $relationship->getNameInModel();
             }
         };
         $mappedIncludes      = $this->getMappedIncludes();
-        $getIncludes         = function () use ($mappedIncludes, $includeAsModelNames) : iterable {
+        $getIncludes         = function() use ($mappedIncludes, $includeAsModelNames) : iterable {
             foreach ($mappedIncludes as $relationships) {
                 yield $includeAsModelNames($relationships);
             }

src/Package/FluteContainerConfigurator.php

Spacing +9 added lines, -9 removed lines

@@ -54,22 +54,22 @@ 
 
         $container[FactoryInterface::class] = $factory;
 
-        $container[JsonSchemesInterface::class] = function (PsrContainerInterface $container) use ($factory) {
+        $container[JsonSchemesInterface::class] = function(PsrContainerInterface $container) use ($factory) {
             $settings     = $container->get(SettingsProviderInterface::class)->get(FluteSettings::class);
             $modelSchemes = $container->get(ModelSchemeInfoInterface::class);
 
             return $factory->createJsonSchemes($settings[FluteSettings::KEY_MODEL_TO_SCHEME_MAP], $modelSchemes);
         };
 
-        $container[QueryParserInterface::class] = function (PsrContainerInterface $container) {
+        $container[QueryParserInterface::class] = function(PsrContainerInterface $container) {
             return new QueryParser($container->get(PaginationStrategyInterface::class));
         };
 
-        $container[ParametersMapperInterface::class] = function (PsrContainerInterface $container) {
+        $container[ParametersMapperInterface::class] = function(PsrContainerInterface $container) {
             return new ParametersMapper($container->get(JsonSchemesInterface::class));
         };
 
-        $container[EncoderInterface::class] = function (PsrContainerInterface $container) use ($factory) {
+        $container[EncoderInterface::class] = function(PsrContainerInterface $container) use ($factory) {
             /** @var JsonSchemesInterface $jsonSchemes */
             $jsonSchemes = $container->get(JsonSchemesInterface::class);
             $settings    = $container->get(SettingsProviderInterface::class)->get(FluteSettings::class);
@@ -84,7 +84,7 @@ 
             return $encoder;
         };
 
-        $container[PaginationStrategyInterface::class] = function (PsrContainerInterface $container) {
+        $container[PaginationStrategyInterface::class] = function(PsrContainerInterface $container) {
             $settings = $container->get(SettingsProviderInterface::class)->get(FluteSettings::class);
 
             return new PaginationStrategy(
@@ -93,19 +93,19 @@ 
             );
         };
 
-        $container[JsonApiValidatorFactoryInterface::class] = function (PsrContainerInterface $container) {
+        $container[JsonApiValidatorFactoryInterface::class] = function(PsrContainerInterface $container) {
             $factory = new JsonApiValidatorFactory($container);
 
             return $factory;
         };
 
-        $container[FormValidatorFactoryInterface::class] = function (PsrContainerInterface $container) {
+        $container[FormValidatorFactoryInterface::class] = function(PsrContainerInterface $container) {
             $factory = new FormValidatorFactory($container);
 
             return $factory;
         };
 
-        $container[QueryValidatorFactoryInterface::class] = function (PsrContainerInterface $container) {
+        $container[QueryValidatorFactoryInterface::class] = function(PsrContainerInterface $container) {
             /** @var PaginationStrategyInterface $paginationStrategy */
             $paginationStrategy = $container->get(PaginationStrategyInterface::class);
             $settings           = $container->get(SettingsProviderInterface::class)->get(FluteSettings::class);
@@ -137,7 +137,7 @@ 
      */
     public static function configureExceptionHandler(LimoncelloContainerInterface $container)
     {
-        $container[ThrowableHandlerInterface::class] = function (PsrContainerInterface $container) {
+        $container[ThrowableHandlerInterface::class] = function(PsrContainerInterface $container) {
             /** @var CacheSettingsProviderInterface $provider */
             $provider      = $container->get(CacheSettingsProviderInterface::class);
             $appConfig     = $provider->getApplicationConfiguration();

src/Package/FluteSettings.php

Spacing +4 added lines, -4 removed lines

@@ -147,10 +147,10 @@
         );
         assert(empty($queryValFileMask) === false, "Invalid Query Validators file mask `$queryValFileMask`.");
 
-        $schemesPath         = $schemesFolder . DIRECTORY_SEPARATOR . $schemesFileMask;
-        $jsonValidatorsPath  = $jsonValFolder . DIRECTORY_SEPARATOR . $jsonValFileMask;
-        $formsValidatorsPath = $formsValFolder . DIRECTORY_SEPARATOR . $formsValFileMask;
-        $queryValidatorsPath = $queryValFolder . DIRECTORY_SEPARATOR . $queryValFileMask;
+        $schemesPath         = $schemesFolder.DIRECTORY_SEPARATOR.$schemesFileMask;
+        $jsonValidatorsPath  = $jsonValFolder.DIRECTORY_SEPARATOR.$jsonValFileMask;
+        $formsValidatorsPath = $formsValFolder.DIRECTORY_SEPARATOR.$formsValFileMask;
+        $queryValidatorsPath = $queryValFolder.DIRECTORY_SEPARATOR.$queryValFileMask;
 
         $requireUniqueTypes = $defaults[static::KEY_SCHEMES_REQUIRE_UNIQUE_TYPES] ?? true;
 

src/Adapters/ModelQueryBuilder.php

Spacing +13 added lines, -13 removed lines

@@ -320,7 +320,7 @@ 
         string $relationshipName,
         iterable $relationshipFilters,
         ?iterable $relationshipSorts
-    ): self {
+    ) : self {
         $joinWith = $this->expr()->andX();
 
         return $this->addRelationshipFiltersAndSorts(
@@ -354,7 +354,7 @@ 
         string $relationshipName,
         iterable $relationshipFilters,
         ?iterable $relationshipSorts
-    ): self {
+    ) : self {
         $joinWith = $this->expr()->orX();
 
         return $this->addRelationshipFiltersAndSorts(
@@ -415,7 +415,7 @@ 
         CompositeExpression $filterLink,
         iterable $relationshipFilters,
         ?iterable $relationshipSorts
-    ): self {
+    ) : self {
         $relationshipType = $this->getModelSchemes()->getRelationshipType($this->getModelClass(), $relationshipName);
         switch ($relationshipType) {
             case RelationshipTypes::BELONGS_TO:
@@ -488,7 +488,7 @@ 
         CompositeExpression $filterLink,
         iterable $relationshipFilters,
         ?iterable $relationshipSorts
-    ): self {
+    ) : self {
         $foreignKey = $this->getModelSchemes()->getForeignKey($this->getModelClass(), $relationshipName);
         list($onePrimaryKey, $oneTable) =
             $this->getModelSchemes()->getReversePrimaryKey($this->getModelClass(), $relationshipName);
@@ -522,7 +522,7 @@ 
         CompositeExpression $filterLink,
         iterable $relationshipFilters,
         ?iterable $relationshipSorts
-    ): self {
+    ) : self {
         $primaryKey = $this->getModelSchemes()->getPrimaryKey($this->getModelClass());
         list($manyForeignKey, $manyTable) =
             $this->getModelSchemes()->getReverseForeignKey($this->getModelClass(), $relationshipName);
@@ -556,7 +556,7 @@ 
         CompositeExpression $targetFilterLink,
         iterable $relationshipFilters,
         ?iterable $relationshipSorts
-    ): self {
+    ) : self {
         $primaryKey = $this->getModelSchemes()->getPrimaryKey($this->getModelClass());
         list ($intermediateTable, $intermediatePk, $intermediateFk) =
             $this->getModelSchemes()->getBelongsToManyRelationship($this->getModelClass(), $relationshipName);
@@ -606,9 +606,9 @@ 
         ?CompositeExpression $targetFilterLink,
         ?iterable $targetFilterParams,
         ?iterable $relationshipSorts
-    ): string {
+    ) : string {
         $targetAlias   = $this->createAlias($targetTable);
-        $joinCondition = $this->buildColumnName($fromAlias, $fromColumn) . '=' .
+        $joinCondition = $this->buildColumnName($fromAlias, $fromColumn).'='.
             $this->buildColumnName($targetAlias, $targetColumn);
 
         $this->innerJoin(
@@ -667,7 +667,7 @@ 
         ?CompositeExpression $targetFilterLink,
         ?iterable $targetFilterParams,
         ?iterable $targetSortParams
-    ): string {
+    ) : string {
         $intNoSorting = null;
         $intAlias     = $this->innerJoinOneTable(
             $fromAlias,
@@ -678,7 +678,7 @@ 
             $intFilterParams,
             $intNoSorting
         );
-        $targetAlias  = $this->innerJoinOneTable(
+        $targetAlias = $this->innerJoinOneTable(
             $intAlias,
             $intToTargetColumn,
             $targetTable,
@@ -698,7 +698,7 @@ 
      */
     private function createAlias(string $tableName): string
     {
-        $alias                          = $tableName . (++$this->aliasIdCounter);
+        $alias                          = $tableName.(++$this->aliasIdCounter);
         $this->knownAliases[$tableName] = $alias;
 
         return $alias;
@@ -876,7 +876,7 @@ 
         if ($this->dtToDbConverter === null) {
             $type     = Type::getType(DateTimeType::DATETIME);
             $platform = $this->getConnection()->getDatabasePlatform();
-            $this->dtToDbConverter = function (DateTimeInterface $dateTime) use ($type, $platform) : string {
+            $this->dtToDbConverter = function(DateTimeInterface $dateTime) use ($type, $platform) : string {
                 return $type->convertToDatabaseValue($dateTime, $platform);
             };
         }
@@ -902,7 +902,7 @@ 
         } else {
             assert(
                 $value !== null,
-                'It seems you are trying to use `null` with =, >, <, or etc operator. ' .
+                'It seems you are trying to use `null` with =, >, <, or etc operator. '.
                 'Use `is null` or `not null` instead.'
             );
             assert(is_string($value), "Only strings, booleans and integers are supported.");

src/Api/Crud.php

Doc Comments +7 added lines, -7 removed lines

@@ -741,9 +741,9 @@ 
     }
 
     /**
-     * @param iterable $paths (string[])
+     * @param iterable|null $paths (string[])
      *
-     * @return iterable
+     * @return Generator
      */
     private static function getPaths(iterable $paths): iterable
     {
@@ -1331,7 +1331,7 @@ 
      * @param string       $modelClass
      * @param string       $keyColumnName
      *
-     * @return iterable
+     * @return Generator
      */
     private function fetchResourcesWithoutRelationships(
         QueryBuilder $builder,
@@ -1425,7 +1425,7 @@ 
      * @param null|string $index
      * @param iterable    $attributes
      *
-     * @return iterable
+     * @return Generator
      */
     protected function filterAttributesOnCreate(?string $index, iterable $attributes): iterable
     {
@@ -1445,7 +1445,7 @@ 
     /**
      * @param iterable $attributes
      *
-     * @return iterable
+     * @return Generator
      */
     protected function filterAttributesOnUpdate(iterable $attributes): iterable
     {
@@ -1634,10 +1634,10 @@ 
 
     /**
      * @param iterable         $attributes
-     * @param array            $typeNames
+     * @param Type[]            $typeNames
      * @param AbstractPlatform $platform
      *
-     * @return iterable
+     * @return Generator
      */
     private function readTypedAttributes(iterable $attributes, array $typeNames, AbstractPlatform $platform): iterable
     {

Spacing +16 added lines, -17 removed lines

@@ -673,7 +673,7 @@ 
             $classAtPath = new ArrayObject();
             $idsAtPath   = new ArrayObject();
 
-            $registerModelAtRoot = function ($model) use ($modelStorage, $modelsAtPath, $idsAtPath): void {
+            $registerModelAtRoot = function($model) use ($modelStorage, $modelsAtPath, $idsAtPath): void {
                 self::registerModelAtPath(
                     $model,
                     static::ROOT_PATH,
@@ -761,7 +761,7 @@ 
                 assert(is_string($pathPiece));
                 $parent                    = $tmpPath;
                 $tmpPath                   = empty($tmpPath) === true ?
-                    $pathPiece : $tmpPath . static::PATH_SEPARATOR . $pathPiece;
+                    $pathPiece : $tmpPath.static::PATH_SEPARATOR.$pathPiece;
                 $normalizedPaths[$tmpPath] = [$parent, $pathPiece];
                 $pathsDepths[$parent]      = $parentDepth++;
             }
@@ -933,8 +933,7 @@ 
             $filters = $this->getFilters();
             $sorts   = $this->getSorts();
             $this->areFiltersWithAnd() ?
-                $builder->addRelationshipFiltersAndSortsWithAnd($reverseRelName, $filters, $sorts) :
-                $builder->addRelationshipFiltersAndSortsWithOr($reverseRelName, $filters, $sorts);
+                $builder->addRelationshipFiltersAndSortsWithAnd($reverseRelName, $filters, $sorts) : $builder->addRelationshipFiltersAndSortsWithOr($reverseRelName, $filters, $sorts);
         }
         // ... and the input filters to actual data we select
         if ($relationshipFilters !== null) {
@@ -1053,7 +1052,7 @@ 
 
         $this->clearFetchParameters();
 
-        return (int)$deleted;
+        return (int) $deleted;
     }
 
     /**
@@ -1067,7 +1066,7 @@ 
 
         $this->clearFetchParameters();
 
-        return (int)$deleted > 0;
+        return (int) $deleted > 0;
     }
 
     /**
@@ -1088,7 +1087,7 @@ 
 
         $this->clearBuilderParameters()->clearFetchParameters();
 
-        $this->inTransaction(function () use ($saveMain, $toMany, &$index) {
+        $this->inTransaction(function() use ($saveMain, $toMany, &$index) {
             $saveMain->execute();
 
             // if no index given will use last insert ID as index
@@ -1104,7 +1103,7 @@ 
                         ->prepareCreateInToManyRelationship($relationshipName, $index, $secondaryIdBindName)
                 );
                 foreach ($secondaryIds as $secondaryId) {
-                    $inserted += (int)$saveToMany->setParameter($secondaryIdBindName, $secondaryId)->execute();
+                    $inserted += (int) $saveToMany->setParameter($secondaryIdBindName, $secondaryId)->execute();
                 }
             }
         });
@@ -1133,12 +1132,12 @@ 
             ->createBuilder($this->getModelClass())
             ->updateModels($allowedChanges)
             ->addFiltersWithAndToTable($filters);
-        $saveMain       = $this->builderSaveResourceOnUpdate($saveMain);
+        $saveMain = $this->builderSaveResourceOnUpdate($saveMain);
         $saveMain->getSQL(); // prepare
 
         $this->clearBuilderParameters()->clearFetchParameters();
 
-        $this->inTransaction(function () use ($saveMain, $toMany, $index, &$updated) {
+        $this->inTransaction(function() use ($saveMain, $toMany, $index, &$updated) {
             $updated = $saveMain->execute();
 
             foreach ($toMany as $relationshipName => $secondaryIds) {
@@ -1158,12 +1157,12 @@ 
                         ->prepareCreateInToManyRelationship($relationshipName, $index, $secondaryIdBindName)
                 );
                 foreach ($secondaryIds as $secondaryId) {
-                    $updated += (int)$saveToMany->setParameter($secondaryIdBindName, $secondaryId)->execute();
+                    $updated += (int) $saveToMany->setParameter($secondaryIdBindName, $secondaryId)->execute();
                 }
             }
         });
 
-        return (int)$updated;
+        return (int) $updated;
     }
 
     /**
@@ -1247,7 +1246,7 @@ 
     /**
      * @inheritdoc
      */
-    public function fetchRow(QueryBuilder $builder, string $modelClass): ?array
+    public function fetchRow(QueryBuilder $builder, string $modelClass): ? array
     {
         $model = null;
 
@@ -1427,7 +1426,7 @@ 
      *
      * @return iterable
      */
-    protected function filterAttributesOnCreate(?string $index, iterable $attributes): iterable
+    protected function filterAttributesOnCreate(?string $index, iterable $attributes) : iterable
     {
         if ($index !== null) {
             $pkName = $this->getModelSchemes()->getPrimaryKey($this->getModelClass());
@@ -1487,7 +1486,7 @@ 
 
         $pkName = $this->getModelSchemes()->getPrimaryKey($parentClass);
 
-        $registerModelAtPath = function ($model, string $path) use ($deDup, $modelsAtPath, $idsAtPath) {
+        $registerModelAtPath = function($model, string $path) use ($deDup, $modelsAtPath, $idsAtPath) {
             return self::registerModelAtPath(
                 $model,
                 $path,
@@ -1499,7 +1498,7 @@ 
         };
 
         foreach ($childRelationships as $name) {
-            $childrenPath = $parentsPath !== static::ROOT_PATH ? $parentsPath . static::PATH_SEPARATOR . $name : $name;
+            $childrenPath = $parentsPath !== static::ROOT_PATH ? $parentsPath.static::PATH_SEPARATOR.$name : $name;
 
             $relationshipType = $this->getModelSchemes()->getRelationshipType($parentClass, $name);
             list ($targetModelClass, $reverseRelName) =
@@ -1549,7 +1548,7 @@ 
                             [$pkName => [FilterParameterInterface::OPERATION_EQUALS => [$parent->{$pkName}]]],
                             []
                         );
-                        $children      = $this->fetchPaginatedResourcesWithoutRelationships(
+                        $children = $this->fetchPaginatedResourcesWithoutRelationships(
                             $clonedBuilder,
                             $clonedBuilder->getModelClass()
                         );