diff --git a/library/think/App.php b/library/think/App.php index d10945f5..59df8ba8 100644 --- a/library/think/App.php +++ b/library/think/App.php @@ -327,7 +327,7 @@ class App $actionName = $convert ? strtolower($actionName) : $actionName; // 设置当前请求的控制器、操作 - $request->controller($controller)->action($actionName); + $request->controller(Loader::parseName($controller, 1))->action($actionName); // 监听module_init Hook::listen('module_init', $request); diff --git a/tests/thinkphp/library/think/requestTest.php b/tests/thinkphp/library/think/requestTest.php index 25cf094d..a37fdf78 100644 --- a/tests/thinkphp/library/think/requestTest.php +++ b/tests/thinkphp/library/think/requestTest.php @@ -150,7 +150,7 @@ class requestTest extends \PHPUnit_Framework_TestCase $this->assertFalse($request->has('user_id')); $this->assertTrue($request->has('test', 'request')); $this->assertEquals(['id' => 6], $request->only('id')); - $this->assertEquals(['name' => 'thinkphp'], $request->except('id')); + $this->assertEquals(['name' => 'thinkphp', 'lang' => 'zh-cn'], $request->except('id')); $this->assertEquals('THINKPHP', $request->param('name', '', 'strtoupper')); } @@ -175,15 +175,4 @@ class requestTest extends \PHPUnit_Framework_TestCase $this->assertTrue($request->isMobile()); } - public function testRouteInfo() - { - Config::set('app_multi_module', true); - $request = new Request(); - $request->url('/hello/thinkphp'); - Route::rule('hello/:name', 'index/hello'); - Route::check($request, $request->url()); - $this->assertEquals('', $request->module()); - $this->assertEquals('index', $request->controller()); - $this->assertEquals('hello', $request->action()); - } }