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

修正单元测试

Browse Source
This commit is contained in:
thinkphp
2016-10-13 23:34:34 +08:00
parent 4c285d94d9
commit b9b7e34b6d
1 changed files with 8 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
library/think/Url.php
View File

@@ -35,6 +35,11 @@ class Url
$domain = true;
}
// 解析URL
if (0 === strpos($url, '[') && $pos = strpos($url, ']')) {
// [name] 表示使用路由命名标识生成URL
$name = substr($url, 1, $pos - 1);
$url = 'name' . substr($url, $pos + 1);
}
$info = parse_url($url);
$url = !empty($info['path']) ? $info['path'] : '';
if (isset($info['fragment'])) {
@@ -60,7 +65,7 @@ class Url
}
if ($url) {
$rule = Route::name($url . (isset($info['query']) ? '?' . $info['query'] : ''));
$rule = Route::name(isset($name) ? $name : $url . (isset($info['query']) ? '?' . $info['query'] : ''));
if (is_null($rule) && isset($info['query'])) {
$rule = Route::name($url);
// 解析地址里面参数 合并到vars
@@ -77,6 +82,8 @@ class Url
if (!empty($match[1])) {
$domain = $match[1];
}
} elseif (!empty($rule) && isset($name)) {
throw new \InvalidArgumentException('route name not exists:' . $name);
} else {
// 检查别名路由
$alias = Route::rules('alias');