hnrazevedo / Validator

src/Validator.php

Spacing +20 added lines, -20 removed lines

@@ -14,15 +14,15 @@ 
 
     public function __construct(?string $lang = null)
     {
-        $lang = (null !== $lang) ? $lang : 'en';
-        require __DIR__.DIRECTORY_SEPARATOR.'languages'. DIRECTORY_SEPARATOR . $lang .'.php';
+        $lang = (null!==$lang) ? $lang : 'en';
+        require __DIR__.DIRECTORY_SEPARATOR.'languages'.DIRECTORY_SEPARATOR.$lang.'.php';
         self::$err = $VALIDATOR_LANG;
     }
 
     public static function lang(string $lang): Validator
     {
         unset($VALIDATOR_LANG);
-        require __DIR__.DIRECTORY_SEPARATOR.'languages'. DIRECTORY_SEPARATOR . $lang .'.php';
+        require __DIR__.DIRECTORY_SEPARATOR.'languages'.DIRECTORY_SEPARATOR.$lang.'.php';
         self::$err = $VALIDATOR_LANG;
         return self::getInstance($lang);
     }
@@ -42,7 +42,7 @@ 
 
     private static function getClass(string $class)
     {
-        if(!class_exists($class)){
+        if (!class_exists($class)) {
             throw new \RuntimeException(self::$err['nFormID']);
         }
 
@@ -53,21 +53,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(self::$err['nFoundForm']);
         }
     }
 
     public function checkDatas(array $data): void
     {
-        if(!isset($data['_PROVIDER']) || !isset($data['_ROLE'])){
+        if (!isset($data['_PROVIDER']) || !isset($data['_ROLE'])) {
             throw new \RuntimeException(self::$err['issetData']);
         }
     }
 
     public static function execute(array $data): bool
     {
-        try{
+        try {
             self::getInstance()->checkDatas($data);
 
             self::getInstance()->data = $data;
@@ -78,8 +78,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;
                 }
             }
@@ -88,7 +88,7 @@ 
         
             self::getInstance()->validate();
             self::getInstance()->requireds();
-        }catch(\Exception $er){
+        }catch (\Exception $er) {
             self::getInstance()->errors[] = ['form' => $er->getMessage()];
         }
         
@@ -97,18 +97,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) {
                     continue;
                 }
 
@@ -118,7 +118,7 @@ 
 
                     $function = strtolower($subkey);
 
-                    self::getInstance()->hasMethod($function)->$function($keyy, $subvalue, (self::getInstance()->validator(self::getInstance()->model)->getRules(self::getInstance()->data['_ROLE'])) );
+                    self::getInstance()->hasMethod($function)->$function($keyy, $subvalue, (self::getInstance()->validator(self::getInstance()->model)->getRules(self::getInstance()->data['_ROLE'])));
                 }
 				
 			}
@@ -127,8 +127,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']);
         }
     }
 
@@ -139,8 +139,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;
@@ -161,7 +161,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))).',';
         }
@@ -171,7 +171,7 @@ 
     
     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);
         }
 

src/Check.php

Spacing +30 added lines, -30 removed lines

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