facile-it / validoo

src/Validoo/Validator.php

Doc Comments +1 added lines, -1 removed lines

@@ -72,7 +72,7 @@
 
     /**
      * @param string $lang
-     * @return null
+     * @return string
      */
     protected function getErrorFilePath(string $lang)
     {

Spacing +42 added lines, -42 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
@@ -55,9 +55,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;
             }
         }
     }
@@ -86,9 +86,9 @@ 
     protected function getDefaultErrorTexts(string $lang = null)
     {
         /* handle default error text file */
-        $default_error_texts = [];
-        if (file_exists(__DIR__ . "./errors/" . $lang . ".php")) {
-            $default_error_texts = include(__DIR__ . "./errors/" . $lang . ".php");
+        $default_error_texts = [ ];
+        if (file_exists(__DIR__."./errors/".$lang.".php")) {
+            $default_error_texts = include(__DIR__."./errors/".$lang.".php");
         }
         return $default_error_texts;
     }
@@ -100,7 +100,7 @@ 
     protected function getCustomErrorTexts(string $lang = null)
     {
         /* handle error text file for custom validators */
-        $custom_error_texts = [];
+        $custom_error_texts = [ ];
         if (file_exists($this->getErrorFilePath($lang)))
             $custom_error_texts = include($this->getErrorFilePath($lang));
         return $custom_error_texts;
@@ -112,8 +112,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;
         }
@@ -128,10 +128,10 @@ 
     {
         foreach ($params as $key => $param) {
             if (preg_match("#^:([a-zA-Z0-9_]+)$#", $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 ];
             }
         }
         return $params;
@@ -147,7 +147,7 @@ 
         if ($lang == null)
             $lang = $this->getDefaultLang();
 
-        $error_results = [];
+        $error_results = [ ];
         $default_error_texts = $this->getDefaultErrorTexts($lang);
         $custom_error_texts = $this->getCustomErrorTexts($lang);
         foreach ($this->errors as $input_name => $results) {
@@ -156,19 +156,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);
                 }
@@ -176,10 +176,10 @@ 
                  * 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);
             }
         }
         return $error_results;
@@ -193,8 +193,8 @@ 
     public function has(string $input_name, string $rule_name = null): bool
     {
         if ($rule_name != null)
-            return isset($this->errors[$input_name][$rule_name]);
-        return isset($this->errors[$input_name]);
+            return isset($this->errors[ $input_name ][ $rule_name ]);
+        return isset($this->errors[ $input_name ]);
     }
 
     /**
@@ -214,13 +214,13 @@ 
     {
         if (preg_match("#^([a-zA-Z0-9_]+)\((.+?)\)$#", $rule, $matches)) {
             return [
-                'rule' => $matches[1],
-                'params' => explode(",", $matches[2])
+                'rule' => $matches[ 1 ],
+                'params' => explode(",", $matches[ 2 ])
             ];
         }
         return [
             'rule' => $rule,
-            'params' => []
+            'params' => [ ]
         ];
     }
 
@@ -234,7 +234,7 @@ 
     {
         foreach ($params as $key => $param) {
             if (preg_match("#^:([a-zA-Z0-9_]+)$#", $param, $param_type)) {
-                $params[$key] = @$inputs[(string)$param_type[1]];
+                $params[ $key ] = @$inputs[ (string) $param_type[ 1 ] ];
             }
         }
         return $params;
@@ -253,10 +253,10 @@ 
         foreach ($rules as $input => $input_rules) {
             if (is_array($input_rules)) {
                 foreach ($input_rules as $rule => $closure) {
-                    if (!isset($inputs[(string)$input]))
+                    if (!isset($inputs[ (string) $input ]))
                         $input_value = null;
                     else
-                        $input_value = $inputs[(string)$input];
+                        $input_value = $inputs[ (string) $input ];
                     /**
                      * if the key of the $input_rules is numeric that means
                      * it's neither an anonymous nor an user function.
@@ -265,8 +265,8 @@ 
                         $rule = $closure;
                     }
                     $rule_and_params = static::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 = static::getParamValues($params, $inputs);
                     array_unshift($params, $input_value);
                     /**
@@ -289,8 +289,8 @@ 
                         throw new ValidooException(ValidooException::UNKNOWN_RULE, $rule);
                     }
                     if ($validation == false) {
-                        $errors[(string)$input][(string)$rule]['result'] = false;
-                        $errors[(string)$input][(string)$rule]['params'] = $real_params;
+                        $errors[ (string) $input ][ (string) $rule ][ 'result' ] = false;
+                        $errors[ (string) $input ][ (string) $rule ][ 'params' ] = $real_params;
                     }
                 }
             } else {
@@ -333,7 +333,7 @@ 
      */
     protected static function integer($input): bool
     {
-        return is_int($input) || ($input == (string)(int)$input);
+        return is_int($input) || ($input == (string) (int) $input);
     }
 
     /**
@@ -342,7 +342,7 @@ 
      */
     protected static function float($input): bool
     {
-        return is_float($input) || ($input == (string)(float)$input);
+        return is_float($input) || ($input == (string) (float) $input);
     }
 
     /**

Braces +22 added lines, -16 removed lines

@@ -101,8 +101,9 @@ 
     {
         /* handle error text file for custom validators */
         $custom_error_texts = [];
-        if (file_exists($this->getErrorFilePath($lang)))
-            $custom_error_texts = include($this->getErrorFilePath($lang));
+        if (file_exists($this->getErrorFilePath($lang))) {
+                    $custom_error_texts = include($this->getErrorFilePath($lang));
+        }
         return $custom_error_texts;
     }
 
@@ -128,10 +129,11 @@ 
     {
         foreach ($params as $key => $param) {
             if (preg_match("#^:([a-zA-Z0-9_]+)$#", $param, $param_type)) {
-                if (isset($this->namings[(string)$param_type[1]]))
-                    $params[$key] = $this->namings[(string)$param_type[1]];
-                else
-                    $params[$key] = $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];
+                }
             }
         }
         return $params;
@@ -144,8 +146,9 @@ 
      */
     public function getErrors(string $lang = null): array
     {
-        if ($lang == null)
-            $lang = $this->getDefaultLang();
+        if ($lang == null) {
+                    $lang = $this->getDefaultLang();
+        }
 
         $error_results = [];
         $default_error_texts = $this->getDefaultErrorTexts($lang);
@@ -175,9 +178,10 @@ 
                 /**
                  * handle :params(..)
                  */
-                if (preg_match_all("#:params\((.+?)\)#", $error_message, $param_indexes))
-                    foreach ($param_indexes[1] as $param_index) {
+                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);
+                }
                     }
                 $error_results[] = str_replace(":attribute", $named_input, $error_message);
             }
@@ -192,8 +196,9 @@ 
      */
     public function has(string $input_name, string $rule_name = null): bool
     {
-        if ($rule_name != null)
-            return isset($this->errors[$input_name][$rule_name]);
+        if ($rule_name != null) {
+                    return isset($this->errors[$input_name][$rule_name]);
+        }
         return isset($this->errors[$input_name]);
     }
 
@@ -253,10 +258,11 @@ 
         foreach ($rules as $input => $input_rules) {
             if (is_array($input_rules)) {
                 foreach ($input_rules as $rule => $closure) {
-                    if (!isset($inputs[(string)$input]))
-                        $input_value = null;
-                    else
-                        $input_value = $inputs[(string)$input];
+                    if (!isset($inputs[(string)$input])) {
+                                            $input_value = null;
+                    } else {
+                                            $input_value = $inputs[(string)$input];
+                    }
                     /**
                      * if the key of the $input_rules is numeric that means
                      * it's neither an anonymous nor an user function.

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);
     }
 
 }