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

修正Relation类 改进Route类的group方法

Browse Source
This commit is contained in:
thinkphp
2016-05-11 22:03:26 +08:00
parent 15e01901fb
commit cbd8ea477d
3 changed files with 143 additions and 54 deletions
Download Patch File Download Diff File Expand all files Collapse all files

112
library/think/Route.php
View File

@@ -53,6 +53,9 @@ class Route
private static $pattern = []; private static $pattern = [];
// 域名绑定 // 域名绑定
private static $bind = []; private static $bind = [];
// 当前分组
private static $group;
private static $option = [];
// 添加URL映射规则 // 添加URL映射规则
public static function map($map = '', $route = '') public static function map($map = '', $route = '')
@@ -150,43 +153,118 @@ class Route
} }
self::$rules[$type][$rule] = $result; self::$rules[$type][$rule] = $result;
} }
} }
} }
// 路由分组 // 注册路由规则
public static function group($name, $routes = [], $type = '*', $option = [], $pattern = []) public static function rule($rule, $route = '', $type = '*', $option = [], $pattern = [], $group = '')
{ {
self::$rules[$type][$name] = ['routes' => $routes, 'option' => $option, 'pattern' => $pattern]; $group = $group ?: self::$group;
$option = $option ?: self::$option;
if (strpos($type, '|')) {
foreach (explode('|', $type) as $val) {
self::rule($rule, $route, $val, $option, $pattern, $group);
}
} else {
$rules = [];
if (is_array($rule)) {
foreach ($rule as $key => $val) {
if (is_numeric($key)) {
$key = array_shift($val);
}
if (is_array($val)) {
$result = ['route' => $val[0], 'option' => $val[1], 'pattern' => isset($val[2]) ? $val[2] : []];
} else {
$result = ['route' => $val, 'option' => $option, 'pattern' => $pattern];
}
if ($group) {
self::$rules[$type][$group]['routes'][$key] = $result['route'];
} else {
self::$rules[$type][$key] = $result;
}
}
} else {
if ($group) {
self::$rules[$type][$group]['routes'][$rule] = $route;
} else {
self::$rules[$type][$rule] = ['route' => $route, 'option' => $option, 'pattern' => $pattern];
}
}
}
}
// 设置当前的路由分组
public static function setGroup($name)
{
self::$group = $name;
}
// 设置当前的路由分组
public static function setOption($option)
{
self::$option = $option;
}
// 路由分组
public static function group($name, $routes, $option = [], $type = '*', $pattern = [])
{
if (is_array($name)) {
$option = $name;
$name = isset($option['name']) ? $option['name'] : '';
}
if (!empty($name)) {
if ($routes instanceof \Closure) {
self::setGroup($name);
call_user_func_array($routes, []);
self::setGroup(null);
self::$rules[$type][$name]['option'] = $option;
self::$rules[$type][$name]['pattern'] = $pattern;
} else {
self::$rules[$type][$name] = ['routes' => $routes, 'option' => $option, 'pattern' => $pattern];
}
} else {
if ($routes instanceof \Closure) {
// 闭包注册
self::setOption($option);
call_user_func_array($routes, []);
self::setOption([]);
} else {
// 批量注册路由
self::rule($routes, '', $type, $option, $pattern);
}
}
} }
// 注册任意请求的路由规则 // 注册任意请求的路由规则
public static function any($rule, $route = '', $option = [], $pattern = []) public static function any($rule, $route = '', $option = [], $pattern = [], $group = '')
{ {
self::register($rule, $route, '*', $option, $pattern); self::rule($rule, $route, '*', $option, $pattern, $group);
} }
// 注册get请求的路由规则 // 注册get请求的路由规则
public static function get($rule, $route = '', $option = [], $pattern = []) public static function get($rule, $route = '', $option = [], $pattern = [], $group = '')
{ {
self::register($rule, $route, 'GET', $option, $pattern); self::rule($rule, $route, 'GET', $option, $pattern, $group);
} }
// 注册post请求的路由规则 // 注册post请求的路由规则
public static function post($rule, $route = '', $option = [], $pattern = []) public static function post($rule, $route = '', $option = [], $pattern = [], $group = '')
{ {
self::register($rule, $route, 'POST', $option, $pattern); self::rule($rule, $route, 'POST', $option, $pattern, $group);
} }
// 注册put请求的路由规则 // 注册put请求的路由规则
public static function put($rule, $route = '', $option = [], $pattern = []) public static function put($rule, $route = '', $option = [], $pattern = [], $group = '')
{ {
self::register($rule, $route, 'PUT', $option, $pattern); self::rule($rule, $route, 'PUT', $option, $pattern, $group);
} }
// 注册delete请求的路由规则 // 注册delete请求的路由规则
public static function delete($rule, $route = '', $option = [], $pattern = []) public static function delete($rule, $route = '', $option = [], $pattern = [], $group = '')
{ {
self::register($rule, $route, 'DELETE', $option, $pattern); self::rule($rule, $route, 'DELETE', $option, $pattern, $group);
} }
// 注册资源路由 // 注册资源路由
@@ -219,7 +297,7 @@ class Route
if (strpos($val[1], ':id') && isset($option['var'][$rule])) { if (strpos($val[1], ':id') && isset($option['var'][$rule])) {
$val[1] = str_replace(':id', ':' . $option['var'][$rule], $val[1]); $val[1] = str_replace(':id', ':' . $option['var'][$rule], $val[1]);
} }
self::register($rule . $val[1] . '$', $route . '/' . $val[2], $val[0], $option, $pattern); self::rule($rule . $val[1] . '$', $route . '/' . $val[2], $val[0], $option, $pattern);
} }
} }
} }
@@ -255,7 +333,7 @@ class Route
// 注册未匹配路由规则后的处理 // 注册未匹配路由规则后的处理
public static function miss($route, $method = '*', $option = []) public static function miss($route, $method = '*', $option = [])
{ {
self::register('__miss__', $route, $method, $option, []); self::rule('__miss__', $route, $method, $option, []);
} }
// 获取路由定义 // 获取路由定义
@@ -395,8 +473,8 @@ class Route
unset($rules['__miss__']); unset($rules['__miss__']);
} }
foreach ($rules as $rule => $val) { foreach ($rules as $rule => $val) {
$option = $val['option']; $option = isset($val['option']) ? $val['option'] : [];
$pattern = $val['pattern']; $pattern = isset($val['pattern']) ? $val['pattern'] : [];
// 参数有效性检查 // 参数有效性检查
if (!self::checkOption($option, $url)) { if (!self::checkOption($option, $url)) {

6
library/think/model/Relation.php
View File

@@ -85,9 +85,9 @@ class Relation
break; break;
case self::BELONGS_TO_MANY: case self::BELONGS_TO_MANY:
// 关联查询 // 关联查询
$pk = $this->parent->getPk(); $pk = $this->parent->getPk();
$condition['pivot.' . $foreignKey] = $this->parent->$pk; $condition['pivot.' . $localKey] = $this->parent->$pk;
$result = $this->belongsToManyQuery($relation, $this->middle, $foreignKey, $localKey, $condition)->select(); $result = $this->belongsToManyQuery($relation, $this->middle, $foreignKey, $localKey, $condition)->select();
foreach ($result as $set) { foreach ($result as $set) {
$pivot = []; $pivot = [];
foreach ($set->toArray() as $key => $val) { foreach ($set->toArray() as $key => $val) {

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

@@ -24,60 +24,65 @@ class routeTest extends \PHPUnit_Framework_TestCase
public function testRegister() public function testRegister()
{ {
$request = Request::instance();
Route::get('hello/:name', 'index/hello'); Route::get('hello/:name', 'index/hello');
Route::get(['hello/:name' => 'index/hello']); Route::get(['hello/:name' => 'index/hello']);
Route::post('hello/:name', 'index/post'); Route::post('hello/:name', 'index/post');
Route::put('hello/:name', 'index/put'); Route::put('hello/:name', 'index/put');
Route::delete('hello/:name', 'index/delete'); Route::delete('hello/:name', 'index/delete');
Route::any('user/:id', 'index/user'); Route::any('user/:id', 'index/user');
$this->assertEquals(['type' => 'module', 'module' => [null, 'index', 'hello']], Route::check(Request::instance(), 'hello/thinkphp')); $this->assertEquals(['type' => 'module', 'module' => [null, 'index', 'hello']], Route::check($request, 'hello/thinkphp'));
$this->assertEquals(['hello/:name' => ['route' => 'index/hello', 'option' => [], 'pattern' => []]], Route::getRules('GET')); $this->assertEquals(['hello/:name' => ['route' => 'index/hello', 'option' => [], 'pattern' => []]], Route::getRules('GET'));
Route::register('type/:name', 'index/type', 'PUT|POST'); Route::register('type/:name', 'index/type', 'PUT|POST');
Route::rule('type/:name', 'index/type', 'PUT|POST');
} }
public function testResource() public function testResource()
{ {
$request = Request::instance();
Route::resource('res', 'index/blog'); Route::resource('res', 'index/blog');
Route::resource(['res' => ['index/blog']]); Route::resource(['res' => ['index/blog']]);
$this->assertEquals(['type' => 'module', 'module' => ['index', 'blog', 'index']], Route::check(Request::instance(), 'res')); $this->assertEquals(['type' => 'module', 'module' => ['index', 'blog', 'index']], Route::check($request, 'res'));
$this->assertEquals(['type' => 'module', 'module' => ['index', 'blog', 'create']], Route::check(Request::instance(), 'res/create')); $this->assertEquals(['type' => 'module', 'module' => ['index', 'blog', 'create']], Route::check($request, 'res/create'));
$this->assertEquals(['type' => 'module', 'module' => ['index', 'blog', 'read']], Route::check(Request::instance(), 'res/8')); $this->assertEquals(['type' => 'module', 'module' => ['index', 'blog', 'read']], Route::check($request, 'res/8'));
$this->assertEquals(['type' => 'module', 'module' => ['index', 'blog', 'edit']], Route::check(Request::instance(), 'res/8/edit')); $this->assertEquals(['type' => 'module', 'module' => ['index', 'blog', 'edit']], Route::check($request, 'res/8/edit'));
Route::resource('blog.comment', 'index/comment'); Route::resource('blog.comment', 'index/comment');
$this->assertEquals(['type' => 'module', 'module' => ['index', 'comment', 'read']], Route::check(Request::instance(), 'blog/8/comment/10')); $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::instance(), 'blog/8/comment/10/edit')); $this->assertEquals(['type' => 'module', 'module' => ['index', 'comment', 'edit']], Route::check($request, 'blog/8/comment/10/edit'));
} }
public function testRest() public function testRest()
{ {
$request = Request::instance();
Route::rest('read', ['GET', '/:id', 'look']); Route::rest('read', ['GET', '/:id', 'look']);
Route::rest('create', ['GET', '/create', 'add']); Route::rest('create', ['GET', '/create', 'add']);
Route::rest(['read' => ['GET', '/:id', 'look'], 'create' => ['GET', '/create', 'add']]); Route::rest(['read' => ['GET', '/:id', 'look'], 'create' => ['GET', '/create', 'add']]);
Route::resource('res', 'index/blog'); Route::resource('res', 'index/blog');
$this->assertEquals(['type' => 'module', 'module' => ['index', 'blog', 'add']], Route::check(Request::instance(), 'res/create')); $this->assertEquals(['type' => 'module', 'module' => ['index', 'blog', 'add']], Route::check($request, 'res/create'));
$this->assertEquals(['type' => 'module', 'module' => ['index', 'blog', 'look']], Route::check(Request::instance(), 'res/8')); $this->assertEquals(['type' => 'module', 'module' => ['index', 'blog', 'look']], Route::check($request, 'res/8'));
} }
public function testRouteMap() public function testRouteMap()
{ {
$request = Request::instance();
Route::map('hello', 'index/hello'); Route::map('hello', 'index/hello');
$this->assertEquals('index/hello', Route::map('hello')); $this->assertEquals('index/hello', Route::map('hello'));
$this->assertEquals(['type' => 'module', 'module' => ['index', 'hello', null]], Route::check(Request::instance(), 'hello')); $this->assertEquals(['type' => 'module', 'module' => ['index', 'hello', null]], Route::check($request, 'hello'));
} }
public function testMixVar() public function testMixVar()
{ {
$request = Request::instance();
Route::get('hello-<name>', 'index/hello', [], ['name' => '\w+']); Route::get('hello-<name>', 'index/hello', [], ['name' => '\w+']);
$this->assertEquals(['type' => 'module', 'module' => [null, 'index', 'hello']], Route::check(Request::instance(), 'hello-thinkphp')); $this->assertEquals(['type' => 'module', 'module' => [null, 'index', 'hello']], Route::check($request, 'hello-thinkphp'));
Route::get('hello-<name><id?>', 'index/hello', [], ['name' => '\w+', 'id' => '\d+']); Route::get('hello-<name><id?>', 'index/hello', [], ['name' => '\w+', 'id' => '\d+']);
$this->assertEquals(['type' => 'module', 'module' => [null, 'index', 'hello']], Route::check(Request::instance(), 'hello-thinkphp2016')); $this->assertEquals(['type' => 'module', 'module' => [null, 'index', 'hello']], Route::check($request, 'hello-thinkphp2016'));
Route::get('hello-<name>/[:id]', 'index/hello', [], ['name' => '\w+', 'id' => '\d+']); Route::get('hello-<name>/[:id]', 'index/hello', [], ['name' => '\w+', 'id' => '\d+']);
$this->assertEquals(['type' => 'module', 'module' => [null, 'index', 'hello']], Route::check(Request::instance(), 'hello-thinkphp/2016')); $this->assertEquals(['type' => 'module', 'module' => [null, 'index', 'hello']], Route::check($request, 'hello-thinkphp/2016'));
} }
public function testParseUrl() public function testParseUrl()
@@ -94,66 +99,72 @@ class routeTest extends \PHPUnit_Framework_TestCase
{ {
Route::get('hello/:name', 'index/hello'); Route::get('hello/:name', 'index/hello');
Route::get('blog/:id', 'blog/read', [], ['id' => '\d+']); Route::get('blog/:id', 'blog/read', [], ['id' => '\d+']);
$request = Request::instance();
$this->assertEquals(false, Route::check(Request::instance(), 'test/thinkphp')); $this->assertEquals(false, Route::check($request, 'test/thinkphp'));
$this->assertEquals(false, Route::check(Request::instance(), 'blog/thinkphp')); $this->assertEquals(false, Route::check($request, 'blog/thinkphp'));
$this->assertEquals(['type' => 'module', 'module' => [null, 'blog', 'read']], Route::check(Request::instance(), 'blog/5')); $this->assertEquals(['type' => 'module', 'module' => [null, 'blog', 'read']], Route::check($request, 'blog/5'));
$this->assertEquals(['type' => 'module', 'module' => [null, 'index', 'hello']], Route::check(Request::instance(), 'hello/thinkphp/abc/test')); $this->assertEquals(['type' => 'module', 'module' => [null, 'index', 'hello']], Route::check($request, 'hello/thinkphp/abc/test'));
} }
public function testCheckRouteGroup() public function testCheckRouteGroup()
{ {
$request = Request::instance();
Route::pattern(['id' => '\d+', 'name' => '\w{6,25}']); Route::pattern(['id' => '\d+', 'name' => '\w{6,25}']);
Route::group('group', [':id' => 'index/hello', ':name' => 'index/say']); Route::group('group', [':id' => 'index/hello', ':name' => 'index/say']);
$this->assertEquals(false, Route::check(Request::instance(), 'empty/think')); $this->assertEquals(false, Route::check($request, 'empty/think'));
$this->assertEquals(['type' => 'module', 'module' => [null, 'index', 'say']], Route::check(Request::instance(), 'group/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::instance(), 'group/10')); $this->assertEquals(['type' => 'module', 'module' => [null, 'index', 'hello']], Route::check($request, 'group/10'));
$this->assertEquals(['type' => 'module', 'module' => [null, 'index', 'say']], Route::check(Request::instance(), 'group/thinkphp')); $this->assertEquals(['type' => 'module', 'module' => [null, 'index', 'say']], Route::check($request, 'group/thinkphp'));
} }
public function testRouteToModule() public function testRouteToModule()
{ {
$request = Request::instance();
Route::get('hello/:name', 'index/hello'); Route::get('hello/:name', 'index/hello');
Route::get('blog/:id', 'blog/read', [], ['id' => '\d+']); Route::get('blog/:id', 'blog/read', [], ['id' => '\d+']);
$this->assertEquals(false, Route::check(Request::instance(), 'test/thinkphp')); $this->assertEquals(false, Route::check($request, 'test/thinkphp'));
$this->assertEquals(false, Route::check(Request::instance(), 'blog/thinkphp')); $this->assertEquals(false, Route::check($request, 'blog/thinkphp'));
$this->assertEquals(['type' => 'module', 'module' => [null, 'index', 'hello']], Route::check(Request::instance(), 'hello/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::instance(), 'blog/5')); $this->assertEquals(['type' => 'module', 'module' => [null, 'blog', 'read']], Route::check($request, 'blog/5'));
} }
public function testRouteToController() public function testRouteToController()
{ {
$request = Request::instance();
Route::get('say/:name', '@app\index\controller\index\hello'); Route::get('say/:name', '@app\index\controller\index\hello');
$this->assertEquals(['type' => 'controller', 'controller' => 'app\index\controller\index\hello', 'params' => ['name' => 'thinkphp']], Route::check(Request::instance(), 'say/thinkphp')); $this->assertEquals(['type' => 'controller', 'controller' => 'app\index\controller\index\hello', 'params' => ['name' => 'thinkphp']], Route::check($request, 'say/thinkphp'));
} }
public function testRouteToMethod() public function testRouteToMethod()
{ {
$request = Request::instance();
Route::get('user/:name', '\app\index\service\User::get', [], ['name' => '\w+']); Route::get('user/:name', '\app\index\service\User::get', [], ['name' => '\w+']);
Route::get('info/:name', ['\app\index\model\Info', 'getInfo'], [], ['name' => '\w+']); Route::get('info/:name', ['\app\index\model\Info', 'getInfo'], [], ['name' => '\w+']);
$this->assertEquals(['type' => 'method', 'method' => '\app\index\service\User::get', 'params' => ['name' => 'thinkphp']], Route::check(Request::instance(), 'user/thinkphp')); $this->assertEquals(['type' => 'method', 'method' => '\app\index\service\User::get', 'params' => ['name' => 'thinkphp']], Route::check($request, 'user/thinkphp'));
$this->assertEquals(['type' => 'method', 'method' => ['\app\index\model\Info', 'getInfo'], 'params' => ['name' => 'thinkphp']], Route::check(Request::instance(), 'info/thinkphp')); $this->assertEquals(['type' => 'method', 'method' => ['\app\index\model\Info', 'getInfo'], 'params' => ['name' => 'thinkphp']], Route::check($request, 'info/thinkphp'));
} }
public function testRouteToRedirect() public function testRouteToRedirect()
{ {
$request = Request::instance();
Route::get('art/:id', '/article/read/id/:id', [], ['id' => '\d+']); Route::get('art/:id', '/article/read/id/:id', [], ['id' => '\d+']);
$this->assertEquals(['type' => 'redirect', 'url' => '/article/read/id/8', 'status' => 301], Route::check(Request::instance(), 'art/8')); $this->assertEquals(['type' => 'redirect', 'url' => '/article/read/id/8', 'status' => 301], Route::check($request, 'art/8'));
} }
public function testBind() public function testBind()
{ {
$request = Request::instance();
Route::bind('module', 'index/blog'); Route::bind('module', 'index/blog');
$this->assertEquals(['type' => 'module', 'module' => ['index', 'blog', 'read']], Route::parseUrl('read/10')); $this->assertEquals(['type' => 'module', 'module' => ['index', 'blog', 'read']], Route::parseUrl('read/10'));
Route::get('index/blog/:id', 'index/blog/read'); Route::get('index/blog/:id', 'index/blog/read');
$this->assertEquals(['type' => 'module', 'module' => ['index', 'blog', 'read']], Route::check(Request::instance(), '10')); $this->assertEquals(['type' => 'module', 'module' => ['index', 'blog', 'read']], Route::check($request, '10'));
Route::bind('namespace', '\app\index\controller'); Route::bind('namespace', '\app\index\controller');
$this->assertEquals(['type' => 'method', 'method' => ['\app\index\controller\blog', 'read'], 'params' => []], Route::check(Request::instance(), 'blog/read')); $this->assertEquals(['type' => 'method', 'method' => ['\app\index\controller\blog', 'read'], 'params' => []], Route::check($request, 'blog/read'));
Route::bind('class', '\app\index\controller\blog'); Route::bind('class', '\app\index\controller\blog');
$this->assertEquals(['type' => 'method', 'method' => ['\app\index\controller\blog', 'read'], 'params' => []], Route::check(Request::instance(), 'read')); $this->assertEquals(['type' => 'method', 'method' => ['\app\index\controller\blog', 'read'], 'params' => []], Route::check($request, 'read'));
} }
public function testSsl() public function testSsl()