mirror-fastadminnet/framework
1
0
Fork 0
mirror of https://gitee.com/fastadminnet/framework.git synced 2026-07-01 12:42: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

6
convention.php
View File

@@ -87,10 +87,8 @@ return [
'url_domain_deploy' => false, 'url_domain_deploy' => false,
// 域名根，如.thinkphp.cn // 域名根，如.thinkphp.cn
'url_domain_root' => '', 'url_domain_root' => '',
// 是否自动转换URL中的控制器名 // 是否自动转换URL中的控制器和操作名
'url_controller_convert' => true, 'url_convert' => true,
// 是否自动转换URL中的操作名
'url_action_convert' => true,
// 默认的访问控制器层 // 默认的访问控制器层
'url_controller_layer' => 'controller', 'url_controller_layer' => 'controller',
// 表单请求类型伪装变量 // 表单请求类型伪装变量

11
library/think/App.php
View File

@@ -98,7 +98,7 @@ class App
break; break;
case 'module': case 'module':
// 模块/控制器/操作 // 模块/控制器/操作
$data = self::module($dispatch['module'], $config); $data = self::module($dispatch['module'], $config, isset($dispatch['convert']) ? $dispatch['convert'] : null );
break; break;
case 'controller': case 'controller':
// 执行控制器操作 // 执行控制器操作
@@ -222,9 +222,10 @@ class App
* @access public * @access public
* @param array $result 模块/控制器/操作 * @param array $result 模块/控制器/操作
* @param array $config 配置参数 * @param array $config 配置参数
* @param bool $convert 是否自动转换控制器和操作名
* @return mixed * @return mixed
*/ */
public static function module($result, $config) public static function module($result, $config, $convert = null)
{ {
if (is_string($result)) { if (is_string($result)) {
$result = explode('/', $result); $result = explode('/', $result);
@@ -258,13 +259,15 @@ class App
// 当前模块路径 // 当前模块路径
App::$modulePath = APP_PATH . ($module ? $module . DS : ''); App::$modulePath = APP_PATH . ($module ? $module . DS : '');
// 是否自动转换控制器和操作名
$convert = is_bool($convert) ? $convert : $config['url_convert'];
// 获取控制器名 // 获取控制器名
$controller = strip_tags($result[1] ?: $config['default_controller']); $controller = strip_tags($result[1] ?: $config['default_controller']);
$controller = $config['url_controller_convert'] ? strtolower($controller) : $controller; $controller = $convert ? strtolower($controller) : $controller;
// 获取操作名 // 获取操作名
$actionName = strip_tags($result[2] ?: $config['default_action']); $actionName = strip_tags($result[2] ?: $config['default_action']);
$actionName = $config['url_action_convert'] ? strtolower($actionName) : $actionName; $actionName = $convert ? strtolower($actionName) : $actionName;
// 执行操作 // 执行操作
if (!preg_match('/^[A-Za-z](\/|\.|\w)*$/', $controller)) { if (!preg_match('/^[A-Za-z](\/|\.|\w)*$/', $controller)) {

11
library/think/Route.php
View File

@@ -606,7 +606,7 @@ class Route
self::$bind = ['type' => 'group', 'group' => substr($result, 1, -1)]; self::$bind = ['type' => 'group', 'group' => substr($result, 1, -1)];
} else { } else {
// 绑定到模块/控制器 例如 index/user // 绑定到模块/控制器 例如 index/user
self::$bind = ['type' => 'module', 'module' => $result]; self::$bind = ['type' => 'module', 'module' => $result, 'convert' => true];
} }
} }
} }
@@ -853,7 +853,7 @@ class Route
if (!empty($array[1])) { if (!empty($array[1])) {
self::parseUrlParams($array[1]); self::parseUrlParams($array[1]);
} }
return ['type' => 'module', 'module' => $controller . '/' . $action, 'params' => []]; return ['type' => 'module', 'module' => $controller . '/' . $action, 'convert' => true];
} }
/** /**
@@ -973,7 +973,7 @@ class Route
if (!empty($result['var'])) { if (!empty($result['var'])) {
$_GET = array_merge($result['var'], $_GET); $_GET = array_merge($result['var'], $_GET);
} }
return ['type' => 'module', 'module' => $result['route']]; return ['type' => 'module', 'module' => $result['route'], 'convert' => null];
} }
/** /**
@@ -1172,10 +1172,7 @@ class Route
// 解析剩余的URL参数 // 解析剩余的URL参数
self::parseUrlParams(implode('/', $paths), $var); self::parseUrlParams(implode('/', $paths), $var);
// 路由到模块/控制器/操作 // 路由到模块/控制器/操作
$result = ['type' => 'module', 'module' => $result['route']]; $result = ['type' => 'module', 'module' => $result['route'], 'convert' => true];
// 路由地址中的控制器和操作关闭自动转换
Config::set('url_controller_convert', false);
Config::set('url_action_convert', false);
} }
return $result; return $result;
} }

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