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

改进Handle类支持异常的多语言 Lang类增加has方法 增加核心中文语言包

Browse Source
This commit is contained in:
thinkphp
2016-06-16 16:07:44 +08:00
parent d8fc0bf7aa
commit 50d1798e92
35 changed files with 151 additions and 59 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
library/think/App.php
View File

@@ -249,7 +249,7 @@ class App
// 初始化模块
$config = self::init($module);
} else {
throw new HttpException(404, 'module [ ' . $module . ' ] not exists ');
throw new HttpException(404, 'module not exists:' . $module);
}
} else {
// 单一模块部署
@@ -286,7 +286,7 @@ class App
$action = $actionName . $config['action_suffix'];
if (!preg_match('/^[A-Za-z](\w)*$/', $action)) {
// 非法操作
throw new \ReflectionException('illegal action name :' . $actionName);
throw new \ReflectionException('illegal action name:' . $actionName);
}
// 执行操作方法
@@ -301,7 +301,7 @@ class App
$data = $method->invokeArgs($instance, [$action, '']);
self::$debug && Log::record('[ RUN ] ' . $method->getFileName(), 'info');
} else {
throw new HttpException(404, 'method [ ' . (new \ReflectionClass($instance))->getName() . '->' . $action . ' ] not exists ');
throw new HttpException(404, 'method not exists:' . (new \ReflectionClass($instance))->getName() . '->' . $action);
}
}
return $data;
@@ -419,7 +419,7 @@ class App
{
// 检测URL禁用后缀
if ($config['url_deny_suffix'] && preg_match('/\.(' . $config['url_deny_suffix'] . ')$/i', $request->pathinfo())) {
throw new Exception('url suffix deny');
throw new Exception('url suffix deny:'.$request->ext());
}
$path = $request->path();