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

Merge branch 'master' into bugfix3

Browse Source
This commit is contained in:
苗高鹏
2017-02-13 14:53:24 +08:00
committed by GitHub
parent 5c4df0ce08 59c6ec2dce
commit 21834f797d
45 changed files with 1843 additions and 836 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
library/think/Validate.php
View File

@@ -568,7 +568,7 @@ class Validate
break;
case 'ip':
// 是否为IP地址
$result = $this->filter($value, FILTER_VALIDATE_IP, FILTER_FLAG_IPV4 | FILTER_FLAG_IPV6);
$result = $this->filter($value, [FILTER_VALIDATE_IP, FILTER_FLAG_IPV4 | FILTER_FLAG_IPV6]);
break;
case 'url':
// 是否为一个URL地址
@@ -591,7 +591,7 @@ class Validate
break;
case 'boolean':
// 是否为布尔值
$result = in_array($value, [0, 1, true, false]);
$result = in_array($value, [true, false, 0, 1, '0', '1'], true);
break;
case 'array':
// 是否为数组
@@ -656,7 +656,7 @@ class Validate
if (!in_array($rule, ['ipv4', 'ipv6'])) {
$rule = 'ipv4';
}
return $this->filter($value, FILTER_VALIDATE_IP, 'ipv6' == $rule ? FILTER_FLAG_IPV6 : FILTER_FLAG_IPV4);
return $this->filter($value, [FILTER_VALIDATE_IP, 'ipv6' == $rule ? FILTER_FLAG_IPV6 : FILTER_FLAG_IPV4]);
}
/**
@@ -872,6 +872,7 @@ class Validate
list($rule, $param) = explode(',', $rule);
} elseif (is_array($rule)) {
$param = isset($rule[1]) ? $rule[1] : null;
$rule = $rule[0];
} else {
$param = null;
}
@@ -1222,9 +1223,9 @@ class Validate
$msg = Lang::get(substr($msg, 2, -1));
}
if (is_string($msg) && is_string($rule) && false !== strpos($msg, ':')) {
if (is_string($msg) && is_scalar($rule) && false !== strpos($msg, ':')) {
// 变量替换
if (strpos($rule, ',')) {
if (is_string($rule) && strpos($rule, ',')) {
$array = array_pad(explode(',', $rule), 3, '');
} else {
$array = array_pad([], 3, '');