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

异常类规范 增加异常类 改进Query类的value和column的缓存冲突问题

Browse Source
This commit is contained in:
thinkphp
2016-06-12 16:35:42 +08:00
parent 659900ab91
commit b10635e22e
33 changed files with 236 additions and 79 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
library/think/Loader.php
View File

@@ -12,6 +12,7 @@
namespace think;
use think\exception\HttpException;
use think\exception\ClassNotFoundException;
use think\Request;
class Loader
@@ -269,6 +270,7 @@ class Loader
* @param bool $appendSuffix 是否添加类名后缀
* @param string $common 公共模块名
* @return Object
* @throws ClassNotFoundException
*/
public static function model($name = '', $layer = 'model', $appendSuffix = false, $common = 'common')
{
@@ -289,7 +291,7 @@ class Loader
if (class_exists($class)) {
$model = new $class();
} else {
throw new Exception('class [ ' . $class . ' ] not exists', 10001);
throw new ClassNotFoundException('class [ ' . $class . ' ] not exists');
}
}
$_model[$name . $layer] = $model;
@@ -303,6 +305,7 @@ class Loader
* @param bool $appendSuffix 是否添加类名后缀
* @param string $empty 空控制器名称
* @return Object|false
* @throws ClassNotFoundException
*/
public static function controller($name, $layer = 'controller', $appendSuffix = false, $empty = '')
{
@@ -324,7 +327,7 @@ class Loader
} elseif ($empty && class_exists($emptyClass = self::parseClass($module, $layer, $empty, $appendSuffix))) {
return new $emptyClass(Request::instance());
} else {
throw new HttpException(404, 'class [ ' . $class . ' ] not exists');
throw new ClassNotFoundException('class [ ' . $class . ' ] not exists');
}
}
@@ -335,6 +338,7 @@ class Loader
* @param bool $appendSuffix 是否添加类名后缀
* @param string $common 公共模块名
* @return Object|false
* @throws ClassNotFoundException
*/
public static function validate($name = '', $layer = 'validate', $appendSuffix = false, $common = 'common')
{
@@ -360,7 +364,7 @@ class Loader
if (class_exists($class)) {
$validate = new $class;
} else {
throw new Exception('class [ ' . $class . ' ] not exists', 10001);
throw new ClassNotFoundException('class [ ' . $class . ' ] not exists');
}
}
$_instance[$name . $layer] = $validate;
@@ -409,7 +413,7 @@ class Loader
* @param string $method 类的静态方法名
*
* @return mixed
* @throws Exception
* @throws ClassNotFoundException
*/
public static function instance($class, $method = '')
{
@@ -424,7 +428,7 @@ class Loader
$_instance[$identify] = $o;
}
} else {
throw new Exception('class not exist :' . $class, 10007);
throw new ClassNotFoundException('class not exist :' . $class);
}
}
return $_instance[$identify];