hnrazevedo / Validator

src/Validator.php

Indentation +9 added lines, -9 removed lines

@@ -88,7 +88,7 @@ 
             self::getInstance()->errors[] = $er->getMessage();
         }
         
-		return self::errors();
+        return self::errors();
     }
 
     public static function errors(): bool
@@ -100,22 +100,22 @@ 
     {
         foreach ( (self::getInstance()->validator(self::getInstance()->model)->getRules(self::getInstance()->data['_ROLE'])) as $key => $value) {
 
-			foreach (self::getInstance()->data as $keyy => $valuee) {
+            foreach (self::getInstance()->data as $keyy => $valuee) {
 
-				self::getInstance()->checkExpected($keyy);
+                self::getInstance()->checkExpected($keyy);
 
-				if($keyy===$key){
+                if($keyy===$key){
 
                     unset(self::getInstance()->required[$key]);
 
-					foreach ($value as $subkey => $subvalue) {
+                    foreach ($value as $subkey => $subvalue) {
 
                         $function = strtolower($subkey);
 
                         self::getInstance()->hasMethod($function)->$function($keyy, $subvalue);
-					}
-				}
-			}
+                    }
+                }
+            }
         }
     }
 
@@ -155,7 +155,7 @@ 
 
         self::getInstance()->existRole(self::getInstance()->model());
 
-		foreach ( self::getInstance()->validator(self::getInstance()->model())->getRules($request['_ROLE'])  as $field => $r) {
+        foreach ( self::getInstance()->validator(self::getInstance()->model())->getRules($request['_ROLE'])  as $field => $r) {
             $r = self::getInstance()->replaceRegex($r);
             $response .= ("'$field':".json_encode(array_reverse($r))).',';
         }

Spacing +18 added lines, -18 removed lines

@@ -14,7 +14,7 @@ 
 
     public function __construct()
     {
-        require __DIR__.DIRECTORY_SEPARATOR.'languages'. DIRECTORY_SEPARATOR . self::$lang .'.php';
+        require __DIR__.DIRECTORY_SEPARATOR.'languages'.DIRECTORY_SEPARATOR.self::$lang.'.php';
         self::$err = $VALIDATOR_LANG;
     }
 
@@ -38,7 +38,7 @@ 
 
     private static function getClass(string $class)
     {
-        if(!class_exists($class)){
+        if (!class_exists($class)) {
             throw new \RuntimeException("Form ID {$class} inválido");
         }
 
@@ -49,21 +49,21 @@ 
 
     private function existRole($getRules)
     {
-        if(empty(self::getInstance()->validator($getRules)->getRules(self::getInstance()->data['_ROLE']))){
+        if (empty(self::getInstance()->validator($getRules)->getRules(self::getInstance()->data['_ROLE']))) {
             throw new \RuntimeException('Não existe regras para validar este formulário');
         }
     }
 
     public function checkDatas(array $data): void
     {
-        if(!isset($data['_PROVIDER']) || !isset($data['_ROLE'])){
+        if (!isset($data['_PROVIDER']) || !isset($data['_ROLE'])) {
             throw new \RuntimeException('The server did not receive the information needed to retrieve the requested validator');
         }
     }
 
     public static function execute(array $data): bool
     {
-        try{
+        try {
             self::getInstance()->checkDatas($data);
 
             self::getInstance()->data = $data;
@@ -74,8 +74,8 @@ 
 
             self::getInstance()->existRole(self::getInstance()->model);
                 
-            foreach ( (self::getInstance()->validator(self::getInstance()->model)->getRules($data['_ROLE'])) as $key => $value) {
-                if(@$value['required'] === true){
+            foreach ((self::getInstance()->validator(self::getInstance()->model)->getRules($data['_ROLE'])) as $key => $value) {
+                if (@$value['required']===true) {
                     self::getInstance()->required[$key] = $value;
                 }
             }
@@ -84,7 +84,7 @@ 
         
             self::getInstance()->validate();
             self::getInstance()->requireds();
-        }catch(\Exception $er){
+        }catch (\Exception $er) {
             self::getInstance()->errors[] = $er->getMessage();
         }
         
@@ -93,18 +93,18 @@ 
 
     public static function errors(): bool
     {
-        return (count(self::getInstance()->errors) === 0);
+        return (count(self::getInstance()->errors)===0);
     }
     
     public function validate(): void
     {
-        foreach ( (self::getInstance()->validator(self::getInstance()->model)->getRules(self::getInstance()->data['_ROLE'])) as $key => $value) {
+        foreach ((self::getInstance()->validator(self::getInstance()->model)->getRules(self::getInstance()->data['_ROLE'])) as $key => $value) {
 
 			foreach (self::getInstance()->data as $keyy => $valuee) {
 
 				self::getInstance()->checkExpected($keyy);
 
-				if($keyy===$key){
+				if ($keyy===$key) {
 
                     unset(self::getInstance()->required[$key]);
 
@@ -121,8 +121,8 @@ 
 
     private function checkExpected(string $keyy): void
     {
-        if(!array_key_exists($keyy, (self::getInstance()->validator(self::getInstance()->model)->getRules(self::getInstance()->data['_ROLE'])) ) && !in_array($keyy, self::getInstance()->defaultData)){
-            throw new \RuntimeException($keyy . self::$err['nExpected']);
+        if (!array_key_exists($keyy, (self::getInstance()->validator(self::getInstance()->model)->getRules(self::getInstance()->data['_ROLE']))) && !in_array($keyy, self::getInstance()->defaultData)) {
+            throw new \RuntimeException($keyy.self::$err['nExpected']);
         }
     }
 
@@ -133,8 +133,8 @@ 
 
     public function hasMethod($method): Validator
     {
-        if(!method_exists(static::class, $method)){
-            throw new \RuntimeException($method . self::$err['nMethod']);
+        if (!method_exists(static::class, $method)) {
+            throw new \RuntimeException($method.self::$err['nMethod']);
         }
         
         return $this;
@@ -155,17 +155,17 @@ 
 
         self::getInstance()->existRole(self::getInstance()->model());
 
-		foreach ( self::getInstance()->validator(self::getInstance()->model())->getRules($request['_ROLE'])  as $field => $r) {
+		foreach (self::getInstance()->validator(self::getInstance()->model())->getRules($request['_ROLE'])  as $field => $r) {
             $r = self::getInstance()->replaceRegex($r);
             $response .= ("'$field':".json_encode(array_reverse($r))).',';
         }
 
-        return '{'.substr($response,0,-1).'}';
+        return '{'.substr($response, 0, -1).'}';
     }
     
     private function replaceRegex(array $getRules): array
     {
-        if(array_key_exists('regex', $getRules)){ 
+        if (array_key_exists('regex', $getRules)) { 
             $getRules['regex'] = substr($getRules['regex'], 1, -2);
         }
 

Braces +1 added lines, -1 removed lines

@@ -84,7 +84,7 @@
         
             self::getInstance()->validate();
             self::getInstance()->requireds();
-        }catch(\Exception $er){
+        } catch(\Exception $er){
             self::getInstance()->errors[] = $er->getMessage();
         }
         

src/ExtraCheck.php

Spacing +4 added lines, -4 removed lines

@@ -8,15 +8,15 @@ 
     
     protected function requireds(): void
     {
-        if(count(self::getInstance()->required()) > 0){
-            self::getInstance()->error([ self::$err['needed'].implode(', ', array_keys(self::getInstance()->required())) ]);
+        if (count(self::getInstance()->required())>0) {
+            self::getInstance()->error([self::$err['needed'].implode(', ', array_keys(self::getInstance()->required()))]);
         }
     }
 
     public 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 function isRequired(string $param): bool
@@ -27,7 +27,7 @@ 
 
     protected function valid(string $param, $value): bool
     {
-        return (self::getInstance()->isRequired($param) || strlen($value > 0));
+        return (self::getInstance()->isRequired($param) || strlen($value>0));
     }
 
 }

src/Rules.php

Indentation +10 added lines, -10 removed lines

@@ -12,29 +12,29 @@
 
     public function __construct(object $model)
     {
-	    $this->form['model'] = ucfirst(get_class($model));
-	}
+        $this->form['model'] = ucfirst(get_class($model));
+    }
 
     public function action(string $action): Rules
     {
-	    $this->action = $action;
-	    return $this;
-	}
+        $this->action = $action;
+        return $this;
+    }
 
     public function field(string $field, array $test, ?string $placeholder = null): Rules
     {
-	    if(empty($this->action)){
+        if(empty($this->action)){
             self::$errors[] = self::$err['nFoundForm'];
             return $this;
         }
 
         $this->form[$this->action][$field] = $test;
         $this->form[$this->action][$field]['placeholder'] = (null !== $placeholder) ? $placeholder : $test;
-	    return $this;
-  	}
+        return $this;
+        }
 
     public function getRules(string $action): Array
     {
-		return (array_key_exists($action, $this->form)) ? $this->form[$action] : [];
-	}
+        return (array_key_exists($action, $this->form)) ? $this->form[$action] : [];
+    }
 }

Spacing +2 added lines, -2 removed lines

@@ -23,13 +23,13 @@
 
     public function field(string $field, array $test, ?string $placeholder = null): Rules
     {
-	    if(empty($this->action)){
+	    if (empty($this->action)) {
             self::$errors[] = self::$err['nFoundForm'];
             return $this;
         }
 
         $this->form[$this->action][$field] = $test;
-        $this->form[$this->action][$field]['placeholder'] = (null !== $placeholder) ? $placeholder : $test;
+        $this->form[$this->action][$field]['placeholder'] = (null!==$placeholder) ? $placeholder : $test;
 	    return $this;
   	}
 

src/Helper.php

Spacing +6 added lines, -6 removed lines

@@ -16,12 +16,12 @@ 
 
     protected static function array($value): Array
     {
-        return (is_array($value)) ? $value : [ $value ];
+        return (is_array($value)) ? $value : [$value];
     }
 
     protected static function getInstance(?string $lang = null): Validator
     {
-        self::$lang = (null !== $lang) ? $lang : 'en';
+        self::$lang = (null!==$lang) ? $lang : 'en';
         self::$instance = (isset(self::$instance)) ? self::$instance : new Validator();
         return self::$instance;
     }
@@ -33,10 +33,10 @@ 
 
     protected function data($field = null, ?array $values = null)
     {
-        if(null !== $values){
+        if (null!==$values) {
             $this->data[$field] = $values;
         }
-        if(null !== $field){
+        if (null!==$field) {
             return $this->data[$field];
         }
         return $this->data;
@@ -44,7 +44,7 @@ 
 
     protected function validator(string $model, ?object $callback = null)
     {
-        if(null !== $callback){
+        if (null!==$callback) {
             $this->validators[$model] = $callback;
         }
         return $this->validators[$model];
@@ -52,7 +52,7 @@ 
 
     protected function model(?string $model = null): string
     {
-        if(null !== $model){
+        if (null!==$model) {
             $this->model = $model;
         }
         return $this->model;

src/Check.php

Spacing +30 added lines, -30 removed lines

@@ -9,19 +9,19 @@ 
 
     protected function minlength(string $param, int $value): void
     {
-        if(!self::getInstance()->valid($param, self::getInstance()->data($param))){ 
+        if (!self::getInstance()->valid($param, self::getInstance()->data($param))) { 
             return;
         }
 
-        foreach( self::array(self::getInstance()->data($param)) as $val ){
+        foreach (self::array(self::getInstance()->data($param)) as $val) {
 
-            if(strlen($val) === 0) {
-                self::getInstance()->error([ $param => self::$err['required'] ]);
+            if (strlen($val)===0) {
+                self::getInstance()->error([$param => self::$err['required']]);
                 continue;
             }
 
-            if($value > strlen($val)){
-                self::getInstance()->error([ $param => self::$err['minlength'] ]);
+            if ($value>strlen($val)) {
+                self::getInstance()->error([$param => self::$err['minlength']]);
             }
 
         }
@@ -30,76 +30,76 @@ 
 
     protected function regex(string $param, string $value): void
     {
-        if(!self::getInstance()->valid($param, self::getInstance()->data($param))){
+        if (!self::getInstance()->valid($param, self::getInstance()->data($param))) {
             return;
         }
 
-        foreach(self::array(self::getInstance()->data($param)) as $val){
-            if(!preg_match($value, $val)){
-                self::getInstance()->error([ $param => self::$err['regex'] ]);
+        foreach (self::array(self::getInstance()->data($param)) as $val) {
+            if (!preg_match($value, $val)) {
+                self::getInstance()->error([$param => self::$err['regex']]);
             }  
         }  
     }
 
     protected function mincount(string $param, string $value): void
     {
-        if(!self::getInstance()->valid($param, self::getInstance()->data($param))){
+        if (!self::getInstance()->valid($param, self::getInstance()->data($param))) {
             return;
         }
 
-        if(count(self::array(self::getInstance()->data($param))) < intval($value)){
-            self::getInstance()->error([ $param => self::$err['mincount'] ]);
+        if (count(self::array(self::getInstance()->data($param)))<intval($value)) {
+            self::getInstance()->error([$param => self::$err['mincount']]);
         }
         
     }
 
     protected function maxcount(string $param, string $value): void
     {
-        if(!self::getInstance()->valid($param, self::getInstance()->data($param))){
+        if (!self::getInstance()->valid($param, self::getInstance()->data($param))) {
             return;
         }
         
-        if(count(self::array(self::getInstance()->data($param))) > intval($value)){
-            self::getInstance()->error([ $param => self::$err['maxcount'] ]);
+        if (count(self::array(self::getInstance()->data($param)))>intval($value)) {
+            self::getInstance()->error([$param => self::$err['maxcount']]);
         }
         
     }
 
     protected function equals(string $param, string $value): void
     {
-        if(!array_key_exists($param, self::getInstance()->data())){
-            self::getInstance()->error([ $param => $value . self::$err['nFoundEquals'] ]);
+        if (!array_key_exists($param, self::getInstance()->data())) {
+            self::getInstance()->error([$param => $value.self::$err['nFoundEquals']]);
             return;
         }
             
-        if(self::getInstance()->data($param) != self::getInstance()->data($value)){
-            self::getInstance()->error([ $param => self::$err['equals'] . ucfirst($value) ]);
+        if (self::getInstance()->data($param)!=self::getInstance()->data($value)) {
+            self::getInstance()->error([$param => self::$err['equals'].ucfirst($value)]);
         } 
     }
 
     protected function maxlength(string $param, string $value): void
     {
-        if(!self::getInstance()->valid($param, self::getInstance()->data($param))){
+        if (!self::getInstance()->valid($param, self::getInstance()->data($param))) {
             return;
         }
 
-        foreach( self::array(self::getInstance()->data($param)) as $val ){
-            if(intval($value) < strlen($val)) {
-                self::getInstance()->error([ $param => self::$err['maxlength'] ]);
+        foreach (self::array(self::getInstance()->data($param)) as $val) {
+            if (intval($value)<strlen($val)) {
+                self::getInstance()->error([$param => self::$err['maxlength']]);
             }
         }
     }
 
     protected function type(string $param, string $value): void
     {
-        if(!self::getInstance()->valid($param, self::getInstance()->data($param))){
+        if (!self::getInstance()->valid($param, self::getInstance()->data($param))) {
             return;
         }
 
         switch ($value) {
             case 'date':
-                if(!self::getInstance()->validateDate(self::getInstance()->data($param) , 'd/m/Y')){
-                    self::getInstance()->error([ $param => self::$err['type'] ]);
+                if (!self::getInstance()->validateDate(self::getInstance()->data($param), 'd/m/Y')) {
+                    self::getInstance()->error([$param => self::$err['type']]);
                 }
             break;
         }
@@ -108,12 +108,12 @@ 
 
     protected function filter(string $param, string $value): void
     {
-        if(!self::getInstance()->valid($param, self::getInstance()->data($param))){
+        if (!self::getInstance()->valid($param, self::getInstance()->data($param))) {
             return;
         }
             
-        if(!filter_var(self::getInstance()->data($param), $value)){
-            self::getInstance()->error([ $param => self::$err['filter'] ]);
+        if (!filter_var(self::getInstance()->data($param), $value)) {
+            self::getInstance()->error([$param => self::$err['filter']]);
         }
         
     }

examples/index.php

Spacing +1 added lines, -1 removed lines

@@ -6,7 +6,7 @@
     'password' => '123456',
     'password2' => '1234567777777777777777777777777777777777777777777',
     'phones' => [
-        '949164770','949164771','949164772'
+        '949164770', '949164771', '949164772'
     ],
     'birth' => '28/09/1996',
     '_PROVIDER' => 'user',

examples/DefaultUseExample.php

Spacing +5 added lines, -5 removed lines

@@ -4,18 +4,18 @@ 
 
 use HnrAzevedo\Validator\Validator;
 
-try{
+try {
 
     /* Checks whether the passed data is valid for the selected function */
     $valid = Validator::namespace('HnrAzevedo\\Validator\\Example\\Rules')->lang('pt_br')->execute($data);
     
     $errors = [];
 
-    if(!$valid){
-        foreach(Validator::getErrors() as $err => $message){
+    if (!$valid) {
+        foreach (Validator::getErrors() as $err => $message) {
             
             $errors[] = [
-                'input' => $err,                 // Return name input error
+                'input' => $err, // Return name input error
                 'message' => $message            // Return message error
             ];
         }
@@ -26,7 +26,7 @@ 
     /* Transforms validation to Json format to be validated on the client if desired */
     $json = Validator::namespace('HnrAzevedo\\Validator\\Example\\Rules')->toJson($data);
 
-}catch(Exception $er){
+}catch (Exception $er) {
 
     die("Code Error: {$er->getCode()}<br> Line: {$er->getLine()}<br> File: {$er->getFile()}<br> Message: {$er->getMessage()}");
 

examples/Rules/User.php

Indentation +12 added lines, -12 removed lines

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

Spacing +8 added lines, -8 removed lines

@@ -5,23 +5,23 @@
 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->action('login')
-                  ->field('email',[
+                  ->field('email', [
                       'minlength' => 1,
                       'filter' => FILTER_VALIDATE_EMAIL,
                       'regex' => '/^[_a-z0-9-]+(\.[_a-z0-9-]+)*@[a-z0-9-]+(\.[a-z0-9-]+)*(\.[a-z]{2,3})$/',
                       'required' => true
                   ], 'Email address')
-                  ->field('password',['minlength'=>6,'maxlength'=>20,'required'=>true])
-                  ->field('password2',['minlength'=>6,'maxlength'=>20,'equals'=>'password','required'=>true])
-                  ->field('remember',['minlength'=>2,'maxlength'=>2,'required'=>false])
-                  ->field('birth',['type'=>'date','required'=>true])
-                  ->field('phones',['mincount'=>2,'maxcount'=>3,'required'=>true,'minlength'=>8,'maxlength'=>9]);
+                  ->field('password', ['minlength'=>6, 'maxlength'=>20, 'required'=>true])
+                  ->field('password2', ['minlength'=>6, 'maxlength'=>20, 'equals'=>'password', 'required'=>true])
+                  ->field('remember', ['minlength'=>2, 'maxlength'=>2, 'required'=>false])
+                  ->field('birth', ['type'=>'date', 'required'=>true])
+                  ->field('phones', ['mincount'=>2, 'maxcount'=>3, 'required'=>true, 'minlength'=>8, 'maxlength'=>9]);
 
 			return $rules;
         });