From 4202fbc20b21c2c6c4ec6a438c141804a60f3b4c Mon Sep 17 00:00:00 2001 From: thinkphp Date: Wed, 21 Sep 2016 18:50:40 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=AD=A3=E5=8D=95=E5=85=83=E6=B5=8B?= =?UTF-8?q?=E8=AF=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- library/think/Route.php | 2 +- tests/thinkphp/library/think/routeTest.php | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/library/think/Route.php b/library/think/Route.php index fe96e777..d1c2e14f 100644 --- a/library/think/Route.php +++ b/library/think/Route.php @@ -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; diff --git a/tests/thinkphp/library/think/routeTest.php b/tests/thinkphp/library/think/routeTest.php index 74f2f5da..afc9a9fb 100644 --- a/tests/thinkphp/library/think/routeTest.php +++ b/tests/thinkphp/library/think/routeTest.php @@ -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()