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

改进Route类的分组定义

Browse Source
This commit is contained in:
thinkphp
2016-07-19 10:40:27 +08:00
parent 746a763606
commit 2f43df50ba
1 changed files with 8 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
library/think/Route.php
View File

@@ -59,7 +59,7 @@ class Route
// 域名绑定 // 域名绑定
private static $bind = []; private static $bind = [];
// 当前分组 // 当前分组
private static $group; private static $group = '';
// 当前参数 // 当前参数
private static $option = []; private static $option = [];
@@ -257,7 +257,11 @@ class Route
*/ */
public static function setGroup($name) public static function setGroup($name)
{ {
self::$group = $name; if (self::$group) {
self::$group = self::$group . '/' . ltrim($name, '/');
} else {
self::$group = $name;
}
} }
/** /**
@@ -291,9 +295,10 @@ class Route
if (!empty($name)) { if (!empty($name)) {
// 分组 // 分组
if ($routes instanceof \Closure) { if ($routes instanceof \Closure) {
$curentGroup = self::$group;
self::setGroup($name); self::setGroup($name);
call_user_func_array($routes, []); call_user_func_array($routes, []);
self::setGroup(null); self::setGroup($curentGroup);
self::$rules[$type][$name]['route'] = ''; self::$rules[$type][$name]['route'] = '';
self::$rules[$type][$name]['var'] = self::parseVar($name); self::$rules[$type][$name]['var'] = self::parseVar($name);
self::$rules[$type][$name]['option'] = $option; self::$rules[$type][$name]['option'] = $option;