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

验证类的check方法 和 模型类的 validateData 方法 取消引用传参

Browse Source
This commit is contained in:
thinkphp
2016-06-03 16:45:55 +08:00
parent 40f113b05f
commit bd498a587e
2 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
library/think/Model.php
View File

@@ -520,7 +520,7 @@ abstract class Model implements \JsonSerializable, \ArrayAccess
* @param array $data 验证数据 * @param array $data 验证数据
* @return bool * @return bool
*/ */
protected function validateData(&$data) protected function validateData($data)
{ {
if (!empty($this->validate)) { if (!empty($this->validate)) {
$info = $this->validate; $info = $this->validate;

14
library/think/Validate.php
View File

@@ -227,7 +227,7 @@ class Validate
* @param string $scene 验证场景 * @param string $scene 验证场景
* @return bool * @return bool
*/ */
public function check(&$data, $rules = [], $scene = '') public function check($data, $rules = [], $scene = '')
{ {
$this->error = []; $this->error = [];
@@ -276,7 +276,7 @@ class Validate
// 场景检测 // 场景检测
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])) {
continue; continue;
} elseif (is_array($scene)) { } elseif (is_array($scene)) {
if (!in_array($key, $array)) { if (!in_array($key, $array)) {
@@ -323,11 +323,11 @@ class Validate
* @param array $msg 提示信息 * @param array $msg 提示信息
* @return mixed * @return mixed
*/ */
protected function checkItem($field, $value, $rules, &$data, $title = '', $msg = []) protected function checkItem($field, $value, $rules, $data, $title = '', $msg = [])
{ {
if ($rules instanceof \Closure) { if ($rules instanceof \Closure) {
// 匿名函数验证 支持传入当前字段和所有字段两个数据 // 匿名函数验证 支持传入当前字段和所有字段两个数据
$result = call_user_func_array($rules, [$value, &$data]); $result = call_user_func_array($rules, [$value, $data]);
} else { } else {
// 支持多规则验证 require|in:a,b,c|... 或者 ['require','in'=>'a,b,c',...] // 支持多规则验证 require|in:a,b,c|... 或者 ['require','in'=>'a,b,c',...]
if (is_string($rules)) { if (is_string($rules)) {
@@ -336,7 +336,7 @@ class Validate
$i = 0; $i = 0;
foreach ($rules as $key => $rule) { foreach ($rules as $key => $rule) {
if ($rule instanceof \Closure) { if ($rule instanceof \Closure) {
$result = call_user_func_array($rule, [$value, &$data]); $result = call_user_func_array($rule, [$value, $data]);
} else { } else {
// 判断验证类型 // 判断验证类型
if (is_numeric($key) && strpos($rule, ':')) { if (is_numeric($key) && strpos($rule, ':')) {
@@ -358,7 +358,7 @@ class Validate
// 验证类型 // 验证类型
$callback = isset(self::$type[$type]) ? self::$type[$type] : [$this, $type]; $callback = isset(self::$type[$type]) ? self::$type[$type] : [$this, $type];
// 验证数据 // 验证数据
$result = call_user_func_array($callback, [$value, $rule, &$data, $field]); $result = call_user_func_array($callback, [$value, $rule, $data, $field]);
} else { } else {
$result = true; $result = true;
} }
@@ -686,7 +686,7 @@ class Validate
protected function method($value, $rule) protected function method($value, $rule)
{ {
$method = Request::instance()->method(); $method = Request::instance()->method();
return $method == strtoupper($rule); return strtoupper($rule) == $method;
} }
/** /**