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

简化validate

Browse Source
This commit is contained in:
thinkphp
2016-03-22 22:20:06 +08:00
parent ab57b45070
commit 16dad1e748
1 changed files with 2 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
library/think/Validate.php
View File

@@ -232,11 +232,6 @@ class Validate
// 分析验证规则 // 分析验证规则
$scene = $this->getScene($scene); $scene = $this->getScene($scene);
// 读取提示信息
if (isset($rules['__message__'])) {
$this->message($rules['__message__']);
unset($rules['__message__']);
}
foreach ($rules as $key => $item) { foreach ($rules as $key => $item) {
// field => rule1|rule2... field=>['rule1','rule2',...] // field => rule1|rule2... field=>['rule1','rule2',...]
@@ -259,6 +254,7 @@ class Validate
} else { } else {
$title = $key; $title = $key;
} }
// 场景检测 // 场景检测
if (!empty($scene)) { if (!empty($scene)) {
if ($scene instanceof \Closure && !call_user_func_array($scene, [$key, &$data])) { if ($scene instanceof \Closure && !call_user_func_array($scene, [$key, &$data])) {
@@ -332,6 +328,7 @@ class Validate
} else { } else {
$info = $type = $key; $info = $type = $key;
} }
// 如果不是require 有数据才会行验证 // 如果不是require 有数据才会行验证
if (0 === strpos($info, 'require') || !empty($value)) { if (0 === strpos($info, 'require') || !empty($value)) {
// 验证类型 // 验证类型