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

修正单元测试

Browse Source
This commit is contained in:
thinkphp
2016-09-21 18:50:40 +08:00
parent f7e65f4f4b
commit 4202fbc20b
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
library/think/Route.php
View File

@@ -1402,7 +1402,7 @@ class Route
} elseif (0 === strpos($route, '/') || 0 === strpos($route, 'http')) {
// 路由到重定向地址
$result = ['type' => 'redirect', 'url' => $route, 'status' => isset($option['status']) ? $option['status'] : 301];
} elseif (strpos($route, '\\')) {
} elseif (false !== strpos($route, '\\')) {
// 路由到方法
$route = str_replace('/', '@', $route);
$method = strpos($route, '@') ? explode('@', $route) : $route;

4
tests/thinkphp/library/think/routeTest.php
View File

@@ -226,8 +226,8 @@ class routeTest extends \PHPUnit_Framework_TestCase
public function testRouteToController()
{
$request = Request::instance();
Route::get('say/:name', '@app\index\controller\index\hello');
$this->assertEquals(['type' => 'controller', 'controller' => 'app\index\controller\index\hello'], Route::check($request, 'say/thinkphp'));
Route::get('say/:name', '@index/hello');
$this->assertEquals(['type' => 'controller', 'controller' => 'index/hello'], Route::check($request, 'say/thinkphp'));
}
public function testRouteToMethod()