hnrazevedo / Validator

examples/Rules/User.php

Spacing +1 added lines, -1 removed lines

@@ -9,7 +9,7 @@
 {
     public function __construct()
     {
-        Validator::add($this, function(Rules $rules){
+        Validator::add($this, function(Rules $rules) {
             $rules->action('login')
                   ->field(
                       'field_email',

examples/MiddlewareUseExample.php

Spacing +9 added lines, -9 removed lines

@@ -11,24 +11,24 @@ 
 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,
         'lang' => 'pt_br'
     ]);
 
-    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']) {
                 
                 $errors = [];
 
-                foreach($request->getAttribute('validator')['errors'] as $error){
+                foreach ($request->getAttribute('validator')['errors'] as $error) {
                     $errors[] = [
-                        'input' => array_keys($error)[0],                 // Return name input error
+                        'input' => array_keys($error)[0], // Return name input error
                         'message' => array_values($error)[0]            // Return message error
                     ];
                 }
@@ -42,7 +42,7 @@ 
         }
     }
 
-    define('GLOBAL_MIDDLEWARES',[
+    define('GLOBAL_MIDDLEWARES', [
         Validator::class,
         App::class
     ]);
@@ -78,7 +78,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);
@@ -88,7 +88,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()}.");
 

examples/index.php

Spacing +1 added lines, -1 removed lines

@@ -6,7 +6,7 @@
     'field_password' => '123456',
     'field_password2' => '1234567',
     'field_phones' => [
-        '949164770','949164771','949164772'
+        '949164770', '949164771', '949164772'
     ],
     'field_birth' => '28/09/1996',
     '_PROVIDER' => 'user',

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::lang('pt_br')->namespace('HnrAzevedo\\Validator\\Example\\Rules')->execute($data);
     
     $errors = [];
 
-    if(!$valid){
-        foreach(Validator::getErrors() as $error){
+    if (!$valid) {
+        foreach (Validator::getErrors() as $error) {
             $errors[] = [
-                'input' => array_keys($error)[0],                 // Return name input error
+                'input' => array_keys($error)[0], // Return name input error
                 'message' => array_values($error)[0]            // Return message error
             ];
         }
@@ -25,7 +25,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()}");
 

src/Helper.php

Spacing +5 added lines, -5 removed lines

@@ -15,7 +15,7 @@ 
 
     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
@@ -31,10 +31,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;
@@ -42,7 +42,7 @@ 
 
     protected function validator(string $model, ?object $callback = null)
     {
-        if(null !== $callback){
+        if (null!==$callback) {
             $this->validators[$model] = $callback;
         }
         return $this->validators[$model];
@@ -50,7 +50,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, 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), $value)){
-            self::getInstance()->error([ $param => $rules[$param]['placeholder'] . self::$err['filter'] ]);
+        if (!filter_var(self::getInstance()->data($param), $value)) {
+            self::getInstance()->error([$param => $rules[$param]['placeholder'].self::$err['filter']]);
         }
         
     }

src/MiddlewareTrait.php

Spacing +4 added lines, -4 removed lines

@@ -6,13 +6,13 @@
 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'] : '';
-        $lang = ($request->getAttribute('validator') !== null && isset($request->getAttribute('validator')['lang'])) ? $request->getAttribute('validator')['lang'] : 'en';
+        $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'] : '';
+        $lang = ($request->getAttribute('validator')!==null && isset($request->getAttribute('validator')['lang'])) ? $request->getAttribute('validator')['lang'] : 'en';
         
         return $handler->handle($request->withAttribute('validator', [
             'valid' => self::lang($lang)->namespace($namespace)->execute($data),

src/Rules.php

Spacing +3 added lines, -3 removed lines

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

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