mirror-fastadminnet/framework
1
0
Fork 0
mirror of https://gitee.com/fastadminnet/framework.git synced 2026-09-02 21:41:36 +08:00
Code Issues Packages Projects Releases Wiki Activity

PSR规范调整

Browse Source
This commit is contained in:
thinkphp
2015-10-04 13:05:15 +08:00
parent 1cfb3704c6
commit 27e724bb3c
135 changed files with 9426 additions and 11556 deletions
Download Patch File Download Diff File Expand all files Collapse all files

182
library/org/validate.php
View File

@@ -11,19 +11,22 @@
namespace think;
class Validate {
class Validate
{
protected $validate = []; // 自动验证定义
protected $validate = []; // 自动验证定义
// 是否批处理验证
protected $patchValidate = false;
protected $error = '';
protected $patchValidate = false;
protected $error = '';
public function rule($rule){
$this->validate = $rule;
public function rule($rule)
{
$this->validate = $rule;
return $this;
}
public function getError(){
public function getError()
{
return $this->error;
}
@@ -34,30 +37,41 @@ class Validate {
* @param string $type 创建类型
* @return boolean
*/
public function valid($data,$rule=[]) {
$validate = $rule?$rule:$this->validate;
public function valid($data, $rule = [])
{
$validate = $rule ? $rule : $this->validate;
// 属性验证
if($validate) { // 如果设置了数据自动验证则进行数据验证
if($this->patchValidate) { // 重置验证错误信息
if ($validate) {
// 如果设置了数据自动验证则进行数据验证
if ($this->patchValidate) {
// 重置验证错误信息
$this->error = [];
}
foreach($validate as $key=>$val) {
foreach ($validate as $key => $val) {
// 验证因子定义格式
// array(field,rule,message,condition,type,params)
// 判断是否需要执行验证
if(0==strpos($val[2],'{%') && strpos($val[2],'}'))
// 支持提示信息的多语言 使用 {%语言定义} 方式
$val[2] = L(substr($val[2],2,-1));
$val[3] = isset($val[3])?$val[3]:0;
$val[4] = isset($val[4])?$val[4]:'regex';
if (0 == strpos($val[2], '{%') && strpos($val[2], '}'))
// 支持提示信息的多语言 使用 {%语言定义} 方式
{
$val[2] = L(substr($val[2], 2, -1));
}
$val[3] = isset($val[3]) ? $val[3] : 0;
$val[4] = isset($val[4]) ? $val[4] : 'regex';
// 判断验证条件
if( 1 == $val[3] || (2 == $val[3] && '' != trim($data[$val[0]])) || (0 == $val[3] && isset($data[$val[0]])) ) {
if(false === $this->_validationField($data,$val))
if (1 == $val[3] || (2 == $val[3] && '' != trim($data[$val[0]])) || (0 == $val[3] && isset($data[$val[0]]))) {
if (false === $this->_validationField($data, $val)) {
return false;
}
}
}
// 批量验证的时候最后返回错误
if(!empty($this->error)) return false;
if (!empty($this->error)) {
return false;
}
}
return true;
}
@@ -70,16 +84,17 @@ class Validate {
* @param array $val 验证因子
* @return boolean
*/
protected function _validationField($data,$val) {
if(false === $this->_validationFieldItem($data,$val)){
if($this->patchValidate) {
$this->error[$val[0]] = $val[2];
}else{
$this->error = $val[2];
protected function _validationField($data, $val)
{
if (false === $this->_validationFieldItem($data, $val)) {
if ($this->patchValidate) {
$this->error[$val[0]] = $val[2];
} else {
$this->error = $val[2];
return false;
}
}
return ;
return;
}
/**
@@ -89,25 +104,30 @@ class Validate {
* @param array $val 验证因子
* @return boolean
*/
protected function _validationFieldItem($data,$val) {
switch(strtolower(trim($val[4]))) {
case 'callback':// 调用方法进行验证
$args = isset($val[5])?(array)$val[5]:[];
if(is_string($val[0]) && strpos($val[0], ','))
protected function _validationFieldItem($data, $val)
{
switch (strtolower(trim($val[4]))) {
case 'callback': // 调用方法进行验证
$args = isset($val[5]) ? (array) $val[5] : [];
if (is_string($val[0]) && strpos($val[0], ',')) {
$val[0] = explode(',', $val[0]);
if(is_array($val[0])){
}
if (is_array($val[0])) {
// 支持多个字段验证
foreach($val[0] as $field)
foreach ($val[0] as $field) {
$_data[$field] = $data[$field];
}
array_unshift($args, $_data);
}else{
} else {
array_unshift($args, $data[$val[0]]);
}
return call_user_func_array($val[1], $args);
case 'confirm': // 验证两个字段是否相同
return $data[$val[0]] == $data[$val[1]];
default: // 检查附加规则
return $this->check($data[$val[0]],$val[1],$val[4]);
default: // 检查附加规则
return $this->check($data[$val[0]], $val[1], $val[4]);
}
}
@@ -119,46 +139,55 @@ class Validate {
* @param string $type 验证方式 默认为正则验证
* @return boolean
*/
public function check($value,$rule,$type='regex'){
$type = strtolower(trim($type));
switch($type) {
public function check($value, $rule, $type = 'regex')
{
$type = strtolower(trim($type));
switch ($type) {
case 'in': // 验证是否在某个指定范围之内 逗号分隔字符串或者数组
case 'notin':
$range = is_array($rule)? $rule : explode(',',$rule);
return $type == 'in' ? in_array($value ,$range) : !in_array($value ,$range);
$range = is_array($rule) ? $rule : explode(',', $rule);
return 'in' == $type ? in_array($value, $range) : !in_array($value, $range);
case 'between': // 验证是否在某个范围
case 'notbetween': // 验证是否不在某个范围
if (is_array($rule)){
$min = $rule[0];
$max = $rule[1];
}else{
list($min,$max) = explode(',',$rule);
case 'notbetween': // 验证是否不在某个范围
if (is_array($rule)) {
$min = $rule[0];
$max = $rule[1];
} else {
list($min, $max) = explode(',', $rule);
}
return $type == 'between' ? $value>=$min && $value<=$max : $value<$min || $value>$max;
return 'between' == $type ? $value >= $min && $value <= $max : $value < $min || $value > $max;
case 'equal': // 验证是否等于某个值
case 'notequal': // 验证是否等于某个值
return $type == 'equal' ? $value == $rule : $value != $rule;
case 'notequal': // 验证是否等于某个值
return 'equal' == $type ? $value == $rule : $value != $rule;
case 'length': // 验证长度
$length = mb_strlen($value,'utf-8'); // 当前数据长度
if(strpos($rule,',')) { // 长度区间
list($min,$max) = explode(',',$rule);
$length = mb_strlen($value, 'utf-8'); // 当前数据长度
if (strpos($rule, ',')) {
// 长度区间
list($min, $max) = explode(',', $rule);
return $length >= $min && $length <= $max;
}else{// 指定长度
} else {
// 指定长度
return $length == $rule;
}
case 'expire':
list($start,$end) = explode(',',$rule);
if(!is_numeric($start)) $start = strtotime($start);
if(!is_numeric($end)) $end = strtotime($end);
list($start, $end) = explode(',', $rule);
if (!is_numeric($start)) {
$start = strtotime($start);
}
if (!is_numeric($end)) {
$end = strtotime($end);
}
return NOW_TIME >= $start && NOW_TIME <= $end;
case 'ip_allow': // IP 操作许可验证
return in_array($_SERVER['REMOTE_ADDR'],explode(',',$rule));
return in_array($_SERVER['REMOTE_ADDR'], explode(',', $rule));
case 'ip_deny': // IP 操作禁止验证
return !in_array($_SERVER['REMOTE_ADDR'],explode(',',$rule));
return !in_array($_SERVER['REMOTE_ADDR'], explode(',', $rule));
case 'regex':
default: // 默认使用正则验证 可以使用验证类中定义的验证名称
default: // 默认使用正则验证 可以使用验证类中定义的验证名称
// 检查附加规则
return $this->regex($value,$rule);
return $this->regex($value, $rule);
}
}
@@ -169,21 +198,24 @@ class Validate {
* @param string $rule 验证规则
* @return boolean
*/
public function regex($value,$rule) {
public function regex($value, $rule)
{
$validate = [
'require' => '/.+/',
'email' => '/^\w+([-+.]\w+)*@\w+([-.]\w+)*\.\w+([-.]\w+)*$/',
'url' => '/^http(s?):\/\/(?:[A-za-z0-9-]+\.)+[A-za-z]{2,4}(?:[\/\?#][\/=\?%\-&~`@[\]\':+!\.#\w]*)?$/',
'currency' => '/^\d+(\.\d+)?$/',
'number' => '/^\d+$/',
'zip' => '/^\d{6}$/',
'integer' => '/^[-\+]?\d+$/',
'double' => '/^[-\+]?\d+(\.\d+)?$/',
'english' => '/^[A-Za-z]+$/',
'require' => '/.+/',
'email' => '/^\w+([-+.]\w+)*@\w+([-.]\w+)*\.\w+([-.]\w+)*$/',
'url' => '/^http(s?):\/\/(?:[A-za-z0-9-]+\.)+[A-za-z]{2,4}(?:[\/\?#][\/=\?%\-&~`@[\]\':+!\.#\w]*)?$/',
'currency' => '/^\d+(\.\d+)?$/',
'number' => '/^\d+$/',
'zip' => '/^\d{6}$/',
'integer' => '/^[-\+]?\d+$/',
'double' => '/^[-\+]?\d+(\.\d+)?$/',
'english' => '/^[A-Za-z]+$/',
];
// 检查是否有内置的正则表达式
if(isset($validate[strtolower($rule)]))
$rule = $validate[strtolower($rule)];
return preg_match($rule,$value)===1;
if (isset($validate[strtolower($rule)])) {
$rule = $validate[strtolower($rule)];
}
return preg_match($rule, $value) === 1;
}
}