diff --git a/library/think/Url.php b/library/think/Url.php index 77d9f32b..79e3c1cb 100644 --- a/library/think/Url.php +++ b/library/think/Url.php @@ -85,13 +85,28 @@ class Url } elseif (!empty($rule) && isset($name)) { throw new \InvalidArgumentException('route name not exists:' . $name); } else { + // 检查别名路由 + $alias = Route::rules('alias'); + if ($alias) { + // 别名路由解析 + foreach ($alias as $key => $val) { + if (is_array($val)) { + $val = $val[0]; + } + if (0 === strpos($url, $val)) { + $url = $key . substr($url, strlen($val)); + break; + } + } + } else { + // 路由标识不存在 直接解析 + $url = self::parseUrl($url, $domain); + } if (isset($info['query'])) { // 解析地址里面参数 合并到vars parse_str($info['query'], $params); $vars = array_merge($params, $vars); } - // 路由标识不存在 直接解析 - $url = self::parseUrl($url, $domain); } // 检测URL绑定 diff --git a/tests/thinkphp/library/think/urlTest.php b/tests/thinkphp/library/think/urlTest.php index 94dfc71d..ef49b89f 100644 --- a/tests/thinkphp/library/think/urlTest.php +++ b/tests/thinkphp/library/think/urlTest.php @@ -25,7 +25,18 @@ class urlTest extends \PHPUnit_Framework_TestCase public function setUp() { - Route::rules([]); + Route::rules(['GET' => [], + 'POST' => [], + 'PUT' => [], + 'DELETE' => [], + 'PATCH' => [], + 'HEAD' => [], + 'OPTIONS' => [], + '*' => [], + 'alias' => [], + 'domain' => [], + 'pattern' => [], + 'name' => []]); Route::name([]); }