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

url_controller_convert 和 url_action_convert 合并为 url_convert 参数 改进Route类对url_convert的支持

Browse Source
This commit is contained in:
thinkphp
2016-06-17 00:07:34 +08:00
parent 0eaf681208
commit 402bd9282a
4 changed files with 69 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files

86
tests/thinkphp/library/think/routeTest.php
View File

@@ -37,7 +37,8 @@ class routeTest extends \PHPUnit_Framework_TestCase
Route::put('hello/:name', 'index/put');
Route::delete('hello/:name', 'index/delete');
Route::any('user/:id', 'index/user');
$this->assertEquals(['type' => 'module', 'module' => [null, 'index', 'hello']], Route::check($request, 'hello/thinkphp'));
$result = Route::check($request, 'hello/thinkphp');
$this->assertEquals([null, 'index', 'hello'], $result['module']);
$this->assertEquals(['hello/:name' => ['route' => 'index/hello', 'option' => [], 'pattern' => []]], Route::getRules('GET'));
Route::rule('type/:name', 'index/type', 'PUT|POST');
}
@@ -47,15 +48,20 @@ class routeTest extends \PHPUnit_Framework_TestCase
$request = Request::instance();
Route::resource('res', 'index/blog');
Route::resource(['res' => ['index/blog']]);
$this->assertEquals(['type' => 'module', 'module' => ['index', 'blog', 'index']], Route::check($request, 'res'));
$this->assertEquals(['type' => 'module', 'module' => ['index', 'blog', 'create']], Route::check($request, 'res/create'));
$this->assertEquals(['type' => 'module', 'module' => ['index', 'blog', 'read']], Route::check($request, 'res/8'));
$this->assertEquals(['type' => 'module', 'module' => ['index', 'blog', 'edit']], Route::check($request, 'res/8/edit'));
$result = Route::check($request, 'res');
$this->assertEquals(['index', 'blog', 'index'], $result['module']);
$result = Route::check($request, 'res/create');
$this->assertEquals(['index', 'blog', 'create'], $result['module']);
$result = Route::check($request, 'res/8');
$this->assertEquals(['index', 'blog', 'read'], $result['module']);
$result = Route::check($request, 'res/8/edit');
$this->assertEquals(['index', 'blog', 'edit'], $result['module']);
Route::resource('blog.comment', 'index/comment');
$this->assertEquals(['type' => 'module', 'module' => ['index', 'comment', 'read']], Route::check($request, 'blog/8/comment/10'));
$this->assertEquals(['type' => 'module', 'module' => ['index', 'comment', 'edit']], Route::check($request, 'blog/8/comment/10/edit'));
$result = Route::check($request, 'blog/8/comment/10');
$this->assertEquals(['index', 'comment', 'read'], $result['module']);
$result = Route::check($request, 'blog/8/comment/10/edit');
$this->assertEquals(['index', 'comment', 'edit'], $result['module']);
}
public function testRest()
@@ -65,9 +71,10 @@ class routeTest extends \PHPUnit_Framework_TestCase
Route::rest('create', ['GET', '/create', 'add']);
Route::rest(['read' => ['GET', '/:id', 'look'], 'create' => ['GET', '/create', 'add']]);
Route::resource('res', 'index/blog');
$this->assertEquals(['type' => 'module', 'module' => ['index', 'blog', 'add']], Route::check($request, 'res/create'));
$this->assertEquals(['type' => 'module', 'module' => ['index', 'blog', 'look']], Route::check($request, 'res/8'));
$result = Route::check($request, 'res/create');
$this->assertEquals(['index', 'blog', 'add'], $result['module']);
$result = Route::check($request, 'res/8');
$this->assertEquals(['index', 'blog', 'look'], $result['module']);
}
@@ -76,28 +83,38 @@ class routeTest extends \PHPUnit_Framework_TestCase
$request = Request::instance();
Route::map('hello', 'index/hello');
$this->assertEquals('index/hello', Route::map('hello'));
$this->assertEquals(['type' => 'module', 'module' => ['index', 'hello', null]], Route::check($request, 'hello'));
$result = Route::check($request, 'hello');
$this->assertEquals(['index', 'hello', null], $result['module']);
}
public function testMixVar()
{
$request = Request::instance();
Route::get('hello-<name>', 'index/hello', [], ['name' => '\w+']);
$this->assertEquals(['type' => 'module', 'module' => [null, 'index', 'hello']], Route::check($request, 'hello-thinkphp'));
$result = Route::check($request, 'hello-thinkphp');
$this->assertEquals([null, 'index', 'hello'], $result['module']);
Route::get('hello-<name><id?>', 'index/hello', [], ['name' => '\w+', 'id' => '\d+']);
$this->assertEquals(['type' => 'module', 'module' => [null, 'index', 'hello']], Route::check($request, 'hello-thinkphp2016'));
$result = Route::check($request, 'hello-thinkphp2016');
$this->assertEquals([null, 'index', 'hello'], $result['module']);
Route::get('hello-<name>/[:id]', 'index/hello', [], ['name' => '\w+', 'id' => '\d+']);
$this->assertEquals(['type' => 'module', 'module' => [null, 'index', 'hello']], Route::check($request, 'hello-thinkphp/2016'));
$result = Route::check($request, 'hello-thinkphp/2016');
$this->assertEquals([null, 'index', 'hello'], $result['module']);
}
public function testParseUrl()
{
$this->assertEquals(['type' => 'module', 'module' => ['hello', null, null]], Route::parseUrl('hello'));
$this->assertEquals(['type' => 'module', 'module' => ['index', 'hello', null]], Route::parseUrl('index/hello'));
$this->assertEquals(['type' => 'module', 'module' => ['index', 'hello', null]], Route::parseUrl('index/hello?name=thinkphp'));
$this->assertEquals(['type' => 'module', 'module' => ['index', 'user', 'hello']], Route::parseUrl('index/user/hello'));
$this->assertEquals(['type' => 'module', 'module' => ['index', 'user', 'hello']], Route::parseUrl('index/user/hello/name/thinkphp'));
$this->assertEquals(['type' => 'module', 'module' => ['index', 'index', 'hello']], Route::parseUrl('index-index-hello', '-'));
$result = Route::parseUrl('hello');
$this->assertEquals(['hello', null, null], $result['module']);
$result = Route::parseUrl('index/hello');
$this->assertEquals(['index', 'hello', null], $result['module']);
$result = Route::parseUrl('index/hello?name=thinkphp');
$this->assertEquals(['index', 'hello', null], $result['module']);
$result = Route::parseUrl('index/user/hello');
$this->assertEquals(['index', 'user', 'hello'], $result['module']);
$result = Route::parseUrl('index/user/hello/name/thinkphp');
$this->assertEquals(['index', 'user', 'hello'], $result['module']);
$result = Route::parseUrl('index-index-hello', '-');
$this->assertEquals(['index', 'index', 'hello'], $result['module']);
}
public function testCheckRoute()
@@ -107,8 +124,10 @@ class routeTest extends \PHPUnit_Framework_TestCase
$request = Request::instance();
$this->assertEquals(false, Route::check($request, 'test/thinkphp'));
$this->assertEquals(false, Route::check($request, 'blog/thinkphp'));
$this->assertEquals(['type' => 'module', 'module' => [null, 'blog', 'read']], Route::check($request, 'blog/5'));
$this->assertEquals(['type' => 'module', 'module' => [null, 'index', 'hello']], Route::check($request, 'hello/thinkphp/abc/test'));
$result = Route::check($request, 'blog/5');
$this->assertEquals([null, 'blog', 'read'], $result['module']);
$result = Route::check($request, 'hello/thinkphp/abc/test');
$this->assertEquals([null, 'index', 'hello'], $result['module']);
}
public function testCheckRouteGroup()
@@ -117,9 +136,12 @@ class routeTest extends \PHPUnit_Framework_TestCase
Route::pattern(['id' => '\d+', 'name' => '\w{6,25}']);
Route::group('group', [':id' => 'index/hello', ':name' => 'index/say']);
$this->assertEquals(false, Route::check($request, 'empty/think'));
$this->assertEquals(['type' => 'module', 'module' => [null, 'index', 'say']], Route::check($request, 'group/think'));
$this->assertEquals(['type' => 'module', 'module' => [null, 'index', 'hello']], Route::check($request, 'group/10'));
$this->assertEquals(['type' => 'module', 'module' => [null, 'index', 'say']], Route::check($request, 'group/thinkphp'));
$result = Route::check($request, 'group/think');
$this->assertEquals([null, 'index', 'say'], $result['module']);
$result = Route::check($request, 'group/10');
$this->assertEquals([null, 'index', 'hello'], $result['module']);
$result = Route::check($request, 'group/thinkphp');
$this->assertEquals([null, 'index', 'say'], $result['module']);
}
public function testRouteToModule()
@@ -129,8 +151,10 @@ class routeTest extends \PHPUnit_Framework_TestCase
Route::get('blog/:id', 'blog/read', [], ['id' => '\d+']);
$this->assertEquals(false, Route::check($request, 'test/thinkphp'));
$this->assertEquals(false, Route::check($request, 'blog/thinkphp'));
$this->assertEquals(['type' => 'module', 'module' => [null, 'index', 'hello']], Route::check($request, 'hello/thinkphp'));
$this->assertEquals(['type' => 'module', 'module' => [null, 'blog', 'read']], Route::check($request, 'blog/5'));
$result = Route::check($request, 'hello/thinkphp');
$this->assertEquals([null, 'index', 'hello'], $result['module']);
$result = Route::check($request, 'blog/5');
$this->assertEquals([null, 'blog', 'read'], $result['module']);
}
public function testRouteToController()
@@ -160,10 +184,12 @@ class routeTest extends \PHPUnit_Framework_TestCase
{
$request = Request::instance();
Route::bind('module', 'index/blog');
$this->assertEquals(['type' => 'module', 'module' => ['index', 'blog', 'read']], Route::parseUrl('read/10'));
$result = Route::parseUrl('read/10');
$this->assertEquals(['index', 'blog', 'read'], $result['module']);
Route::get('index/blog/:id', 'index/blog/read');
$this->assertEquals(['type' => 'module', 'module' => ['index', 'blog', 'read']], Route::check($request, '10'));
$result = Route::check($request, '10');
$this->assertEquals(['index', 'blog', 'read'], $result['module']);
Route::bind('namespace', '\app\index\controller');
$this->assertEquals(['type' => 'method', 'method' => ['\app\index\controller\blog', 'read'], 'params' => []], Route::check($request, 'blog/read'));