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

改进Think\Route类的闭包定义和调用 支持传入参数

Browse Source
This commit is contained in:
thinkphp
2013-03-25 21:03:01 +08:00
parent f426a438cf
commit fa5afa1d11
1 changed files with 55 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

60
Think/Route.php
View File

@@ -89,10 +89,13 @@ class Route {
foreach ($rules as $rule=>$route){ foreach ($rules as $rule=>$route){
if(0===strpos($rule,'/') && preg_match($rule,$regx,$matches)) { // 正则路由 if(0===strpos($rule,'/') && preg_match($rule,$regx,$matches)) { // 正则路由
if($route instanceof \Closure) { if($route instanceof \Closure) {
call_user_func($route); array_shift($matches);
// 执行闭包并中止
self::invokeRegx($route,$matches);
exit; exit;
} }else{
return self::parseRegex($matches,$route,$regx); return self::parseRegex($matches,$route,$regx);
}
}else{ // 规则路由 }else{ // 规则路由
$len1 = substr_count($regx,'/'); $len1 = substr_count($regx,'/');
$len2 = substr_count($rule,'/'); $len2 = substr_count($rule,'/');
@@ -104,20 +107,54 @@ class Route {
$rule = substr($rule,0,-1); $rule = substr($rule,0,-1);
} }
} }
if(self::match($regx,$rule)){ if($var = self::match($regx,$rule)){
if($route instanceof \Closure) { if($route instanceof \Closure) {
call_user_func($route); // 执行闭包并中止
self::invokeRule($route,$var);
exit; exit;
} }else{
return self::parseRule($rule,$route,$regx); return self::parseRule($rule,$route,$regx);
} }
} }
} }
} }
} }
}
return self::parseUrl($regx); return self::parseUrl($regx);
} }
// 执行正则匹配下的闭包方法
static private function invokeRegx($closure,$var=[]) {
$reflect = new \ReflectionFunction($closure);
$params = $reflect->getParameters();
$args = [];
foreach ($params as $param){
$name = $param->getName();
if(!empty($var)) {
$args[] = array_shift($var);
}elseif($param->isDefaultValueAvailable()){
$args[] = $param->getDefaultValue();
}
}
$reflect->invokeArgs($args);
}
// 执行规则匹配下的闭包方法
static private function invokeRule($closure,$var=[]) {
$reflect = new \ReflectionFunction($closure);
$params = $reflect->getParameters();
$args = [];
foreach ($params as $param){
$name = $param->getName();
if(isset($var[$name])) {
$args[] = $var[$name];
}elseif($param->isDefaultValueAvailable()){
$args[] = $param->getDefaultValue();
}
}
$reflect->invokeArgs($args);
}
// 解析模块的URL地址 // 解析模块的URL地址
static private function parseUrl($url) { static private function parseUrl($url) {
if('/'==$url) { if('/'==$url) {
@@ -164,24 +201,31 @@ class Route {
static private function match($regx,$rule) { static private function match($regx,$rule) {
$m1 = explode('/',$regx); $m1 = explode('/',$regx);
$m2 = explode('/',$rule); $m2 = explode('/',$rule);
$var = [];
foreach ($m2 as $key=>$val){ foreach ($m2 as $key=>$val){
if(':' == substr($val,0,1)) {// 动态变量 if(0===strpos($val,':')) {// 动态变量
if(strpos($val,'\\')) { if(strpos($val,'\\')) {
$type = substr($val,-1); $type = substr($val,-1);
if('d'==$type && !is_numeric($m1[$key])) { if('d'==$type && !is_numeric($m1[$key])) {
return false; return false;
} }
}elseif(strpos($val,'^')){ $name = substr($val,1,-2);
}elseif($pos = strpos($val,'^')){
$array = explode('|',substr(strstr($val,'^'),1)); $array = explode('|',substr(strstr($val,'^'),1));
if(in_array($m1[$key],$array)) { if(in_array($m1[$key],$array)) {
return false; return false;
} }
$name = substr($val,1,$pos-1);
}else{
$name = substr($val,1);
} }
$var[$name] = $m1[$key];
}elseif(0 !== strcasecmp($val,$m1[$key])){ }elseif(0 !== strcasecmp($val,$m1[$key])){
return false; return false;
} }
} }
return true; // 成功匹配后返回URL中的动态变量数组
return $var;
} }
// 解析规则路由 // 解析规则路由