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

改进Url类

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

10
library/think/Url.php
View File

@@ -35,11 +35,6 @@ class Url
$domain = true; $domain = true;
} }
// 解析URL // 解析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); $info = parse_url($url);
$url = !empty($info['path']) ? $info['path'] : ''; $url = !empty($info['path']) ? $info['path'] : '';
if (isset($info['fragment'])) { if (isset($info['fragment'])) {
@@ -65,7 +60,7 @@ class Url
} }
if ($url) { if ($url) {
$rule = Route::name(isset($name) ? $name : $url . (isset($info['query']) ? '?' . $info['query'] : '')); $rule = Route::name($url . (isset($info['query']) ? '?' . $info['query'] : ''));
if (is_null($rule) && isset($info['query'])) { if (is_null($rule) && isset($info['query'])) {
$rule = Route::name($url); $rule = Route::name($url);
// 解析地址里面参数 合并到vars // 解析地址里面参数 合并到vars
@@ -82,8 +77,6 @@ class Url
if (!empty($match[1])) { if (!empty($match[1])) {
$domain = $match[1]; $domain = $match[1];
} }
} elseif (!empty($rule) && isset($name)) {
throw new \InvalidArgumentException('route name not exists:' . $name);
} else { } else {
// 检查别名路由 // 检查别名路由
$alias = Route::rules('alias'); $alias = Route::rules('alias');
@@ -107,7 +100,6 @@ class Url
parse_str($info['query'], $params); parse_str($info['query'], $params);
$vars = array_merge($params, $vars); $vars = array_merge($params, $vars);
} }
} }
// 检测URL绑定 // 检测URL绑定

13
tests/thinkphp/library/think/urlTest.php
View File

@@ -25,7 +25,18 @@ class urlTest extends \PHPUnit_Framework_TestCase
public function setUp() public function setUp()
{ {
Route::rules([]); Route::rules(['GET' => [],
'POST' => [],
'PUT' => [],
'DELETE' => [],
'PATCH' => [],
'HEAD' => [],
'OPTIONS' => [],
'*' => [],
'alias' => [],
'domain' => [],
'pattern' => [],
'name' => []]);
Route::name([]); Route::name([]);
} }