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

修正异常处理和单元测试

Browse Source
This commit is contained in:
yunwuxin
2016-05-15 10:14:17 +08:00
parent 00b17411b6
commit f78ba76767
6 changed files with 36 additions and 48 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
library/think/Error.php
View File

@@ -14,6 +14,7 @@ namespace think;
use think\exception\ErrorException;
use think\exception\Handle;
use think\exception\ThrowableError;
use think\console\Output as ConsoleOutput;
class Error
{
@@ -35,7 +36,7 @@ class Error
/**
* Exception Handler
* @param \Exception $e
* @param \Exception|\Throwable $e
*/
public static function appException($e)
{
@@ -44,8 +45,11 @@ class Error
}
self::getExceptionHandler()->report($e);
self::getExceptionHandler()->render($e)->send();
if(IS_CLI){
self::getExceptionHandler()->renderForConsole(new ConsoleOutput, $e);
}else{
self::getExceptionHandler()->render($e)->send();
}
}
/**