内核更新

This commit is contained in:
2016-08-19 11:53:45 +08:00
parent 63f95a8ee9
commit 707ebdf51d
20 changed files with 505 additions and 154 deletions

View File

@@ -73,15 +73,16 @@ class Url
parse_str($info['query'], $params);
$vars = array_merge($params, $vars);
}
$rule = Route::name(isset($name) ? $name : $url);
if ($rule && $match = self::getRuleUrl($rule, $vars)) {
if ($url) {
$rule = Route::name(isset($name) ? $name : $url);
}
if (!empty($rule) && $match = self::getRuleUrl($rule, $vars)) {
// 匹配路由命名标识 快速生成
$url = $match;
if (!empty($rule[2])) {
$domain = $rule[2];
}
} elseif ($rule && isset($name)) {
} elseif (!empty($rule) && isset($name)) {
throw new \InvalidArgumentException('route name not exists:' . $name);
} else {
// 获取路由别名