hnrazevedo / Validator

src/Rules.php

Indentation +11 added lines, -11 removed lines

@@ -9,30 +9,30 @@
 
     public function __construct(object $model)
     {
-	    $this->form['model'] = ucfirst(get_class($model));
-	}
+        $this->form['model'] = ucfirst(get_class($model));
+    }
 
     public function setAction(string $action): Rules
     {
-	    $this->action = $action;
-	    return $this;
-	}
+        $this->action = $action;
+        return $this;
+    }
 
     public function addField(string $field, array $test): Rules
     {
-	    if(empty($this->action)){
+        if(empty($this->action)){
             self::$errors[] = "Form action not registered.";
         }
 
-	    if(empty($this->form[$this->action][$field])){
+        if(empty($this->form[$this->action][$field])){
             $this->form[$this->action][$field] = $test;
         }
 
-	    return $this;
-  	}
+        return $this;
+        }
 
     public function getRules(string $action): ?array
     {
-		return (array_key_exists($action, $this->form)) ? $this->form[$action] : null;
-	}
+        return (array_key_exists($action, $this->form)) ? $this->form[$action] : null;
+    }
 }

Spacing +3 added lines, -3 removed lines

@@ -2,7 +2,7 @@ 
 
 namespace HnrAzevedo\Validator;
 
-Class Rules{
+Class Rules {
     private string $action;
     protected static array $errors = [];
 
@@ -21,11 +21,11 @@ 
 
     public function addField(string $field, array $test): Rules
     {
-	    if(empty($this->action)){
+	    if (empty($this->action)) {
             self::$errors[] = "Form action not registered.";
         }
 
-	    if(empty($this->form[$this->action][$field])){
+	    if (empty($this->form[$this->action][$field])) {
             $this->form[$this->action][$field] = $test;
         }
 

examples/Rules/User.php

Indentation +9 added lines, -9 removed lines

@@ -12,15 +12,15 @@
 
         Validator::add($this, function(Rules $rules){
             $rules->setAction('login')
-                  //->addField('email',['minlength'=>1,'regex'=>'/^[_a-z0-9-]+(\.[_a-z0-9-]+)*@[a-z0-9-]+(\.[a-z0-9-]+)*(\.[a-z]{2,3})$/','required'=>true])
-                  ->addField('email',['minlength'=>1,'filter'=>FILTER_VALIDATE_EMAIL,'required'=>true])
-                  ->addField('password',['minlength'=>6,'maxlength'=>20,'required'=>true])
-                  ->addField('password2',['equals'=>'password','required'=>true])
-                  ->addField('remember',['minlength'=>2,'maxlength'=>2,'required'=>false])
-                  ->addField('birth',['type'=>'date','required'=>true])
-                  ->addField('phones',['mincount'=>2,'maxcount'=>3,'required'=>true,'minlength'=>8,'maxlength'=>9]);
-
-			return $rules;
+                    //->addField('email',['minlength'=>1,'regex'=>'/^[_a-z0-9-]+(\.[_a-z0-9-]+)*@[a-z0-9-]+(\.[a-z0-9-]+)*(\.[a-z]{2,3})$/','required'=>true])
+                    ->addField('email',['minlength'=>1,'filter'=>FILTER_VALIDATE_EMAIL,'required'=>true])
+                    ->addField('password',['minlength'=>6,'maxlength'=>20,'required'=>true])
+                    ->addField('password2',['equals'=>'password','required'=>true])
+                    ->addField('remember',['minlength'=>2,'maxlength'=>2,'required'=>false])
+                    ->addField('birth',['type'=>'date','required'=>true])
+                    ->addField('phones',['mincount'=>2,'maxcount'=>3,'required'=>true,'minlength'=>8,'maxlength'=>9]);
+
+            return $rules;
         });
 
         return $this;

Spacing +8 added lines, -8 removed lines

@@ -5,20 +5,20 @@
 use HnrAzevedo\Validator\Validator;
 use HnrAzevedo\Validator\Rules;
 
-Class User{
+Class User {
 
     public function __construct()
     {
 
-        Validator::add($this, function(Rules $rules){
+        Validator::add($this, function(Rules $rules) {
             $rules->setAction('login')
                   //->addField('email',['minlength'=>1,'regex'=>'/^[_a-z0-9-]+(\.[_a-z0-9-]+)*@[a-z0-9-]+(\.[a-z0-9-]+)*(\.[a-z]{2,3})$/','required'=>true])
-                  ->addField('email',['minlength'=>1,'filter'=>FILTER_VALIDATE_EMAIL,'required'=>true])
-                  ->addField('password',['minlength'=>6,'maxlength'=>20,'required'=>true])
-                  ->addField('password2',['equals'=>'password','required'=>true])
-                  ->addField('remember',['minlength'=>2,'maxlength'=>2,'required'=>false])
-                  ->addField('birth',['type'=>'date','required'=>true])
-                  ->addField('phones',['mincount'=>2,'maxcount'=>3,'required'=>true,'minlength'=>8,'maxlength'=>9]);
+                  ->addField('email', ['minlength'=>1, 'filter'=>FILTER_VALIDATE_EMAIL, 'required'=>true])
+                  ->addField('password', ['minlength'=>6, 'maxlength'=>20, 'required'=>true])
+                  ->addField('password2', ['equals'=>'password', 'required'=>true])
+                  ->addField('remember', ['minlength'=>2, 'maxlength'=>2, 'required'=>false])
+                  ->addField('birth', ['type'=>'date', 'required'=>true])
+                  ->addField('phones', ['mincount'=>2, 'maxcount'=>3, 'required'=>true, 'minlength'=>8, 'maxlength'=>9]);
 
 			return $rules;
         });

src/ExtraCheck.php

Spacing +7 added lines, -7 removed lines

@@ -2,7 +2,7 @@ 
 
 namespace HnrAzevedo\Validator;
 
-Trait ExtraCheck{
+Trait ExtraCheck {
     protected static array $data = [];
     protected static array $validators = [];
     protected static string $model = '';
@@ -11,9 +11,9 @@ 
 
     protected static function checkRequireds()
     {
-        if(count(self::$required) > 0){
+        if (count(self::$required)>0) {
             self::$errors[] = [
-                'As seguintes informações não poderam ser validadas: '.implode(', ',array_keys(self::$required)).'.'
+                'As seguintes informações não poderam ser validadas: '.implode(', ', array_keys(self::$required)).'.'
             ];
         }
     }
@@ -21,22 +21,22 @@ 
     public static function validateDate($date, $format = 'Y-m-d H:i:s')
     {
         $d = \DateTime::createFromFormat($format, $date);
-        return $d && $d->format($format) == $date;
+        return $d && $d->format($format)==$date;
     }
 
     protected static function checkRequired(string $param): bool
     {
-        return (array_key_exists('required',self::$validators[self::$model]->getRules(self::$data['role'])[$param]) && self::$validators[self::$model]->getRules(self::$data['role'])[$param]['required']);
+        return (array_key_exists('required', self::$validators[self::$model]->getRules(self::$data['role'])[$param]) && self::$validators[self::$model]->getRules(self::$data['role'])[$param]['required']);
     }
 
     protected static function toNext(string $param, $value)
     {
-        return (self::checkRequired($param) || strlen($value > 0));
+        return (self::checkRequired($param) || strlen($value>0));
     }
 
     protected static function testArray(string $param, $value): ?array
     {
-        if(!is_array(json_decode($value))){
+        if (!is_array(json_decode($value))) {
             self::$errors[] = [
                 $param => 'Era esperado uma informação em formato array para está informação.'
             ];

src/Check.php

Spacing +22 added lines, -22 removed lines

@@ -2,23 +2,23 @@ 
 
 namespace HnrAzevedo\Validator;
 
-Trait Check{
+Trait Check {
     use ExtraCheck;
 
     protected static function checkMinlength(string $param, $value)
     {
-        if(self::toNext($param,$value)){    
+        if (self::toNext($param, $value)) {    
             
             $realval = (is_array(json_decode(self::$data['data'])->$param)) ? json_decode(self::$data['data'])->$param : [json_decode(self::$data['data'])->$param];
 
-            foreach($realval as $val){
-                if(strlen($val) === 0) {
+            foreach ($realval as $val) {
+                if (strlen($val)===0) {
                     self::$errors[] = [
                         $param => 'é obrigatório.'
                     ];
                     continue;
                 }
-                if($value > strlen($val)) {
+                if ($value>strlen($val)) {
                     self::$errors[] = [
                         $param => 'não atingiu o mínimo de caracteres esperado.'
                     ];
@@ -29,13 +29,13 @@ 
 
     protected static function checkRegex(string $param, $value)
     {
-        if(self::toNext($param,$value)){
+        if (self::toNext($param, $value)) {
 
             $realval = (is_array(json_decode(self::$data['data'])->$param)) ? json_decode(self::$data['data'])->$param : [json_decode(self::$data['data'])->$param];
 
-            foreach($realval as $val){
+            foreach ($realval as $val) {
 
-                if(!preg_match(self::$validators[self::$model]->getRules(self::$data['role'])[$param]['regex'], $val)){
+                if (!preg_match(self::$validators[self::$model]->getRules(self::$data['role'])[$param]['regex'], $val)) {
                     self::$errors[] = [
                         $param => 'inválido(a).'
                     ];
@@ -47,9 +47,9 @@ 
 
     protected static function checkMincount(string $param, $value)
     {
-        if(self::toNext($param,$value)){
+        if (self::toNext($param, $value)) {
             $array = self::testArray($param, json_decode(self::$data['data'])->$param);
-            if(count($array) < $value){
+            if (count($array)<$value) {
                 self::$errors[] = [
                     $param => 'não atingiu o mínimo esperado.'
                 ];
@@ -59,9 +59,9 @@ 
 
     protected static function checkMaxcount(string $param, $value)
     {
-        if(self::toNext($param,$value)){
+        if (self::toNext($param, $value)) {
             $array = self::testArray($param, json_decode(self::$data['data'])->$param);
-            if(count($array) > $value){
+            if (count($array)>$value) {
                 self::$errors[] = [
                     $param => 'ultrapassou o esperado.'
                 ];
@@ -71,15 +71,15 @@ 
 
     protected static function checkEquals(string $param, $value)
     {
-        if(self::toNext($param,$value)){
+        if (self::toNext($param, $value)) {
 
-            if(!array_key_exists($param,json_decode(self::$data['data'],true))){
+            if (!array_key_exists($param, json_decode(self::$data['data'], true))) {
                 self::$errors[] = [
                     $param => "O servidor não encontrou a informação '{$value}' para ser comparada."
                 ];
             }
             
-            if(json_decode(self::$data['data'])->$param != json_decode(self::$data['data'],true)[$value]){
+            if (json_decode(self::$data['data'])->$param!=json_decode(self::$data['data'], true)[$value]) {
                 self::$errors[] = [
                     $param => 'está diferente de '.ucfirst($value)
                 ];
@@ -90,13 +90,13 @@ 
 
     protected static function checkMaxlength(string $param, $value)
     {
-        if(self::toNext($param,$value)){
+        if (self::toNext($param, $value)) {
 
             $realval = (is_array(json_decode(self::$data['data'])->$param)) ? json_decode(self::$data['data'])->$param : [json_decode(self::$data['data'])->$param];
 
-            foreach($realval as $val){
+            foreach ($realval as $val) {
 
-                if($value < strlen($val)) {
+                if ($value<strlen($val)) {
                     self::$errors[] = [
                         $param => 'ultrapassou o máximo de caracteres esperado.'
                     ];
@@ -108,11 +108,11 @@ 
 
     protected static function checkType(string $param, $value)
     {
-        if(self::toNext($param,$value)){
+        if (self::toNext($param, $value)) {
 
             switch ($value) {
                 case 'date':
-                    if(!self::validateDate(json_decode(self::$data['data'])->$param , 'd/m/Y')){
+                    if (!self::validateDate(json_decode(self::$data['data'])->$param, 'd/m/Y')) {
                         self::$errors[] = [
                             $param => 'não é uma data válida.'
                         ];
@@ -124,9 +124,9 @@ 
 
     protected static function checkFilter(string $param, $value)
     {
-        if(self::toNext($param,$value)){
+        if (self::toNext($param, $value)) {
 
-            if(!filter_var(json_decode(self::$data['data'])->$param, $value)){
+            if (!filter_var(json_decode(self::$data['data'])->$param, $value)) {
                 self::$errors[] = [
                     $param => 'não passou pela filtragem de dados.'
                 ];

src/Validator.php

Indentation +12 added lines, -12 removed lines

@@ -62,7 +62,7 @@ 
 
     public static function checkDatas()
     {
-		self::existData();
+        self::existData();
         self::jsonData();
         self::hasProvider();
         self::hasRole();
@@ -78,9 +78,9 @@ 
             
         self::$model = self::getClass($model);
 
-		self::existRole(self::$model);
+        self::existRole(self::$model);
             
-		foreach ( (self::$validators[self::$model]->getRules($datas['role'])) as $key => $value) {
+        foreach ( (self::$validators[self::$model]->getRules($datas['role'])) as $key => $value) {
             if(@$value['required'] === true){
                 self::$required[$key] = $value;
             }
@@ -92,7 +92,7 @@ 
         
         self::checkRequireds();
 				
-		return self::checkErrors();
+        return self::checkErrors();
     }
 
     public static function checkErrors(): bool
@@ -104,23 +104,23 @@ 
     {
         foreach ( (self::$validators[self::$model]->getRules(self::$data['role'])) as $key => $value) {
 
-			foreach (json_decode(self::$data['data']) as $keyy => $valuee) {
+            foreach (json_decode(self::$data['data']) as $keyy => $valuee) {
 
-				if(!array_key_exists($keyy, (self::$validators[self::$model]->getRules(self::$data['role'])) )){
+                if(!array_key_exists($keyy, (self::$validators[self::$model]->getRules(self::$data['role'])) )){
                     throw new Exception("O campo '{$keyy}' não é esperado para está operação.");
                 }
 
-				if($keyy===$key){
+                if($keyy===$key){
 
                     unset(self::$required[$key]);
 
-					foreach ($value as $subkey => $subvalue) {
+                    foreach ($value as $subkey => $subvalue) {
                         $function = "check".ucfirst($subkey);
                         self::testMethod($function);
                         self::$function($keyy,$subvalue);
-					}
-				}
-			}
+                    }
+                }
+            }
         }
     }
 
@@ -149,7 +149,7 @@ 
 
         self::existRole(self::$model);
 
-		foreach ( self::$validators[self::$model]->getRules($request['role'])  as $field => $r) {
+        foreach ( self::$validators[self::$model]->getRules($request['role'])  as $field => $r) {
             $r = self::replaceRegex($r);
             $response .= ("{$field}:".json_encode(array_reverse($r))).',';
         }

Spacing +20 added lines, -20 removed lines

@@ -5,10 +5,10 @@ 
 use HnrAzevedo\Validator\Rules;
 use Exception;
 
-Class Validator{
+Class Validator {
     use Check;
 
-    public static function add(object $model,callable $return): void
+    public static function add(object $model, callable $return): void
     {
         self::$model = get_class($model);
         self::$validators[self::$model] = $return($Rules = new Rules($model));
@@ -16,35 +16,35 @@ 
     
     private static function existData()
     {
-        if(!array_key_exists('data', self::$data)){
+        if (!array_key_exists('data', self::$data)) {
             throw new Exception('Informações cruciais não foram recebidas.');
         }
     }
 
     private static function jsonData()
     {
-        if(json_decode(self::$data['data']) === null){
+        if (json_decode(self::$data['data'])===null) {
             throw new Exception('O servidor recebeu as informações no formato esperado.');
         }
     }
 
     private static function hasProvider()
     {
-        if(!array_key_exists('provider',self::$data)){
+        if (!array_key_exists('provider', self::$data)) {
             throw new Exception('O servidor não recebeu o ID do formulário.');
         }
     }
 
     private static function hasRole()
     {
-        if(!array_key_exists('role',self::$data)){
+        if (!array_key_exists('role', self::$data)) {
             throw new Exception('O servidor não conseguiu identificar a finalidade deste formulário.');
         }
     }
 
     private static function getClass(string $class)
     {
-        if(!class_exists($class)){
+        if (!class_exists($class)) {
             throw new Exception("Form ID {$class} inválido.");
         }
 
@@ -55,7 +55,7 @@ 
 
     private static function existRole($rules)
     {
-        if(empty(self::$validators[$rules]->getRules(self::$data['role']))){
+        if (empty(self::$validators[$rules]->getRules(self::$data['role']))) {
             throw new Exception('Não existe regras para validar este formulário.');
         }
     }
@@ -80,8 +80,8 @@ 
 
 		self::existRole(self::$model);
             
-		foreach ( (self::$validators[self::$model]->getRules($datas['role'])) as $key => $value) {
-            if(@$value['required'] === true){
+		foreach ((self::$validators[self::$model]->getRules($datas['role'])) as $key => $value) {
+            if (@$value['required']===true) {
                 self::$required[$key] = $value;
             }
         }
@@ -97,27 +97,27 @@ 
 
     public static function checkErrors(): bool
     {
-        return (count(self::$errors) === 0);
+        return (count(self::$errors)===0);
     }
     
     public static function validate()
     {
-        foreach ( (self::$validators[self::$model]->getRules(self::$data['role'])) as $key => $value) {
+        foreach ((self::$validators[self::$model]->getRules(self::$data['role'])) as $key => $value) {
 
 			foreach (json_decode(self::$data['data']) as $keyy => $valuee) {
 
-				if(!array_key_exists($keyy, (self::$validators[self::$model]->getRules(self::$data['role'])) )){
+				if (!array_key_exists($keyy, (self::$validators[self::$model]->getRules(self::$data['role'])))) {
                     throw new Exception("O campo '{$keyy}' não é esperado para está operação.");
                 }
 
-				if($keyy===$key){
+				if ($keyy===$key) {
 
                     unset(self::$required[$key]);
 
 					foreach ($value as $subkey => $subvalue) {
                         $function = "check".ucfirst($subkey);
                         self::testMethod($function);
-                        self::$function($keyy,$subvalue);
+                        self::$function($keyy, $subvalue);
 					}
 				}
 			}
@@ -131,7 +131,7 @@ 
 
     public static function testMethod($method)
     {
-        if(!method_exists(static::class, $method)){
+        if (!method_exists(static::class, $method)) {
             throw new Exception("{$method} não é uma validação válida.");
         }
     }
@@ -149,18 +149,18 @@ 
 
         self::existRole(self::$model);
 
-		foreach ( self::$validators[self::$model]->getRules($request['role'])  as $field => $r) {
+		foreach (self::$validators[self::$model]->getRules($request['role'])  as $field => $r) {
             $r = self::replaceRegex($r);
             $response .= ("{$field}:".json_encode(array_reverse($r))).',';
         }
 
-        return '{'.substr($response,0,-1).'}';
+        return '{'.substr($response, 0, -1).'}';
     }
     
     private static function replaceRegex(array $rules): array
     {
-        if(array_key_exists('regex',$rules)){ 
-            $rules['regex'] = substr($rules['regex'],1,-2);
+        if (array_key_exists('regex', $rules)) { 
+            $rules['regex'] = substr($rules['regex'], 1, -2);
         }
         return $rules;
     }

examples/index.php

Spacing +6 added lines, -6 removed lines

@@ -12,7 +12,7 @@ 
         'password' => 123456,
         'password2' => 123456,
         'phones' => json_encode([
-            '949164770','949164771','949164772'
+            '949164770', '949164771', '949164772'
         ]),
         'birth' => '28/09/1996' 
     ]),
@@ -20,16 +20,16 @@ 
     'role' => 'login'
 ];
 
-try{
+try {
 
     /* Checks whether the passed data is valid for the selected function */
     $valid = Validator::execute($data);
     
-    if(!$valid){
+    if (!$valid) {
         $errors = [];
-        foreach(Validator::getErrors() as $err => $message){
+        foreach (Validator::getErrors() as $err => $message) {
             $errors[] = [
-                'input' => array_keys($message)[0],                 // Return name input error
+                'input' => array_keys($message)[0], // Return name input error
                 'message' => $message[array_keys($message)[0]]      // Return message error
             ];
         }
@@ -40,7 +40,7 @@ 
 
     var_dump($json);
 
-}catch(Exception $er){
+}catch (Exception $er) {
 
     die("Code Error: {$er->getCode()}, Line: {$er->getLine()}, File: {$er->getFile()}, Message: {$er->getMessage()}.");
 

Braces +1 added lines, -1 removed lines

@@ -40,7 +40,7 @@
 
     var_dump($json);
 
-}catch(Exception $er){
+} catch(Exception $er){
 
     die("Code Error: {$er->getCode()}, Line: {$er->getLine()}, File: {$er->getFile()}, Message: {$er->getMessage()}.");