spiral / framework

src/Config/src/Loader/DirectoryLoader.php

Spacing +6 added lines, -6 removed lines

@@ -37,9 +37,9 @@ 
      */
     public function has(string $section): bool
     {
-        foreach ($this->loaderExtensions() as $extension) {
+        foreach ($this->loaderExtensions() as $extension){
             $filename = sprintf('%s/%s.%s', $this->directory, $section, $extension);
-            if (file_exists($filename)) {
+            if (file_exists($filename)){
                 return true;
             }
         }
@@ -52,15 +52,15 @@ 
      */
     public function load(string $section): array
     {
-        foreach ($this->loaderExtensions() as $extension) {
+        foreach ($this->loaderExtensions() as $extension){
             $filename = sprintf('%s/%s.%s', $this->directory, $section, $extension);
-            if (!file_exists($filename)) {
+            if (!file_exists($filename)){
                 continue;
             }
 
-            try {
+            try{
                 return $this->getLoader($extension)->loadFile($section, $filename);
-            } catch (LoaderException $e) {
+            }catch (LoaderException $e){
                 throw new LoaderException("Unable to load config `{$section}`: {$e->getMessage()}", $e->getCode(), $e);
             }
         }

Braces +13 added lines, -6 removed lines

@@ -37,9 +37,11 @@ 
      */
     public function has(string $section): bool
     {
-        foreach ($this->loaderExtensions() as $extension) {
+        foreach ($this->loaderExtensions() as $extension)
+        {
             $filename = sprintf('%s/%s.%s', $this->directory, $section, $extension);
-            if (file_exists($filename)) {
+            if (file_exists($filename))
+            {
                 return true;
             }
         }
@@ -52,15 +54,20 @@ 
      */
     public function load(string $section): array
     {
-        foreach ($this->loaderExtensions() as $extension) {
+        foreach ($this->loaderExtensions() as $extension)
+        {
             $filename = sprintf('%s/%s.%s', $this->directory, $section, $extension);
-            if (!file_exists($filename)) {
+            if (!file_exists($filename))
+            {
                 continue;
             }
 
-            try {
+            try
+            {
                 return $this->getLoader($extension)->loadFile($section, $filename);
-            } catch (LoaderException $e) {
+            }
+            catch (LoaderException $e)
+            {
                 throw new LoaderException("Unable to load config `{$section}`: {$e->getMessage()}", $e->getCode(), $e);
             }
         }

src/Filters/src/SchemaBuilder.php

Spacing +10 added lines, -10 removed lines

@@ -70,18 +70,18 @@ 
     protected function buildMap(ReflectionEntity $filter): array
     {
         $schema = $filter->getProperty('schema', true);
-        if (empty($schema)) {
+        if (empty($schema)){
             throw new SchemaException("Filter `{$filter->getName()}` does not define any schema");
         }
 
         $result = [];
-        foreach ($schema as $field => $definition) {
+        foreach ($schema as $field => $definition){
             $optional = false;
 
             // short definition
-            if (is_string($definition)) {
+            if (is_string($definition)){
                 // simple scalar field definition
-                if (!class_exists($definition)) {
+                if (!class_exists($definition)){
                     [$source, $origin] = $this->parseDefinition($field, $definition);
                     $result[$field] = [
                         FilterProvider::SOURCE => $source,
@@ -102,25 +102,25 @@ 
                 continue;
             }
 
-            if (!is_array($definition) || count($definition) === 0) {
+            if (!is_array($definition) || count($definition) === 0){
                 throw new SchemaException(
                     "Invalid schema definition at `{$filter->getName()}`->`{$field}`"
                 );
             }
 
             // complex definition
-            if (!empty($definition[self::ORIGIN])) {
+            if (!empty($definition[self::ORIGIN])){
                 $origin = $definition[self::ORIGIN];
 
                 // [class, 'data:something.*'] vs [class, 'data:something']
                 $iterate = strpos($origin, '.*') !== false || !empty($definition[self::ITERATE]);
                 $origin = rtrim($origin, '.*');
-            } else {
+            }else{
                 $origin = $field;
                 $iterate = true;
             }
 
-            if (!empty($definition[self::OPTIONAL]) && $definition[self::OPTIONAL]) {
+            if (!empty($definition[self::OPTIONAL]) && $definition[self::OPTIONAL]){
                 $optional = true;
             }
 
@@ -133,7 +133,7 @@ 
                 FilterProvider::OPTIONAL => $optional,
             ];
 
-            if ($iterate) {
+            if ($iterate){
                 [$source, $origin] = $this->parseDefinition($field, $definition[self::ITERATE] ?? $origin);
 
                 $map[FilterProvider::ITERATE_SOURCE] = $source;
@@ -159,7 +159,7 @@ 
      */
     private function parseDefinition(string $field, string $definition): array
     {
-        if (strpos($definition, ':') === false) {
+        if (strpos($definition, ':') === false){
             return ['data', $definition ?? $field];
         }
 

Braces +21 added lines, -10 removed lines

@@ -70,18 +70,22 @@ 
     protected function buildMap(ReflectionEntity $filter): array
     {
         $schema = $filter->getProperty('schema', true);
-        if (empty($schema)) {
+        if (empty($schema))
+        {
             throw new SchemaException("Filter `{$filter->getName()}` does not define any schema");
         }
 
         $result = [];
-        foreach ($schema as $field => $definition) {
+        foreach ($schema as $field => $definition)
+        {
             $optional = false;
 
             // short definition
-            if (is_string($definition)) {
+            if (is_string($definition))
+            {
                 // simple scalar field definition
-                if (!class_exists($definition)) {
+                if (!class_exists($definition))
+                {
                     [$source, $origin] = $this->parseDefinition($field, $definition);
                     $result[$field] = [
                         FilterProvider::SOURCE => $source,
@@ -102,25 +106,30 @@ 
                 continue;
             }
 
-            if (!is_array($definition) || count($definition) === 0) {
+            if (!is_array($definition) || count($definition) === 0)
+            {
                 throw new SchemaException(
                     "Invalid schema definition at `{$filter->getName()}`->`{$field}`"
                 );
             }
 
             // complex definition
-            if (!empty($definition[self::ORIGIN])) {
+            if (!empty($definition[self::ORIGIN]))
+            {
                 $origin = $definition[self::ORIGIN];
 
                 // [class, 'data:something.*'] vs [class, 'data:something']
                 $iterate = strpos($origin, '.*') !== false || !empty($definition[self::ITERATE]);
                 $origin = rtrim($origin, '.*');
-            } else {
+            }
+            else
+            {
                 $origin = $field;
                 $iterate = true;
             }
 
-            if (!empty($definition[self::OPTIONAL]) && $definition[self::OPTIONAL]) {
+            if (!empty($definition[self::OPTIONAL]) && $definition[self::OPTIONAL])
+            {
                 $optional = true;
             }
 
@@ -133,7 +142,8 @@ 
                 FilterProvider::OPTIONAL => $optional,
             ];
 
-            if ($iterate) {
+            if ($iterate)
+            {
                 [$source, $origin] = $this->parseDefinition($field, $definition[self::ITERATE] ?? $origin);
 
                 $map[FilterProvider::ITERATE_SOURCE] = $source;
@@ -159,7 +169,8 @@ 
      */
     private function parseDefinition(string $field, string $definition): array
     {
-        if (strpos($definition, ':') === false) {
+        if (strpos($definition, ':') === false)
+        {
             return ['data', $definition ?? $field];
         }
 

Upper-Lower-Casing +2 added lines, -2 removed lines

@@ -95,7 +95,7 @@ 
                     FilterProvider::SOURCE   => null,
                     FilterProvider::ORIGIN   => $field,
                     FilterProvider::FILTER   => $definition,
-                    FilterProvider::ARRAY    => false,
+                    FilterProvider::array    => false,
                     FilterProvider::OPTIONAL => $optional,
                 ];
 
@@ -129,7 +129,7 @@ 
                 FilterProvider::FILTER   => $definition[self::NESTED],
                 FilterProvider::SOURCE   => null,
                 FilterProvider::ORIGIN   => $origin,
-                FilterProvider::ARRAY    => $iterate,
+                FilterProvider::array    => $iterate,
                 FilterProvider::OPTIONAL => $optional,
             ];
 

src/Filters/src/FilterProvider.php

Upper-Lower-Casing +2 added lines, -2 removed lines

@@ -33,7 +33,7 @@ 
     public const SOURCE         = 'source';
     public const ORIGIN         = 'origin';
     public const FILTER         = 'filter';
-    public const ARRAY          = 'array';
+    public const array          = 'array';
     public const OPTIONAL       = 'optional';
     public const ITERATE_SOURCE = 'iterate_source';
     public const ITERATE_ORIGIN = 'iterate_origin';
@@ -103,7 +103,7 @@ 
             }
 
             $nested = $map[self::FILTER];
-            if (empty($map[self::ARRAY])) {
+            if (empty($map[self::array])) {
                 // slicing down
                 $result[$field] = $this->createFilter($nested, $input->withPrefix($map[self::ORIGIN]));
                 continue;

Spacing +14 added lines, -14 removed lines

@@ -86,18 +86,18 @@ 
     public function initValues(array $mappingSchema, InputInterface $input): array
     {
         $result = [];
-        foreach ($mappingSchema as $field => $map) {
-            if (empty($map[self::FILTER])) {
+        foreach ($mappingSchema as $field => $map){
+            if (empty($map[self::FILTER])){
                 $value = $input->getValue($map[self::SOURCE], $map[self::ORIGIN]);
 
-                if ($value !== null) {
+                if ($value !== null){
                     $result[$field] = $value;
                 }
                 continue;
             }
 
             $nested = $map[self::FILTER];
-            if (empty($map[self::ARRAY])) {
+            if (empty($map[self::ARRAY])){
                 // slicing down
                 $result[$field] = $this->createFilter($nested, $input->withPrefix($map[self::ORIGIN]));
                 continue;
@@ -106,7 +106,7 @@ 
             $values = [];
 
             // List of "key" => "location in request"
-            foreach ($this->iterate($map, $input) as $index => $origin) {
+            foreach ($this->iterate($map, $input) as $index => $origin){
                 $values[$index] = $this->createFilter($nested, $input->withPrefix($origin));
             }
 
@@ -122,18 +122,18 @@ 
     private function iterate(array $schema, InputInterface $input): Generator
     {
         $values = $input->getValue($schema[self::ITERATE_SOURCE], $schema[self::ITERATE_ORIGIN]);
-        if (empty($values) || !is_array($values)) {
+        if (empty($values) || !is_array($values)){
             return [];
         }
 
-        foreach (array_keys($values) as $key) {
-            yield $key => $schema[self::ORIGIN] . '.' . $key;
+        foreach (array_keys($values) as $key){
+            yield $key => $schema[self::ORIGIN].'.'.$key;
         }
     }
 
     private function getErrorMapper(string $filter): ErrorMapper
     {
-        if (isset($this->errorMappers[$filter])) {
+        if (isset($this->errorMappers[$filter])){
             return $this->errorMappers[$filter];
         }
 
@@ -145,7 +145,7 @@ 
 
     private function getValidator(string $filter): ValidatorInterface
     {
-        if (isset($this->validators[$filter])) {
+        if (isset($this->validators[$filter])){
             return $this->validators[$filter];
         }
 
@@ -161,18 +161,18 @@ 
      */
     private function getSchema(string $filter): array
     {
-        if (isset($this->cache[$filter])) {
+        if (isset($this->cache[$filter])){
             return $this->cache[$filter];
         }
 
-        try {
+        try{
             $reflection = new ReflectionEntity($filter);
-            if (!$reflection->getReflection()->isSubclassOf(Filter::class)) {
+            if (!$reflection->getReflection()->isSubclassOf(Filter::class)){
                 throw new SchemaException('Invalid filter class, must be subclass of Filter');
             }
 
             $builder = new SchemaBuilder(new ReflectionEntity($filter));
-        } catch (ReflectionException $e) {
+        }catch (ReflectionException $e){
             throw new SchemaException('Invalid filter schema', $e->getCode(), $e);
         }
 

Braces +27 added lines, -13 removed lines

@@ -86,18 +86,22 @@ 
     public function initValues(array $mappingSchema, InputInterface $input): array
     {
         $result = [];
-        foreach ($mappingSchema as $field => $map) {
-            if (empty($map[self::FILTER])) {
+        foreach ($mappingSchema as $field => $map)
+        {
+            if (empty($map[self::FILTER]))
+            {
                 $value = $input->getValue($map[self::SOURCE], $map[self::ORIGIN]);
 
-                if ($value !== null) {
+                if ($value !== null)
+                {
                     $result[$field] = $value;
                 }
                 continue;
             }
 
             $nested = $map[self::FILTER];
-            if (empty($map[self::ARRAY])) {
+            if (empty($map[self::ARRAY]))
+            {
                 // slicing down
                 $result[$field] = $this->createFilter($nested, $input->withPrefix($map[self::ORIGIN]));
                 continue;
@@ -106,7 +110,8 @@ 
             $values = [];
 
             // List of "key" => "location in request"
-            foreach ($this->iterate($map, $input) as $index => $origin) {
+            foreach ($this->iterate($map, $input) as $index => $origin)
+            {
                 $values[$index] = $this->createFilter($nested, $input->withPrefix($origin));
             }
 
@@ -122,18 +127,21 @@ 
     private function iterate(array $schema, InputInterface $input): Generator
     {
         $values = $input->getValue($schema[self::ITERATE_SOURCE], $schema[self::ITERATE_ORIGIN]);
-        if (empty($values) || !is_array($values)) {
+        if (empty($values) || !is_array($values))
+        {
             return [];
         }
 
-        foreach (array_keys($values) as $key) {
+        foreach (array_keys($values) as $key)
+        {
             yield $key => $schema[self::ORIGIN] . '.' . $key;
         }
     }
 
     private function getErrorMapper(string $filter): ErrorMapper
     {
-        if (isset($this->errorMappers[$filter])) {
+        if (isset($this->errorMappers[$filter]))
+        {
             return $this->errorMappers[$filter];
         }
 
@@ -145,7 +153,8 @@ 
 
     private function getValidator(string $filter): ValidatorInterface
     {
-        if (isset($this->validators[$filter])) {
+        if (isset($this->validators[$filter]))
+        {
             return $this->validators[$filter];
         }
 
@@ -161,18 +170,23 @@ 
      */
     private function getSchema(string $filter): array
     {
-        if (isset($this->cache[$filter])) {
+        if (isset($this->cache[$filter]))
+        {
             return $this->cache[$filter];
         }
 
-        try {
+        try
+        {
             $reflection = new ReflectionEntity($filter);
-            if (!$reflection->getReflection()->isSubclassOf(Filter::class)) {
+            if (!$reflection->getReflection()->isSubclassOf(Filter::class))
+            {
                 throw new SchemaException('Invalid filter class, must be subclass of Filter');
             }
 
             $builder = new SchemaBuilder(new ReflectionEntity($filter));
-        } catch (ReflectionException $e) {
+        }
+        catch (ReflectionException $e)
+        {
             throw new SchemaException('Invalid filter schema', $e->getCode(), $e);
         }
 

src/Session/src/Handler/FileHandler.php

Spacing +2 added lines, -2 removed lines

@@ -63,8 +63,8 @@
     #[\ReturnTypeWillChange]
     public function gc($maxlifetime)
     {
-        foreach ($this->files->getFiles($this->directory) as $filename) {
-            if ($this->files->time($filename) < time() - $maxlifetime) {
+        foreach ($this->files->getFiles($this->directory) as $filename){
+            if ($this->files->time($filename) < time() - $maxlifetime){
                 $this->files->delete($filename);
             }
         }

Braces +4 added lines, -2 removed lines

@@ -63,8 +63,10 @@
     #[\ReturnTypeWillChange]
     public function gc($maxlifetime)
     {
-        foreach ($this->files->getFiles($this->directory) as $filename) {
-            if ($this->files->time($filename) < time() - $maxlifetime) {
+        foreach ($this->files->getFiles($this->directory) as $filename)
+        {
+            if ($this->files->time($filename) < time() - $maxlifetime)
+            {
                 $this->files->delete($filename);
             }
         }

src/Core/src/InjectableConfig.php

Spacing +1 added lines, -1 removed lines

@@ -72,7 +72,7 @@
     #[\ReturnTypeWillChange]
     public function offsetGet($offset)
     {
-        if (!$this->offsetExists($offset)) {
+        if (!$this->offsetExists($offset)){
             throw new ConfigException("Undefined configuration key '{$offset}'");
         }
 

Braces +2 added lines, -1 removed lines

@@ -72,7 +72,8 @@
     #[\ReturnTypeWillChange]
     public function offsetGet($offset)
     {
-        if (!$this->offsetExists($offset)) {
+        if (!$this->offsetExists($offset))
+        {
             throw new ConfigException("Undefined configuration key '{$offset}'");
         }
 

src/Stempler/src/Lexer/Buffer.php

Spacing +16 added lines, -16 removed lines

@@ -46,7 +46,7 @@ 
      */
     public function getIterator(): \Traversable
     {
-        while ($n = $this->next()) {
+        while ($n = $this->next()){
             yield $n;
         }
     }
@@ -64,18 +64,18 @@ 
      */
     public function next()
     {
-        if ($this->replay !== []) {
+        if ($this->replay !== []){
             $n = array_shift($this->replay);
-        } else {
+        }else{
             $n = $this->generator->current();
-            if ($n === null) {
+            if ($n === null){
                 return null;
             }
             $this->generator->next();
             $this->buffer[] = $n;
         }
 
-        if ($n !== null) {
+        if ($n !== null){
             $this->offset = $n->offset;
         }
 
@@ -90,10 +90,10 @@ 
     public function nextBytes(): string
     {
         $result = '';
-        while ($n = $this->next()) {
-            if ($n instanceof Byte) {
+        while ($n = $this->next()){
+            if ($n instanceof Byte){
                 $result .= $n->char;
-            } else {
+            }else{
                 break;
             }
         }
@@ -106,12 +106,12 @@ 
      */
     public function lookahead()
     {
-        if ($this->replay !== []) {
+        if ($this->replay !== []){
             return $this->replay[0];
         }
 
         $n = $this->next();
-        if ($n !== null) {
+        if ($n !== null){
             array_unshift($this->replay, $n);
         }
 
@@ -128,20 +128,20 @@ 
     {
         $result = '';
         $replay = [];
-        for ($i = 0; $i < $size; $i++) {
+        for ($i = 0; $i < $size; $i++){
             $n = $this->next();
-            if ($n !== null) {
+            if ($n !== null){
                 $replay[] = $n;
             }
 
-            if (!$n instanceof Byte) {
+            if (!$n instanceof Byte){
                 break;
             }
 
             $result .= $n->char;
         }
 
-        foreach (array_reverse($replay) as $n) {
+        foreach (array_reverse($replay) as $n){
             array_unshift($this->replay, $n);
         }
 
@@ -155,8 +155,8 @@ 
      */
     public function replay(int $offset): void
     {
-        foreach ($this->buffer as $n) {
-            if ($n->offset > $offset) {
+        foreach ($this->buffer as $n){
+            if ($n->offset > $offset){
                 $this->replay[] = $n;
             }
         }

Braces +34 added lines, -16 removed lines

@@ -46,7 +46,8 @@ 
      */
     public function getIterator(): \Traversable
     {
-        while ($n = $this->next()) {
+        while ($n = $this->next())
+        {
             yield $n;
         }
     }
@@ -64,18 +65,23 @@ 
      */
     public function next()
     {
-        if ($this->replay !== []) {
+        if ($this->replay !== [])
+        {
             $n = array_shift($this->replay);
-        } else {
+        }
+        else
+        {
             $n = $this->generator->current();
-            if ($n === null) {
+            if ($n === null)
+            {
                 return null;
             }
             $this->generator->next();
             $this->buffer[] = $n;
         }
 
-        if ($n !== null) {
+        if ($n !== null)
+        {
             $this->offset = $n->offset;
         }
 
@@ -90,10 +96,14 @@ 
     public function nextBytes(): string
     {
         $result = '';
-        while ($n = $this->next()) {
-            if ($n instanceof Byte) {
+        while ($n = $this->next())
+        {
+            if ($n instanceof Byte)
+            {
                 $result .= $n->char;
-            } else {
+            }
+            else
+            {
                 break;
             }
         }
@@ -106,12 +116,14 @@ 
      */
     public function lookahead()
     {
-        if ($this->replay !== []) {
+        if ($this->replay !== [])
+        {
             return $this->replay[0];
         }
 
         $n = $this->next();
-        if ($n !== null) {
+        if ($n !== null)
+        {
             array_unshift($this->replay, $n);
         }
 
@@ -128,20 +140,24 @@ 
     {
         $result = '';
         $replay = [];
-        for ($i = 0; $i < $size; $i++) {
+        for ($i = 0; $i < $size; $i++)
+        {
             $n = $this->next();
-            if ($n !== null) {
+            if ($n !== null)
+            {
                 $replay[] = $n;
             }
 
-            if (!$n instanceof Byte) {
+            if (!$n instanceof Byte)
+            {
                 break;
             }
 
             $result .= $n->char;
         }
 
-        foreach (array_reverse($replay) as $n) {
+        foreach (array_reverse($replay) as $n)
+        {
             array_unshift($this->replay, $n);
         }
 
@@ -155,8 +171,10 @@ 
      */
     public function replay(int $offset): void
     {
-        foreach ($this->buffer as $n) {
-            if ($n->offset > $offset) {
+        foreach ($this->buffer as $n)
+        {
+            if ($n->offset > $offset)
+            {
                 $this->replay[] = $n;
             }
         }

src/Filters/src/Filter.php

Spacing +16 added lines, -16 removed lines

@@ -90,7 +90,7 @@ 
         array $schema,
         ValidatorInterface $validator,
         ErrorMapper $errorMapper
-    ) {
+    ){
         parent::__construct($data, $schema);
 
         $this->mappings = $schema[FilterProvider::MAPPING] ?? [];
@@ -151,10 +151,10 @@ 
      */
     public function getErrors(): array
     {
-        if ($this->errors === null) {
+        if ($this->errors === null){
             $this->errors = [];
-            foreach ($this->validator->withData($this)->getErrors() as $field => $error) {
-                if (is_string($error) && Translator::isMessage($error)) {
+            foreach ($this->validator->withData($this)->getErrors() as $field => $error){
+                if (is_string($error) && Translator::isMessage($error)){
                     // translate error message
                     $error = $this->say($error);
                 }
@@ -195,32 +195,32 @@ 
      */
     protected function validateNested(array $errors): array
     {
-        foreach ($this->getFields(false) as $index => $value) {
-            if (isset($errors[$index])) {
+        foreach ($this->getFields(false) as $index => $value){
+            if (isset($errors[$index])){
                 //Invalid on parent level
                 continue;
             }
 
-            if ($value instanceof FilterInterface) {
-                if ($this->isOptional($index) && !$this->hasBeenPassed($index)) {
+            if ($value instanceof FilterInterface){
+                if ($this->isOptional($index) && !$this->hasBeenPassed($index)){
                     continue;
                 }
 
-                if (!$value->isValid()) {
+                if (!$value->isValid()){
                     $errors[$index] = $value->getErrors();
                     continue;
                 }
             }
 
             //Array of nested entities for validation
-            if (is_iterable($value)) {
-                foreach ($value as $nIndex => $nValue) {
-                    if ($nValue instanceof FilterInterface) {
-                        if ($this->isOptional($nIndex) && !$this->hasBeenPassed($nIndex)) {
+            if (is_iterable($value)){
+                foreach ($value as $nIndex => $nValue){
+                    if ($nValue instanceof FilterInterface){
+                        if ($this->isOptional($nIndex) && !$this->hasBeenPassed($nIndex)){
                             continue;
                         }
 
-                        if (!$nValue->isValid()) {
+                        if (!$nValue->isValid()){
                             $errors[$index][$nIndex] = $nValue->getErrors();
                         }
                     }
@@ -254,11 +254,11 @@ 
     {
         $value = $this->getField((string)$field);
 
-        if ($value === null) {
+        if ($value === null){
             return false;
         }
 
-        if ($value instanceof FilterInterface) {
+        if ($value instanceof FilterInterface){
             return $value->getValue() !== [];
         }
 

Braces +30 added lines, -15 removed lines

@@ -151,10 +151,13 @@ 
      */
     public function getErrors(): array
     {
-        if ($this->errors === null) {
+        if ($this->errors === null)
+        {
             $this->errors = [];
-            foreach ($this->validator->withData($this)->getErrors() as $field => $error) {
-                if (is_string($error) && Translator::isMessage($error)) {
+            foreach ($this->validator->withData($this)->getErrors() as $field => $error)
+            {
+                if (is_string($error) && Translator::isMessage($error))
+                {
                     // translate error message
                     $error = $this->say($error);
                 }
@@ -195,32 +198,42 @@ 
      */
     protected function validateNested(array $errors): array
     {
-        foreach ($this->getFields(false) as $index => $value) {
-            if (isset($errors[$index])) {
+        foreach ($this->getFields(false) as $index => $value)
+        {
+            if (isset($errors[$index]))
+            {
                 //Invalid on parent level
                 continue;
             }
 
-            if ($value instanceof FilterInterface) {
-                if ($this->isOptional($index) && !$this->hasBeenPassed($index)) {
+            if ($value instanceof FilterInterface)
+            {
+                if ($this->isOptional($index) && !$this->hasBeenPassed($index))
+                {
                     continue;
                 }
 
-                if (!$value->isValid()) {
+                if (!$value->isValid())
+                {
                     $errors[$index] = $value->getErrors();
                     continue;
                 }
             }
 
             //Array of nested entities for validation
-            if (is_iterable($value)) {
-                foreach ($value as $nIndex => $nValue) {
-                    if ($nValue instanceof FilterInterface) {
-                        if ($this->isOptional($nIndex) && !$this->hasBeenPassed($nIndex)) {
+            if (is_iterable($value))
+            {
+                foreach ($value as $nIndex => $nValue)
+                {
+                    if ($nValue instanceof FilterInterface)
+                    {
+                        if ($this->isOptional($nIndex) && !$this->hasBeenPassed($nIndex))
+                        {
                             continue;
                         }
 
-                        if (!$nValue->isValid()) {
+                        if (!$nValue->isValid())
+                        {
                             $errors[$index][$nIndex] = $nValue->getErrors();
                         }
                     }
@@ -254,11 +267,13 @@ 
     {
         $value = $this->getField((string)$field);
 
-        if ($value === null) {
+        if ($value === null)
+        {
             return false;
         }
 
-        if ($value instanceof FilterInterface) {
+        if ($value instanceof FilterInterface)
+        {
             return $value->getValue() !== [];
         }
 

src/Framework/Bootloader/Distribution/DistributionConfig.php

Spacing +29 added lines, -29 removed lines

@@ -71,8 +71,8 @@ 
      */
     private function bootResolvers(array $config): void
     {
-        foreach ($config['resolvers'] ?? [] as $name => $child) {
-            if (!\is_string($name)) {
+        foreach ($config['resolvers'] ?? [] as $name => $child){
+            if (!\is_string($name)){
                 throw new InvalidArgumentException(
                     \vsprintf('Distribution driver config key must be a string, but %s given', [
                         \get_debug_type($child),
@@ -80,7 +80,7 @@ 
                 );
             }
 
-            if (!\is_array($child)) {
+            if (!\is_array($child)){
                 throw new InvalidArgumentException(
                     \vsprintf('Distribution driver config `%s` must be an array, but %s given', [
                         $name,
@@ -100,9 +100,9 @@ 
     {
         $default = $config['default'] ?? null;
 
-        if ($default !== null) {
+        if ($default !== null){
             // Validate config
-            if (!\is_string($default)) {
+            if (!\is_string($default)){
                 throw new InvalidArgumentException(
                     \vsprintf('Distribution config default driver must be a string, but %s given', [
                         \get_debug_type($default),
@@ -121,13 +121,13 @@ 
      */
     private function createResolver(string $name, array $config): UriResolverInterface
     {
-        if (!isset($config['type']) || !\is_string($config['type'])) {
+        if (!isset($config['type']) || !\is_string($config['type'])){
             throw $this->invalidConfigKey($name, 'type', 'string');
         }
 
         $type = $config['type'];
 
-        switch ($type) {
+        switch ($type){
             case 'static':
                 return $this->createStaticResolver($name, $config);
 
@@ -150,17 +150,17 @@ 
      */
     private function createCustomResolver(string $type, string $name, array $config): UriResolverInterface
     {
-        if (!\is_subclass_of($type, UriResolverInterface::class, true)) {
+        if (!\is_subclass_of($type, UriResolverInterface::class, true)){
             throw $this->invalidConfigKey($name, 'type', UriResolverInterface::class);
         }
 
-        if (isset($config['options']) && !\is_array($config['options'])) {
+        if (isset($config['options']) && !\is_array($config['options'])){
             throw $this->invalidConfigKey($name, 'options', 'array');
         }
 
-        try {
+        try{
             return new $type(...\array_values($config['options'] ?? []));
-        } catch (\Throwable $e) {
+        }catch (\Throwable $e){
             $message = 'An error occurred while resolver `%s` initializing: %s';
             throw new InvalidArgumentException(\sprintf($message, $name, $e->getMessage()), 0, $e);
         }
@@ -174,36 +174,36 @@ 
     private function createS3Resolver(string $name, array $config): UriResolverInterface
     {
         // Required config options
-        if (!isset($config['region']) || !\is_string($config['region'])) {
+        if (!isset($config['region']) || !\is_string($config['region'])){
             throw $this->invalidConfigKey($name, 'region', 'string');
         }
 
-        if (!isset($config['key']) || !\is_string($config['key'])) {
+        if (!isset($config['key']) || !\is_string($config['key'])){
             throw $this->invalidConfigKey($name, 'key', 'string');
         }
 
-        if (!isset($config['secret']) || !\is_string($config['secret'])) {
+        if (!isset($config['secret']) || !\is_string($config['secret'])){
             throw $this->invalidConfigKey($name, 'secret', 'string');
         }
 
-        if (!isset($config['bucket']) || !\is_string($config['bucket'])) {
+        if (!isset($config['bucket']) || !\is_string($config['bucket'])){
             throw $this->invalidConfigKey($name, 'bucket', 'string');
         }
 
         // Optional config options
-        if (!\is_string($config['prefix'] ?? '')) {
+        if (!\is_string($config['prefix'] ?? '')){
             throw $this->invalidConfigKey($name, 'prefix', 'string or null');
         }
 
-        if (!\is_string($config['version'] ?? '')) {
+        if (!\is_string($config['version'] ?? '')){
             throw $this->invalidConfigKey($name, 'version', 'string or null');
         }
 
-        if (!\is_string($config['token'] ?? '')) {
+        if (!\is_string($config['token'] ?? '')){
             throw $this->invalidConfigKey($name, 'token', 'string or null');
         }
 
-        if (!\is_int($config['expires'] ?? 0)) {
+        if (!\is_int($config['expires'] ?? 0)){
             throw $this->invalidConfigKey($name, 'expires', 'positive int (unix timestamp)');
         }
 
@@ -233,19 +233,19 @@ 
      */
     private function createCloudFrontResolver(string $name, array $config): UriResolverInterface
     {
-        if (!isset($config['key']) || !\is_string($config['key'])) {
+        if (!isset($config['key']) || !\is_string($config['key'])){
             throw $this->invalidConfigKey($name, 'key', 'string');
         }
 
-        if (!isset($config['private']) || !\is_string($config['private'])) {
+        if (!isset($config['private']) || !\is_string($config['private'])){
             throw $this->invalidConfigKey($name, 'private', 'string value or path to key file');
         }
 
-        if (!isset($config['domain']) || !\is_string($config['domain'])) {
+        if (!isset($config['domain']) || !\is_string($config['domain'])){
             throw $this->invalidConfigKey($name, 'domain', 'string');
         }
 
-        if (!\is_string($config['prefix'] ?? '')) {
+        if (!\is_string($config['prefix'] ?? '')){
             throw $this->invalidConfigKey($name, 'prefix', 'string or null');
         }
 
@@ -264,7 +264,7 @@ 
      */
     private function createStaticResolver(string $name, array $config): UriResolverInterface
     {
-        if (!isset($config['uri']) || !\is_string($config['uri'])) {
+        if (!isset($config['uri']) || !\is_string($config['uri'])){
             throw $this->invalidConfigKey($name, 'uri', 'string');
         }
 
@@ -279,17 +279,17 @@ 
      */
     private function createUri(string $name, string $uri, array $config): UriInterface
     {
-        if (!\is_string($config['factory'] ?? '')) {
+        if (!\is_string($config['factory'] ?? '')){
             throw $this->invalidConfigKey($name, 'factory', 'string (PSR-7 uri factory implementation)');
         }
 
-        switch (true) {
+        switch (true){
             case isset($config['factory']):
                 /** @var UriFactoryInterface $factory */
                 $factory = new $config['factory']();
 
-                if (!$factory instanceof UriFactoryInterface) {
-                    $message = 'Distribution config driver `%s` should contain class that must be a valid PSR-7 ' .
+                if (!$factory instanceof UriFactoryInterface){
+                    $message = 'Distribution config driver `%s` should contain class that must be a valid PSR-7 '.
                         'uri factory implementation, but `%s` given';
                     throw new InvalidArgumentException(\sprintf($message, $name, $config['factory']));
                 }
@@ -303,7 +303,7 @@ 
                 return new GuzzleUri($uri);
 
             default:
-                $message = 'Can not resolve available PSR-7 UriFactory implementation; ' .
+                $message = 'Can not resolve available PSR-7 UriFactory implementation; '.
                     'Please define `factory` config section in `%s` distribution driver config';
                 throw new InvalidArgumentException(\sprintf($message, $name));
         }

Braces +55 added lines, -27 removed lines

@@ -71,8 +71,10 @@ 
      */
     private function bootResolvers(array $config): void
     {
-        foreach ($config['resolvers'] ?? [] as $name => $child) {
-            if (!\is_string($name)) {
+        foreach ($config['resolvers'] ?? [] as $name => $child)
+        {
+            if (!\is_string($name))
+            {
                 throw new InvalidArgumentException(
                     \vsprintf('Distribution driver config key must be a string, but %s given', [
                         \get_debug_type($child),
@@ -80,7 +82,8 @@ 
                 );
             }
 
-            if (!\is_array($child)) {
+            if (!\is_array($child))
+            {
                 throw new InvalidArgumentException(
                     \vsprintf('Distribution driver config `%s` must be an array, but %s given', [
                         $name,
@@ -100,9 +103,11 @@ 
     {
         $default = $config['default'] ?? null;
 
-        if ($default !== null) {
+        if ($default !== null)
+        {
             // Validate config
-            if (!\is_string($default)) {
+            if (!\is_string($default))
+            {
                 throw new InvalidArgumentException(
                     \vsprintf('Distribution config default driver must be a string, but %s given', [
                         \get_debug_type($default),
@@ -121,13 +126,15 @@ 
      */
     private function createResolver(string $name, array $config): UriResolverInterface
     {
-        if (!isset($config['type']) || !\is_string($config['type'])) {
+        if (!isset($config['type']) || !\is_string($config['type']))
+        {
             throw $this->invalidConfigKey($name, 'type', 'string');
         }
 
         $type = $config['type'];
 
-        switch ($type) {
+        switch ($type)
+        {
             case 'static':
                 return $this->createStaticResolver($name, $config);
 
@@ -150,17 +157,22 @@ 
      */
     private function createCustomResolver(string $type, string $name, array $config): UriResolverInterface
     {
-        if (!\is_subclass_of($type, UriResolverInterface::class, true)) {
+        if (!\is_subclass_of($type, UriResolverInterface::class, true))
+        {
             throw $this->invalidConfigKey($name, 'type', UriResolverInterface::class);
         }
 
-        if (isset($config['options']) && !\is_array($config['options'])) {
+        if (isset($config['options']) && !\is_array($config['options']))
+        {
             throw $this->invalidConfigKey($name, 'options', 'array');
         }
 
-        try {
+        try
+        {
             return new $type(...\array_values($config['options'] ?? []));
-        } catch (\Throwable $e) {
+        }
+        catch (\Throwable $e)
+        {
             $message = 'An error occurred while resolver `%s` initializing: %s';
             throw new InvalidArgumentException(\sprintf($message, $name, $e->getMessage()), 0, $e);
         }
@@ -174,36 +186,44 @@ 
     private function createS3Resolver(string $name, array $config): UriResolverInterface
     {
         // Required config options
-        if (!isset($config['region']) || !\is_string($config['region'])) {
+        if (!isset($config['region']) || !\is_string($config['region']))
+        {
             throw $this->invalidConfigKey($name, 'region', 'string');
         }
 
-        if (!isset($config['key']) || !\is_string($config['key'])) {
+        if (!isset($config['key']) || !\is_string($config['key']))
+        {
             throw $this->invalidConfigKey($name, 'key', 'string');
         }
 
-        if (!isset($config['secret']) || !\is_string($config['secret'])) {
+        if (!isset($config['secret']) || !\is_string($config['secret']))
+        {
             throw $this->invalidConfigKey($name, 'secret', 'string');
         }
 
-        if (!isset($config['bucket']) || !\is_string($config['bucket'])) {
+        if (!isset($config['bucket']) || !\is_string($config['bucket']))
+        {
             throw $this->invalidConfigKey($name, 'bucket', 'string');
         }
 
         // Optional config options
-        if (!\is_string($config['prefix'] ?? '')) {
+        if (!\is_string($config['prefix'] ?? ''))
+        {
             throw $this->invalidConfigKey($name, 'prefix', 'string or null');
         }
 
-        if (!\is_string($config['version'] ?? '')) {
+        if (!\is_string($config['version'] ?? ''))
+        {
             throw $this->invalidConfigKey($name, 'version', 'string or null');
         }
 
-        if (!\is_string($config['token'] ?? '')) {
+        if (!\is_string($config['token'] ?? ''))
+        {
             throw $this->invalidConfigKey($name, 'token', 'string or null');
         }
 
-        if (!\is_int($config['expires'] ?? 0)) {
+        if (!\is_int($config['expires'] ?? 0))
+        {
             throw $this->invalidConfigKey($name, 'expires', 'positive int (unix timestamp)');
         }
 
@@ -233,19 +253,23 @@ 
      */
     private function createCloudFrontResolver(string $name, array $config): UriResolverInterface
     {
-        if (!isset($config['key']) || !\is_string($config['key'])) {
+        if (!isset($config['key']) || !\is_string($config['key']))
+        {
             throw $this->invalidConfigKey($name, 'key', 'string');
         }
 
-        if (!isset($config['private']) || !\is_string($config['private'])) {
+        if (!isset($config['private']) || !\is_string($config['private']))
+        {
             throw $this->invalidConfigKey($name, 'private', 'string value or path to key file');
         }
 
-        if (!isset($config['domain']) || !\is_string($config['domain'])) {
+        if (!isset($config['domain']) || !\is_string($config['domain']))
+        {
             throw $this->invalidConfigKey($name, 'domain', 'string');
         }
 
-        if (!\is_string($config['prefix'] ?? '')) {
+        if (!\is_string($config['prefix'] ?? ''))
+        {
             throw $this->invalidConfigKey($name, 'prefix', 'string or null');
         }
 
@@ -264,7 +288,8 @@ 
      */
     private function createStaticResolver(string $name, array $config): UriResolverInterface
     {
-        if (!isset($config['uri']) || !\is_string($config['uri'])) {
+        if (!isset($config['uri']) || !\is_string($config['uri']))
+        {
             throw $this->invalidConfigKey($name, 'uri', 'string');
         }
 
@@ -279,16 +304,19 @@ 
      */
     private function createUri(string $name, string $uri, array $config): UriInterface
     {
-        if (!\is_string($config['factory'] ?? '')) {
+        if (!\is_string($config['factory'] ?? ''))
+        {
             throw $this->invalidConfigKey($name, 'factory', 'string (PSR-7 uri factory implementation)');
         }
 
-        switch (true) {
+        switch (true)
+        {
             case isset($config['factory']):
                 /** @var UriFactoryInterface $factory */
                 $factory = new $config['factory']();
 
-                if (!$factory instanceof UriFactoryInterface) {
+                if (!$factory instanceof UriFactoryInterface)
+                {
                     $message = 'Distribution config driver `%s` should contain class that must be a valid PSR-7 ' .
                         'uri factory implementation, but `%s` given';
                     throw new InvalidArgumentException(\sprintf($message, $name, $config['factory']));

src/Framework/Bootloader/AttributesBootloader.php

Spacing +2 added lines, -2 removed lines

@@ -28,11 +28,11 @@
         $container->bindSingleton(ReaderInterface::class, function () use ($container) {
             $factory = new Factory();
 
-            if ($container->has(CacheInterface::class)) {
+            if ($container->has(CacheInterface::class)){
                 $factory = $factory->withCache(
                     $container->get(CacheInterface::class)
                 );
-            } elseif ($container->has(CacheItemPoolInterface::class)) {
+            } elseif ($container->has(CacheItemPoolInterface::class)){
                 $factory = $factory->withCache(
                     $container->get(CacheItemPoolInterface::class)
                 );

Braces +7 added lines, -3 removed lines

@@ -25,14 +25,18 @@
      */
     public function boot(Container $container): void
     {
-        $container->bindSingleton(ReaderInterface::class, function () use ($container) {
+        $container->bindSingleton(ReaderInterface::class, function () use ($container)
+        {
             $factory = new Factory();
 
-            if ($container->has(CacheInterface::class)) {
+            if ($container->has(CacheInterface::class))
+            {
                 $factory = $factory->withCache(
                     $container->get(CacheInterface::class)
                 );
-            } elseif ($container->has(CacheItemPoolInterface::class)) {
+            }
+            elseif ($container->has(CacheItemPoolInterface::class))
+            {
                 $factory = $factory->withCache(
                     $container->get(CacheItemPoolInterface::class)
                 );