@@ -67,7 +67,7 @@ discard block |
||
67 | 67 | |
68 | 68 | public static function checkDatas() |
69 | 69 | { |
70 | - self::existData(); |
|
70 | + self::existData(); |
|
71 | 71 | self::jsonData(); |
72 | 72 | self::hasProvider(); |
73 | 73 | self::hasRole(); |
@@ -83,9 +83,9 @@ discard block |
||
83 | 83 | |
84 | 84 | self::$model = get_class(self::getClass('HnrAzevedo\\Validator\\'.ucfirst(self::$data['provider']))); |
85 | 85 | |
86 | - self::existRole(self::$model); |
|
86 | + self::existRole(self::$model); |
|
87 | 87 | |
88 | - foreach ( (self::$validators[self::$model]->getRules($datas['role'])) as $key => $value) { |
|
88 | + foreach ( (self::$validators[self::$model]->getRules($datas['role'])) as $key => $value) { |
|
89 | 89 | if(@$value['required'] === true){ |
90 | 90 | self::$required[$key] = $value; |
91 | 91 | } |
@@ -95,32 +95,32 @@ discard block |
||
95 | 95 | |
96 | 96 | self::check_requireds(); |
97 | 97 | |
98 | - return true; |
|
98 | + return true; |
|
99 | 99 | } |
100 | 100 | |
101 | 101 | public static function validate() |
102 | 102 | { |
103 | 103 | foreach ( (self::$validators[self::$model]->getRules(self::$data['role'])) as $key => $value) { |
104 | 104 | |
105 | - foreach (json_decode(self::$data['data']) as $keyy => $valuee) { |
|
105 | + foreach (json_decode(self::$data['data']) as $keyy => $valuee) { |
|
106 | 106 | |
107 | - if(!array_key_exists($keyy, (self::$validators[self::$model]->getRules(self::$data['role'])) )){ |
|
107 | + if(!array_key_exists($keyy, (self::$validators[self::$model]->getRules(self::$data['role'])) )){ |
|
108 | 108 | throw new Exception("O campo '{$keyy}' não é esperado para está operação."); |
109 | 109 | } |
110 | 110 | |
111 | - if($keyy===$key){ |
|
111 | + if($keyy===$key){ |
|
112 | 112 | |
113 | 113 | unset(self::$required[$key]); |
114 | 114 | |
115 | - foreach ($value as $subkey => $subvalue) { |
|
115 | + foreach ($value as $subkey => $subvalue) { |
|
116 | 116 | $function = "check_{$subkey}"; |
117 | 117 | |
118 | 118 | self::testMethod($function); |
119 | 119 | |
120 | 120 | self::$function($keyy,$subvalue); |
121 | - } |
|
122 | - } |
|
123 | - } |
|
121 | + } |
|
122 | + } |
|
123 | + } |
|
124 | 124 | } |
125 | 125 | } |
126 | 126 | |
@@ -144,7 +144,7 @@ discard block |
||
144 | 144 | |
145 | 145 | self::existRole(self::$model); |
146 | 146 | |
147 | - foreach ( self::$validators[self::$model]->getRules($request['role']) as $field => $r) { |
|
147 | + foreach ( self::$validators[self::$model]->getRules($request['role']) as $field => $r) { |
|
148 | 148 | |
149 | 149 | $response .= ("{$field}:".json_encode(array_reverse($r))).','; |
150 | 150 | |
@@ -155,6 +155,6 @@ discard block |
||
155 | 155 | $response = str_replace('{"','',$response); |
156 | 156 | $response = str_replace('":',':',$response); |
157 | 157 | |
158 | - return $response; |
|
159 | - } |
|
158 | + return $response; |
|
159 | + } |
|
160 | 160 | } |
@@ -9,15 +9,15 @@ |
||
9 | 9 | |
10 | 10 | Validator::add($this, function(Rules $rules){ |
11 | 11 | $rules->setAction('login') |
12 | - //->addField('email',['minlength'=>1,'regex'=>'/^[_a-z0-9-]+(\.[_a-z0-9-]+)*@[a-z0-9-]+(\.[a-z0-9-]+)*(\.[a-z]{2,3})$/','required'=>true]) |
|
13 | - ->addField('email',['minlength'=>1,'filter'=>FILTER_VALIDATE_EMAIL,'required'=>true]) |
|
14 | - ->addField('password',['minlength'=>6,'maxlength'=>20,'required'=>true]) |
|
15 | - ->addField('password2',['equals'=>'password','required'=>true]) |
|
16 | - ->addField('remember',['minlength'=>2,'maxlength'=>2,'required'=>false]) |
|
17 | - ->addField('birth',['type'=>'date','required'=>true]) |
|
18 | - ->addField('phones',['mincount'=>2,'maxcount'=>3,'required'=>true,'minlength'=>8,'maxlength'=>9]); |
|
12 | + //->addField('email',['minlength'=>1,'regex'=>'/^[_a-z0-9-]+(\.[_a-z0-9-]+)*@[a-z0-9-]+(\.[a-z0-9-]+)*(\.[a-z]{2,3})$/','required'=>true]) |
|
13 | + ->addField('email',['minlength'=>1,'filter'=>FILTER_VALIDATE_EMAIL,'required'=>true]) |
|
14 | + ->addField('password',['minlength'=>6,'maxlength'=>20,'required'=>true]) |
|
15 | + ->addField('password2',['equals'=>'password','required'=>true]) |
|
16 | + ->addField('remember',['minlength'=>2,'maxlength'=>2,'required'=>false]) |
|
17 | + ->addField('birth',['type'=>'date','required'=>true]) |
|
18 | + ->addField('phones',['mincount'=>2,'maxcount'=>3,'required'=>true,'minlength'=>8,'maxlength'=>9]); |
|
19 | 19 | |
20 | - return $rules; |
|
20 | + return $rules; |
|
21 | 21 | }); |
22 | 22 | |
23 | 23 | return $this; |