From 402bd9282a02efd425da87233582b49edfc79323 Mon Sep 17 00:00:00 2001 From: thinkphp Date: Fri, 17 Jun 2016 00:07:34 +0800 Subject: [PATCH] =?UTF-8?q?url=5Fcontroller=5Fconvert=20=E5=92=8C=20url=5F?= =?UTF-8?q?action=5Fconvert=20=E5=90=88=E5=B9=B6=E4=B8=BA=20url=5Fconvert?= =?UTF-8?q?=20=E5=8F=82=E6=95=B0=20=E6=94=B9=E8=BF=9BRoute=E7=B1=BB?= =?UTF-8?q?=E5=AF=B9url=5Fconvert=E7=9A=84=E6=94=AF=E6=8C=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- convention.php | 6 +- library/think/App.php | 11 ++- library/think/Route.php | 11 +-- tests/thinkphp/library/think/routeTest.php | 86 ++++++++++++++-------- 4 files changed, 69 insertions(+), 45 deletions(-) diff --git a/convention.php b/convention.php index 7c906b80..eca9e883 100644 --- a/convention.php +++ b/convention.php @@ -87,10 +87,8 @@ return [ 'url_domain_deploy' => false, // 域名根，如.thinkphp.cn 'url_domain_root' => '', - // 是否自动转换URL中的控制器名 - 'url_controller_convert' => true, - // 是否自动转换URL中的操作名 - 'url_action_convert' => true, + // 是否自动转换URL中的控制器和操作名 + 'url_convert' => true, // 默认的访问控制器层 'url_controller_layer' => 'controller', // 表单请求类型伪装变量 diff --git a/library/think/App.php b/library/think/App.php index 9a3dd8e6..4f676fa2 100644 --- a/library/think/App.php +++ b/library/think/App.php @@ -98,7 +98,7 @@ class App break; case 'module': // 模块/控制器/操作 - $data = self::module($dispatch['module'], $config); + $data = self::module($dispatch['module'], $config, isset($dispatch['convert']) ? $dispatch['convert'] : null ); break; case 'controller': // 执行控制器操作 @@ -222,9 +222,10 @@ class App * @access public * @param array $result 模块/控制器/操作 * @param array $config 配置参数 + * @param bool $convert 是否自动转换控制器和操作名 * @return mixed */ - public static function module($result, $config) + public static function module($result, $config, $convert = null) { if (is_string($result)) { $result = explode('/', $result); @@ -258,13 +259,15 @@ class App // 当前模块路径 App::$modulePath = APP_PATH . ($module ? $module . DS : ''); + // 是否自动转换控制器和操作名 + $convert = is_bool($convert) ? $convert : $config['url_convert']; // 获取控制器名 $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 = $config['url_action_convert'] ? strtolower($actionName) : $actionName; + $actionName = $convert ? strtolower($actionName) : $actionName; // 执行操作 if (!preg_match('/^[A-Za-z](\/|\.|\w)*$/', $controller)) { diff --git a/library/think/Route.php b/library/think/Route.php index ab9885dc..1b6d2052 100644 --- a/library/think/Route.php +++ b/library/think/Route.php @@ -606,7 +606,7 @@ class Route self::$bind = ['type' => 'group', 'group' => substr($result, 1, -1)]; } else { // 绑定到模块/控制器 例如 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])) { 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'])) { $_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参数 self::parseUrlParams(implode('/', $paths), $var); // 路由到模块/控制器/操作 - $result = ['type' => 'module', 'module' => $result['route']]; - // 路由地址中的控制器和操作关闭自动转换 - Config::set('url_controller_convert', false); - Config::set('url_action_convert', false); + $result = ['type' => 'module', 'module' => $result['route'], 'convert' => true]; } return $result; } diff --git a/tests/thinkphp/library/think/routeTest.php b/tests/thinkphp/library/think/routeTest.php index 1ca2afdb..1ebc89d6 100644 --- a/tests/thinkphp/library/think/routeTest.php +++ b/tests/thinkphp/library/think/routeTest.php @@ -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-', '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-', '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-/[: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'));