limoncello-php-dist / flute

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/Schema/Schema.php

Spacing +2 added lines, -2 removed lines

@@ -212,12 +212,12 @@
             return [static::DATA => $data->getData()];
         }
 
-        $buildUrl = function ($offset) use ($data, $uri) {
+        $buildUrl = function($offset) use ($data, $uri) {
             $paramsWithPaging = [
                 PaginationStrategyInterface::PARAM_PAGING_OFFSET => $offset,
                 PaginationStrategyInterface::PARAM_PAGING_LIMIT  => $data->getLimit(),
             ];
-            $fullUrl          = $uri . '?' . http_build_query($paramsWithPaging);
+            $fullUrl = $uri.'?'.http_build_query($paramsWithPaging);
 
             return $fullUrl;
         };

src/Adapters/ModelQueryBuilder.php

Doc Comments +8 added lines, -8 removed lines

@@ -171,7 +171,7 @@ 
     }
 
     /**
-     * @param iterable $attributes
+     * @param \Generator $attributes
      *
      * @return self
      *
@@ -193,7 +193,7 @@ 
     }
 
     /**
-     * @param iterable $attributes
+     * @param \Generator $attributes
      *
      * @return self
      *
@@ -216,7 +216,7 @@ 
      * @param string   $modelClass
      * @param iterable $attributes
      *
-     * @return iterable
+     * @return \Generator
      *
      * @SuppressWarnings(PHPMD.StaticAccess)
      *
@@ -315,7 +315,7 @@ 
     }
 
     /**
-     * @param iterable $filters
+     * @param \Limoncello\Flute\Api\iterable|null $filters
      *
      * @return self
      *
@@ -331,7 +331,7 @@ 
     }
 
     /**
-     * @param iterable $filters
+     * @param \Limoncello\Flute\Api\iterable|null $filters
      *
      * @return self
      *
@@ -347,7 +347,7 @@ 
     }
 
     /**
-     * @param iterable $filters
+     * @param \Limoncello\Flute\Api\iterable|null $filters
      *
      * @return self
      *
@@ -391,7 +391,7 @@ 
 
     /**
      * @param string        $relationshipName
-     * @param iterable      $relationshipFilters
+     * @param \Limoncello\Flute\Api\iterable|null      $relationshipFilters
      * @param iterable|null $relationshipSorts
      *
      * @return self
@@ -417,7 +417,7 @@ 
     }
 
     /**
-     * @param iterable $sortParameters
+     * @param \Limoncello\Flute\Api\iterable|null $sortParameters
      *
      * @return self
      */

Spacing +3 added lines, -3 removed lines

@@ -639,7 +639,7 @@ 
         string $targetColumn
     ): string {
         $targetAlias   = $this->createAlias($targetTable);
-        $joinCondition = $this->buildColumnName($fromAlias, $fromColumn) . '=' .
+        $joinCondition = $this->buildColumnName($fromAlias, $fromColumn).'='.
             $this->buildColumnName($targetAlias, $targetColumn);
 
         $this->innerJoin(
@@ -685,7 +685,7 @@ 
      */
     private function createAlias(string $tableName): string
     {
-        $alias                          = $tableName . (++$this->aliasIdCounter);
+        $alias                          = $tableName.(++$this->aliasIdCounter);
         $this->knownAliases[$tableName] = $alias;
 
         return $alias;
@@ -850,7 +850,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

Spacing +18 added lines, -19 removed lines

@@ -687,7 +687,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,
@@ -775,7 +775,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++;
             }
@@ -930,7 +930,7 @@ 
             $countBuilder = $this->getConnection()->createQueryBuilder();
             $countBuilder->setParameters($builder->getParameters());
 
-            $countBuilder->select('COUNT(*)')->from('(' . $builder->getSQL() . ') AS RESULT');
+            $countBuilder->select('COUNT(*)')->from('('.$builder->getSQL().') AS RESULT');
 
             $builder = $countBuilder;
         }
@@ -960,7 +960,7 @@ 
     ): ModelQueryBuilder {
         assert(
             $this->getModelSchemes()->hasRelationship($this->getModelClass(), $relationshipName),
-            "Relationship `$relationshipName` do not exist in model `" . $this->getModelClass() . '`'
+            "Relationship `$relationshipName` do not exist in model `".$this->getModelClass().'`'
         );
 
         // as we read data from a relationship our main table and model would be the table/model in the relationship
@@ -979,8 +979,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) {
@@ -1008,7 +1007,7 @@ 
     ) {
         assert(
             $this->getModelSchemes()->hasRelationship($this->getModelClass(), $name),
-            "Relationship `$name` do not exist in model `" . $this->getModelClass() . '`'
+            "Relationship `$name` do not exist in model `".$this->getModelClass().'`'
         );
 
         // depending on the relationship type we expect the result to be either single resource or a collection
@@ -1035,7 +1034,7 @@ 
     ): array {
         assert(
             $this->getModelSchemes()->hasRelationship($this->getModelClass(), $name),
-            "Relationship `$name` do not exist in model `" . $this->getModelClass() . '`'
+            "Relationship `$name` do not exist in model `".$this->getModelClass().'`'
         );
 
         // depending on the relationship type we expect the result to be either single resource or a collection
@@ -1109,7 +1108,7 @@ 
 
         $this->clearFetchParameters();
 
-        return (int)$deleted;
+        return (int) $deleted;
     }
 
     /**
@@ -1123,7 +1122,7 @@ 
 
         $this->clearFetchParameters();
 
-        return (int)$deleted > 0;
+        return (int) $deleted > 0;
     }
 
     /**
@@ -1144,7 +1143,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
@@ -1160,7 +1159,7 @@ 
                         ->prepareCreateInToManyRelationship($relationshipName, $index, $secondaryIdBindName)
                 );
                 foreach ($secondaryIds as $secondaryId) {
-                    $inserted += (int)$saveToMany->setParameter($secondaryIdBindName, $secondaryId)->execute();
+                    $inserted += (int) $saveToMany->setParameter($secondaryIdBindName, $secondaryId)->execute();
                 }
             }
         });
@@ -1189,12 +1188,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) {
@@ -1214,12 +1213,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;
     }
 
     /**
@@ -1555,7 +1554,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,
@@ -1567,7 +1566,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) =
@@ -1617,7 +1616,7 @@ 
                             [$pkName => [FilterParameterInterface::OPERATION_EQUALS => [$parent->{$pkName}]]],
                             []
                         );
-                        $children      = $this->fetchPaginatedResourcesWithoutRelationships(
+                        $children = $this->fetchPaginatedResourcesWithoutRelationships(
                             $clonedBuilder,
                             $clonedBuilder->getModelClass()
                         );

Doc Comments +7 added lines, -7 removed lines

@@ -756,9 +756,9 @@ 
     }
 
     /**
-     * @param iterable $paths (string[])
+     * @param iterable|null $paths (string[])
      *
-     * @return iterable
+     * @return Generator
      */
     private static function getPaths(iterable $paths): iterable
     {
@@ -1399,7 +1399,7 @@ 
      * @param string       $modelClass
      * @param string       $keyColumnName
      *
-     * @return iterable
+     * @return Generator
      *
      * @throws DBALException
      *
@@ -1503,7 +1503,7 @@ 
      * @param null|string $index
      * @param iterable    $attributes
      *
-     * @return iterable
+     * @return Generator
      */
     protected function filterAttributesOnCreate(?string $index, iterable $attributes): iterable
     {
@@ -1523,7 +1523,7 @@ 
     /**
      * @param iterable $attributes
      *
-     * @return iterable
+     * @return Generator
      */
     protected function filterAttributesOnUpdate(iterable $attributes): iterable
     {
@@ -1722,10 +1722,10 @@ 
 
     /**
      * @param iterable         $attributes
-     * @param array            $typeNames
+     * @param Type[]            $typeNames
      * @param AbstractPlatform $platform
      *
-     * @return iterable
+     * @return Generator
      *
      * @throws DBALException
      */

src/Adapters/PaginationStrategy.php

Spacing +1 added lines, -1 removed lines

@@ -75,7 +75,7 @@
             0,
             PHP_INT_MAX
         );
-        $size   = $this->getValue(
+        $size = $this->getValue(
             $parameters,
             static::PARAM_PAGING_LIMIT,
             $this->getDefaultPageSize(),

src/Encoder/Encoder.php

Spacing +2 added lines, -2 removed lines

@@ -125,7 +125,7 @@ 
 
         parse_str($this->getOriginalUri()->getQuery(), $queryParams);
 
-        return function ($offset) use ($pageSize, $queryParams) {
+        return function($offset) use ($pageSize, $queryParams) {
             $paramsWithPaging = array_merge($queryParams, [
                 BaseQueryParserInterface::PARAM_PAGE => [
                     PaginationStrategyInterface::PARAM_PAGING_OFFSET => $offset,
@@ -133,7 +133,7 @@ 
                 ],
             ]);
             $newUri           = $this->getOriginalUri()->withQuery(http_build_query($paramsWithPaging));
-            $fullUrl          = (string)$newUri;
+            $fullUrl          = (string) $newUri;
             $link             = $this->getFactory()->createLink($fullUrl, null, true);
 
             return $link;