@@ -92,7 +92,7 @@ discard block |
||
92 | 92 | self::getInstance()->errors[] = ['form' => $er->getMessage()]; |
93 | 93 | } |
94 | 94 | |
95 | - return self::errors(); |
|
95 | + return self::errors(); |
|
96 | 96 | } |
97 | 97 | |
98 | 98 | public static function errors(): bool |
@@ -104,7 +104,7 @@ discard block |
||
104 | 104 | { |
105 | 105 | foreach ( (self::getInstance()->validator(self::getInstance()->model)->getRules(self::getInstance()->data['_ROLE'])) as $key => $value) { |
106 | 106 | |
107 | - foreach (self::getInstance()->data as $keyy => $valuee) { |
|
107 | + foreach (self::getInstance()->data as $keyy => $valuee) { |
|
108 | 108 | |
109 | 109 | if($keyy!==$key){ |
110 | 110 | continue; |
@@ -114,14 +114,14 @@ discard block |
||
114 | 114 | |
115 | 115 | unset(self::getInstance()->required[$key]); |
116 | 116 | |
117 | - foreach ($value as $subkey => $subvalue) { |
|
117 | + foreach ($value as $subkey => $subvalue) { |
|
118 | 118 | |
119 | 119 | $function = strtolower($subkey); |
120 | 120 | |
121 | 121 | self::getInstance()->hasMethod($function)->$function($keyy, $subvalue, (self::getInstance()->validator(self::getInstance()->model)->getRules(self::getInstance()->data['_ROLE'])) ); |
122 | 122 | } |
123 | 123 | |
124 | - } |
|
124 | + } |
|
125 | 125 | } |
126 | 126 | } |
127 | 127 | |
@@ -168,7 +168,7 @@ discard block |
||
168 | 168 | |
169 | 169 | self::getInstance()->existRole(self::getInstance()->model()); |
170 | 170 | |
171 | - foreach ( self::getInstance()->validator(self::getInstance()->model())->getRules($request['_ROLE']) as $field => $r) { |
|
171 | + foreach ( self::getInstance()->validator(self::getInstance()->model())->getRules($request['_ROLE']) as $field => $r) { |
|
172 | 172 | $r = self::getInstance()->replaceRegex($r); |
173 | 173 | $response .= ("'$field':".json_encode(array_reverse($r))).','; |
174 | 174 | } |
@@ -14,15 +14,15 @@ discard block |
||
14 | 14 | |
15 | 15 | public function __construct(?string $lang = null) |
16 | 16 | { |
17 | - $lang = (null !== $lang) ? $lang : 'en'; |
|
18 | - require __DIR__.DIRECTORY_SEPARATOR.'languages'. DIRECTORY_SEPARATOR . $lang .'.php'; |
|
17 | + $lang = (null!==$lang) ? $lang : 'en'; |
|
18 | + require __DIR__.DIRECTORY_SEPARATOR.'languages'.DIRECTORY_SEPARATOR.$lang.'.php'; |
|
19 | 19 | self::$err = $VALIDATOR_LANG; |
20 | 20 | } |
21 | 21 | |
22 | 22 | public static function lang(string $lang): Validator |
23 | 23 | { |
24 | 24 | unset($VALIDATOR_LANG); |
25 | - require __DIR__.DIRECTORY_SEPARATOR.'languages'. DIRECTORY_SEPARATOR . $lang .'.php'; |
|
25 | + require __DIR__.DIRECTORY_SEPARATOR.'languages'.DIRECTORY_SEPARATOR.$lang.'.php'; |
|
26 | 26 | self::$err = $VALIDATOR_LANG; |
27 | 27 | return self::getInstance($lang); |
28 | 28 | } |
@@ -42,7 +42,7 @@ discard block |
||
42 | 42 | |
43 | 43 | private static function getClass(string $class) |
44 | 44 | { |
45 | - if(!class_exists($class)){ |
|
45 | + if (!class_exists($class)) { |
|
46 | 46 | throw new \RuntimeException(self::$err['nFormID']); |
47 | 47 | } |
48 | 48 | |
@@ -53,21 +53,21 @@ discard block |
||
53 | 53 | |
54 | 54 | private function existRole($getRules) |
55 | 55 | { |
56 | - if(empty(self::getInstance()->validator($getRules)->getRules(self::getInstance()->data['_ROLE']))){ |
|
56 | + if (empty(self::getInstance()->validator($getRules)->getRules(self::getInstance()->data['_ROLE']))) { |
|
57 | 57 | throw new \RuntimeException(self::$err['nFoundForm']); |
58 | 58 | } |
59 | 59 | } |
60 | 60 | |
61 | 61 | public function checkDatas(array $data): void |
62 | 62 | { |
63 | - if(!isset($data['_PROVIDER']) || !isset($data['_ROLE'])){ |
|
63 | + if (!isset($data['_PROVIDER']) || !isset($data['_ROLE'])) { |
|
64 | 64 | throw new \RuntimeException(self::$err['issetData']); |
65 | 65 | } |
66 | 66 | } |
67 | 67 | |
68 | 68 | public static function execute(array $data): bool |
69 | 69 | { |
70 | - try{ |
|
70 | + try { |
|
71 | 71 | self::getInstance()->checkDatas($data); |
72 | 72 | |
73 | 73 | self::getInstance()->data = $data; |
@@ -78,8 +78,8 @@ discard block |
||
78 | 78 | |
79 | 79 | self::getInstance()->existRole(self::getInstance()->model); |
80 | 80 | |
81 | - foreach ( (self::getInstance()->validator(self::getInstance()->model)->getRules($data['_ROLE'])) as $key => $value) { |
|
82 | - if(@$value['required'] === true){ |
|
81 | + foreach ((self::getInstance()->validator(self::getInstance()->model)->getRules($data['_ROLE'])) as $key => $value) { |
|
82 | + if (@$value['required']===true) { |
|
83 | 83 | self::getInstance()->required[$key] = $value; |
84 | 84 | } |
85 | 85 | } |
@@ -88,7 +88,7 @@ discard block |
||
88 | 88 | |
89 | 89 | self::getInstance()->validate(); |
90 | 90 | self::getInstance()->requireds(); |
91 | - }catch(\Exception $er){ |
|
91 | + }catch (\Exception $er) { |
|
92 | 92 | self::getInstance()->errors[] = ['form' => $er->getMessage()]; |
93 | 93 | } |
94 | 94 | |
@@ -97,16 +97,16 @@ discard block |
||
97 | 97 | |
98 | 98 | public static function errors(): bool |
99 | 99 | { |
100 | - return (count(self::getInstance()->errors) === 0); |
|
100 | + return (count(self::getInstance()->errors)===0); |
|
101 | 101 | } |
102 | 102 | |
103 | 103 | public function validate(): void |
104 | 104 | { |
105 | - foreach ( (self::getInstance()->validator(self::getInstance()->model)->getRules(self::getInstance()->data['_ROLE'])) as $key => $value) { |
|
105 | + foreach ((self::getInstance()->validator(self::getInstance()->model)->getRules(self::getInstance()->data['_ROLE'])) as $key => $value) { |
|
106 | 106 | |
107 | 107 | foreach (self::getInstance()->data as $keyy => $valuee) { |
108 | 108 | |
109 | - if($keyy!==$key){ |
|
109 | + if ($keyy!==$key) { |
|
110 | 110 | continue; |
111 | 111 | } |
112 | 112 | |
@@ -118,7 +118,7 @@ discard block |
||
118 | 118 | |
119 | 119 | $function = strtolower($subkey); |
120 | 120 | |
121 | - self::getInstance()->hasMethod($function)->$function($keyy, $subvalue, (self::getInstance()->validator(self::getInstance()->model)->getRules(self::getInstance()->data['_ROLE'])) ); |
|
121 | + self::getInstance()->hasMethod($function)->$function($keyy, $subvalue, (self::getInstance()->validator(self::getInstance()->model)->getRules(self::getInstance()->data['_ROLE']))); |
|
122 | 122 | } |
123 | 123 | |
124 | 124 | } |
@@ -127,16 +127,16 @@ discard block |
||
127 | 127 | |
128 | 128 | private function checkExpected(string $keyy): void |
129 | 129 | { |
130 | - if(!array_key_exists($keyy, (self::getInstance()->validator(self::getInstance()->model)->getRules(self::getInstance()->data['_ROLE'])) ) && !in_array($keyy, self::getInstance()->defaultData)){ |
|
131 | - if(!$this->checkExpectedArray($keyy)){ |
|
132 | - throw new \RuntimeException($keyy . self::$err['nExpected']); |
|
130 | + if (!array_key_exists($keyy, (self::getInstance()->validator(self::getInstance()->model)->getRules(self::getInstance()->data['_ROLE']))) && !in_array($keyy, self::getInstance()->defaultData)) { |
|
131 | + if (!$this->checkExpectedArray($keyy)) { |
|
132 | + throw new \RuntimeException($keyy.self::$err['nExpected']); |
|
133 | 133 | } |
134 | 134 | } |
135 | 135 | } |
136 | 136 | |
137 | 137 | private function checkExpectedArray(string $keyy): bool |
138 | 138 | { |
139 | - return (!array_key_exists($keyy.'[]', (self::getInstance()->validator(self::getInstance()->model)->getRules(self::getInstance()->data['_ROLE'])) ) && !in_array($keyy.'[]', self::getInstance()->defaultData)); |
|
139 | + return (!array_key_exists($keyy.'[]', (self::getInstance()->validator(self::getInstance()->model)->getRules(self::getInstance()->data['_ROLE']))) && !in_array($keyy.'[]', self::getInstance()->defaultData)); |
|
140 | 140 | } |
141 | 141 | |
142 | 142 | public static function getErrors(): array |
@@ -146,8 +146,8 @@ discard block |
||
146 | 146 | |
147 | 147 | public function hasMethod($method): Validator |
148 | 148 | { |
149 | - if(!method_exists(static::class, $method)){ |
|
150 | - throw new \RuntimeException($method . self::$err['nMethod']); |
|
149 | + if (!method_exists(static::class, $method)) { |
|
150 | + throw new \RuntimeException($method.self::$err['nMethod']); |
|
151 | 151 | } |
152 | 152 | |
153 | 153 | return $this; |
@@ -168,7 +168,7 @@ discard block |
||
168 | 168 | |
169 | 169 | self::getInstance()->existRole(self::getInstance()->model()); |
170 | 170 | |
171 | - foreach ( self::getInstance()->validator(self::getInstance()->model())->getRules($request['_ROLE']) as $field => $r) { |
|
171 | + foreach (self::getInstance()->validator(self::getInstance()->model())->getRules($request['_ROLE']) as $field => $r) { |
|
172 | 172 | $r = self::getInstance()->replaceRegex($r); |
173 | 173 | $response .= ("'$field':".json_encode(array_reverse($r))).','; |
174 | 174 | } |
@@ -178,7 +178,7 @@ discard block |
||
178 | 178 | |
179 | 179 | private function replaceRegex(array $getRules): array |
180 | 180 | { |
181 | - if(array_key_exists('regex', $getRules)){ |
|
181 | + if (array_key_exists('regex', $getRules)) { |
|
182 | 182 | $getRules['regex'] = substr($getRules['regex'], 1, -2); |
183 | 183 | } |
184 | 184 |