limoncello-php-dist / flute

src/Http/Query/ParametersMapper.php

Doc Comments +1 added lines, -1 removed lines

@@ -408,7 +408,7 @@
      * @param string   $parameterName
      * @param iterable $value
      *
-     * @return iterable
+     * @return Generator
      */
     private function parseOperationsAndArguments(string $parameterName, iterable $value): iterable
     {

Spacing +4 added lines, -4 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 {
+        $mappedIncludes = $this->getMappedIncludes();
+        $getIncludes = function() use ($mappedIncludes, $includeAsModelNames) : iterable {
             foreach ($mappedIncludes as $relationships) {
                 yield $includeAsModelNames($relationships);
             }

src/Http/Query/QueryParser.php

Doc Comments +1 added lines, -1 removed lines

@@ -264,7 +264,7 @@
      * @param string $parameterName
      * @param array  $value
      *
-     * @return iterable
+     * @return Generator
      */
     private function parseOperationsAndArguments(string $parameterName, array $value): iterable
     {

Spacing +3 added lines, -3 removed lines

@@ -92,7 +92,7 @@ 
     {
         // debug check all fields are strings
         assert(
-            (function () use ($fields) {
+            (function() use ($fields) {
                 $allAreStrings = !empty($fields);
                 foreach ($fields as $field) {
                     $allAreStrings = $allAreStrings === true && is_string($field) === true && empty($field) === false;
@@ -134,7 +134,7 @@ 
     {
         // debug check all fields are strings
         assert(
-            (function () use ($fields) {
+            (function() use ($fields) {
                 $allAreStrings = !empty($fields);
                 foreach ($fields as $field) {
                     $allAreStrings = $allAreStrings === true && is_string($field) === true && empty($field) === false;
@@ -176,7 +176,7 @@ 
     {
         // debug check all fields are strings
         assert(
-            (function () use ($paths) {
+            (function() use ($paths) {
                 $allAreStrings = !empty($paths);
                 foreach ($paths as $path) {
                     $allAreStrings = $allAreStrings === true && is_string($path) === true && empty($path) === false;

src/Package/FluteContainerConfigurator.php

Spacing +7 added lines, -7 removed lines

@@ -49,22 +49,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);
@@ -79,7 +79,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(
@@ -88,7 +88,7 @@ 
             );
         };
 
-        $container[JsonApiValidatorFactoryInterface::class] = function (PsrContainerInterface $container) {
+        $container[JsonApiValidatorFactoryInterface::class] = function(PsrContainerInterface $container) {
             $factory = new JsonApiValidatorFactory($container);
 
             return $factory;
@@ -116,7 +116,7 @@ 
      */
     public static function configureExceptionHandler(LimoncelloContainerInterface $container)
     {
-        $container[ThrowableHandlerInterface::class] = function (PsrContainerInterface $container) {
+        $container[ThrowableHandlerInterface::class] = function(PsrContainerInterface $container) {
             $appSettings   = $container->get(SettingsProviderInterface::class)->get(A::class);
             $fluteSettings = $container->get(SettingsProviderInterface::class)->get(FluteSettings::class);
 

src/Adapters/ModelQueryBuilder.php

Doc Comments +8 added lines, -8 removed lines

@@ -128,7 +128,7 @@ 
     }
 
     /**
-     * @param iterable $attributes
+     * @param Generator $attributes
      *
      * @return self
      *
@@ -148,7 +148,7 @@ 
     }
 
     /**
-     * @param iterable $attributes
+     * @param Generator $attributes
      *
      * @return self
      *
@@ -169,7 +169,7 @@ 
      * @param string   $modelClass
      * @param iterable $attributes
      *
-     * @return iterable
+     * @return Generator
      *
      * @SuppressWarnings(PHPMD.StaticAccess)
      */
@@ -249,7 +249,7 @@ 
     }
 
     /**
-     * @param iterable $filters
+     * @param \Limoncello\Flute\Api\iterable|null $filters
      *
      * @return self
      */
@@ -259,7 +259,7 @@ 
     }
 
     /**
-     * @param iterable $filters
+     * @param \Limoncello\Flute\Api\iterable|null $filters
      *
      * @return self
      */
@@ -269,7 +269,7 @@ 
     }
 
     /**
-     * @param iterable $filters
+     * @param \Limoncello\Flute\Api\iterable|null $filters
      *
      * @return self
      */
@@ -314,7 +314,7 @@ 
 
     /**
      * @param string        $relationshipName
-     * @param iterable      $relationshipFilters
+     * @param \Limoncello\Flute\Api\iterable|null      $relationshipFilters
      * @param iterable|null $relationshipSorts
      *
      * @return self
@@ -335,7 +335,7 @@ 
     }
 
     /**
-     * @param iterable $sortParameters
+     * @param \Limoncello\Flute\Api\iterable|null $sortParameters
      *
      * @return self
      */

Spacing +12 added lines, -12 removed lines

@@ -289,7 +289,7 @@ 
         string $relationshipName,
         iterable $relationshipFilters,
         ?iterable $relationshipSorts
-    ): self {
+    ) : self {
         $joinWith = $this->expr()->andX();
 
         return $this->addRelationshipFiltersAndSorts(
@@ -323,7 +323,7 @@ 
         string $relationshipName,
         iterable $relationshipFilters,
         ?iterable $relationshipSorts
-    ): self {
+    ) : self {
         $joinWith = $this->expr()->orX();
 
         return $this->addRelationshipFiltersAndSorts(
@@ -386,7 +386,7 @@ 
         CompositeExpression $filterLink,
         iterable $relationshipFilters,
         ?iterable $relationshipSorts
-    ): self {
+    ) : self {
         $relationshipType = $this->getModelSchemes()->getRelationshipType($this->getModelClass(), $relationshipName);
         switch ($relationshipType) {
             case RelationshipTypes::BELONGS_TO:
@@ -459,7 +459,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);
@@ -491,7 +491,7 @@ 
         CompositeExpression $filterLink,
         iterable $relationshipFilters,
         ?iterable $relationshipSorts
-    ): self {
+    ) : self {
         $primaryKey = $this->getModelSchemes()->getPrimaryKey($this->getModelClass());
         list($manyForeignKey, $manyTable) =
             $this->getModelSchemes()->getReverseForeignKey($this->getModelClass(), $relationshipName);
@@ -523,7 +523,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);
@@ -571,9 +571,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(
@@ -632,7 +632,7 @@ 
         ?CompositeExpression $targetFilterLink,
         ?iterable $targetFilterParams,
         ?iterable $targetSortParams
-    ): string {
+    ) : string {
         $intNoSorting = null;
         $intAlias     = $this->innerJoinOneTable(
             $fromAlias,
@@ -643,7 +643,7 @@ 
             $intFilterParams,
             $intNoSorting
         );
-        $targetAlias  = $this->innerJoinOneTable(
+        $targetAlias = $this->innerJoinOneTable(
             $intAlias,
             $intToTargetColumn,
             $targetTable,
@@ -663,7 +663,7 @@ 
      */
     private function createAlias(string $tableName): string
     {
-        $alias                          = $tableName . (++$this->aliasIdCounter);
+        $alias                          = $tableName.(++$this->aliasIdCounter);
         $this->knownAliases[$tableName] = $alias;
 
         return $alias;
@@ -827,7 +827,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 +6 added lines, -6 removed lines

@@ -616,9 +616,9 @@ 
     }
 
     /**
-     * @param iterable $paths (string[])
+     * @param iterable|null $paths (string[])
      *
-     * @return iterable
+     * @return Generator
      */
     private static function getPaths(iterable $paths): iterable
     {
@@ -1230,7 +1230,7 @@ 
      * @param null|string $index
      * @param iterable    $attributes
      *
-     * @return iterable
+     * @return Generator
      */
     protected function filterAttributesOnCreate(?string $index, iterable $attributes): iterable
     {
@@ -1250,7 +1250,7 @@ 
     /**
      * @param iterable $attributes
      *
-     * @return iterable
+     * @return Generator
      */
     protected function filterAttributesOnUpdate(iterable $attributes): iterable
     {
@@ -1422,10 +1422,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 +14 added lines, -15 removed lines

@@ -674,7 +674,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++;
             }
@@ -842,8 +842,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) {
@@ -962,7 +961,7 @@ 
 
         $this->clearFetchParameters();
 
-        return (int)$deleted;
+        return (int) $deleted;
     }
 
     /**
@@ -991,7 +990,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
@@ -1007,7 +1006,7 @@ 
                         ->prepareCreateInToManyRelationship($relationshipName, $index, $secondaryIdBindName)
                 );
                 foreach ($secondaryIds as $secondaryId) {
-                    $inserted += (int)$saveToMany->setParameter($secondaryIdBindName, $secondaryId)->execute();
+                    $inserted += (int) $saveToMany->setParameter($secondaryIdBindName, $secondaryId)->execute();
                 }
             }
         });
@@ -1036,12 +1035,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) {
@@ -1061,12 +1060,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;
     }
 
     /**
@@ -1150,7 +1149,7 @@ 
     /**
      * @inheritdoc
      */
-    public function fetchRow(QueryBuilder $builder, string $modelClass): ?array
+    public function fetchRow(QueryBuilder $builder, string $modelClass): ? array
     {
         $model = null;
 
@@ -1300,7 +1299,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());
@@ -1359,7 +1358,7 @@ 
         $pkName = $this->getModelSchemes()->getPrimaryKey($parentClass);
 
         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) =
@@ -1380,7 +1379,7 @@ 
                             [$pkName => [FilterParameterInterface::OPERATION_EQUALS => [$parent->{$pkName}]]],
                             []
                         );
-                        $child         = $deDup->register($this->fetchResourceWithoutRelationships(
+                        $child = $deDup->register($this->fetchResourceWithoutRelationships(
                             $clonedBuilder,
                             $clonedBuilder->getModelClass()
                         ));
@@ -1401,7 +1400,7 @@ 
                             [$pkName => [FilterParameterInterface::OPERATION_EQUALS => [$parent->{$pkName}]]],
                             []
                         );
-                        $children      = $this->fetchPaginatedResourcesWithoutRelationships(
+                        $children = $this->fetchPaginatedResourcesWithoutRelationships(
                             $clonedBuilder,
                             $clonedBuilder->getModelClass()
                         );

src/Contracts/Api/CrudInterface.php

Spacing +1 added lines, -1 removed lines

@@ -121,7 +121,7 @@
      *
      * @return array|null
      */
-    public function fetchRow(QueryBuilder $builder, string $modelClass): ?array;
+    public function fetchRow(QueryBuilder $builder, string $modelClass): ? array;
 
     /**
      * @param QueryBuilder $builder

Doc Comments +3 added lines, -3 removed lines

@@ -108,7 +108,7 @@ 
     public function fetchResources(QueryBuilder $builder, string $modelClass): PaginatedDataInterface;
 
     /**
-     * @param QueryBuilder|null $builder
+     * @param QueryBuilder $builder
      * @param string|null       $modelClass
      *
      * @return mixed|null
@@ -128,7 +128,7 @@ 
      * @param string       $modelClass
      * @param string       $columnName
      *
-     * @return iterable
+     * @return \Generator
      */
     public function fetchColumn(QueryBuilder $builder, string $modelClass, string $columnName): iterable;
 
@@ -211,7 +211,7 @@ 
     ): array;
 
     /**
-     * @param int|string    $index
+     * @param string    $index
      * @param string        $name
      * @param iterable|null $relationshipFilters
      * @param iterable|null $relationshipSorts

src/Http/BaseController.php

Spacing +4 added lines, -4 removed lines

@@ -240,7 +240,7 @@ 
      */
     protected static function readJsonFromRequest(ContainerInterface $container, ServerRequestInterface $request): array
     {
-        $body = (string)$request->getBody();
+        $body = (string) $request->getBody();
         if (empty($body) === true || ($json = json_decode($body, true)) === null) {
             /** @var FactoryInterface $factory */
             $factory = $container->get(FactoryInterface::class);
@@ -383,7 +383,7 @@ 
     {
         assert(
             empty(static::ON_CREATE_VALIDATION_RULES_SET_CLASS) === false,
-            'Validation rules set should be defined for class ' . static::class . '.'
+            'Validation rules set should be defined for class '.static::class.'.'
         );
 
         return static::createJsonApiValidator($container, static::ON_CREATE_VALIDATION_RULES_SET_CLASS);
@@ -398,7 +398,7 @@ 
     {
         assert(
             empty(static::ON_UPDATE_VALIDATION_RULES_SET_CLASS) === false,
-            'Validation rules set should be defined for class ' . static::class . '.'
+            'Validation rules set should be defined for class '.static::class.'.'
         );
 
         return static::createJsonApiValidator($container, static::ON_UPDATE_VALIDATION_RULES_SET_CLASS);
@@ -606,7 +606,7 @@ 
         ContainerInterface $container,
         ServerRequestInterface $request
     ): array {
-        $jsonData  = static::normalizeIndexValueOnUpdate(
+        $jsonData = static::normalizeIndexValueOnUpdate(
             $routeParams,
             $container,
             static::readJsonFromRequest($container, $request)