spiral / framework

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

Spacing +8 added lines, -8 removed lines

@@ -16,7 +16,7 @@ 
     public function __construct(
         private readonly SchemaProviderInterface $schemaProvider,
         private readonly SetterRegistryInterface $registry
-    ) {
+    ){
     }
 
     /**
@@ -26,29 +26,29 @@ 
     {
         $class = new \ReflectionClass($filter);
 
-        foreach ($this->schemaProvider->getSchema($filter) as $field => $map) {
-            if (!empty($map[Builder::SCHEMA_FILTER]) && $data[$field] === []) {
+        foreach ($this->schemaProvider->getSchema($filter) as $field => $map){
+            if (!empty($map[Builder::SCHEMA_FILTER]) && $data[$field] === []){
                 continue;
             }
 
             $property = $class->getProperty($field);
-            if (!empty($map[Builder::SCHEMA_FILTER])) {
+            if (!empty($map[Builder::SCHEMA_FILTER])){
                 $this->registry->getDefault()->setValue($filter, $property, $data[$field]);
                 continue;
             }
             $type = $property->getType();
-            if (!isset($data[$field]) && $type->allowsNull()) {
+            if (!isset($data[$field]) && $type->allowsNull()){
                 $this->registry->getDefault()->setValue($filter, $property, null);
                 continue;
             }
 
-            if (!$type instanceof \ReflectionNamedType || $type->isBuiltin()) {
+            if (!$type instanceof \ReflectionNamedType || $type->isBuiltin()){
                 $this->registry->getDefault()->setValue($filter, $property, $data[$field]);
                 continue;
             }
 
-            foreach ($this->registry->getSetters() as $setter) {
-                if ($setter->supports($type)) {
+            foreach ($this->registry->getSetters() as $setter){
+                if ($setter->supports($type)){
                     $setter->setValue($filter, $property, $data[$field]);
                 }
             }

Braces +14 added lines, -7 removed lines

@@ -26,29 +26,36 @@
     {
         $class = new \ReflectionClass($filter);
 
-        foreach ($this->schemaProvider->getSchema($filter) as $field => $map) {
-            if (!empty($map[Builder::SCHEMA_FILTER]) && $data[$field] === []) {
+        foreach ($this->schemaProvider->getSchema($filter) as $field => $map)
+        {
+            if (!empty($map[Builder::SCHEMA_FILTER]) && $data[$field] === [])
+            {
                 continue;
             }
 
             $property = $class->getProperty($field);
-            if (!empty($map[Builder::SCHEMA_FILTER])) {
+            if (!empty($map[Builder::SCHEMA_FILTER]))
+            {
                 $this->registry->getDefault()->setValue($filter, $property, $data[$field]);
                 continue;
             }
             $type = $property->getType();
-            if (!isset($data[$field]) && $type->allowsNull()) {
+            if (!isset($data[$field]) && $type->allowsNull())
+            {
                 $this->registry->getDefault()->setValue($filter, $property, null);
                 continue;
             }
 
-            if (!$type instanceof \ReflectionNamedType || $type->isBuiltin()) {
+            if (!$type instanceof \ReflectionNamedType || $type->isBuiltin())
+            {
                 $this->registry->getDefault()->setValue($filter, $property, $data[$field]);
                 continue;
             }
 
-            foreach ($this->registry->getSetters() as $setter) {
-                if ($setter->supports($type)) {
+            foreach ($this->registry->getSetters() as $setter)
+            {
+                if ($setter->supports($type))
+                {
                     $setter->setValue($filter, $property, $data[$field]);
                 }
             }

src/Filters/src/Model/Schema/SchemaProvider.php

Spacing +9 added lines, -9 removed lines

@@ -33,12 +33,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);
         }
 
@@ -50,7 +50,7 @@ 
 
     public function getSetters(FilterInterface $filter): array
     {
-        if (!isset($this->setters[$filter::class])) {
+        if (!isset($this->setters[$filter::class])){
             $this->read($filter);
         }
 
@@ -61,7 +61,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);
@@ -70,20 +70,20 @@ 
 
     private function markOptionalFilters(FilterInterface $filter, array $schema): array
     {
-        if (!isset($this->optionalFilters[$filter::class])) {
+        if (!isset($this->optionalFilters[$filter::class])){
             $this->optionalFilters[$filter::class] = [];
-            foreach ($schema as $field => $map) {
-                if (!empty($map[Builder::SCHEMA_FILTER])) {
+            foreach ($schema as $field => $map){
+                if (!empty($map[Builder::SCHEMA_FILTER])){
                     $property = new \ReflectionProperty($filter, $field);
                     $type = $property->getType();
-                    if ($type instanceof \ReflectionNamedType && $type->allowsNull()) {
+                    if ($type instanceof \ReflectionNamedType && $type->allowsNull()){
                         $this->optionalFilters[$filter::class][] = $field;
                     }
                 }
             }
         }
 
-        foreach ($this->optionalFilters[$filter::class] as $field) {
+        foreach ($this->optionalFilters[$filter::class] as $field){
             $schema[$field][Builder::SCHEMA_OPTIONAL] = true;
         }
 

Braces +16 added lines, -8 removed lines

@@ -38,7 +38,8 @@ 
 
     public function getSchema(FilterInterface $filter): array
     {
-        if (!isset($this->schema[$filter::class])) {
+        if (!isset($this->schema[$filter::class]))
+        {
             $this->read($filter);
         }
 
@@ -50,7 +51,8 @@ 
 
     public function getSetters(FilterInterface $filter): array
     {
-        if (!isset($this->setters[$filter::class])) {
+        if (!isset($this->setters[$filter::class]))
+        {
             $this->read($filter);
         }
 
@@ -61,7 +63,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);
@@ -70,20 +73,25 @@ 
 
     private function markOptionalFilters(FilterInterface $filter, array $schema): array
     {
-        if (!isset($this->optionalFilters[$filter::class])) {
+        if (!isset($this->optionalFilters[$filter::class]))
+        {
             $this->optionalFilters[$filter::class] = [];
-            foreach ($schema as $field => $map) {
-                if (!empty($map[Builder::SCHEMA_FILTER])) {
+            foreach ($schema as $field => $map)
+            {
+                if (!empty($map[Builder::SCHEMA_FILTER]))
+                {
                     $property = new \ReflectionProperty($filter, $field);
                     $type = $property->getType();
-                    if ($type instanceof \ReflectionNamedType && $type->allowsNull()) {
+                    if ($type instanceof \ReflectionNamedType && $type->allowsNull())
+                    {
                         $this->optionalFilters[$filter::class][] = $field;
                     }
                 }
             }
         }
 
-        foreach ($this->optionalFilters[$filter::class] as $field) {
+        foreach ($this->optionalFilters[$filter::class] as $field)
+        {
             $schema[$field][Builder::SCHEMA_OPTIONAL] = true;
         }
 

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

Spacing +18 added lines, -18 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,18 +27,18 @@ 
         $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) {
-                    if ($map[Builder::SCHEMA_OPTIONAL]) {
+                }catch (ValidationException $e){
+                    if ($map[Builder::SCHEMA_OPTIONAL]){
                         $result[$field] = null;
                         continue;
                     }
@@ -51,10 +51,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;
                 }
             }
@@ -68,13 +68,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);
                     }
 
@@ -83,7 +83,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),
@@ -106,12 +106,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 +34 added lines, -16 removed lines

@@ -27,18 +27,25 @@ 
         $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) {
-                    if ($map[Builder::SCHEMA_OPTIONAL]) {
+                }
+                catch (ValidationException $e)
+                {
+                    if ($map[Builder::SCHEMA_OPTIONAL])
+                    {
                         $result[$field] = null;
                         continue;
                     }
@@ -51,10 +58,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;
                 }
             }
@@ -68,13 +79,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);
                     }
 
@@ -83,7 +98,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),
@@ -106,11 +122,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;
         }
     }