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

改进Route类

Browse Source
This commit is contained in:
thinkphp
2016-03-25 18:30:52 +08:00
parent 0ad3e4587a
commit bbebe0a02d
1 changed files with 8 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
library/think/Route.php
View File

@@ -602,21 +602,18 @@ class Route
if (false !== strpos($val, '<') && preg_match_all('/<(\w+(\??))>/', $val, $matches)) { if (false !== strpos($val, '<') && preg_match_all('/<(\w+(\??))>/', $val, $matches)) {
foreach ($matches[1] as $name) { foreach ($matches[1] as $name) {
if (strpos($name, '?')) { if (strpos($name, '?')) {
// 可选 $name = substr($name, 0, -1);
$name = substr($name, 0, -1); $replace[] = '((' . (isset($pattern[$name]) ? $pattern[$name] : '') . ')?)';
$val = str_replace('<' . $name . '?>', '((' . $pattern[$name] . ')?)', $val);
} else { } else {
$val = str_replace('<' . $name . '>', '(' . $pattern[$name] . ')', $val); $replace[] = '(' . (isset($pattern[$name]) ? $pattern[$name] : '') . ')';
} }
$value[] = $name;
} }
$val = str_replace($matches[0], $replace, $val);
if (preg_match('/^' . $val . '$/', $m1[$key], $match)) { if (preg_match('/^' . $val . '$/', $m1[$key], $match)) {
array_shift($match); array_shift($match);
foreach ($matches[1] as $i => $name) { $match = array_slice($match, 0, count($value));
if (strpos($name, '?')) { $var = array_merge($var, array_combine($value, $match));
$name = substr($name, 0, -1);
}
$var[$name] = $match[$i];
}
continue; continue;
} else { } else {
return false; return false;
@@ -634,7 +631,7 @@ class Route
// 检查变量规则 // 检查变量规则
return false; return false;
} }
$var[$name] = $m1[$key]; $var[$name] = isset($m1[$key]) ? $m1[$key] : '';
} elseif (0 !== strcasecmp($val, $m1[$key])) { } elseif (0 !== strcasecmp($val, $m1[$key])) {
return false; return false;
} }