spiral / framework

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;

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);
                 }
@@ -178,32 +178,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();
                         }
                     }
@@ -237,11 +237,11 @@ 
     {
         $value = $this->getField($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);
                 }
@@ -178,32 +181,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();
                         }
                     }
@@ -237,11 +250,13 @@ 
     {
         $value = $this->getField($field);
 
-        if ($value === null) {
+        if ($value === null)
+        {
             return false;
         }
 
-        if ($value instanceof FilterInterface) {
+        if ($value instanceof FilterInterface)
+        {
             return $value->getValue() !== [];
         }