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

Merge pull request #334 from oldrind/model

Browse Source 
增加model类单元测试文件；单条规则返回值为数组时改成与$this->error合并； 增加验证规则条件是否为正则的判断。
This commit is contained in:
ThinkPHP
2016-03-02 15:59:18 +08:00
parent 694ba8a0b6 91f1137dac
commit 6c2562a75b
2 changed files with 419 additions and 120 deletions
Download Patch File Download Diff File Expand all files Collapse all files

338
library/think/Model.php
View File

@@ -1004,47 +1004,25 @@ class Model
// 获取自动验证规则 // 获取自动验证规则
list($rules, $options, $scene) = $this->getDataRule($this->options['validate'], 'validate'); list($rules, $options, $scene) = $this->getDataRule($this->options['validate'], 'validate');
$options['value_validate'] = isset($options['value_validate']) ? $options['value_validate'] : []; if (!isset($options['value_validate'])) {
$options['exists_validate'] = isset($options['exists_validate']) ? $options['exists_validate'] : []; $options['value_validate'] = [];
foreach ($rules as $key => $val) { } elseif(is_string($options['value_validate'])) {
if (is_numeric($key) && is_array($val)) { $options['value_validate'] = explode(',', $options['value_validate']);
$key = array_shift($val); }
if (!isset($options['exists_validate'])) {
$options['exists_validate'] = [];
} elseif(is_string($options['exists_validate'])) {
$options['exists_validate'] = explode(',', $options['exists_validate']);
}
foreach ($rules as $key => $rule) {
if (is_numeric($key) && is_array($rule)) {
$key = array_shift($rule);
} }
if (!empty($scene) && !in_array($key, $scene)) { if (!empty($scene) && !in_array($key, $scene)) {
continue; continue;
} }
// 获取数据 支持二维数组 if (!$this->fieldValidate($key, $rule, $data, $options)) {
$value = $this->getDataValue($data, $key); break;
if ((in_array($key, $options['value_validate']) && '' == $value)
|| (in_array($key, $options['exists_validate']) && is_null($value))) {
// 不满足自动验证条件
continue;
}
$result = true;
if ($val instanceof \Closure) {
// 匿名函数验证 支持传入当前字段和所有字段两个数据
$result = call_user_func_array($val, [$value, &$data]);
} elseif (is_string($val)) {
// 行为验证 用于一次性批量验证
$result = Hook::exec($val, '', $data);
} else {
// 验证字段规则
$result = $this->checkValidate($value, $val, $data);
}
if (true !== $result) {
// 没有返回true 则表示验证失败
if (!empty($options['patch'])) {
// 批量验证
if (is_array($result)) {
$this->error[] = $result;
} else {
$this->error[$key] = $result;
}
} else {
$this->error = $result;
return;
}
} }
} }
$this->options['validate'] = null; $this->options['validate'] = null;
@@ -1052,6 +1030,77 @@ class Model
return; return;
} }
/**
* 字段验证
* @access protected
* @param string $name 字段名
* @param mixed $rule 规则
* @param array $data 数据
* @param array $options 配置参数
* @param string $key 子字段名
* @param array $value 子字段值
* @return boolean
*/
protected function fieldValidate($name, $rule, &$data, $options = [], $key = null, $value = null) {
if (is_null($key)) {
$key = $name;
}
// 字段名带有通配符* 需要进行多项验证
if (false !== $_key = strstr($key, '.*', true)) {
if (is_null($value)) {
$value = $this->getDataValue($data, $_key);
}
if (is_array($value)) {
$key = substr($key, strlen($_key . '.*'));
foreach ($value as $i => $val) {
// 对数组中每一项进行验证
if (!$this->fieldValidate($name, $rule, $data, $options, $_key . '.' . $i . $key, $val)) {
return false;
}
}
} else {
return false;
}
} else {
// 取得对应的键值
$value = $this->getDataValue($data, $key);
if ((in_array($name, $options['value_validate']) && '' == $value)
|| (in_array($name, $options['exists_validate']) && is_null($value))) {
// 不满足自动验证条件
return true;
}
if ($rule instanceof \Closure) {
// 匿名函数验证 支持传入当前字段和所有字段两个数据
$result = call_user_func_array($rule, [$value, &$data]);
} elseif (is_string($rule)) {
// 行为验证 用于一次性批量验证
$result = Hook::exec($rule, '', $data);
} else {
// 验证字段规则
$result = $this->checkValidate($value, $rule, $data);
}
if (true !== $result) {
// 没有返回true 则表示验证失败
if (!empty($options['patch'])) {
// 批量验证
if (is_array($result)) {
if (empty($this->error)) {
$this->error = $result;
} else {
$this->error[] = array_merge($this->error, $result);
}
} else {
$this->error[$key] = $result;
}
} else {
$this->error = $result;
return false;
}
}
}
return true;
}
/** /**
* 数据自动填充 * 数据自动填充
* @access protected * @access protected
@@ -1064,17 +1113,25 @@ class Model
// 获取自动完成规则 // 获取自动完成规则
list($rules, $options, $scene) = $this->getDataRule($this->options['auto'], 'auto'); list($rules, $options, $scene) = $this->getDataRule($this->options['auto'], 'auto');
$options['value_fill'] = isset($options['value_fill']) ? $options['value_fill'] : []; if (!isset($options['value_fill'])) {
$options['exists_fill'] = isset($options['exists_fill']) ? $options['exists_fill'] : []; $options['value_fill'] = [];
foreach ($rules as $key => $val) { } elseif(is_string($options['value_fill'])) {
if (is_numeric($key) && is_array($val)) { $options['value_fill'] = explode(',', $options['value_fill']);
$key = array_shift($val); }
if (!isset($options['exists_fill'])) {
$options['exists_fill'] = [];
} elseif(is_string($options['exists_fill'])) {
$options['exists_fill'] = explode(',', $options['exists_fill']);
}
foreach ($rules as $key => $rule) {
if (is_numeric($key) && is_array($rule)) {
$key = array_shift($rule);
} }
if (!empty($scene) && !in_array($key, $scene)) { if (!empty($scene) && !in_array($key, $scene)) {
continue; continue;
} }
// 数据自动填充 // 数据自动填充
$this->autoOperation($key, $val, $data, $options); $this->autoOperation($key, $rule, $data, $options);
} }
$this->options['auto'] = null; $this->options['auto'] = null;
} }
@@ -1084,19 +1141,27 @@ class Model
* 获取数据值 * 获取数据值
* @access protected * @access protected
* @param array $data 数据 * @param array $data 数据
* @param string $key 数据标识 支持二维 * @param string|string $key 数据标识 支持数组
* @return mixed * @return mixed
*/ */
protected function getDataValue($data, $key) protected function getDataValue($data, $key)
{ {
if (strpos($key, '.')) { if (is_string($key)) {
// 支持二维数组验证 if (!strpos($key, '.')) {
list($name1, $name2) = explode('.', $key); return isset($data[$key]) ? $data[$key] : null;
$value = isset($data[$name1][$name2]) ? $data[$name1][$name2] : null; } else {
} else { $key = explode('.', $key);
$value = isset($data[$key]) ? $data[$key] : null; }
} }
return $value; foreach ($key as $val) {
if (isset($data[$val])) {
$data = $data[$val];
} else {
$data = null;
break;
}
}
return $data;
} }
/** /**
@@ -1122,7 +1187,7 @@ class Model
} else { } else {
$name = $rules; $name = $rules;
} }
$rules = $config[$name]; $rules = isset($config[$name]) ? $config[$name] : [];
if (isset($config['__all__'])) { if (isset($config['__all__'])) {
$rules = array_merge($config['__all__'], $rules); $rules = array_merge($config['__all__'], $rules);
} }
@@ -1149,75 +1214,104 @@ class Model
/** /**
* 数据自动填充 * 数据自动填充
* @access protected * @access protected
* @param string $key 字段名 * @param string $name 字段名
* @param mixed $val 填充规则 * @param mixed $rule 填充规则
* @param array $data 数据 * @param array $data 数据
* @param array $options 参数 * @param array $options 参数
* @param string $key 子字段名
* @param array $value 子字段值
* @return void * @return void
*/ */
protected function autoOperation($key, $val, &$data, $options = []) protected function autoOperation($name, $rule, &$data, $options = [], $key = null, $value = null)
{ {
// 获取数据 支持二维数组 if (is_null($key)) {
$value = $this->getDataValue($data, $key); $key = $name;
if (strpos($key, '.')) {
list($name1, $name2) = explode('.', $key);
} }
if ((in_array($key, $options['value_fill']) && '' == $value) // 字段名带有通配符* 需要进行多项填充
|| (in_array($key, $options['exists_fill']) && is_null($value))) { if (false !== $_key = strstr($key, '.*', true)) {
// 不满足自动填充条件 if (is_null($value)) {
return; $value = $this->getDataValue($data, $_key);
} }
if ($val instanceof \Closure) { if (is_array($value)) {
$result = call_user_func_array($val, [$value, &$data]); $key = substr($key, strlen($_key . '.*'));
} elseif (isset($val[0]) && $val[0] instanceof \Closure) { foreach ($value as $i => $val) {
$result = call_user_func_array($val[0], [$value, &$data]); // 对数组中每一项进行填充
} elseif (!is_array($val)) { $this->autoOperation($name, $rule, $data, $options, $_key . '.' . $i . $key, $val);
$result = $val; }
} else {
$rule = isset($val[0]) ? $val[0] : $val;
$type = isset($val[1]) ? $val[1] : 'value';
$params = isset($val[2]) ? $val[2] : [];
switch ($type) {
case 'behavior':
Hook::exec($rule, '', $data);
return;
case 'callback':
array_unshift($params, $value);
$result = call_user_func_array($rule, $params);
break;
case 'serialize':
if (is_string($rule)) {
$rule = explode(',', $rule);
}
$serialize = [];
foreach ($rule as $name) {
if (isset($data[$name])) {
$serialize[$name] = $data[$name];
unset($data[$name]);
}
}
$fun = !empty($params['type']) ? $params['type'] : 'serialize';
$result = $fun($serialize);
break;
case 'ignore':
if ($rule === $value) {
if (strpos($key, '.')) {
unset($data[$name1][$name2]);
} else {
unset($data[$key]);
}
}
return;
case 'value':
default:
$result = $rule;
break;
} }
}
if (strpos($key, '.')) {
$data[$name1][$name2] = $result;
} else { } else {
$data[$key] = $result; // 取得对应的键值
$value = $this->getDataValue($data, $key);
if ((in_array($name, $options['value_fill']) && '' == $value)
|| (in_array($name, $options['exists_fill']) && is_null($value))) {
// 不满足自动填充条件
return;
}
// 匿名函数 用于设置或删除表单中字段的值
$dataField = function($key, $val = null) use (&$data) {
$str = '$data';
foreach (explode('.', $key) as $k) {
$str .= '[\'' . $k . '\']';
}
if (isset($val)) {
eval($str . "=\$val;");
} else {
eval('unset('. $str . ');');
}
};
if ($rule instanceof \Closure) {
$result = call_user_func_array($rule, [$value, &$data]);
} elseif (isset($rule[0]) && $rule[0] instanceof \Closure) {
$result = call_user_func_array($rule[0], [$value, &$data]);
} elseif (!is_array($rule)) {
$result = $rule;
} else {
$val = isset($rule[0]) ? $rule[0] : $rule;
$type = isset($rule[1]) ? $rule[1] : 'value';
$params = isset($rule[2]) ? (array) $rule[2] : [];
switch ($type) {
case 'behavior':
Hook::exec($val, '', $data);
return;
case 'callback':
array_unshift($params, $value);
$result = call_user_func_array($val, $params);
break;
case 'serialize':
if (empty($val)) {
// 为空则序列化自身
$serialize = (array) $this->getDataValue($data, $key);
} else {
// 把$data中指定的字段序列化到当前字段
if (is_string($val)) {
$val = explode(',', $val);
}
$serialize = [];
foreach ($val as $name) {
if (isset($data[$name])) {
$serialize[$name] = $data[$name];
unset($data[$name]);
}
}
}
$fun = !empty($params['type']) ? $params['type'] : 'serialize';
$result = $fun($serialize);
break;
case 'ignore':
if ($val === $value) {
// 从$data中移除$key
$dataField($key);
}
return;
case 'value':
default:
$result = $val;
break;
}
}
// 设置$data中$key的值
$dataField($key, $result);
} }
} }
@@ -1234,7 +1328,7 @@ class Model
$rule = $val[0]; $rule = $val[0];
$msg = isset($val[1]) ? $val[1] : ''; $msg = isset($val[1]) ? $val[1] : '';
$type = isset($val[2]) ? $val[2] : 'regex'; $type = isset($val[2]) ? $val[2] : 'regex';
$options = isset($val[3]) ? $val[3] : []; $options = isset($val[3]) ? (array) $val[3] : [];
if ($rule instanceof \Closure) { if ($rule instanceof \Closure) {
// 匿名函数验证 支持传入当前字段和所有字段两个数据 // 匿名函数验证 支持传入当前字段和所有字段两个数据
$result = call_user_func_array($rule, [$value, &$data]); $result = call_user_func_array($rule, [$value, &$data]);
@@ -1248,19 +1342,19 @@ class Model
// 行为验证 // 行为验证
$result = Hook::exec($rule, '', $data); $result = Hook::exec($rule, '', $data);
break; break;
case 'filter': // 使用filter_var验证 case 'filter': // 使用filter_var验证
$result = filter_var($value, is_int($rule) ? $rule : filter_id($rule), $options); $result = false !== filter_var($value, is_int($rule) ? $rule : filter_id($rule), $options);
break; break;
case 'confirm': case 'confirm':
$result = $value == $data[$rule]; $result = $value == $this->getDataValue($data, $rule);
break; break;
case 'in': case 'in':
case 'notin': case 'notin':
$range = is_array($rule) ? $rule : explode(',', $rule); $range = is_array($rule) ? $rule : explode(',', $rule);
$result = 'in' == $type ? in_array($value, $range) : !in_array($value, $range); $result = 'in' == $type ? in_array($value, $range) : !in_array($value, $range);
break; break;
case 'between': // 验证是否在某个范围 case 'between': // 验证是否在某个范围
case 'notbetween': // 验证是否不在某个范围 case 'notbetween': // 验证是否不在某个范围
if (is_string($rule)) { if (is_string($rule)) {
$rule = explode(',', $rule); $rule = explode(',', $rule);
} }
@@ -1272,7 +1366,11 @@ class Model
if (isset($this->rule[$rule])) { if (isset($this->rule[$rule])) {
$rule = $this->rule[$rule]; $rule = $this->rule[$rule];
} }
$result = 1 === preg_match('/^' . $rule . '$/', (string) $value); if (!(0 === strpos($rule, '/') && preg_match('/\/[imsU]{0,4}$/', $rule))) {
// 不是正则表达式则两端补上/
$rule = '/^' . $rule . '$/';
}
$result = 1 === preg_match($rule, (string) $value);
break; break;
} }
} }

201
tests/thinkphp/library/think/modelTest.php Normal file
View File

@@ -0,0 +1,201 @@
<?php
// +----------------------------------------------------------------------
// | ThinkPHP [ WE CAN DO IT JUST THINK ]
// +----------------------------------------------------------------------
// | Copyright (c) 2006~2016 http://thinkphp.cn All rights reserved.
// +----------------------------------------------------------------------
// | Licensed ( http://www.apache.org/licenses/LICENSE-2.0 )
// +----------------------------------------------------------------------
// | Author: liu21st <liu21st@gmail.com>
// +----------------------------------------------------------------------
/**
* 模型类测试
*/
namespace tests\thinkphp\library\think;
use think\Model;
class modelTest extends \PHPUnit_Framework_TestCase
{
public function getConfig()
{
$config = [
'connection' => [
'type' => 'mysql',
'database' => 'test',
'username' => 'root',
'password' => '',
],
];
return $config;
}
public function testValidate()
{
$model = new Model('', $this->getConfig());
$data = [
'username' => 'username',
'nickname' => 'nickname',
'password' => '123456',
'repassword' => '123456',
'mobile' => '13800000000',
'email' => 'abc@abc.com',
'sex' => '0',
'age' => '20',
'code' => '1234',
];
$validate = [
'__pattern__' => [
'mobile' => '/^1(?:[358]\d|7[6-8])\d{8}$/',
'require' => '/.+/',
],
'__all__' => [
'code' => function($value, $data) {return '1234' != $value ? 'code error' : true;},
],
'user' => [
['username', [&$this, 'checkName'], '用户名长度为5到15个字符', 'callback', 'username'],
['nickname', 'require', '请填昵称'],
'password' => ['[\w-]{6,15}', '密码长度为6到15个字符'],
'repassword' => ['password', '两次密码不一到致', 'confirm'],
'mobile' => ['mobile', '手机号错误'],
'email' => ['validate_email', '邮箱格式错误', 'filter'],
'sex' => ['0,1', '性别只能为为男或女', 'in'],
'age' => ['1,80', '年龄只能在10-80之间', 'between'],
'__option__' => [
'scene' => [
'add' => 'username,nickname,password,repassword,mobile,email,age,code',
'edit' => 'nickname,password,repassword,mobile,email,sex,age,code',
],
'value_validate' => 'email',
'exists_validate' => 'password,repassword,code',
],
],
];
\think\Config::set('validate', $validate);
$result = $model->validate('user.add')->create($data);
$this->assertEquals('', $model->getError());
unset($data['password'], $data['repassword']);
$data['email'] = '';
$result = $model->validate('user.edit')->create($data);
$this->assertEquals('', $model->getError());
// 测试带.和*的键名
$data = [
'code' => '',
'name' => ['a' => '', 'b' => ''],
'sku' => [
0 => [
0 => [
'item' => 'item',
'price' => '',
],
1 => [
'item' => 'item2',
'price' => '',
]
]
]
];
$test = [
'code' => function($value, $data) {return empty($value) ? ['code' => 'not empty'] : true;},
'name.*' => ['/.+/', 'not empty'],
'sku.*.*.price' => ['/\d+/', 'mast int'],
'__option__' => [
'patch' => true,
],
];
$result = $model->validate($test)->create($data);
$msg = [
'code' => 'not empty',
'name.a' => 'not empty',
'name.b' => 'not empty',
'sku.0.0.price' => 'mast int',
'sku.0.1.price' => 'mast int',
];
$this->assertEquals($msg, $model->getError());
}
public function checkName($value, $field) {
switch($field) {
case 'username':
return !empty($value);
case 'mobile':
return 13 == strlen($value);
}
}
public function testFill()
{
$model = new Model('', $this->getConfig());
$data = [
'username' => '',
'nickname' => 'nickname',
'phone' => ' 123456',
'hobby' => ['1', '2'],
'cityid' => '1',
];
$auto = [
'user' => [
'__option__' => [
'value_fill' => ['username', 'password', 'phone'],
'exists_fill' => 'nickname',
],
'username' => ['strtolower', 'callback'],
'password' => ['md5', 'callback'],
'nickname' => [[&$this, 'fillName'], 'callback', 'cn_'],
'phone' => function($value, $data) {return trim($value);},
'hobby' => ['', 'serialize'],
'cityid' => ['1', 'ignore'] ,
'address' => ['address'],
'integral' => 0,
['reg_time', 'time', 'callback'],
['login_time', function($value, $data) {return $data['reg_time'];}],
],
];
\think\Config::set('auto', $auto);
$result = $model->auto('user')->create($data);
$data['nickname'] = 'cn_nickname';
$data['phone'] = '123456';
$data['hobby'] = serialize($data['hobby']);
$data['address'] = 'address';
$data['integral'] = 0;
$data['reg_time'] = time();
$data['login_time'] = $data['reg_time'];
unset($data['cityid']);
$this->assertEquals($data, $result);
// 测试带.和*的键名
$data = [
'name' => ['a' => 'a', 'b' => 'b'],
'goods' => [
0 => [
0 => [
'item' => 'item',
'price' => '',
],
1 => [
'item' => 'item2',
'price' => '',
]
]
]
];
$test = [
'name.*' => 'name',
'goods.*.*.price' => 100,
];
$result = $model->auto($test)->create($data);
$data['name']['a'] = $data['name']['b'] = 'name';
$data['goods'][0][0]['price'] = 100;
$data['goods'][0][1]['price'] = 100;
$this->assertEquals($data, $result);
}
public function fillName($value, $prefix) {
return $prefix . trim($value);
}
}