hnrazevedo / Validator

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

@@ -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/DefaultUseExample.php

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

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

examples/Rules/User.php

Indentation +25 added lines, -25 removed lines

@@ -11,38 +11,38 @@
     {
         Validator::add($this, function(Rules $rules){
             $rules->action('login')
-                  ->field(
-                      '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(
+                        '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(
-                      'field_password',
-                      ['minlength' => 6, 'maxlength' => 20, 'required' => true],
-                      'Password'
+                    ->field(
+                        'field_password',
+                        ['minlength' => 6, 'maxlength' => 20, 'required' => true],
+                        'Password'
                     )
-                  ->field(
-                      'field_password2',
-                      ['minlength' => 6, 'maxlength' => 20, 'equals' => 'field_password', 'required' => true],
-                      'Confirm password'
+                    ->field(
+                        'field_password2',
+                        ['minlength' => 6, 'maxlength' => 20, 'equals' => 'field_password', 'required' => true],
+                        'Confirm password'
                     )
-                  ->field(
-                      'field_remember',
-                      ['minlength' => 2, 'maxlength' => 2, 'required' => false],
-                      'Keep connected'
+                    ->field(
+                        'field_remember',
+                        ['minlength' => 2, 'maxlength' => 2, 'required' => false],
+                        'Keep connected'
                     )
-                  ->field(
-                      'field_birth',
-                      ['type' => 'date', 'required' => true],
-                      'Date of birth'
+                    ->field(
+                        'field_birth',
+                        ['type' => 'date', 'required' => true],
+                        'Date of birth'
                     )
-                  ->field(
-                      'field_phones',
-                      ['mincount' => 2, 'maxcount' => 3, 'required' => true, 'minlength' => 8, 'maxlength' => 9],
-                      'Phones'
+                    ->field(
+                        'field_phones',
+                        ['mincount' => 2, 'maxcount' => 3, 'required' => true, 'minlength' => 8, 'maxlength' => 9],
+                        'Phones'
                     );
 
-			return $rules;
+            return $rules;
         });
     }
 

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/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',

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/Rules.php

Indentation +10 added lines, -10 removed lines

@@ -11,29 +11,29 @@
 
     public function __construct(string $model)
     {
-	    $this->form['model'] = ucfirst($model);
-	}
+        $this->form['model'] = ucfirst($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)){
             $this->error([ 'form' => self::$err['nFoundForm'] ]);
             return $this;
         }
 
         $this->form[$this->action][$field] = $test;
         $this->form[$this->action][$field]['placeholder'] = (null !== $placeholder) ? $placeholder : $field;
-	    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 +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

Braces +1 added lines, -1 removed lines

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

Indentation +5 added lines, -5 removed lines

@@ -92,7 +92,7 @@ 
             self::getInstance()->errors[] = ['form' => $er->getMessage()];
         }
         
-		return self::errors();
+        return self::errors();
     }
 
     public static function errors(): bool
@@ -104,7 +104,7 @@ 
     {
         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) {
 
                 if($keyy!==$key){
                     continue;
@@ -114,14 +114,14 @@ 
 
                 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, (self::getInstance()->validator(self::getInstance()->model)->getRules(self::getInstance()->data['_ROLE'])) );
                 }
 				
-			}
+            }
         }
     }
 
@@ -168,7 +168,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 +22 added lines, -22 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,16 +97,16 @@ 
 
     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) {
 
-                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,16 +127,16 @@ 
 
     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)){
-            if(!$this->checkExpectedArray($keyy)){
-                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)) {
+            if (!$this->checkExpectedArray($keyy)) {
+                throw new \RuntimeException($keyy.self::$err['nExpected']);
             }
         }
     }
 
     private function checkExpectedArray(string $keyy): bool
     {
-        return (!array_key_exists($keyy.'[]', (self::getInstance()->validator(self::getInstance()->model)->getRules(self::getInstance()->data['_ROLE'])) ) && !in_array($keyy.'[]', self::getInstance()->defaultData));
+        return (!array_key_exists($keyy.'[]', (self::getInstance()->validator(self::getInstance()->model)->getRules(self::getInstance()->data['_ROLE']))) && !in_array($keyy.'[]', self::getInstance()->defaultData));
     }
 
     public static function getErrors(): array
@@ -146,8 +146,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;
@@ -168,7 +168,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))).',';
         }
@@ -178,7 +178,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/MiddlewareTrait.php

Indentation +2 added lines, -2 removed lines

@@ -12,8 +12,8 @@
     {
         return $handler->handle($request->withAttribute('validator', [
             'valid' => self::lang($this->requestLang($request))
-                           ->namespace($this->requestNamespace($request))
-                           ->execute($this->requestData($request)),
+                            ->namespace($this->requestNamespace($request))
+                            ->execute($this->requestData($request)),
             'errors' => self::getErrors()
         ]));
     }

Spacing +4 added lines, -4 removed lines

@@ -6,7 +6,7 @@ 
 use Psr\Http\Server\RequestHandlerInterface;
 use Psr\Http\Message\ResponseInterface;
 
-trait MiddlewareTrait{
+trait MiddlewareTrait {
 
     public function process(ServerRequestInterface $request, RequestHandlerInterface $handler): ResponseInterface
     {
@@ -20,17 +20,17 @@ 
 
     private function requestData(ServerRequestInterface $request): array
     {
-        return ($request->getAttribute('validator') !== null && isset($request->getAttribute('validator')['data'])) ? $request->getAttribute('validator')['data'] : $_REQUEST;
+        return ($request->getAttribute('validator')!==null && isset($request->getAttribute('validator')['data'])) ? $request->getAttribute('validator')['data'] : $_REQUEST;
     }
 
     private function requestNamespace(ServerRequestInterface $request): string
     {
-        return ($request->getAttribute('validator') !== null && isset($request->getAttribute('validator')['namespace'])) ? $request->getAttribute('validator')['namespace'] : '';
+        return ($request->getAttribute('validator')!==null && isset($request->getAttribute('validator')['namespace'])) ? $request->getAttribute('validator')['namespace'] : '';
     }
 
     private function requestLang(ServerRequestInterface $request): string
     {
-        return ($request->getAttribute('validator') !== null && isset($request->getAttribute('validator')['lang'])) ? $request->getAttribute('validator')['lang'] : 'en';
+        return ($request->getAttribute('validator')!==null && isset($request->getAttribute('validator')['lang'])) ? $request->getAttribute('validator')['lang'] : 'en';
     }
     
 }
\ No newline at end of file