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

改进Route类的parseRule方法

Browse Source
This commit is contained in:
thinkphp
2016-07-08 20:12:54 +08:00
parent 94e2bb47ae
commit 5d0884755b
1 changed files with 24 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

51
library/think/Route.php
View File

@@ -686,12 +686,7 @@ class Route
if (true === $rule) { if (true === $rule) {
$rule = self::$rules['*'][$url]; $rule = self::$rules['*'][$url];
} }
if (!empty($rule['option']['complete_match'])) { return self::parseRule($url, $rule['route'], $url, $rule['option']);
// 是否完整匹配
return self::parseRule($url, $rule['route'], $url);
} else {
return self::checkRule($url, $rule['route'], $url, [], $rule['option']);
}
} }
// 路由规则检测 // 路由规则检测
@@ -968,26 +963,7 @@ class Route
$pattern = array_merge(self::$rules['pattern'], $pattern); $pattern = array_merge(self::$rules['pattern'], $pattern);
if (false !== $match = self::match($url, $rule, $pattern, $merge)) { if (false !== $match = self::match($url, $rule, $pattern, $merge)) {
// 匹配到路由规则 // 匹配到路由规则
// 检测是否定义路由 return self::parseRule($rule, $route, $url, $option, $match, $merge);
if (!empty($option['after_behavior'])) {
if ($option['after_behavior'] instanceof \Closure) {
$result = call_user_func_array($option['after_behavior'], [$route]);
} else {
foreach ((array) $option['after_behavior'] as $behavior) {
$result = Hook::exec($behavior, '', $route);
if (!is_null($result)) {
break;
}
}
}
// 路由规则重定向
if ($result instanceof Response) {
return ['type' => 'response', 'response' => $result, 'params' => $match];
} elseif (is_array($result)) {
return $result;
}
}
return self::parseRule($rule, $route, $url, $match, $merge);
} }
} }
return false; return false;
@@ -1138,12 +1114,33 @@ class Route
* @param string $rule 路由规则 * @param string $rule 路由规则
* @param string $route 路由地址 * @param string $route 路由地址
* @param string $pathinfo URL地址 * @param string $pathinfo URL地址
* @param array $option 路由参数
* @param array $matches 匹配的变量 * @param array $matches 匹配的变量
* @param bool $merge 合并额外变量 * @param bool $merge 合并额外变量
* @return array * @return array
*/ */
private static function parseRule($rule, $route, $pathinfo, $matches = [], $merge = false) private static function parseRule($rule, $route, $pathinfo, $option = [], $matches = [], $merge = false)
{ {
// 检测是否定义路由
if (!empty($option['after_behavior'])) {
if ($option['after_behavior'] instanceof \Closure) {
$result = call_user_func_array($option['after_behavior'], [$route]);
} else {
foreach ((array) $option['after_behavior'] as $behavior) {
$result = Hook::exec($behavior, '', $route);
if (!is_null($result)) {
break;
}
}
}
// 路由规则重定向
if ($result instanceof Response) {
return ['type' => 'response', 'response' => $result, 'params' => $matches];
} elseif (is_array($result)) {
return $result;
}
}
// 解析路由规则 // 解析路由规则
if ($rule) { if ($rule) {
$rule = explode('/', $rule); $rule = explode('/', $rule);