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

Controller类增加batchValidate属性 validate方法增加batch参数，用于设置是否批量验证

Browse Source 
异常类改进
This commit is contained in:
thinkphp
2016-06-13 11:09:42 +08:00
parent 00b0c0f229
commit b6b8b6dcb4
12 changed files with 85 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
library/think/Controller.php
View File

@@ -28,6 +28,8 @@ class Controller
protected $request;
// 验证失败是否抛出异常
protected $failException = false;
// 是否批量验证
protected $batchValidate = false;
/**
* 前置操作方法列表
@@ -162,10 +164,11 @@ class Controller
* @param array $data 数据
* @param string|array $validate 验证器名或者验证规则数组
* @param array $message 提示信息
* @param bool $batch 是否批量验证
* @param mixed $callback 回调方法（闭包）
* @return true|string|array
*/
protected function validate($data, $validate, $message = [], $callback = null)
protected function validate($data, $validate, $message = [], $batch = false, $callback = null)
{
if (is_array($validate)) {
$v = Loader::validate();
@@ -180,12 +183,16 @@ class Controller
$v->scene($scene);
}
}
// 是否批量验证
if($batch || $this->batchValidate){
$v->batch(true);
}
if (is_array($message)) {
$v->message($message);
}
if (is_callable($callback)) {
if ($callback && is_callable($callback)) {
call_user_func_array($callback, [$v, &$data]);
}

8
library/think/Loader.php
View File

@@ -291,7 +291,7 @@ class Loader
if (class_exists($class)) {
$model = new $class();
} else {
throw new ClassNotFoundException('class [ ' . $class . ' ] not exists');
throw new ClassNotFoundException('class [ ' . $class . ' ] not exists', $class);
}
}
$_model[$name . $layer] = $model;
@@ -327,7 +327,7 @@ class Loader
} elseif ($empty && class_exists($emptyClass = self::parseClass($module, $layer, $empty, $appendSuffix))) {
return new $emptyClass(Request::instance());
} else {
throw new ClassNotFoundException('class [ ' . $class . ' ] not exists');
throw new ClassNotFoundException('class [ ' . $class . ' ] not exists', $class);
}
}
@@ -364,7 +364,7 @@ class Loader
if (class_exists($class)) {
$validate = new $class;
} else {
throw new ClassNotFoundException('class [ ' . $class . ' ] not exists');
throw new ClassNotFoundException('class [ ' . $class . ' ] not exists', $class);
}
}
$_instance[$name . $layer] = $validate;
@@ -428,7 +428,7 @@ class Loader
$_instance[$identify] = $o;
}
} else {
throw new ClassNotFoundException('class not exist :' . $class);
throw new ClassNotFoundException('class not exist :' . $class, $class);
}
}
return $_instance[$identify];

2
library/think/Session.php
View File

@@ -94,7 +94,7 @@ class Session
// 检查驱动类
if (!class_exists($class) || !session_set_save_handler(new $class($config))) {
throw new ClassNotFoundException('error session handler');
throw new ClassNotFoundException('error session handler', $class);
}
}
if ($isDoStart) {

2
library/think/Template.php
View File

@@ -1068,7 +1068,7 @@ class Template
$this->includeFile[$template] = filemtime($template);
return $template;
} else {
throw new TemplateNotFoundException('template not exist:' . $template);
throw new TemplateNotFoundException('template not exist:' . $template, $template);
}
}

6
library/think/db/Query.php
View File

@@ -1723,7 +1723,11 @@ class Query
}
}
} elseif (!empty($options['fail'])) {
throw new DbException('Data not Found', $options, $sql);
if(!empty($this->model)){
throw new ModelNotFoundException('Data not Found', $this->model, $options);
}else{
throw new DataNotFoundException('Data not Found', $options['table'], $options);
}
}
return $resultSet;
}

10
library/think/db/exception/DataNotFoundException.php
View File

@@ -31,5 +31,13 @@ class DataNotFoundException extends DbException
$this->setData('Database Config', $config);
}
/**
* 获取数据表名
* @access public
* @return string
*/
public function getTable()
{
return $this->table;
}
}

5
library/think/db/exception/ModelNotFoundException.php
View File

@@ -30,6 +30,11 @@ class ModelNotFoundException extends DbException
$this->setData('Database Config', $config);
}
/**
* 获取模型类名
* @access public
* @return string
*/
public function getModel()
{
return $this->model;

16
library/think/exception/ClassNotFoundException.php
View File

@@ -13,4 +13,20 @@ namespace think\exception;
class ClassNotFoundException extends \RuntimeException
{
protected $class;
public function __construct($message,$class='')
{
$this->message = $message;
$this->class = $class;
}
/**
* 获取类名
* @access public
* @return string
*/
public function getClass()
{
return $this->class;
}
}

17
library/think/exception/TemplateNotFoundException.php
View File

@@ -13,4 +13,21 @@ namespace think\exception;
class TemplateNotFoundException extends \RuntimeException
{
protected $template;
public function __construct($message,$template='')
{
$this->message = $message;
$this->template = $template;
}
/**
* 获取模板文件
* @access public
* @return string
*/
public function getTemplate()
{
return $this->template;
}
}

16
library/think/exception/ValidateException.php
View File

@@ -13,4 +13,20 @@ namespace think\exception;
class ValidateException extends \RuntimeException
{
protected $error;
public function __construct($error)
{
$this->error = $error;
}
/**
* 获取验证错误信息
* @access public
* @return array|string
*/
public function getError()
{
return $this->error;
}
}

2
library/think/view/driver/Php.php
View File

@@ -62,7 +62,7 @@ class Php
}
// 模板不存在 抛出异常
if (!is_file($template)) {
throw new TemplateNotFoundException('template file not exists:' . $template);
throw new TemplateNotFoundException('template file not exists:' . $template, $template);
}
// 记录视图信息
APP_DEBUG && Log::record('[ VIEW ] ' . $template . ' [ ' . var_export(array_keys($data), true) . ' ]', 'info');

2
library/think/view/driver/Think.php
View File

@@ -72,7 +72,7 @@ class Think
}
// 模板不存在 抛出异常
if (!is_file($template)) {
throw new TemplateNotFoundException('template file not exists:' . $template);
throw new TemplateNotFoundException('template file not exists:' . $template, $template);
}
// 记录视图信息
APP_DEBUG && Log::record('[ VIEW ] ' . $template . ' [ ' . var_export(array_keys($data), true) . ' ]', 'info');