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

修正单元测试

Browse Source
This commit is contained in:
thinkphp
2016-05-18 00:02:27 +08:00
parent 1fab955a5f
commit c0048e80ea
2 changed files with 7 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
library/think/App.php
View File

@@ -321,9 +321,9 @@ class App
throw new Exception('url suffix deny');
}
$_SERVER['PATH_INFO'] = $request->path();
$depr = $config['pathinfo_depr'];
$result = false;
$path = $request->path();
$depr = $config['pathinfo_depr'];
$result = false;
// 路由检测
if (APP_ROUTE_ON && !empty($config['url_route_on'])) {
// 开启路由
@@ -332,7 +332,7 @@ class App
Route::import($config['route']);
}
// 路由检测（根据路由定义返回不同的URL调度）
$result = Route::check($request, $_SERVER['PATH_INFO'], $depr, !IS_CLI ? $config['url_domain_deploy'] : false);
$result = Route::check($request, $path, $depr, !IS_CLI ? $config['url_domain_deploy'] : false);
if (APP_ROUTE_MUST && false === $result && $config['url_route_must']) {
// 路由无效
throw new Exception('route not define ');
@@ -340,7 +340,7 @@ class App
}
if (false === $result) {
// 路由无效默认分析为模块/控制器/操作/参数...方式URL
$result = Route::parseUrl($_SERVER['PATH_INFO'], $depr);
$result = Route::parseUrl($path, $depr);
}
//保证$_REQUEST正常取值
$_REQUEST = array_merge($_POST, $_GET, $_COOKIE);

6
tests/thinkphp/library/think/appTest.php
View File

@@ -87,12 +87,10 @@ class appTest extends \PHPUnit_Framework_TestCase
// 类method调度
public function testInvokeMethod()
{
$_GET = ['thinkphp'];
$result = App::invokeMethod(['tests\thinkphp\library\think\AppInvokeMethodTestClass', 'run']);
$result = App::invokeMethod(['tests\thinkphp\library\think\AppInvokeMethodTestClass', 'run'], ['thinkphp']);
$this->assertEquals('thinkphp', $result);
$_GET = ['thinkphp'];
$result = App::invokeMethod('tests\thinkphp\library\think\AppInvokeMethodTestClass::staticRun');
$result = App::invokeMethod('tests\thinkphp\library\think\AppInvokeMethodTestClass::staticRun', ['thinkphp']);
$this->assertEquals('thinkphp', $result);
}
}