spiral / framework

src/Framework/Bootloader/Security/FiltersBootloader.php

Spacing +2 added lines, -2 removed lines

@@ -43,7 +43,7 @@ 
         private readonly ContainerInterface $container,
         private readonly BinderInterface $binder,
         private readonly ConfiguratorInterface $config
-    ) {
+    ){
     }
 
     /**
@@ -93,7 +93,7 @@ 
         ?EventDispatcherInterface $dispatcher = null
     ): FilterProvider {
         $core = new InterceptableCore(new Core(), $dispatcher);
-        foreach ($config->getInterceptors() as $interceptor) {
+        foreach ($config->getInterceptors() as $interceptor){
             $core->addInterceptor($container->get($interceptor));
         }
 

Braces +2 added lines, -1 removed lines

@@ -93,7 +93,8 @@
         ?EventDispatcherInterface $dispatcher = null
     ): FilterProvider {
         $core = new InterceptableCore(new Core(), $dispatcher);
-        foreach ($config->getInterceptors() as $interceptor) {
+        foreach ($config->getInterceptors() as $interceptor)
+        {
             $core->addInterceptor($container->get($interceptor));
         }
 

src/Filters/src/Model/FilterProvider.php

Spacing +4 added lines, -4 removed lines

@@ -23,7 +23,7 @@ 
         private readonly ContainerInterface $container,
         private readonly ResolverInterface $resolver,
         private readonly CoreInterface $core
-    ) {
+    ){
     }
 
     public function createFilter(string $name, InputInterface $input): FilterInterface
@@ -34,7 +34,7 @@ 
         $filter = $this->createFilterInstance($name);
         [$mappingSchema, $errors, $setters, $optionalFilters] = $attributeMapper->map($filter, $input);
 
-        if ($filter instanceof HasFilterDefinition) {
+        if ($filter instanceof HasFilterDefinition){
             $mappingSchema = \array_merge(
                 $mappingSchema,
                 $filter->filterDefinition()->mappingSchema()
@@ -48,7 +48,7 @@ 
         \assert($schemaBuilder instanceof Builder);
 
         $schema = $schemaBuilder->makeSchema($name, $mappingSchema);
-        foreach ($optionalFilters as $optionalFilter) {
+        foreach ($optionalFilters as $optionalFilter){
             $schema[$optionalFilter][Builder::SCHEMA_OPTIONAL] = true;
         }
 
@@ -66,7 +66,7 @@ 
         $class = new \ReflectionClass($name);
 
         $args = [];
-        if ($constructor = $class->getConstructor()) {
+        if ($constructor = $class->getConstructor()){
             $args = $this->resolver->resolveArguments($constructor);
         }
 

Braces +6 added lines, -3 removed lines

@@ -34,7 +34,8 @@ 
         $filter = $this->createFilterInstance($name);
         [$mappingSchema, $errors, $setters, $optionalFilters] = $attributeMapper->map($filter, $input);
 
-        if ($filter instanceof HasFilterDefinition) {
+        if ($filter instanceof HasFilterDefinition)
+        {
             $mappingSchema = \array_merge(
                 $mappingSchema,
                 $filter->filterDefinition()->mappingSchema()
@@ -48,7 +49,8 @@ 
         \assert($schemaBuilder instanceof Builder);
 
         $schema = $schemaBuilder->makeSchema($name, $mappingSchema);
-        foreach ($optionalFilters as $optionalFilter) {
+        foreach ($optionalFilters as $optionalFilter)
+        {
             $schema[$optionalFilter][Builder::SCHEMA_OPTIONAL] = true;
         }
 
@@ -66,7 +68,8 @@ 
         $class = new \ReflectionClass($name);
 
         $args = [];
-        if ($constructor = $class->getConstructor()) {
+        if ($constructor = $class->getConstructor())
+        {
             $args = $this->resolver->resolveArguments($constructor);
         }
 

src/Filters/src/Model/Mapper/CasterRegistry.php

Spacing +1 added lines, -1 removed lines

@@ -11,7 +11,7 @@
 
     public function __construct(array $casters = [])
     {
-        foreach ($casters as $caster) {
+        foreach ($casters as $caster){
             $this->register($caster);
         }
     }

Braces +2 added lines, -1 removed lines

@@ -11,7 +11,8 @@
 
     public function __construct(array $casters = [])
     {
-        foreach ($casters as $caster) {
+        foreach ($casters as $caster)
+        {
             $this->register($caster);
         }
     }

src/Filters/src/Model/Mapper/Mapper.php

Spacing +4 added lines, -4 removed lines

@@ -13,7 +13,7 @@ 
 {
     public function __construct(
         private readonly CasterRegistryInterface $registry
-    ) {
+    ){
     }
 
     /**
@@ -22,9 +22,9 @@ 
     public function setValue(FilterInterface $filter, \ReflectionProperty $property, mixed $value): void
     {
         $type = $property->getType();
-        if ($type instanceof \ReflectionNamedType && !$type->isBuiltin()) {
-            foreach ($this->registry->getCasters() as $setter) {
-                if ($setter->supports($type)) {
+        if ($type instanceof \ReflectionNamedType && !$type->isBuiltin()){
+            foreach ($this->registry->getCasters() as $setter){
+                if ($setter->supports($type)){
                     $setter->setValue($filter, $property, $value);
                     return;
                 }

Braces +6 added lines, -3 removed lines

@@ -22,9 +22,12 @@
     public function setValue(FilterInterface $filter, \ReflectionProperty $property, mixed $value): void
     {
         $type = $property->getType();
-        if ($type instanceof \ReflectionNamedType && !$type->isBuiltin()) {
-            foreach ($this->registry->getCasters() as $setter) {
-                if ($setter->supports($type)) {
+        if ($type instanceof \ReflectionNamedType && !$type->isBuiltin())
+        {
+            foreach ($this->registry->getCasters() as $setter)
+            {
+                if ($setter->supports($type))
+                {
                     $setter->setValue($filter, $property, $value);
                     return;
                 }

src/Filters/src/Attribute/Setter.php

Spacing +2 added lines, -2 removed lines

@@ -31,9 +31,9 @@
 
     public function updateValue(mixed $value): mixed
     {
-        try {
+        try{
             return ($this->filter)($value, ...$this->args);
-        } catch (\Throwable $e) {
+        }catch (\Throwable $e){
             throw new SetterException($e);
         }
     }

Braces +5 added lines, -2 removed lines

@@ -31,9 +31,12 @@
 
     public function updateValue(mixed $value): mixed
     {
-        try {
+        try
+        {
             return ($this->filter)($value, ...$this->args);
-        } catch (\Throwable $e) {
+        }
+        catch (\Throwable $e)
+        {
             throw new SetterException($e);
         }
     }

src/Filters/src/Model/Interceptor/ValidateFilterInterceptor.php

Spacing +6 added lines, -6 removed lines

@@ -23,7 +23,7 @@ 
 {
     public function __construct(
         private readonly ContainerInterface $container
-    ) {
+    ){
     }
 
     /**
@@ -34,7 +34,7 @@ 
         $bag = $parameters['filterBag'];
         $filter = $core->callAction($controller, $action, $parameters);
 
-        if ($filter instanceof HasFilterDefinition) {
+        if ($filter instanceof HasFilterDefinition){
             $this->validateFilter(
                 $filter->filterDefinition(),
                 $bag,
@@ -43,7 +43,7 @@ 
             );
         }
 
-        if (($bag->errors ?? []) !== []) {
+        if (($bag->errors ?? []) !== []){
             $errorMapper = new ErrorMapper($bag->schema);
             throw new ValidationException($errorMapper->mapErrors($bag->errors), $parameters['context'] ?? null);
         }
@@ -57,7 +57,7 @@ 
         array $errors,
         mixed $context
     ): void {
-        if ($definition instanceof ShouldBeValidated) {
+        if ($definition instanceof ShouldBeValidated){
             $errorMapper = new ErrorMapper($bag->schema);
             $validationProvider = $this->container->get(ValidationProviderInterface::class);
 
@@ -65,12 +65,12 @@ 
                 ->getValidation($definition::class)
                 ->validate($bag, $definition->validationRules(), $context);
 
-            if (!$validator->isValid()) {
+            if (!$validator->isValid()){
                 throw new ValidationException(
                     $errorMapper->mapErrors(\array_merge($errors, $validator->getErrors())),
                     $context
                 );
-            } elseif ($errors !== []) {
+            } elseif ($errors !== []){
                 throw new ValidationException($errorMapper->mapErrors($errors), $context);
             }
         }

Braces +11 added lines, -5 removed lines

@@ -34,7 +34,8 @@ 
         $bag = $parameters['filterBag'];
         $filter = $core->callAction($controller, $action, $parameters);
 
-        if ($filter instanceof HasFilterDefinition) {
+        if ($filter instanceof HasFilterDefinition)
+        {
             $this->validateFilter(
                 $filter->filterDefinition(),
                 $bag,
@@ -43,7 +44,8 @@ 
             );
         }
 
-        if (($bag->errors ?? []) !== []) {
+        if (($bag->errors ?? []) !== [])
+        {
             $errorMapper = new ErrorMapper($bag->schema);
             throw new ValidationException($errorMapper->mapErrors($bag->errors), $parameters['context'] ?? null);
         }
@@ -57,7 +59,8 @@ 
         array $errors,
         mixed $context
     ): void {
-        if ($definition instanceof ShouldBeValidated) {
+        if ($definition instanceof ShouldBeValidated)
+        {
             $errorMapper = new ErrorMapper($bag->schema);
             $validationProvider = $this->container->get(ValidationProviderInterface::class);
 
@@ -65,12 +68,15 @@ 
                 ->getValidation($definition::class)
                 ->validate($bag, $definition->validationRules(), $context);
 
-            if (!$validator->isValid()) {
+            if (!$validator->isValid())
+            {
                 throw new ValidationException(
                     $errorMapper->mapErrors(\array_merge($errors, $validator->getErrors())),
                     $context
                 );
-            } elseif ($errors !== []) {
+            }
+            elseif ($errors !== [])
+            {
                 throw new ValidationException($errorMapper->mapErrors($errors), $context);
             }
         }

src/Filters/src/Model/Schema/InputMapper.php

Spacing +17 added lines, -17 removed lines

@@ -14,7 +14,7 @@ 
 {
     public function __construct(
         private readonly FilterProviderInterface $provider
-    ) {
+    ){
     }
 
     public function map(array $mappingSchema, InputInterface $input, array $setters = []): array
@@ -22,16 +22,16 @@ 
         $errors = [];
         $result = [];
 
-        foreach ($mappingSchema as $field => $map) {
-            if (empty($map[Builder::SCHEMA_FILTER])) {
+        foreach ($mappingSchema as $field => $map){
+            if (empty($map[Builder::SCHEMA_FILTER])){
                 $value = $input->getValue($map[Builder::SCHEMA_SOURCE], $map[Builder::SCHEMA_ORIGIN]);
 
-                if ($value !== null) {
+                if ($value !== null){
                     /** @var Setter $setter */
-                    foreach ($setters[$field] ?? [] as $setter) {
-                        try {
+                    foreach ($setters[$field] ?? [] as $setter){
+                        try{
                             $value = $setter->updateValue($value);
-                        } catch (SetterException $e) {
+                        }catch (SetterException $e){
                             $errors[$field] = $e->getMessage();
                         }
                     }
@@ -42,12 +42,12 @@ 
             }
 
             $nested = $map[Builder::SCHEMA_FILTER];
-            if (empty($map[Builder::SCHEMA_ARRAY])) {
+            if (empty($map[Builder::SCHEMA_ARRAY])){
                 // slicing down
-                try {
+                try{
                     $result[$field] = $this->provider->createFilter($nested, $input->withPrefix($map[Builder::SCHEMA_ORIGIN]));
-                } catch (ValidationException $e) {
-                    if ($map[Builder::SCHEMA_OPTIONAL]) {
+                }catch (ValidationException $e){
+                    if ($map[Builder::SCHEMA_OPTIONAL]){
                         $result[$field] = null;
                         continue;
                     }
@@ -59,10 +59,10 @@ 
             $values = [];
 
             // List of "key" => "location in request"
-            foreach ($this->iterate($map, $input) as $index => $origin) {
-                try {
+            foreach ($this->iterate($map, $input) as $index => $origin){
+                try{
                     $values[$index] = $this->provider->createFilter($nested, $input->withPrefix($origin));
-                } catch (ValidationException $e) {
+                }catch (ValidationException $e){
                     $errors[$field][$index] = $e->errors;
                 }
             }
@@ -83,12 +83,12 @@ 
             $schema[Builder::SCHEMA_ITERATE_ORIGIN]
         );
 
-        if (empty($values) || !\is_array($values)) {
+        if (empty($values) || !\is_array($values)){
             return [];
         }
 
-        foreach (\array_keys($values) as $key) {
-            yield $key => $schema[Builder::SCHEMA_ORIGIN] . '.' . $key;
+        foreach (\array_keys($values) as $key){
+            yield $key => $schema[Builder::SCHEMA_ORIGIN].'.'.$key;
         }
     }
 }

Braces +33 added lines, -15 removed lines

@@ -22,16 +22,23 @@ 
         $errors = [];
         $result = [];
 
-        foreach ($mappingSchema as $field => $map) {
-            if (empty($map[Builder::SCHEMA_FILTER])) {
+        foreach ($mappingSchema as $field => $map)
+        {
+            if (empty($map[Builder::SCHEMA_FILTER]))
+            {
                 $value = $input->getValue($map[Builder::SCHEMA_SOURCE], $map[Builder::SCHEMA_ORIGIN]);
 
-                if ($value !== null) {
+                if ($value !== null)
+                {
                     /** @var Setter $setter */
-                    foreach ($setters[$field] ?? [] as $setter) {
-                        try {
+                    foreach ($setters[$field] ?? [] as $setter)
+                    {
+                        try
+                        {
                             $value = $setter->updateValue($value);
-                        } catch (SetterException $e) {
+                        }
+                        catch (SetterException $e)
+                        {
                             $errors[$field] = $e->getMessage();
                         }
                     }
@@ -42,12 +49,17 @@ 
             }
 
             $nested = $map[Builder::SCHEMA_FILTER];
-            if (empty($map[Builder::SCHEMA_ARRAY])) {
+            if (empty($map[Builder::SCHEMA_ARRAY]))
+            {
                 // slicing down
-                try {
+                try
+                {
                     $result[$field] = $this->provider->createFilter($nested, $input->withPrefix($map[Builder::SCHEMA_ORIGIN]));
-                } catch (ValidationException $e) {
-                    if ($map[Builder::SCHEMA_OPTIONAL]) {
+                }
+                catch (ValidationException $e)
+                {
+                    if ($map[Builder::SCHEMA_OPTIONAL])
+                    {
                         $result[$field] = null;
                         continue;
                     }
@@ -59,10 +71,14 @@ 
             $values = [];
 
             // List of "key" => "location in request"
-            foreach ($this->iterate($map, $input) as $index => $origin) {
-                try {
+            foreach ($this->iterate($map, $input) as $index => $origin)
+            {
+                try
+                {
                     $values[$index] = $this->provider->createFilter($nested, $input->withPrefix($origin));
-                } catch (ValidationException $e) {
+                }
+                catch (ValidationException $e)
+                {
                     $errors[$field][$index] = $e->errors;
                 }
             }
@@ -83,11 +99,13 @@ 
             $schema[Builder::SCHEMA_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[Builder::SCHEMA_ORIGIN] . '.' . $key;
         }
     }

src/Filters/src/Model/Schema/AttributeMapper.php

Spacing +25 added lines, -25 removed lines

@@ -25,7 +25,7 @@ 
         private readonly FilterProviderInterface $provider,
         private readonly ReaderInterface $reader,
         private readonly Mapper $mapper
-    ) {
+    ){
     }
 
     /**
@@ -39,66 +39,66 @@ 
         $optionalFilters = [];
         $class = new \ReflectionClass($filter);
 
-        foreach ($class->getProperties() as $property) {
+        foreach ($class->getProperties() as $property){
             /** @var object $attribute */
-            foreach ($this->reader->getPropertyMetadata($property) as $attribute) {
-                if ($attribute instanceof AbstractInput) {
-                    try {
+            foreach ($this->reader->getPropertyMetadata($property) as $attribute){
+                if ($attribute instanceof AbstractInput){
+                    try{
                         $this->setValue($filter, $property, $attribute->getValue($input, $property));
-                    } catch (SetterException $e) {
+                    }catch (SetterException $e){
                         $errors[$property->getName()] = $e->getMessage();
                     }
                     $schema[$property->getName()] = $attribute->getSchema($property);
-                } elseif ($attribute instanceof NestedFilter) {
+                } elseif ($attribute instanceof NestedFilter){
                     $prefix = $attribute->prefix ?? $property->name;
-                    try {
+                    try{
                         $value = $this->provider->createFilter(
                             $attribute->class,
                             $input->withPrefix($prefix)
                         );
 
-                        try {
+                        try{
                             $this->setValue($filter, $property, $value);
-                        } catch (SetterException $e) {
+                        }catch (SetterException $e){
                             $errors[$property->getName()] = $e->getMessage();
                         }
-                    } catch (ValidationException $e) {
-                        if ($this->allowsNull($property)) {
+                    }catch (ValidationException $e){
+                        if ($this->allowsNull($property)){
                             $this->setValue($filter, $property, null);
                             $optionalFilters[] = $property->getName();
-                        } else {
+                        }else{
                             $errors[$prefix] = $e->errors;
                         }
                     }
 
                     $schema[$property->getName()] = $attribute->getSchema($property);
-                } elseif ($attribute instanceof NestedArray) {
+                } elseif ($attribute instanceof NestedArray){
                     $values = $attribute->getValue($input, $property);
                     $propertyValues = [];
 
                     $prefix = $attribute->input->key ?? $attribute->prefix ?? $property->getName();
 
-                    if (\is_array($values)) {
-                        foreach (\array_keys($values) as $key) {
-                            try {
+                    if (\is_array($values)){
+                        foreach (\array_keys($values) as $key){
+                            try{
                                 $propertyValues[$key] = $this->provider->createFilter(
                                     $attribute->class,
-                                    $input->withPrefix($prefix . '.' . $key)
+                                    $input->withPrefix($prefix.'.'.$key)
                                 );
-                            } catch (ValidationException $e) {
+                            }catch (ValidationException $e){
                                 /** @psalm-suppress InvalidArrayOffset */
                                 $errors[$property->getName()][$key] = $e->errors;
                             }
                         }
                     }
 
-                    try {
+                    try{
                         $this->setValue($filter, $property, $propertyValues);
-                    } catch (SetterException $e) {
+                    }catch (SetterException $e){
                         $errors[$property->getName()] = $e->getMessage();
                     }
-                    $schema[$property->getName()] = [$attribute->class, $prefix . '.*'];
-                } elseif ($attribute instanceof Setter) {
+                    $schema[$property->getName()] = [$attribute->class, $prefix.'.*'];
+                } elseif ($attribute instanceof Setter){
                     $setters[$property->getName()][] = $attribute;
                 }
             }
@@ -109,13 +109,13 @@ 
 
     private function setValue(FilterInterface $filter, \ReflectionProperty $property, mixed $value): void
     {
-        if ($value === null) {
+        if ($value === null){
             return;
         }
 
         $setters = $this->reader->getPropertyMetadata($property, Setter::class);
 
-        foreach ($setters as $setter) {
+        foreach ($setters as $setter){
             $value = $setter->updateValue($value);
         }
 

Braces +53 added lines, -22 removed lines

@@ -39,66 +39,95 @@ 
         $optionalFilters = [];
         $class = new \ReflectionClass($filter);
 
-        foreach ($class->getProperties() as $property) {
+        foreach ($class->getProperties() as $property)
+        {
             /** @var object $attribute */
-            foreach ($this->reader->getPropertyMetadata($property) as $attribute) {
-                if ($attribute instanceof AbstractInput) {
-                    try {
+            foreach ($this->reader->getPropertyMetadata($property) as $attribute)
+            {
+                if ($attribute instanceof AbstractInput)
+                {
+                    try
+                    {
                         $this->setValue($filter, $property, $attribute->getValue($input, $property));
-                    } catch (SetterException $e) {
+                    }
+                    catch (SetterException $e)
+                    {
                         $errors[$property->getName()] = $e->getMessage();
                     }
                     $schema[$property->getName()] = $attribute->getSchema($property);
-                } elseif ($attribute instanceof NestedFilter) {
+                }
+                elseif ($attribute instanceof NestedFilter)
+                {
                     $prefix = $attribute->prefix ?? $property->name;
-                    try {
+                    try
+                    {
                         $value = $this->provider->createFilter(
                             $attribute->class,
                             $input->withPrefix($prefix)
                         );
 
-                        try {
+                        try
+                        {
                             $this->setValue($filter, $property, $value);
-                        } catch (SetterException $e) {
+                        }
+                        catch (SetterException $e)
+                        {
                             $errors[$property->getName()] = $e->getMessage();
                         }
-                    } catch (ValidationException $e) {
-                        if ($this->allowsNull($property)) {
+                    }
+                    catch (ValidationException $e)
+                    {
+                        if ($this->allowsNull($property))
+                        {
                             $this->setValue($filter, $property, null);
                             $optionalFilters[] = $property->getName();
-                        } else {
+                        }
+                        else
+                        {
                             $errors[$prefix] = $e->errors;
                         }
                     }
 
                     $schema[$property->getName()] = $attribute->getSchema($property);
-                } elseif ($attribute instanceof NestedArray) {
+                }
+                elseif ($attribute instanceof NestedArray)
+                {
                     $values = $attribute->getValue($input, $property);
                     $propertyValues = [];
 
                     $prefix = $attribute->input->key ?? $attribute->prefix ?? $property->getName();
 
-                    if (\is_array($values)) {
-                        foreach (\array_keys($values) as $key) {
-                            try {
+                    if (\is_array($values))
+                    {
+                        foreach (\array_keys($values) as $key)
+                        {
+                            try
+                            {
                                 $propertyValues[$key] = $this->provider->createFilter(
                                     $attribute->class,
                                     $input->withPrefix($prefix . '.' . $key)
                                 );
-                            } catch (ValidationException $e) {
+                            }
+                            catch (ValidationException $e)
+                            {
                                 /** @psalm-suppress InvalidArrayOffset */
                                 $errors[$property->getName()][$key] = $e->errors;
                             }
                         }
                     }
 
-                    try {
+                    try
+                    {
                         $this->setValue($filter, $property, $propertyValues);
-                    } catch (SetterException $e) {
+                    }
+                    catch (SetterException $e)
+                    {
                         $errors[$property->getName()] = $e->getMessage();
                     }
                     $schema[$property->getName()] = [$attribute->class, $prefix . '.*'];
-                } elseif ($attribute instanceof Setter) {
+                }
+                elseif ($attribute instanceof Setter)
+                {
                     $setters[$property->getName()][] = $attribute;
                 }
             }
@@ -109,13 +138,15 @@ 
 
     private function setValue(FilterInterface $filter, \ReflectionProperty $property, mixed $value): void
     {
-        if ($value === null) {
+        if ($value === null)
+        {
             return;
         }
 
         $setters = $this->reader->getPropertyMetadata($property, Setter::class);
 
-        foreach ($setters as $setter) {
+        foreach ($setters as $setter)
+        {
             $value = $setter->updateValue($value);
         }