mirror-fastadminnet/framework
1
0
Fork 0
mirror of https://gitee.com/fastadminnet/framework.git synced 2026-07-05 06:42:48 +08:00
Code Issues Packages Projects Releases Wiki Activity

validate类完善 controller和model类的validate方法支持传入提示信息 model类的validate方法支持指定验证器名

Browse Source
This commit is contained in:
thinkphp
2016-03-20 08:19:42 +08:00
parent 53b455e11b
commit 2371b7a55e
3 changed files with 48 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

38
library/think/Validate.php
View File

@@ -187,6 +187,8 @@ class Validate
*/
public function check(&$data, $rules = [], $scene = '')
{
$this->error = [];
if (empty($rules)) {
// 读取验证规则
$rules = $this->rule;
@@ -194,6 +196,12 @@ class Validate
// 分析验证规则
$scene = $this->getScene($scene);
// 读取提示信息
if (isset($rules['__message__'])) {
$this->message($rules['__message__']);
unset($rules['__message__']);
}
foreach ($rules as $key => $rule) {
if (strpos($key, '|')) {
// 支持 字段|描述 用于返回默认错误
@@ -252,26 +260,30 @@ class Validate
$result = call_user_func_array($rules, [$value, &$data]);
} else {
// 支持多规则验证 require|in:a,b,c|... 或者 ['require','in'=>'a,b,c',...]
// [['require|in:a,b,c|...'],['错误信息1','错误信息2']]
if (is_string($rules)) {
$rules = explode('|', $rules);
}
$error = [];
foreach ($rules as $key => $rule) {
// 判断验证类型
if (is_numeric($key) && strpos($rule, ':')) {
list($type, $rule) = explode(':', $rule, 2);
$info = $type;
} elseif (is_numeric($key)) {
$type = 'is';
$info = $rule;
if ($rule instanceof \Closure) {
$result = call_user_func_array($rules, [$value, &$data]);
} else {
$info = $type = $key;
// 判断验证类型
if (is_numeric($key) && strpos($rule, ':')) {
list($type, $rule) = explode(':', $rule, 2);
$info = $type;
} elseif (is_numeric($key)) {
$type = 'is';
$info = $rule;
} else {
$info = $type = $key;
}
// 验证类型
$callback = isset($this->type[$type]) ? $this->type[$type] : [$this, $type];
// 验证数据
$result = call_user_func_array($callback, [$value, $rule, &$data, $field]);
}
// 验证类型
$callback = isset($this->type[$type]) ? $this->type[$type] : [$this, $type];
// 验证数据
$result = call_user_func_array($callback, [$value, $rule, &$data, $field]);
if (false === $result) {
// 验证失败 返回错误信息
if (isset($this->message[$field . '.' . $info])) {