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

改进Request类获取当前请求的控制器名

Browse Source
This commit is contained in:
thinkphp
2016-09-05 16:07:14 +08:00
parent 3e062ed3a7
commit bd0968b407
2 changed files with 2 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
library/think/App.php
View File

@@ -327,7 +327,7 @@ class App
$actionName = $convert ? strtolower($actionName) : $actionName; $actionName = $convert ? strtolower($actionName) : $actionName;
// 设置当前请求的控制器、操作 // 设置当前请求的控制器、操作
$request->controller($controller)->action($actionName); $request->controller(Loader::parseName($controller, 1))->action($actionName);
// 监听module_init // 监听module_init
Hook::listen('module_init', $request); Hook::listen('module_init', $request);

13
tests/thinkphp/library/think/requestTest.php
View File

@@ -150,7 +150,7 @@ class requestTest extends \PHPUnit_Framework_TestCase
$this->assertFalse($request->has('user_id')); $this->assertFalse($request->has('user_id'));
$this->assertTrue($request->has('test', 'request')); $this->assertTrue($request->has('test', 'request'));
$this->assertEquals(['id' => 6], $request->only('id')); $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')); $this->assertEquals('THINKPHP', $request->param('name', '', 'strtoupper'));
} }
@@ -175,15 +175,4 @@ class requestTest extends \PHPUnit_Framework_TestCase
$this->assertTrue($request->isMobile()); $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());
}
} }