@@ -12,15 +12,15 @@ |
||
| 12 | 12 | |
| 13 | 13 | Validator::add($this, function(Rules $rules){ |
| 14 | 14 | $rules->setAction('login') |
| 15 | - //->addField('email',['minlength'=>1,'regex'=>'/^[_a-z0-9-]+(\.[_a-z0-9-]+)*@[a-z0-9-]+(\.[a-z0-9-]+)*(\.[a-z]{2,3})$/','required'=>true]) |
|
| 16 | - ->addField('email',['minlength'=>1,'filter'=>FILTER_VALIDATE_EMAIL,'required'=>true]) |
|
| 17 | - ->addField('password',['minlength'=>6,'maxlength'=>20,'required'=>true]) |
|
| 18 | - ->addField('password2',['equals'=>'password','required'=>true]) |
|
| 19 | - ->addField('remember',['minlength'=>2,'maxlength'=>2,'required'=>false]) |
|
| 20 | - ->addField('birth',['type'=>'date','required'=>true]) |
|
| 21 | - ->addField('phones',['mincount'=>2,'maxcount'=>3,'required'=>true,'minlength'=>8,'maxlength'=>9]); |
|
| 22 | - |
|
| 23 | - return $rules; |
|
| 15 | + //->addField('email',['minlength'=>1,'regex'=>'/^[_a-z0-9-]+(\.[_a-z0-9-]+)*@[a-z0-9-]+(\.[a-z0-9-]+)*(\.[a-z]{2,3})$/','required'=>true]) |
|
| 16 | + ->addField('email',['minlength'=>1,'filter'=>FILTER_VALIDATE_EMAIL,'required'=>true]) |
|
| 17 | + ->addField('password',['minlength'=>6,'maxlength'=>20,'required'=>true]) |
|
| 18 | + ->addField('password2',['equals'=>'password','required'=>true]) |
|
| 19 | + ->addField('remember',['minlength'=>2,'maxlength'=>2,'required'=>false]) |
|
| 20 | + ->addField('birth',['type'=>'date','required'=>true]) |
|
| 21 | + ->addField('phones',['mincount'=>2,'maxcount'=>3,'required'=>true,'minlength'=>8,'maxlength'=>9]); |
|
| 22 | + |
|
| 23 | + return $rules; |
|
| 24 | 24 | }); |
| 25 | 25 | |
| 26 | 26 | return $this; |
@@ -45,7 +45,7 @@ discard block |
||
| 45 | 45 | private static function getClass(string $class) |
| 46 | 46 | { |
| 47 | 47 | if(!class_exists($class)){ |
| 48 | - $class = basename($class); |
|
| 48 | + $class = basename($class); |
|
| 49 | 49 | throw new Exception("Form ID {$class} inválido."); |
| 50 | 50 | } |
| 51 | 51 | |
@@ -61,7 +61,7 @@ discard block |
||
| 61 | 61 | |
| 62 | 62 | public static function checkDatas() |
| 63 | 63 | { |
| 64 | - self::existData(); |
|
| 64 | + self::existData(); |
|
| 65 | 65 | self::jsonData(); |
| 66 | 66 | self::hasProvider(); |
| 67 | 67 | self::hasRole(); |
@@ -80,9 +80,9 @@ discard block |
||
| 80 | 80 | |
| 81 | 81 | self::$model = $model(); |
| 82 | 82 | |
| 83 | - self::existRole(self::$model); |
|
| 83 | + self::existRole(self::$model); |
|
| 84 | 84 | |
| 85 | - foreach ( (self::$validators[self::$model]->getRules($datas['role'])) as $key => $value) { |
|
| 85 | + foreach ( (self::$validators[self::$model]->getRules($datas['role'])) as $key => $value) { |
|
| 86 | 86 | if(@$value['required'] === true){ |
| 87 | 87 | self::$required[$key] = $value; |
| 88 | 88 | } |
@@ -94,7 +94,7 @@ discard block |
||
| 94 | 94 | |
| 95 | 95 | self::checkRequireds(); |
| 96 | 96 | |
| 97 | - return self::checkErrors(); |
|
| 97 | + return self::checkErrors(); |
|
| 98 | 98 | } |
| 99 | 99 | |
| 100 | 100 | public static function checkErrors(): bool |
@@ -106,23 +106,23 @@ discard block |
||
| 106 | 106 | { |
| 107 | 107 | foreach ( (self::$validators[self::$model]->getRules(self::$data['role'])) as $key => $value) { |
| 108 | 108 | |
| 109 | - foreach (json_decode(self::$data['data']) as $keyy => $valuee) { |
|
| 109 | + foreach (json_decode(self::$data['data']) as $keyy => $valuee) { |
|
| 110 | 110 | |
| 111 | - if(!array_key_exists($keyy, (self::$validators[self::$model]->getRules(self::$data['role'])) )){ |
|
| 111 | + if(!array_key_exists($keyy, (self::$validators[self::$model]->getRules(self::$data['role'])) )){ |
|
| 112 | 112 | throw new Exception("O campo '{$keyy}' não é esperado para está operação."); |
| 113 | 113 | } |
| 114 | 114 | |
| 115 | - if($keyy===$key){ |
|
| 115 | + if($keyy===$key){ |
|
| 116 | 116 | |
| 117 | 117 | unset(self::$required[$key]); |
| 118 | 118 | |
| 119 | - foreach ($value as $subkey => $subvalue) { |
|
| 119 | + foreach ($value as $subkey => $subvalue) { |
|
| 120 | 120 | $function = "check_{$subkey}"; |
| 121 | 121 | self::testMethod($function); |
| 122 | 122 | self::$function($keyy,$subvalue); |
| 123 | - } |
|
| 124 | - } |
|
| 125 | - } |
|
| 123 | + } |
|
| 124 | + } |
|
| 125 | + } |
|
| 126 | 126 | } |
| 127 | 127 | } |
| 128 | 128 | |
@@ -151,7 +151,7 @@ discard block |
||
| 151 | 151 | |
| 152 | 152 | self::existRole(self::$model); |
| 153 | 153 | |
| 154 | - foreach ( self::$validators[self::$model]->getRules($request['role']) as $field => $r) { |
|
| 154 | + foreach ( self::$validators[self::$model]->getRules($request['role']) as $field => $r) { |
|
| 155 | 155 | $r = self::replaceRegex($r); |
| 156 | 156 | $response .= ("{$field}:".json_encode(array_reverse($r))).','; |
| 157 | 157 | } |