spiral / framework

src/Filters/tests/Model/Schema/InputMapperTest.php

Spacing +2 added lines, -2 removed lines

@@ -20,9 +20,9 @@
 
 final class InputMapperTest extends BaseTestCase
 {
-    private m\LegacyMockInterface|m\MockInterface|FilterProviderInterface $provider;
+    private m\LegacyMockInterface | m\MockInterface | FilterProviderInterface $provider;
     private InputMapper $mapper;
-    private m\LegacyMockInterface|m\MockInterface|SchemaProviderInterface $schemaProvider;
+    private m\LegacyMockInterface | m\MockInterface | SchemaProviderInterface $schemaProvider;
 
     public function setUp(): void
     {

src/Filters/tests/Model/FilterProviderTest.php

Spacing +1 added lines, -1 removed lines

@@ -37,7 +37,7 @@
         parent::setUp();
 
         $this->container->bindSingleton(ReaderInterface::class, (new Factory())->create());
-        $this->container->bindSingleton(SchemaProviderInterface::class, static function (FactoryInterface $factory) {
+        $this->container->bindSingleton(SchemaProviderInterface::class, static function (FactoryInterface $factory){
             return $factory->make(SchemaProvider::class, [
                 'readers' => [
                     $factory->make(AttributeReader::class),

Braces +2 added lines, -1 removed lines

@@ -37,7 +37,8 @@
         parent::setUp();
 
         $this->container->bindSingleton(ReaderInterface::class, (new Factory())->create());
-        $this->container->bindSingleton(SchemaProviderInterface::class, static function (FactoryInterface $factory) {
+        $this->container->bindSingleton(SchemaProviderInterface::class, static function (FactoryInterface $factory)
+        {
             return $factory->make(SchemaProvider::class, [
                 'readers' => [
                     $factory->make(AttributeReader::class),

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

Spacing +1 added lines, -1 removed lines

@@ -18,7 +18,7 @@
         $errors = array_merge($core->callAction($controller, $action, $parameters), $parameters['errors'] ?? []);
         $errorMapper = new ErrorMapper($parameters['schema']);
 
-        if ($errors !== []) {
+        if ($errors !== []){
             throw new ValidationException(
                 $errorMapper->mapErrors($errors),
                 $parameters['context'] ?? null

Braces +2 added lines, -1 removed lines

@@ -18,7 +18,8 @@
         $errors = array_merge($core->callAction($controller, $action, $parameters), $parameters['errors'] ?? []);
         $errorMapper = new ErrorMapper($parameters['schema']);
 
-        if ($errors !== []) {
+        if ($errors !== [])
+        {
             throw new ValidationException(
                 $errorMapper->mapErrors($errors),
                 $parameters['context'] ?? null

src/Filters/src/Model/Interceptor/Validation/Core.php

Spacing +3 added lines, -3 removed lines

@@ -15,7 +15,7 @@ 
 {
     public function __construct(
         private readonly ContainerInterface $container
-    ) {
+    ){
     }
 
     public function callAction(string $controller, string $action, array $parameters = []): array
@@ -29,9 +29,9 @@ 
 
     private function validateFilter(FilterInterface $filter, array $data, mixed $context = null): array
     {
-        if ($filter instanceof HasFilterDefinition) {
+        if ($filter instanceof HasFilterDefinition){
             $definition = $filter->filterDefinition();
-            if ($definition instanceof ShouldBeValidated) {
+            if ($definition instanceof ShouldBeValidated){
                 /** @var ValidationProviderInterface $validationProvider */
                 $validationProvider = $this->container->get(ValidationProviderInterface::class);
 

Braces +4 added lines, -2 removed lines

@@ -29,9 +29,11 @@
 
     private function validateFilter(FilterInterface $filter, array $data, mixed $context = null): array
     {
-        if ($filter instanceof HasFilterDefinition) {
+        if ($filter instanceof HasFilterDefinition)
+        {
             $definition = $filter->filterDefinition();
-            if ($definition instanceof ShouldBeValidated) {
+            if ($definition instanceof ShouldBeValidated)
+            {
                 /** @var ValidationProviderInterface $validationProvider */
                 $validationProvider = $this->container->get(ValidationProviderInterface::class);
 

src/Filters/src/Model/Schema/Builder.php

Spacing +11 added lines, -11 removed lines

@@ -42,18 +42,18 @@ 
      */
     public function makeSchema(string $name, array $schema): array
     {
-        if (empty($schema)) {
+        if (empty($schema)){
             throw new SchemaException(\sprintf('Filter `%s` does not define any schema', $name));
         }
 
         $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] = [
                         self::SCHEMA_SOURCE => $source,
@@ -74,25 +74,25 @@ 
                 continue;
             }
 
-            if (!\is_array($definition) || $definition === []) {
+            if (!\is_array($definition) || $definition === []){
                 throw new SchemaException(
                     \sprintf('Invalid schema definition at `%s`->`%s`', $name, $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 = \str_contains((string)$origin, '.*') || !empty($definition[self::ITERATE]);
                 $origin = \rtrim($origin, '.*');
-            } else {
+            }else{
                 $origin = $field;
                 $iterate = true;
             }
 
-            if (!empty($definition[self::OPTIONAL])) {
+            if (!empty($definition[self::OPTIONAL])){
                 $optional = true;
             }
 
@@ -105,7 +105,7 @@ 
                 self::SCHEMA_OPTIONAL => $optional,
             ];
 
-            if ($iterate) {
+            if ($iterate){
                 [$source, $origin] = $this->parseDefinition($field, $definition[self::ITERATE] ?? $origin);
 
                 $map[self::SCHEMA_ITERATE_SOURCE] = $source;
@@ -137,11 +137,11 @@ 
             'path',
             'remoteAddress',
             'uri'
-        ], true)) {
+        ], true)){
             return [$definition, $field];
         }
 
-        if (!\str_contains($definition, ':')) {
+        if (!\str_contains($definition, ':')){
             return ['data', empty($definition) ? $field : $definition];
         }
 

Braces +23 added lines, -11 removed lines

@@ -42,18 +42,22 @@ 
      */
     public function makeSchema(string $name, array $schema): array
     {
-        if (empty($schema)) {
+        if (empty($schema))
+        {
             throw new SchemaException(\sprintf('Filter `%s` does not define any schema', $name));
         }
 
         $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] = [
                         self::SCHEMA_SOURCE => $source,
@@ -74,25 +78,30 @@ 
                 continue;
             }
 
-            if (!\is_array($definition) || $definition === []) {
+            if (!\is_array($definition) || $definition === [])
+            {
                 throw new SchemaException(
                     \sprintf('Invalid schema definition at `%s`->`%s`', $name, $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 = \str_contains((string)$origin, '.*') || !empty($definition[self::ITERATE]);
                 $origin = \rtrim($origin, '.*');
-            } else {
+            }
+            else
+            {
                 $origin = $field;
                 $iterate = true;
             }
 
-            if (!empty($definition[self::OPTIONAL])) {
+            if (!empty($definition[self::OPTIONAL]))
+            {
                 $optional = true;
             }
 
@@ -105,7 +114,8 @@ 
                 self::SCHEMA_OPTIONAL => $optional,
             ];
 
-            if ($iterate) {
+            if ($iterate)
+            {
                 [$source, $origin] = $this->parseDefinition($field, $definition[self::ITERATE] ?? $origin);
 
                 $map[self::SCHEMA_ITERATE_SOURCE] = $source;
@@ -137,11 +147,13 @@ 
             'path',
             'remoteAddress',
             'uri'
-        ], true)) {
+        ], true))
+        {
             return [$definition, $field];
         }
 
-        if (!\str_contains($definition, ':')) {
+        if (!\str_contains($definition, ':'))
+        {
             return ['data', empty($definition) ? $field : $definition];
         }
 

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

Spacing +17 added lines, -17 removed lines

@@ -19,7 +19,7 @@ 
         private readonly FilterProviderInterface $provider,
         private readonly SchemaProviderInterface $schemaProvider,
         private readonly FilterFactory $filterFactory
-    ) {
+    ){
     }
 
     public function map(array $mappingSchema, InputInterface $input, array $setters = []): array
@@ -27,17 +27,17 @@ 
         $errors = [];
         $result = $this->mapData($mappingSchema, $input, $setters);
 
-        foreach ($mappingSchema as $field => $map) {
-            if (empty($map[Builder::SCHEMA_FILTER])) {
+        foreach ($mappingSchema as $field => $map){
+            if (empty($map[Builder::SCHEMA_FILTER])){
                 continue;
             }
 
             $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) {
+                }catch (ValidationException $e){
                     $errors[$field] = $e->errors;
                     unset($result[$field]);
                 }
@@ -47,10 +47,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;
                 }
             }
@@ -64,13 +64,13 @@ 
     public function mapData(array $mappingSchema, InputInterface $input, array $setters = []): array
     {
         $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) {
+                    foreach ($setters[$field] ?? [] as $setter){
                         $value = $setter->updateValue($value);
                     }
 
@@ -79,7 +79,7 @@ 
                 continue;
             }
 
-            if (empty($map[Builder::SCHEMA_ARRAY])) {
+            if (empty($map[Builder::SCHEMA_ARRAY])){
                 $filter = $this->filterFactory->createFilterInstance($map[Builder::SCHEMA_FILTER]);
                 $result[$field] = $this->mapData(
                     $this->schemaProvider->getSchema($filter),
@@ -102,12 +102,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 +32 added lines, -15 removed lines

@@ -27,17 +27,23 @@ 
         $errors = [];
         $result = $this->mapData($mappingSchema, $input, $setters);
 
-        foreach ($mappingSchema as $field => $map) {
-            if (empty($map[Builder::SCHEMA_FILTER])) {
+        foreach ($mappingSchema as $field => $map)
+        {
+            if (empty($map[Builder::SCHEMA_FILTER]))
+            {
                 continue;
             }
 
             $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) {
+                }
+                catch (ValidationException $e)
+                {
                     $errors[$field] = $e->errors;
                     unset($result[$field]);
                 }
@@ -47,10 +53,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;
                 }
             }
@@ -64,13 +74,17 @@ 
     public function mapData(array $mappingSchema, InputInterface $input, array $setters = []): array
     {
         $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) {
+                    foreach ($setters[$field] ?? [] as $setter)
+                    {
                         $value = $setter->updateValue($value);
                     }
 
@@ -79,7 +93,8 @@ 
                 continue;
             }
 
-            if (empty($map[Builder::SCHEMA_ARRAY])) {
+            if (empty($map[Builder::SCHEMA_ARRAY]))
+            {
                 $filter = $this->filterFactory->createFilterInstance($map[Builder::SCHEMA_FILTER]);
                 $result[$field] = $this->mapData(
                     $this->schemaProvider->getSchema($filter),
@@ -102,11 +117,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/SchemaProvider.php

Spacing +4 added lines, -4 removed lines

@@ -28,12 +28,12 @@ 
     public function __construct(
         private readonly array $readers,
         private readonly Builder $schemaBuilder
-    ) {
+    ){
     }
 
     public function getSchema(FilterInterface $filter): array
     {
-        if (!isset($this->schema[$filter::class])) {
+        if (!isset($this->schema[$filter::class])){
             $this->read($filter);
         }
 
@@ -42,7 +42,7 @@ 
 
     public function getSetters(FilterInterface $filter): array
     {
-        if (!isset($this->setters[$filter::class])) {
+        if (!isset($this->setters[$filter::class])){
             $this->read($filter);
         }
 
@@ -53,7 +53,7 @@ 
     {
         $this->schema[$filter::class] = [];
         $this->setters[$filter::class] = [];
-        foreach ($this->readers as $reader) {
+        foreach ($this->readers as $reader){
             [$readSchema, $readSetters] = $reader->read($filter);
             $this->schema[$filter::class] = \array_merge($this->schema[$filter::class], $readSchema);
             $this->setters[$filter::class] = \array_merge($this->setters[$filter::class], $readSetters);

Braces +6 added lines, -3 removed lines

@@ -33,7 +33,8 @@ 
 
     public function getSchema(FilterInterface $filter): array
     {
-        if (!isset($this->schema[$filter::class])) {
+        if (!isset($this->schema[$filter::class]))
+        {
             $this->read($filter);
         }
 
@@ -42,7 +43,8 @@ 
 
     public function getSetters(FilterInterface $filter): array
     {
-        if (!isset($this->setters[$filter::class])) {
+        if (!isset($this->setters[$filter::class]))
+        {
             $this->read($filter);
         }
 
@@ -53,7 +55,8 @@ 
     {
         $this->schema[$filter::class] = [];
         $this->setters[$filter::class] = [];
-        foreach ($this->readers as $reader) {
+        foreach ($this->readers as $reader)
+        {
             [$readSchema, $readSetters] = $reader->read($filter);
             $this->schema[$filter::class] = \array_merge($this->schema[$filter::class], $readSchema);
             $this->setters[$filter::class] = \array_merge($this->setters[$filter::class], $readSetters);

src/Filters/src/Model/Schema/AttributeReader.php

Spacing +7 added lines, -7 removed lines

@@ -19,7 +19,7 @@ 
 {
     public function __construct(
         private readonly AttributesReader $reader
-    ) {
+    ){
     }
 
     /**
@@ -33,15 +33,15 @@ 
         $setters = [];
         $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 || $attribute instanceof NestedFilter) {
+            foreach ($this->reader->getPropertyMetadata($property) as $attribute){
+                if ($attribute instanceof AbstractInput || $attribute instanceof NestedFilter){
                     $schema[$property->getName()] = $attribute->getSchema($property);
-                } elseif ($attribute instanceof NestedArray) {
+                } elseif ($attribute instanceof NestedArray){
                     $prefix = $attribute->input->key ?? $attribute->prefix ?? $property->getName();
-                    $schema[$property->getName()] = [$attribute->class, $prefix . '.*'];
-                } elseif ($attribute instanceof Setter) {
+                    $schema[$property->getName()] = [$attribute->class, $prefix.'.*'];
+                } elseif ($attribute instanceof Setter){
                     $setters[$property->getName()][] = $attribute;
                 }
             }

Braces +12 added lines, -5 removed lines

@@ -33,15 +33,22 @@
         $setters = [];
         $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 || $attribute instanceof NestedFilter) {
+            foreach ($this->reader->getPropertyMetadata($property) as $attribute)
+            {
+                if ($attribute instanceof AbstractInput || $attribute instanceof NestedFilter)
+                {
                     $schema[$property->getName()] = $attribute->getSchema($property);
-                } elseif ($attribute instanceof NestedArray) {
+                }
+                elseif ($attribute instanceof NestedArray)
+                {
                     $prefix = $attribute->input->key ?? $attribute->prefix ?? $property->getName();
                     $schema[$property->getName()] = [$attribute->class, $prefix . '.*'];
-                } elseif ($attribute instanceof Setter) {
+                }
+                elseif ($attribute instanceof Setter)
+                {
                     $setters[$property->getName()][] = $attribute;
                 }
             }

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

Spacing +1 added lines, -1 removed lines

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

Braces +2 added lines, -1 removed lines

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