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

闭包路由定义的时候 函数返回值 如果是数组之外的 都会直接输出并exit

Browse Source
This commit is contained in:
thinkphp
2015-12-02 16:45:54 +08:00
parent 0dc82f3ab0
commit 59f71a86bb
3 changed files with 7 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
library/think/app.php
View File

@@ -25,10 +25,6 @@ class App
*/ */
public static function run(array $config = []) public static function run(array $config = [])
{ {
if (version_compare(PHP_VERSION, '5.4.0', '<')) {
throw new Exception('require PHP > 5.4.0 !');
}
// 初始化公共模块 // 初始化公共模块
self::initModule(COMMON_MODULE, $config); self::initModule(COMMON_MODULE, $config);

6
library/think/error.php
View File

@@ -124,12 +124,12 @@ class Error
if (Config::get('show_error_msg')) { if (Config::get('show_error_msg')) {
$e['message'] = is_array($error) ? $error['message'] : $error; $e['message'] = is_array($error) ? $error['message'] : $error;
} else { } else {
$e['message'] = C('error_message'); $e['message'] = Config::get('error_message');
} }
} }
} }
// 包含异常页面模板 // 包含异常页面模板
$data = include Config::get('exception_tmpl'); include Config::get('exception_tmpl');
exit(Response::returnData($data)); exit;
} }
} }

6
library/think/route.php
View File

@@ -273,7 +273,8 @@ class Route
// 正则路由 // 正则路由
if ($route instanceof \Closure) { if ($route instanceof \Closure) {
// 执行闭包 // 执行闭包
return self::invokeRegx($route, $matches); $result = self::invokeRegx($route, $matches);
return is_array($result) ? $result : exit($result);
} }
return self::parseRegex($matches, $route, $regx); return self::parseRegex($matches, $route, $regx);
} }
@@ -297,7 +298,8 @@ class Route
if (false !== $match = self::match($regx, $rule)) { if (false !== $match = self::match($regx, $rule)) {
if ($route instanceof \Closure) { if ($route instanceof \Closure) {
// 执行闭包 // 执行闭包
return self::invokeRule($route, $match); $result = self::invokeRule($route, $match);
return is_array($result) ? $result : exit($result);
} }
return self::parseRule($rule, $route, $regx); return self::parseRule($rule, $route, $regx);
} }