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 +2 added lines, -2 removed lines

@@ -22,11 +22,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

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

Indentation +8 added lines, -8 removed lines

@@ -11,15 +11,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]);
+                    //->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 $rules;
         });
 
         return $this;

examples/MiddlewareUseExample.php

Braces +1 added lines, -1 removed lines

@@ -77,7 +77,7 @@
 
     runMiddlewares($serverRequest);
 
-}catch(Exception $er){
+} catch(Exception $er){
 
     die("Code Error: {$er->getCode()}<br>Line: {$er->getLine()}<br>File: {$er->getFile()}<br>Message: {$er->getMessage()}.");
 

Spacing +9 added lines, -9 removed lines

@@ -10,20 +10,20 @@ 
 use Psr\Http\Message\ResponseInterface;
 use Psr\Http\Server\MiddlewareInterface;
 
-try{
+try {
     $serverRequest = (new Factory())->createServerRequest('GET', new Uri('/'));
-    $serverRequest = $serverRequest->withAttribute('validator',[
+    $serverRequest = $serverRequest->withAttribute('validator', [
         'namespace' => 'HnrAzevedo\\Validator\\Example\\Rules',
         'data' => $data
     ]);
 
-    class App implements MiddlewareInterface{
+    class App implements MiddlewareInterface {
         public function process(ServerRequestInterface $request, RequestHandlerInterface $handler): ResponseInterface
         {
-            if(!$request->getAttribute('validator')['valid']){
+            if (!$request->getAttribute('validator')['valid']) {
                 $err = '';
-                foreach($request->getAttribute('validator')['errors'] as $er => $error){
-                    $err .= (is_array($error)) ? implode('',array_keys($error)) . ' ' . implode('', array_values($error)) : $error;
+                foreach ($request->getAttribute('validator')['errors'] as $er => $error) {
+                    $err .= (is_array($error)) ? implode('', array_keys($error)).' '.implode('', array_values($error)) : $error;
                     $err .= ', ';
                 }
                 throw new \Exception(substr($err, 0, -2));
@@ -33,7 +33,7 @@ 
         }
     }
 
-    define('GLOBAL_MIDDLEWARES',[
+    define('GLOBAL_MIDDLEWARES', [
         Validator::class,
         App::class
     ]);
@@ -69,7 +69,7 @@ 
 
     function runMiddlewares($serverRequest)
     {
-        nextExample(new class implements RequestHandlerInterface{
+        nextExample(new class implements RequestHandlerInterface {
             public function handle(ServerRequestInterface $request): ResponseInterface
             {
                 return (new Factory())->createResponse(200);
@@ -79,7 +79,7 @@ 
 
     runMiddlewares($serverRequest);
 
-}catch(Exception $er){
+}catch (Exception $er) {
 
     die("Code Error: {$er->getCode()}<br>Line: {$er->getLine()}<br>File: {$er->getFile()}<br>Message: {$er->getMessage()}.");
 

src/MiddlewareTrait.php

Spacing +3 added lines, -3 removed lines

@@ -6,12 +6,12 @@
 use Psr\Http\Server\RequestHandlerInterface;
 use Psr\Http\Message\ResponseInterface;
 
-trait MiddlewareTrait{
+trait MiddlewareTrait {
 
     public function process(ServerRequestInterface $request, RequestHandlerInterface $handler): ResponseInterface
     {
-        $data = ($request->getAttribute('validator') !== null && isset($request->getAttribute('validator')['data'])) ? $request->getAttribute('validator')['data'] : $_REQUEST;
-        $namespace = ($request->getAttribute('validator') !== null && isset($request->getAttribute('validator')['namespace'])) ? $request->getAttribute('validator')['namespace'] : '';
+        $data = ($request->getAttribute('validator')!==null && isset($request->getAttribute('validator')['data'])) ? $request->getAttribute('validator')['data'] : $_REQUEST;
+        $namespace = ($request->getAttribute('validator')!==null && isset($request->getAttribute('validator')['namespace'])) ? $request->getAttribute('validator')['namespace'] : '';
         return $handler->handle($request->withAttribute('validator', [
             'valid' => self::namespace($namespace)->execute($data),
             'errors' => self::getErrors()

examples/DefaultUseExample.php

Spacing +5 added lines, -5 removed lines

@@ -4,17 +4,17 @@ 
 
 use HnrAzevedo\Validator\Validator;
 
-try{
+try {
 
     /* Checks whether the passed data is valid for the selected function */
     $valid = Validator::namespace('HnrAzevedo\\Validator\\Example\\Rules')->execute($data);
     
     $errors = [];
 
-    if(!$valid){
-        foreach(Validator::getErrors() as $err => $message){
+    if (!$valid) {
+        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
             ];
         }
@@ -23,7 +23,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()}");
 

Braces +1 added lines, -1 removed lines

@@ -23,7 +23,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/index.php

Spacing +1 added lines, -1 removed lines

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

src/ExtraCheck.php

Spacing +5 added lines, -5 removed lines

@@ -14,9 +14,9 @@ 
 
     protected function checkRequireds(): void
     {
-        if(count(self::getInstance()->required) > 0){
+        if (count(self::getInstance()->required)>0) {
             self::getInstance()->errors[] = [
-                'As seguintes informações não poderam ser validadas: '.implode(', ',array_keys(self::getInstance()->required))
+                'As seguintes informações não poderam ser validadas: '.implode(', ', array_keys(self::getInstance()->required))
             ];
         }
     }
@@ -24,7 +24,7 @@ 
     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 checkRequired(string $param): bool
@@ -37,12 +37,12 @@ 
 
     protected function toNext(string $param, $value): bool
     {
-        return (self::getInstance()->checkRequired($param) || strlen($value > 0));
+        return (self::getInstance()->checkRequired($param) || strlen($value>0));
     }
 
     protected function testArray(string $param, $value): ?array
     {
-        if(!is_array($value)){
+        if (!is_array($value)) {
             self::getInstance()->errors[] = [
                 $param => 'Era esperado uma informação em formato array para está informação'
             ];

src/Check.php

Spacing +21 added lines, -21 removed lines

@@ -8,18 +8,18 @@ 
 
     protected function checkMinlength(string $param, $value): void
     {
-        if(self::getInstance()->toNext($param, $value)){    
+        if (self::getInstance()->toNext($param, $value)) {    
             
             $realval = (is_array(self::getInstance()->data[$param])) ? self::getInstance()->data[$param] : [self::getInstance()->data[$param]];
 
-            foreach($realval as $val){
-                if(strlen($val) === 0) {
+            foreach ($realval as $val) {
+                if (strlen($val)===0) {
                     self::getInstance()->errors[] = [
                         $param => 'é obrigatório'
                     ];
                     continue;
                 }
-                if($value > strlen($val)) {
+                if ($value>strlen($val)) {
                     self::getInstance()->errors[] = [
                         $param => 'não atingiu o mínimo de caracteres esperado'
                     ];
@@ -30,13 +30,13 @@ 
 
     protected function checkRegex(string $param, $value): void
     {
-        if(self::getInstance()->toNext($param, $value)){
+        if (self::getInstance()->toNext($param, $value)) {
 
             $realval = (is_array(self::getInstance()->data[$param])) ? self::getInstance()->data[$param] : [self::getInstance()->data[$param]];
 
-            foreach($realval as $val){
+            foreach ($realval as $val) {
 
-                if(!preg_match(self::getInstance()->validators[self::getInstance()->model]->getRules(self::getInstance()->data['ROLE'])[$param]['regex'], $val)){
+                if (!preg_match(self::getInstance()->validators[self::getInstance()->model]->getRules(self::getInstance()->data['ROLE'])[$param]['regex'], $val)) {
                     self::getInstance()->errors[] = [
                         $param => 'inválido(a)'
                     ];
@@ -48,9 +48,9 @@ 
 
     protected function checkMincount(string $param, $value): void
     {
-        if(self::getInstance()->toNext($param, $value)){
+        if (self::getInstance()->toNext($param, $value)) {
             $array = self::getInstance()->testArray($param, self::getInstance()->data[$param]);
-            if(count($array) < $value){
+            if (count($array)<$value) {
                 self::getInstance()->errors[] = [
                     $param => 'não atingiu o mínimo esperado'
                 ];
@@ -60,9 +60,9 @@ 
 
     protected function checkMaxcount(string $param, $value): void
     {
-        if(self::getInstance()->toNext($param, $value)){
+        if (self::getInstance()->toNext($param, $value)) {
             $array = self::getInstance()->testArray($param, self::getInstance()->data[$param]);
-            if(count($array) > $value){
+            if (count($array)>$value) {
                 self::getInstance()->errors[] = [
                     $param => 'ultrapassou o esperado'
                 ];
@@ -72,15 +72,15 @@ 
 
     protected function checkEquals(string $param, $value): void
     {
-        if(self::getInstance()->toNext($param, $value)){
+        if (self::getInstance()->toNext($param, $value)) {
 
-            if(!array_key_exists($param, self::getInstance()->data)){
+            if (!array_key_exists($param, self::getInstance()->data)) {
                 self::getInstance()->errors[] = [
                     $param => "O servidor não encontrou a informação '{$value}' para ser comparada"
                 ];
             }
             
-            if(self::getInstance()->data[$param] != self::getInstance()->data[$value]){
+            if (self::getInstance()->data[$param]!=self::getInstance()->data[$value]) {
                 self::getInstance()->errors[] = [
                     $param => 'está diferente de '.ucfirst($value)
                 ];
@@ -91,13 +91,13 @@ 
 
     protected function checkMaxlength(string $param, $value)
     {
-        if(self::getInstance()->toNext($param, $value)){
+        if (self::getInstance()->toNext($param, $value)) {
 
             $realval = (is_array(self::getInstance()->data[$param])) ? self::getInstance()->data[$param] : [self::getInstance()->data[$param]];
 
-            foreach($realval as $val){
+            foreach ($realval as $val) {
 
-                if($value < strlen($val)) {
+                if ($value<strlen($val)) {
                     self::getInstance()->errors[] = [
                         $param => 'ultrapassou o máximo de caracteres esperado'
                     ];
@@ -109,11 +109,11 @@ 
 
     protected function checkType(string $param, $value)
     {
-        if(self::getInstance()->toNext($param, $value)){
+        if (self::getInstance()->toNext($param, $value)) {
 
             switch ($value) {
                 case 'date':
-                    if(!self::getInstance()->validateDate(self::getInstance()->data[$param] , 'd/m/Y')){
+                    if (!self::getInstance()->validateDate(self::getInstance()->data[$param], 'd/m/Y')) {
                         self::getInstance()->errors[] = [
                             $param => 'não é uma data válida'
                         ];
@@ -125,9 +125,9 @@ 
 
     protected function checkFilter(string $param, $value)
     {
-        if(self::getInstance()->toNext($param, $value)){
+        if (self::getInstance()->toNext($param, $value)) {
 
-            if(!filter_var(self::getInstance()->data[$param], $value)){
+            if (!filter_var(self::getInstance()->data[$param], $value)) {
                 self::getInstance()->errors[] = [
                     $param => 'não passou pela filtragem de dados'
                 ];

src/Validator.php

Indentation +9 added lines, -9 removed lines

@@ -76,7 +76,7 @@ 
             self::getInstance()->errors[] = $er->getMessage();
         }
         
-		return self::checkErrors();
+        return self::checkErrors();
     }
 
     public static function checkErrors(): bool
@@ -88,21 +88,21 @@ 
     {
         foreach ( (self::getInstance()->validators[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 = "check".ucfirst($subkey);
                         self::getInstance()->testMethod($function);
                         self::getInstance()->$function($keyy, $subvalue);
-					}
-				}
-			}
+                    }
+                }
+            }
         }
     }
 
@@ -140,7 +140,7 @@ 
 
         self::getInstance()->existRole(self::getInstance()->model);
 
-		foreach ( self::getInstance()->validators[self::getInstance()->model]->getRules($request['ROLE'])  as $field => $r) {
+        foreach ( self::getInstance()->validators[self::getInstance()->model]->getRules($request['ROLE'])  as $field => $r) {
             $r = self::getInstance()->replaceRegex($r);
             $response .= ("{$field}:".json_encode(array_reverse($r))).',';
         }

Spacing +16 added lines, -16 removed lines

@@ -18,7 +18,7 @@ 
         'ROLE'
     ];
 
-    public static function add(object $model,callable $return): void
+    public static function add(object $model, callable $return): void
     {
         self::getInstance()->model = get_class($model);
         self::getInstance()->validators[self::getInstance()->model] = $return(new Rules($model));
@@ -26,7 +26,7 @@ 
 
     private static function getClass(string $class)
     {
-        if(!class_exists($class)){
+        if (!class_exists($class)) {
             throw new \RuntimeException("Form ID {$class} inválido");
         }
 
@@ -37,21 +37,21 @@ 
 
     private function existRole($rules)
     {
-        if(empty(self::getInstance()->validators[$rules]->getRules(self::getInstance()->data['ROLE']))){
+        if (empty(self::getInstance()->validators[$rules]->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;
@@ -62,8 +62,8 @@ 
 
             self::getInstance()->existRole(self::getInstance()->model);
                 
-            foreach ( (self::getInstance()->validators[self::getInstance()->model]->getRules($data['ROLE'])) as $key => $value) {
-                if(@$value['required'] === true){
+            foreach ((self::getInstance()->validators[self::getInstance()->model]->getRules($data['ROLE'])) as $key => $value) {
+                if (@$value['required']===true) {
                     self::getInstance()->required[$key] = $value;
                 }
             }
@@ -72,7 +72,7 @@ 
         
             self::getInstance()->validate();
             self::getInstance()->checkRequireds();
-        }catch(\Exception $er){
+        }catch (\Exception $er) {
             self::getInstance()->errors[] = $er->getMessage();
         }
         
@@ -81,18 +81,18 @@ 
 
     public static function checkErrors(): bool
     {
-        return (count(self::getInstance()->errors) === 0);
+        return (count(self::getInstance()->errors)===0);
     }
     
     public function validate(): void
     {
-        foreach ( (self::getInstance()->validators[self::getInstance()->model]->getRules(self::getInstance()->data['ROLE'])) as $key => $value) {
+        foreach ((self::getInstance()->validators[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]);
 
@@ -108,7 +108,7 @@ 
 
     private function checkExpected(string $keyy): void
     {
-        if(!array_key_exists($keyy, (self::getInstance()->validators[self::getInstance()->model]->getRules(self::getInstance()->data['ROLE'])) ) && !in_array($keyy, self::getInstance()->defaultData)){
+        if (!array_key_exists($keyy, (self::getInstance()->validators[self::getInstance()->model]->getRules(self::getInstance()->data['ROLE']))) && !in_array($keyy, self::getInstance()->defaultData)) {
             throw new \RuntimeException("O campo '{$keyy}' não é esperado para está operação");
         }
     }
@@ -120,7 +120,7 @@ 
 
     public function testMethod($method)
     {
-        if(!method_exists(static::class, $method)){
+        if (!method_exists(static::class, $method)) {
             throw new \RuntimeException("{$method} não é uma validação válida");
         }
     }
@@ -140,17 +140,17 @@ 
 
         self::getInstance()->existRole(self::getInstance()->model);
 
-		foreach ( self::getInstance()->validators[self::getInstance()->model]->getRules($request['ROLE'])  as $field => $r) {
+		foreach (self::getInstance()->validators[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 $rules): array
     {
-        if(array_key_exists('regex', $rules)){ 
+        if (array_key_exists('regex', $rules)) { 
             $rules['regex'] = substr($rules['regex'], 1, -2);
         }
         return $rules;

Braces +1 added lines, -1 removed lines

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