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

validate类的extend方法支持批量设置 修正单元测试

Browse Source
This commit is contained in:
thinkphp
2016-03-20 11:27:11 +08:00
parent fa9eae4a26
commit bc5e9897c5
1 changed files with 12 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
library/think/Validate.php
View File

@@ -111,9 +111,13 @@ class Validate
* @param mixed $callback callback方法(或闭包) * @param mixed $callback callback方法(或闭包)
* @return void * @return void
*/ */
public function extend($type, $callback) public function extend($type, $callback = null)
{ {
$this->type[$type] = $callback; if (is_array($type)) {
$this->type = array_merge($this->type, $type);
} else {
$this->type[$type] = $callback;
}
return $this; return $this;
} }
@@ -524,10 +528,13 @@ class Validate
*/ */
public function filter($value, $rule) public function filter($value, $rule)
{ {
if (is_string($rule)) { if (is_int($rule)) {
$rule = explode(',', $rule); $param = null;
} elseif (is_string($rule) && strpos($rule, ',')) {
list($rule, $param) = explode(',', $rule);
} elseif (is_array($rule)) {
$param = isset($rule[1]) ? $rule[1] : null;
} }
list($rule, $param) = $rule;
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);
} }