|
@@ -92,7 +92,7 @@ discard block |
|
|
block discarded – undo |
|
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 |
|
|
block discarded – undo |
|
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 |
|
|
block discarded – undo |
|
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 |
|
|
block discarded – undo |
|
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
|
} |
Please login to merge, or discard this patch.