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

修正单元测试

Browse Source
This commit is contained in:
thinkphp
2016-03-22 11:57:05 +08:00
parent 97a9bd11dd
commit 01e978dbbd
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
library/think/Validate.php
View File

@@ -585,12 +585,12 @@ class Validate
*/ */
protected function filter($value, $rule) protected function filter($value, $rule)
{ {
if (is_int($rule)) { if (is_string($rule) && strpos($rule, ',')) {
$param = null;
} elseif (is_string($rule) && strpos($rule, ',')) {
list($rule, $param) = explode(',', $rule); list($rule, $param) = explode(',', $rule);
} elseif (is_array($rule)) { } elseif (is_array($rule)) {
$param = isset($rule[1]) ? $rule[1] : null; $param = isset($rule[1]) ? $rule[1] : null;
} else {
$param = null;
} }
return false !== filter_var($value, is_int($rule) ? $rule : filter_id($rule), $param); return false !== filter_var($value, is_int($rule) ? $rule : filter_id($rule), $param);
} }

2
tests/thinkphp/library/think/modelTest.php
View File

@@ -49,7 +49,7 @@ class modelTest extends \PHPUnit_Framework_TestCase
]; ];
$validate = [ $validate = [
['username', 'length:5,15|unique:user', '用户名长度为5到15个字符|用户名已经存在'], ['username', 'length:5,15', '用户名长度为5到15个字符'],
['nickname', 'require', '请填昵称'], ['nickname', 'require', '请填昵称'],
['password', '[\w-]{6,15}', '密码长度为6到15个字符'], ['password', '[\w-]{6,15}', '密码长度为6到15个字符'],
['repassword', 'confirm:password', '两次密码不一到致'], ['repassword', 'confirm:password', '两次密码不一到致'],