limoncello-php-dist / flute

src/Validation/ValidatorWrapper.php

Spacing +1 added lines, -1 removed lines

@@ -162,7 +162,7 @@
     protected function setWrapperErrors(array $wrapperErrors): self
     {
         if (empty($wrapperErrors) === false) {
-            assert(call_user_func(function () use ($wrapperErrors) : bool {
+            assert(call_user_func(function() use ($wrapperErrors) : bool {
                 $allAreErrors = true;
 
                 foreach ($wrapperErrors as $error) {

src/Http/ThrowableHandlers/FluteThrowableHandler.php

Spacing +1 added lines, -1 removed lines

@@ -99,7 +99,7 @@
             $details  = null;
             if ($this->isDebug === true) {
                 $message = $throwable->getMessage();
-                $details = (string)$throwable;
+                $details = (string) $throwable;
             }
             $errors->add(new Error(null, null, $httpCode, null, $message, $details));
         }

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, [
                 QueryParametersParserInterface::PARAM_PAGE => [
                     PaginationStrategyInterface::PARAM_PAGING_SKIP => $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;

src/Http/Traits/FluteRoutesTrait.php

Spacing +16 added lines, -16 removed lines

@@ -53,11 +53,11 @@ 
         assert(array_key_exists(SchemaInterface::class, class_implements($schemeClass)) === true);
         $type = $schemeClass::TYPE;
 
-        $indexSlug = '/{' . CI::ROUTE_KEY_INDEX . '}';
-        $params    = function ($method) use ($type) {
-            return [RouteInterface::PARAM_NAME => $type . '_' . $method];
+        $indexSlug = '/{'.CI::ROUTE_KEY_INDEX.'}';
+        $params    = function($method) use ($type) {
+            return [RouteInterface::PARAM_NAME => $type.'_'.$method];
         };
-        $handler   = function ($method) use ($controllerClass) {
+        $handler   = function($method) use ($controllerClass) {
             return [$controllerClass, $method];
         };
 
@@ -70,13 +70,13 @@ 
             $group->post($type, $handler(CI::METHOD_CREATE), $params(CI::METHOD_CREATE));
         }
         if (in_array(ControllerReadInterface::class, $classInterfaces) === true) {
-            $group->get($type . $indexSlug, $handler(CI::METHOD_READ), $params(CI::METHOD_READ));
+            $group->get($type.$indexSlug, $handler(CI::METHOD_READ), $params(CI::METHOD_READ));
         }
         if (in_array(ControllerUpdateInterface::class, $classInterfaces) === true) {
-            $group->patch($type . $indexSlug, $handler(CI::METHOD_UPDATE), $params(CI::METHOD_UPDATE));
+            $group->patch($type.$indexSlug, $handler(CI::METHOD_UPDATE), $params(CI::METHOD_UPDATE));
         }
         if (in_array(ControllerDeleteInterface::class, $classInterfaces) === true) {
-            $group->delete($type . $indexSlug, $handler(CI::METHOD_DELETE), $params(CI::METHOD_DELETE));
+            $group->delete($type.$indexSlug, $handler(CI::METHOD_DELETE), $params(CI::METHOD_DELETE));
         }
 
         return $group;
@@ -91,11 +91,11 @@ 
      */
     protected static function controller(GroupInterface $group, string $subUri, string $controllerClass): GroupInterface
     {
-        $slugged = $subUri . '/{' . CI::ROUTE_KEY_INDEX . '}';
-        $params  = function ($method) use ($subUri) {
-            return [RouteInterface::PARAM_NAME => $subUri . '_' . $method];
+        $slugged = $subUri.'/{'.CI::ROUTE_KEY_INDEX.'}';
+        $params  = function($method) use ($subUri) {
+            return [RouteInterface::PARAM_NAME => $subUri.'_'.$method];
         };
-        $handler = function ($method) use ($controllerClass) {
+        $handler = function($method) use ($controllerClass) {
             return [$controllerClass, $method];
         };
 
@@ -112,11 +112,11 @@ 
             $group->get($slugged, $handler(CI::METHOD_READ), $params(CI::METHOD_READ));
         }
         if (in_array(ControllerUpdateInterface::class, $classInterfaces) === true) {
-            $updateUri = $slugged . '/' . CI::METHOD_UPDATE;
+            $updateUri = $slugged.'/'.CI::METHOD_UPDATE;
             $group->post($updateUri, $handler(CI::METHOD_UPDATE), $params(CI::METHOD_UPDATE));
         }
         if (in_array(ControllerDeleteInterface::class, $classInterfaces) === true) {
-            $deleteUri = $slugged . '/' . CI::METHOD_DELETE;
+            $deleteUri = $slugged.'/'.CI::METHOD_DELETE;
             $group->post($deleteUri, $handler(CI::METHOD_DELETE), $params(CI::METHOD_DELETE));
         }
 
@@ -148,13 +148,13 @@ 
         /** @var string $controllerClass */
         /** @var string $schemaClass */
 
-        $resourceIdUri = $subUri . '/{' . CI::ROUTE_KEY_INDEX . '}/';
-        $selfUri       = $resourceIdUri . DocumentInterface::KEYWORD_RELATIONSHIPS . '/' . $relationshipName;
+        $resourceIdUri = $subUri.'/{'.CI::ROUTE_KEY_INDEX.'}/';
+        $selfUri       = $resourceIdUri.DocumentInterface::KEYWORD_RELATIONSHIPS.'/'.$relationshipName;
 
         return $group
             // `self`
             ->get($selfUri, [$controllerClass, $selfGetMethod])
             // `related`
-            ->get($resourceIdUri . $relationshipName, [$controllerClass, $selfGetMethod]);
+            ->get($resourceIdUri.$relationshipName, [$controllerClass, $selfGetMethod]);
     }
 }

src/Adapters/PaginationStrategy.php

Spacing +2 added lines, -2 removed lines

@@ -68,7 +68,7 @@ 
     /**
      * @inheritdoc
      */
-    public function parseParameters(?array $parameters): array
+    public function parseParameters(? array $parameters) : array
     {
         if ($parameters === null) {
             return [0, $this->getDefaultPageSize()];
@@ -81,7 +81,7 @@ 
             0,
             PHP_INT_MAX
         );
-        $size   = $this->getValue(
+        $size = $this->getValue(
             $parameters,
             static::PARAM_PAGING_SIZE,
             $this->getDefaultPageSize(),

src/Schema/Schema.php

Spacing +2 added lines, -2 removed lines

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

src/Package/FluteSettings.php

Spacing +2 added lines, -2 removed lines

@@ -108,8 +108,8 @@
         );
         assert(empty($validatorsFileMask) === false, "Invalid Validators file mask `$validatorsFileMask`.");
 
-        $schemesPath    = $schemesFolder . DIRECTORY_SEPARATOR . $schemesFileMask;
-        $validatorsPath = $validatorsFolder . DIRECTORY_SEPARATOR . $validatorsFileMask;
+        $schemesPath    = $schemesFolder.DIRECTORY_SEPARATOR.$schemesFileMask;
+        $validatorsPath = $validatorsFolder.DIRECTORY_SEPARATOR.$validatorsFileMask;
 
         $requireUniqueTypes = $defaults[static::KEY_SCHEMES_REQUIRE_UNIQUE_TYPES] ?? true;
 

src/Adapters/ModelQueryBuilder.php

Doc Comments +7 added lines, -7 removed lines

@@ -123,7 +123,7 @@ 
     }
 
     /**
-     * @param iterable $attributes
+     * @param Generator $attributes
      *
      * @return self
      *
@@ -152,7 +152,7 @@ 
     }
 
     /**
-     * @param iterable $attributes
+     * @param Generator $attributes
      *
      * @return self
      *
@@ -234,7 +234,7 @@ 
     }
 
     /**
-     * @param iterable $filters
+     * @param \Limoncello\Flute\Api\iterable|null $filters
      *
      * @return self
      */
@@ -244,7 +244,7 @@ 
     }
 
     /**
-     * @param iterable $filters
+     * @param \Limoncello\Flute\Api\iterable|null $filters
      *
      * @return self
      */
@@ -254,7 +254,7 @@ 
     }
 
     /**
-     * @param iterable $filters
+     * @param \Limoncello\Flute\Api\iterable|null $filters
      *
      * @return self
      */
@@ -299,7 +299,7 @@ 
 
     /**
      * @param string        $relationshipName
-     * @param iterable      $relationshipFilters
+     * @param \Limoncello\Flute\Api\iterable|null      $relationshipFilters
      * @param iterable|null $relationshipSorts
      *
      * @return self
@@ -320,7 +320,7 @@ 
     }
 
     /**
-     * @param iterable $sortParameters
+     * @param \Limoncello\Flute\Api\iterable|null $sortParameters
      *
      * @return self
      */

Spacing +11 added lines, -11 removed lines

@@ -274,7 +274,7 @@ 
         string $relationshipName,
         iterable $relationshipFilters,
         ?iterable $relationshipSorts
-    ): self {
+    ) : self {
         $joinWith = $this->expr()->andX();
 
         return $this->addRelationshipFiltersAndSorts(
@@ -308,7 +308,7 @@ 
         string $relationshipName,
         iterable $relationshipFilters,
         ?iterable $relationshipSorts
-    ): self {
+    ) : self {
         $joinWith = $this->expr()->orX();
 
         return $this->addRelationshipFiltersAndSorts(
@@ -371,7 +371,7 @@ 
         CompositeExpression $filterLink,
         iterable $relationshipFilters,
         ?iterable $relationshipSorts
-    ): self {
+    ) : self {
         $relationshipType = $this->getModelSchemes()->getRelationshipType($this->getModelClass(), $relationshipName);
         switch ($relationshipType) {
             case RelationshipTypes::BELONGS_TO:
@@ -444,7 +444,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);
@@ -476,7 +476,7 @@ 
         CompositeExpression $filterLink,
         iterable $relationshipFilters,
         ?iterable $relationshipSorts
-    ): self {
+    ) : self {
         $primaryKey = $this->getModelSchemes()->getPrimaryKey($this->getModelClass());
         list($manyForeignKey, $manyTable) =
             $this->getModelSchemes()->getReverseForeignKey($this->getModelClass(), $relationshipName);
@@ -508,7 +508,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);
@@ -556,9 +556,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(
@@ -617,7 +617,7 @@ 
         ?CompositeExpression $targetFilterLink,
         ?iterable $targetFilterParams,
         ?iterable $targetSortParams
-    ): string {
+    ) : string {
         $intNoSorting = null;
         $intAlias     = $this->innerJoinOneTable(
             $fromAlias,
@@ -628,7 +628,7 @@ 
             $intFilterParams,
             $intNoSorting
         );
-        $targetAlias  = $this->innerJoinOneTable(
+        $targetAlias = $this->innerJoinOneTable(
             $intAlias,
             $intToTargetColumn,
             $targetTable,
@@ -648,7 +648,7 @@ 
      */
     private function createAlias(string $tableName): string
     {
-        $alias                          = $tableName . (++$this->aliasIdCounter);
+        $alias                          = $tableName.(++$this->aliasIdCounter);
         $this->knownAliases[$tableName] = $alias;
 
         return $alias;

src/Api/Crud.php

Doc Comments +6 added lines, -6 removed lines

@@ -615,9 +615,9 @@ 
     }
 
     /**
-     * @param iterable $paths (string[])
+     * @param iterable|null $paths (string[])
      *
-     * @return iterable
+     * @return \Generator
      */
     private static function getPaths(iterable $paths): iterable
     {
@@ -1149,7 +1149,7 @@ 
      * @param null|string $index
      * @param iterable    $attributes
      *
-     * @return iterable
+     * @return \Generator
      */
     protected function filterAttributesOnCreate(?string $index, iterable $attributes): iterable
     {
@@ -1169,7 +1169,7 @@ 
     /**
      * @param iterable $attributes
      *
-     * @return iterable
+     * @return \Generator
      */
     protected function filterAttributesOnUpdate(iterable $attributes): iterable
     {
@@ -1341,10 +1341,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

@@ -635,7 +635,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++;
             }
@@ -772,8 +772,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) {
@@ -851,7 +850,7 @@ 
 
         $this->clearFetchParameters();
 
-        return (int)$deleted;
+        return (int) $deleted;
     }
 
     /**
@@ -872,7 +871,7 @@ 
 
         $this->clearBuilderParameters()->clearFetchParameters();
 
-        $this->inTransaction($saveMain->getConnection(), function () use ($saveMain, $toMany, &$index) {
+        $this->inTransaction($saveMain->getConnection(), function() use ($saveMain, $toMany, &$index) {
             $saveMain->execute();
 
             // if no index given will use last insert ID as index
@@ -888,7 +887,7 @@ 
                         ->prepareCreateInToManyRelationship($relationshipName, $index, $secondaryIdBindName)
                 );
                 foreach ($secondaryIds as $secondaryId) {
-                    $inserted += (int)$saveToMany->setParameter($secondaryIdBindName, $secondaryId)->execute();
+                    $inserted += (int) $saveToMany->setParameter($secondaryIdBindName, $secondaryId)->execute();
                 }
             }
         });
@@ -917,12 +916,12 @@ 
             ->createBuilder($this->getModelClass())
             ->updateModels($allowedChanges)
             ->addFiltersWithAndToTable($filters);
-        $saveMain       = $this->builderSaveResourceOnUpdate($saveMain);
+        $saveMain = $this->builderSaveResourceOnUpdate($saveMain);
         $saveMain->getSQL(); // prepare
 
         $this->clearBuilderParameters()->clearFetchParameters();
 
-        $this->inTransaction($saveMain->getConnection(), function () use ($saveMain, $toMany, $index, &$updated) {
+        $this->inTransaction($saveMain->getConnection(), function() use ($saveMain, $toMany, $index, &$updated) {
             $updated = $saveMain->execute();
 
             foreach ($toMany as $relationshipName => $secondaryIds) {
@@ -942,12 +941,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;
     }
 
     /**
@@ -1050,7 +1049,7 @@ 
     public function fetchRow(
         QueryBuilder $builder = null,
         string $modelClass = null
-    ): ?array {
+    ): ? array {
         if ($builder === null && $modelClass === null) {
             $builder    = $this->getIndexModelBuilder();
             $modelClass = $builder->getModelClass();
@@ -1151,7 +1150,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());
@@ -1210,7 +1209,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) =
@@ -1231,7 +1230,7 @@ 
                             [$pkName => [FilterParameterInterface::OPERATION_EQUALS => [$parent->{$pkName}]]],
                             []
                         );
-                        $child         = $deDup->register($this->fetchResourceWithoutRelationships(
+                        $child = $deDup->register($this->fetchResourceWithoutRelationships(
                             $clonedBuilder,
                             $clonedBuilder->getModelClass()
                         ));
@@ -1252,7 +1251,7 @@ 
                             [$pkName => [FilterParameterInterface::OPERATION_EQUALS => [$parent->{$pkName}]]],
                             []
                         );
-                        $children      = $this->fetchPaginatedResourcesWithoutRelationships(
+                        $children = $this->fetchPaginatedResourcesWithoutRelationships(
                             $clonedBuilder,
                             $clonedBuilder->getModelClass()
                         );