spiral / framework

src/Validation/src/Checker/Traits/NotEmptyTrait.php

Spacing +1 added lines, -1 removed lines

@@ -25,7 +25,7 @@
      */
     public function notEmpty($value, bool $asString = true): bool
     {
-        if ($asString && is_string($value) && trim($value) === '') {
+        if ($asString && is_string($value) && trim($value) === ''){
             return false;
         }
 

Braces +2 added lines, -1 removed lines

@@ -25,7 +25,8 @@
      */
     public function notEmpty($value, bool $asString = true): bool
     {
-        if ($asString && is_string($value) && trim($value) === '') {
+        if ($asString && is_string($value) && trim($value) === '')
+        {
             return false;
         }
 

src/Validation/src/Checker/Traits/FileTrait.php

Spacing +8 added lines, -8 removed lines

@@ -32,26 +32,26 @@ 
      */
     private function resolveFilename($file): ?string
     {
-        if (empty($file)) {
+        if (empty($file)){
             return null;
         }
 
         if (
             $file instanceof StreamableInterface ||
             ($file instanceof UploadedFileInterface && $file->getError() === 0)
-        ) {
+        ){
             return StreamWrapper::getFilename($file->getStream());
         }
 
-        if (is_array($file)) {
-            if (!isset($file['tmp_name'])) {
+        if (is_array($file)){
+            if (!isset($file['tmp_name'])){
                 return null;
             }
 
             $file = $file['tmp_name'];
         }
 
-        if (!is_string($file) || !$this->files->exists($file)) {
+        if (!is_string($file) || !$this->files->exists($file)){
             return null;
         }
 
@@ -66,18 +66,18 @@ 
      */
     private function isUploaded($file): bool
     {
-        if (is_string($file)) {
+        if (is_string($file)){
             //We can use native method
             return is_uploaded_file($file);
         }
 
-        if (is_array($file)) {
+        if (is_array($file)){
             return isset($file['tmp_name']) && (
                 is_uploaded_file($file['tmp_name']) || isset($file['uploaded'])
             );
         }
 
-        if ($file instanceof UploadedFileInterface) {
+        if ($file instanceof UploadedFileInterface){
             return empty($file->getError());
         }
 

Braces +14 added lines, -7 removed lines

@@ -32,7 +32,8 @@ 
      */
     private function resolveFilename($file): ?string
     {
-        if (empty($file)) {
+        if (empty($file))
+        {
             return null;
         }
 
@@ -43,15 +44,18 @@ 
             return StreamWrapper::getFilename($file->getStream());
         }
 
-        if (is_array($file)) {
-            if (!isset($file['tmp_name'])) {
+        if (is_array($file))
+        {
+            if (!isset($file['tmp_name']))
+            {
                 return null;
             }
 
             $file = $file['tmp_name'];
         }
 
-        if (!is_string($file) || !$this->files->exists($file)) {
+        if (!is_string($file) || !$this->files->exists($file))
+        {
             return null;
         }
 
@@ -66,18 +70,21 @@ 
      */
     private function isUploaded($file): bool
     {
-        if (is_string($file)) {
+        if (is_string($file))
+        {
             //We can use native method
             return is_uploaded_file($file);
         }
 
-        if (is_array($file)) {
+        if (is_array($file))
+        {
             return isset($file['tmp_name']) && (
                 is_uploaded_file($file['tmp_name']) || isset($file['uploaded'])
             );
         }
 
-        if ($file instanceof UploadedFileInterface) {
+        if ($file instanceof UploadedFileInterface)
+        {
             return empty($file->getError());
         }
 

src/Validation/src/Checker/AddressChecker.php

Spacing +5 added lines, -5 removed lines

@@ -51,20 +51,20 @@
     public function url(string $url, ?array $schemas = null, ?string $defaultSchema = null): bool
     {
         //Add default schema if not presented
-        if (!empty($defaultSchema) && !$this->hasSchema($url)) {
+        if (!empty($defaultSchema) && !$this->hasSchema($url)){
             $defaultSchema = $this->trimSchema($defaultSchema);
-            if (!empty($defaultSchema)) {
+            if (!empty($defaultSchema)){
                 $url = "$defaultSchema://{$this->trimURL($url)}";
             }
         }
 
-        if (empty($schemas)) {
+        if (empty($schemas)){
             return (bool)filter_var($url, FILTER_VALIDATE_URL);
         }
 
-        foreach ($schemas as $schema) {
+        foreach ($schemas as $schema){
             $schema = $this->trimSchema($schema);
-            if (empty($schema) || !$this->containsSchema($url, $schema)) {
+            if (empty($schema) || !$this->containsSchema($url, $schema)){
                 continue;
             }
 

Braces +10 added lines, -5 removed lines

@@ -51,20 +51,25 @@
     public function url(string $url, ?array $schemas = null, ?string $defaultSchema = null): bool
     {
         //Add default schema if not presented
-        if (!empty($defaultSchema) && !$this->hasSchema($url)) {
+        if (!empty($defaultSchema) && !$this->hasSchema($url))
+        {
             $defaultSchema = $this->trimSchema($defaultSchema);
-            if (!empty($defaultSchema)) {
+            if (!empty($defaultSchema))
+            {
                 $url = "$defaultSchema://{$this->trimURL($url)}";
             }
         }
 
-        if (empty($schemas)) {
+        if (empty($schemas))
+        {
             return (bool)filter_var($url, FILTER_VALIDATE_URL);
         }
 
-        foreach ($schemas as $schema) {
+        foreach ($schemas as $schema)
+        {
             $schema = $this->trimSchema($schema);
-            if (empty($schema) || !$this->containsSchema($url, $schema)) {
+            if (empty($schema) || !$this->containsSchema($url, $schema))
+            {
                 continue;
             }
 

src/Validation/src/Checker/MixedChecker.php

Spacing +4 added lines, -4 removed lines

@@ -36,11 +36,11 @@ 
      */
     public function cardNumber($value): bool
     {
-        if (!is_string($value) || strlen($value) < 12) {
+        if (!is_string($value) || strlen($value) < 12){
             return false;
         }
 
-        if ($value !== preg_replace('/\D+/', '', $value)) {
+        if ($value !== preg_replace('/\D+/', '', $value)){
             return false;
         }
 
@@ -48,7 +48,7 @@ 
         $odd = strlen($value) % 2;
 
         $length = strlen($value);
-        for ($i = 0; $i < $length; ++$i) {
+        for ($i = 0; $i < $length; ++$i){
             $result += $odd
                 ? $value[$i]
                 : (($value[$i] * 2 > 9) ? $value[$i] * 2 - 9 : $value[$i] * 2);
@@ -70,7 +70,7 @@ 
      */
     public function match($value, string $field, bool $strict = false): bool
     {
-        if ($strict) {
+        if ($strict){
             return $value === $this->getValidator()->getValue($field, null);
         }
 

Braces +8 added lines, -4 removed lines

@@ -36,11 +36,13 @@ 
      */
     public function cardNumber($value): bool
     {
-        if (!is_string($value) || strlen($value) < 12) {
+        if (!is_string($value) || strlen($value) < 12)
+        {
             return false;
         }
 
-        if ($value !== preg_replace('/\D+/', '', $value)) {
+        if ($value !== preg_replace('/\D+/', '', $value))
+        {
             return false;
         }
 
@@ -48,7 +50,8 @@ 
         $odd = strlen($value) % 2;
 
         $length = strlen($value);
-        for ($i = 0; $i < $length; ++$i) {
+        for ($i = 0; $i < $length; ++$i)
+        {
             $result += $odd
                 ? $value[$i]
                 : (($value[$i] * 2 > 9) ? $value[$i] * 2 - 9 : $value[$i] * 2);
@@ -70,7 +73,8 @@ 
      */
     public function match($value, string $field, bool $strict = false): bool
     {
-        if ($strict) {
+        if ($strict)
+        {
             return $value === $this->getValidator()->getValue($field, null);
         }
 

src/Validation/src/Config/ValidatorConfig.php

Spacing +10 added lines, -10 removed lines

@@ -37,7 +37,7 @@ 
     public function __construct(array $config = [])
     {
         parent::__construct($config);
-        if (!empty($this->config['aliases'])) {
+        if (!empty($this->config['aliases'])){
             $this->config['aliases'] = $this->normalizeAliases($this->config['aliases']);
         }
     }
@@ -59,12 +59,12 @@ 
      */
     public function getChecker(string $name): Autowire
     {
-        if (!$this->hasChecker($name)) {
+        if (!$this->hasChecker($name)){
             throw new ValidationException("Undefined checker `{$name}``.");
         }
 
         $instance = $this->wire('checkers', $name);
-        if ($instance !== null) {
+        if ($instance !== null){
             return $instance;
         }
 
@@ -86,12 +86,12 @@ 
      */
     public function getCondition(string $name): Autowire
     {
-        if (!$this->hasCondition($name)) {
+        if (!$this->hasCondition($name)){
             throw new ValidationException("Undefined condition `{$name}`.");
         }
 
         $instance = $this->wire('conditions', $name);
-        if ($instance !== null) {
+        if ($instance !== null){
             return $instance;
         }
 
@@ -107,9 +107,9 @@ 
      */
     public function mapFunction($function)
     {
-        if (is_string($function)) {
+        if (is_string($function)){
             $function = $this->resolveAlias($function);
-            if (strpos($function, ':') !== false) {
+            if (strpos($function, ':') !== false){
                 $function = explode(':', $function);
             }
         }
@@ -124,11 +124,11 @@ 
      */
     private function wire(string $section, string $name): ?Autowire
     {
-        if (is_string($this->config[$section][$name])) {
+        if (is_string($this->config[$section][$name])){
             return new Autowire($this->config[$section][$name]);
         }
 
-        if (isset($this->config[$section][$name]['class'])) {
+        if (isset($this->config[$section][$name]['class'])){
             return new Autowire(
                 $this->config[$section][$name]['class'],
                 $this->config[$section][$name]['options'] ?? []
@@ -146,7 +146,7 @@ 
      */
     private function normalizeAliases(array $aliases): array
     {
-        return array_map(static function ($value) {
+        return array_map(static function ($value){
             return str_replace('::', ':', $value);
         }, $aliases);
     }

Braces +20 added lines, -10 removed lines

@@ -37,7 +37,8 @@ 
     public function __construct(array $config = [])
     {
         parent::__construct($config);
-        if (!empty($this->config['aliases'])) {
+        if (!empty($this->config['aliases']))
+        {
             $this->config['aliases'] = $this->normalizeAliases($this->config['aliases']);
         }
     }
@@ -59,12 +60,14 @@ 
      */
     public function getChecker(string $name): Autowire
     {
-        if (!$this->hasChecker($name)) {
+        if (!$this->hasChecker($name))
+        {
             throw new ValidationException("Undefined checker `{$name}``.");
         }
 
         $instance = $this->wire('checkers', $name);
-        if ($instance !== null) {
+        if ($instance !== null)
+        {
             return $instance;
         }
 
@@ -86,12 +89,14 @@ 
      */
     public function getCondition(string $name): Autowire
     {
-        if (!$this->hasCondition($name)) {
+        if (!$this->hasCondition($name))
+        {
             throw new ValidationException("Undefined condition `{$name}`.");
         }
 
         $instance = $this->wire('conditions', $name);
-        if ($instance !== null) {
+        if ($instance !== null)
+        {
             return $instance;
         }
 
@@ -107,9 +112,11 @@ 
      */
     public function mapFunction($function)
     {
-        if (is_string($function)) {
+        if (is_string($function))
+        {
             $function = $this->resolveAlias($function);
-            if (strpos($function, ':') !== false) {
+            if (strpos($function, ':') !== false)
+            {
                 $function = explode(':', $function);
             }
         }
@@ -124,11 +131,13 @@ 
      */
     private function wire(string $section, string $name): ?Autowire
     {
-        if (is_string($this->config[$section][$name])) {
+        if (is_string($this->config[$section][$name]))
+        {
             return new Autowire($this->config[$section][$name]);
         }
 
-        if (isset($this->config[$section][$name]['class'])) {
+        if (isset($this->config[$section][$name]['class']))
+        {
             return new Autowire(
                 $this->config[$section][$name]['class'],
                 $this->config[$section][$name]['options'] ?? []
@@ -146,7 +155,8 @@ 
      */
     private function normalizeAliases(array $aliases): array
     {
-        return array_map(static function ($value) {
+        return array_map(static function ($value)
+        {
             return str_replace('::', ':', $value);
         }, $aliases);
     }

src/Validation/src/RuleParser.php

Spacing +18 added lines, -18 removed lines

@@ -29,8 +29,8 @@ 
     {
         $rules = is_array($rules) ? $rules : [$rules];
 
-        foreach ($rules as $rule) {
-            if ($rule instanceof \Closure) {
+        foreach ($rules as $rule){
+            if ($rule instanceof \Closure){
                 yield null => $rule;
                 continue;
             }
@@ -44,17 +44,17 @@ 
      */
     public function parseCheck($chunk)
     {
-        if (is_string($chunk)) {
+        if (is_string($chunk)){
             $function = str_replace('::', ':', $chunk);
-        } else {
-            if (!is_array($chunk) || !isset($chunk[0])) {
+        }else{
+            if (!is_array($chunk) || !isset($chunk[0])){
                 throw new ParserException('Validation rule does not define any check.');
             }
 
             $function = $chunk[0];
         }
 
-        if (is_string($function)) {
+        if (is_string($function)){
             return str_replace('::', ':', $function);
         }
 
@@ -66,18 +66,18 @@ 
      */
     public function parseArgs($chunk): array
     {
-        if (!is_array($chunk)) {
+        if (!is_array($chunk)){
             return [];
         }
 
-        foreach (self::ARGUMENTS as $index) {
-            if (isset($chunk[$index])) {
+        foreach (self::ARGUMENTS as $index){
+            if (isset($chunk[$index])){
                 return $chunk[$index];
             }
         }
 
         unset($chunk[0]);
-        foreach (array_merge(self::MESSAGES, self::CONDITIONS) as $index) {
+        foreach (array_merge(self::MESSAGES, self::CONDITIONS) as $index){
             unset($chunk[$index]);
         }
 
@@ -89,12 +89,12 @@ 
      */
     public function parseMessage($chunk): ?string
     {
-        if (!is_array($chunk)) {
+        if (!is_array($chunk)){
             return null;
         }
 
-        foreach (self::MESSAGES as $index) {
-            if (isset($chunk[$index])) {
+        foreach (self::MESSAGES as $index){
+            if (isset($chunk[$index])){
                 return $chunk[$index];
             }
         }
@@ -107,13 +107,13 @@ 
      */
     public function parseConditions($chunk): array
     {
-        foreach (self::CONDITIONS as $index) {
-            if (isset($chunk[$index])) {
+        foreach (self::CONDITIONS as $index){
+            if (isset($chunk[$index])){
                 $conditions = [];
-                foreach ((array)$chunk[$index] as $key => $value) {
-                    if (is_numeric($key)) {
+                foreach ((array)$chunk[$index] as $key => $value){
+                    if (is_numeric($key)){
                         $conditions[$value] = [];
-                    } else {
+                    }else{
                         $conditions[$key] = (array)$value;
                     }
                 }

Braces +38 added lines, -18 removed lines

@@ -29,8 +29,10 @@ 
     {
         $rules = is_array($rules) ? $rules : [$rules];
 
-        foreach ($rules as $rule) {
-            if ($rule instanceof \Closure) {
+        foreach ($rules as $rule)
+        {
+            if ($rule instanceof \Closure)
+            {
                 yield null => $rule;
                 continue;
             }
@@ -44,17 +46,22 @@ 
      */
     public function parseCheck($chunk)
     {
-        if (is_string($chunk)) {
+        if (is_string($chunk))
+        {
             $function = str_replace('::', ':', $chunk);
-        } else {
-            if (!is_array($chunk) || !isset($chunk[0])) {
+        }
+        else
+        {
+            if (!is_array($chunk) || !isset($chunk[0]))
+            {
                 throw new ParserException('Validation rule does not define any check.');
             }
 
             $function = $chunk[0];
         }
 
-        if (is_string($function)) {
+        if (is_string($function))
+        {
             return str_replace('::', ':', $function);
         }
 
@@ -66,18 +73,22 @@ 
      */
     public function parseArgs($chunk): array
     {
-        if (!is_array($chunk)) {
+        if (!is_array($chunk))
+        {
             return [];
         }
 
-        foreach (self::ARGUMENTS as $index) {
-            if (isset($chunk[$index])) {
+        foreach (self::ARGUMENTS as $index)
+        {
+            if (isset($chunk[$index]))
+            {
                 return $chunk[$index];
             }
         }
 
         unset($chunk[0]);
-        foreach (array_merge(self::MESSAGES, self::CONDITIONS) as $index) {
+        foreach (array_merge(self::MESSAGES, self::CONDITIONS) as $index)
+        {
             unset($chunk[$index]);
         }
 
@@ -89,12 +100,15 @@ 
      */
     public function parseMessage($chunk): ?string
     {
-        if (!is_array($chunk)) {
+        if (!is_array($chunk))
+        {
             return null;
         }
 
-        foreach (self::MESSAGES as $index) {
-            if (isset($chunk[$index])) {
+        foreach (self::MESSAGES as $index)
+        {
+            if (isset($chunk[$index]))
+            {
                 return $chunk[$index];
             }
         }
@@ -107,13 +121,19 @@ 
      */
     public function parseConditions($chunk): array
     {
-        foreach (self::CONDITIONS as $index) {
-            if (isset($chunk[$index])) {
+        foreach (self::CONDITIONS as $index)
+        {
+            if (isset($chunk[$index]))
+            {
                 $conditions = [];
-                foreach ((array)$chunk[$index] as $key => $value) {
-                    if (is_numeric($key)) {
+                foreach ((array)$chunk[$index] as $key => $value)
+                {
+                    if (is_numeric($key))
+                    {
                         $conditions[$value] = [];
-                    } else {
+                    }
+                    else
+                    {
                         $conditions[$key] = (array)$value;
                     }
                 }

src/Validation/src/CheckerRule.php

Spacing +2 added lines, -2 removed lines

@@ -38,7 +38,7 @@ 
         string $method,
         array $args = [],
         ?string $message = null
-    ) {
+    ){
         $this->checker = $checker;
         $this->method = $method;
         $this->args = $args;
@@ -66,7 +66,7 @@ 
      */
     public function getMessage(string $field, $value): string
     {
-        if (!empty($this->message)) {
+        if (!empty($this->message)){
             return Translator::interpolate(
                 $this->message,
                 array_merge([$value, $field], $this->args)

Braces +2 added lines, -1 removed lines

@@ -66,7 +66,8 @@
      */
     public function getMessage(string $field, $value): string
     {
-        if (!empty($this->message)) {
+        if (!empty($this->message))
+        {
             return Translator::interpolate(
                 $this->message,
                 array_merge([$value, $field], $this->args)

src/Validation/src/Condition/WithoutAnyCondition.php

Spacing +2 added lines, -2 removed lines

@@ -27,8 +27,8 @@
      */
     public function isMet(ValidatorInterface $validator, string $field, $value): bool
     {
-        foreach ($this->options as $option) {
-            if (empty($validator->getValue($option))) {
+        foreach ($this->options as $option){
+            if (empty($validator->getValue($option))){
                 return true;
             }
         }

Braces +4 added lines, -2 removed lines

@@ -27,8 +27,10 @@
      */
     public function isMet(ValidatorInterface $validator, string $field, $value): bool
     {
-        foreach ($this->options as $option) {
-            if (empty($validator->getValue($option))) {
+        foreach ($this->options as $option)
+        {
+            if (empty($validator->getValue($option)))
+            {
                 return true;
             }
         }

src/Validation/src/Condition/NoneOfCondition.php

Spacing +2 added lines, -2 removed lines

@@ -32,8 +32,8 @@
      */
     public function isMet(ValidatorInterface $validator, string $field, $value): bool
     {
-        foreach ($this->compositor->makeConditions($field, $this->options) as $condition) {
-            if ($condition->isMet($validator, $field, $value)) {
+        foreach ($this->compositor->makeConditions($field, $this->options) as $condition){
+            if ($condition->isMet($validator, $field, $value)){
                 return false;
             }
         }

Braces +4 added lines, -2 removed lines

@@ -32,8 +32,10 @@
      */
     public function isMet(ValidatorInterface $validator, string $field, $value): bool
     {
-        foreach ($this->compositor->makeConditions($field, $this->options) as $condition) {
-            if ($condition->isMet($validator, $field, $value)) {
+        foreach ($this->compositor->makeConditions($field, $this->options) as $condition)
+        {
+            if ($condition->isMet($validator, $field, $value))
+            {
                 return false;
             }
         }