facile-it / validoo

src/Validoo/Validator.php

Spacing +44 added lines, -44 removed lines

@@ -20,13 +20,13 @@ 
 {
 
     /** @var array */
-    private $errors = [];
+    private $errors = [ ];
     /** @var array */
-    private $namings = [];
+    private $namings = [ ];
     /** @var array */
-    private $customErrorsWithInputName = [];
+    private $customErrorsWithInputName = [ ];
     /** @var array */
-    private $customErrors = [];
+    private $customErrors = [ ];
 
     /**
      * Constructor is not allowed because Validoo uses its own
@@ -58,14 +58,14 @@ 
             if (!is_array($input_rules))
                 throw new ValidooException(ValidooException::ARRAY_EXPECTED, $input);
 
-            if (in_array("onlyifset", $input_rules) && !isset($inputs[$input]))
+            if (in_array("onlyifset", $input_rules) && !isset($inputs[ $input ]))
                 continue;
 
             foreach ($input_rules as $rule => $closure) {
-                if (!isset($inputs[$input])) {
+                if (!isset($inputs[ $input ])) {
                     $input_value = null;
                 } else {
-                    $input_value = $inputs[$input];
+                    $input_value = $inputs[ $input ];
                 }
                 if (is_numeric($rule)) {
                     $rule = $closure;
@@ -74,14 +74,14 @@ 
                     continue;
 
                 $rule_and_params = self::getParams($rule);
-                $params = $real_params = $rule_and_params['params'];
-                $rule = $rule_and_params['rule'];
+                $params = $real_params = $rule_and_params[ 'params' ];
+                $rule = $rule_and_params[ 'rule' ];
                 $params = self::getParamValues($params, $inputs);
                 array_unshift($params, $input_value);
 
                 if (false == self::doValidation($closure, $params, $rule)) {
-                    $errors[$input][$rule]['result'] = false;
-                    $errors[$input][$rule]['params'] = $real_params;
+                    $errors[ $input ][ $rule ][ 'result' ] = false;
+                    $errors[ $input ][ $rule ][ 'params' ] = $real_params;
                 }
             }
 
@@ -124,13 +124,13 @@ 
     {
         if (preg_match("#^([\w]+)\((.+?)\)$#", $rule, $matches)) {
             return [
-                'rule' => $matches[1],
-                'params' => explode(',', $matches[2])
+                'rule' => $matches[ 1 ],
+                'params' => explode(',', $matches[ 2 ])
             ];
         }
         return [
             'rule' => $rule,
-            'params' => []
+            'params' => [ ]
         ];
     }
 
@@ -145,7 +145,7 @@ 
     {
         foreach ($params as $key => $param) {
             if (preg_match("#^:([\w]+)$#", $param, $param_type)) {
-                $params[$key] = @$inputs[(string)$param_type[1]];
+                $params[ $key ] = @$inputs[ (string) $param_type[ 1 ] ];
             }
         }
         return $params;
@@ -193,7 +193,7 @@ 
      */
     protected static function integer($input): bool
     {
-        return is_int($input) || ($input == (string)(int)$input);
+        return is_int($input) || ($input == (string) (int) $input);
     }
 
     /**
@@ -202,7 +202,7 @@ 
      */
     protected static function float($input): bool
     {
-        return is_float($input) || ($input == (string)(float)$input);
+        return is_float($input) || ($input == (string) (float) $input);
     }
 
     /**
@@ -307,9 +307,9 @@ 
             // handle input.rule eg (name.required)
             if (preg_match("#^(.+?)\.(.+?)$#", $key, $matches)) {
                 // $this->customErrorsWithInputName[name][required] = error message
-                $this->customErrorsWithInputName[(string)$matches[1]][(string)$matches[2]] = $value;
+                $this->customErrorsWithInputName[ (string) $matches[ 1 ] ][ (string) $matches[ 2 ] ] = $value;
             } else {
-                $this->customErrors[(string)$key] = $value;
+                $this->customErrors[ (string) $key ] = $value;
             }
         }
     }
@@ -325,7 +325,7 @@ 
             $lang = $this->getDefaultLang();
         }
 
-        $error_results = [];
+        $error_results = [ ];
         $default_error_texts = $this->getDefaultErrorTexts($lang);
 
         foreach ($this->errors as $input_name => $results) {
@@ -334,19 +334,19 @@ 
                 /**
                  * if parameters are input name they should be named as well
                  */
-                $result['params'] = $this->handleParameterNaming($result['params']);
+                $result[ 'params' ] = $this->handleParameterNaming($result[ 'params' ]);
                 // if there is a custom message with input name, apply it
-                if (isset($this->customErrorsWithInputName[(string)$input_name][(string)$rule])) {
-                    $error_message = $this->customErrorsWithInputName[(string)$input_name][(string)$rule];
+                if (isset($this->customErrorsWithInputName[ (string) $input_name ][ (string) $rule ])) {
+                    $error_message = $this->customErrorsWithInputName[ (string) $input_name ][ (string) $rule ];
                 } // if there is a custom message for the rule, apply it
-                else if (isset($this->customErrors[(string)$rule])) {
-                    $error_message = $this->customErrors[(string)$rule];
+                else if (isset($this->customErrors[ (string) $rule ])) {
+                    $error_message = $this->customErrors[ (string) $rule ];
                 } // if there is a custom validator try to fetch from its error file
-                else if (isset($custom_error_texts[(string)$rule])) {
-                    $error_message = $custom_error_texts[(string)$rule];
+                else if (isset($custom_error_texts[ (string) $rule ])) {
+                    $error_message = $custom_error_texts[ (string) $rule ];
                 } // if none try to fetch from default error file
-                else if (isset($default_error_texts[(string)$rule])) {
-                    $error_message = $default_error_texts[(string)$rule];
+                else if (isset($default_error_texts[ (string) $rule ])) {
+                    $error_message = $default_error_texts[ (string) $rule ];
                 } else {
                     throw new ValidooException(ValidooException::NO_ERROR_TEXT, $rule);
                 }
@@ -354,11 +354,11 @@ 
                  * handle :params(..)
                  */
                 if (preg_match_all("#:params\((.+?)\)#", $error_message, $param_indexes)) {
-                    foreach ($param_indexes[1] as $param_index) {
-                        $error_message = str_replace(':params(' . $param_index . ')', $result['params'][$param_index], $error_message);
+                    foreach ($param_indexes[ 1 ] as $param_index) {
+                        $error_message = str_replace(':params('.$param_index.')', $result[ 'params' ][ $param_index ], $error_message);
                     }
                 }
-                $error_results[] = str_replace(':attribute', $named_input, $error_message);
+                $error_results[ ] = str_replace(':attribute', $named_input, $error_message);
             }
         }
 
@@ -387,13 +387,13 @@ 
     protected function getDefaultErrorTexts(string $lang = null)
     {
         /* handle default error text file */
-        $default_error_texts = [];
-        if (file_exists(__DIR__ . '/errors/' . $lang . '.php')) {
+        $default_error_texts = [ ];
+        if (file_exists(__DIR__.'/errors/'.$lang.'.php')) {
             /** @noinspection PhpIncludeInspection */
-            $default_error_texts = include __DIR__ . '/errors/' . $lang . '.php';
+            $default_error_texts = include __DIR__.'/errors/'.$lang.'.php';
         }
-        if (file_exists(__DIR__ . '/errors/' . $lang . '.json')) {
-            $default_error_texts = json_decode(file_get_contents(__DIR__ . '/errors/' . $lang . '.json'), true);
+        if (file_exists(__DIR__.'/errors/'.$lang.'.json')) {
+            $default_error_texts = json_decode(file_get_contents(__DIR__.'/errors/'.$lang.'.json'), true);
         }
 
 
@@ -406,8 +406,8 @@ 
      */
     protected function handleNaming(string $input_name)
     {
-        if (isset($this->namings[$input_name])) {
-            $named_input = $this->namings[$input_name];
+        if (isset($this->namings[ $input_name ])) {
+            $named_input = $this->namings[ $input_name ];
         } else {
             $named_input = $input_name;
         }
@@ -423,10 +423,10 @@ 
     {
         foreach ($params as $key => $param) {
             if (preg_match("#^:([\w]+)$#", $param, $param_type)) {
-                if (isset($this->namings[(string)$param_type[1]])) {
-                    $params[$key] = $this->namings[(string)$param_type[1]];
+                if (isset($this->namings[ (string) $param_type[ 1 ] ])) {
+                    $params[ $key ] = $this->namings[ (string) $param_type[ 1 ] ];
                 } else {
-                    $params[$key] = $param_type[1];
+                    $params[ $key ] = $param_type[ 1 ];
                 }
             }
         }
@@ -442,10 +442,10 @@ 
     public function has(string $input_name, string $rule_name = null): bool
     {
         if (null !== $rule_name) {
-            return isset($this->errors[$input_name][$rule_name]);
+            return isset($this->errors[ $input_name ][ $rule_name ]);
         }
 
-        return isset($this->errors[$input_name]);
+        return isset($this->errors[ $input_name ]);
     }
 
     /**

Braces +18 added lines, -12 removed lines

@@ -52,14 +52,17 @@ 
         $errors = null;
         foreach ($rules as $input => $input_rules) {
 
-            if (is_string($input_rules))
-                $input_rules = explode("|", $input_rules);
+            if (is_string($input_rules)) {
+                            $input_rules = explode("|", $input_rules);
+            }
 
-            if (!is_array($input_rules))
-                throw new ValidooException(ValidooException::ARRAY_EXPECTED, $input);
+            if (!is_array($input_rules)) {
+                            throw new ValidooException(ValidooException::ARRAY_EXPECTED, $input);
+            }
 
-            if (in_array("onlyifset", $input_rules) && !isset($inputs[$input]))
-                continue;
+            if (in_array("onlyifset", $input_rules) && !isset($inputs[$input])) {
+                            continue;
+            }
 
             foreach ($input_rules as $rule => $closure) {
                 if (!isset($inputs[$input])) {
@@ -70,8 +73,9 @@ 
                 if (is_numeric($rule)) {
                     $rule = $closure;
                 }
-                if ('onlyifset' == $rule)
-                    continue;
+                if ('onlyifset' == $rule) {
+                                    continue;
+                }
 
                 $rule_and_params = self::getParams($rule);
                 $params = $real_params = $rule_and_params['params'];
@@ -157,10 +161,12 @@ 
      */
     protected static function required($input = null): bool
     {
-        if (is_string($input))
-            $input = trim($input);
-        if (is_numeric($input))
-            return true;
+        if (is_string($input)) {
+                    $input = trim($input);
+        }
+        if (is_numeric($input)) {
+                    return true;
+        }
 
         return (null !== $input && !empty($input));
     }

src/Validoo/ValidooException.php

Spacing +1 added lines, -1 removed lines

@@ -20,7 +20,7 @@
             static::UNKNOWN_RULE => "Unknown Rule: :param",
             static::ARRAY_EXPECTED => "Rules are expected to Array. Input Name: :param"
         ];
-        parent::__construct(str_replace(":param", $param, static::$error_messages[$code]), $code);
+        parent::__construct(str_replace(":param", $param, static::$error_messages[ $code ]), $code);
     }
 
 }