From 74c8daf2c08f0bc1e82b87cd15b5119e017ee3b9 Mon Sep 17 00:00:00 2001 From: thinkphp Date: Fri, 29 Jul 2016 17:13:14 +0800 Subject: [PATCH] =?UTF-8?q?=E6=94=B9=E8=BF=9BRoute=E7=B1=BB=E7=9A=84checkD?= =?UTF-8?q?omain=E6=96=B9=E6=B3=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 | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/library/think/Route.php b/library/think/Route.php index 5958390a..b94be143 100644 --- a/library/think/Route.php +++ b/library/think/Route.php @@ -624,7 +624,7 @@ class Route * @param string $method 请求类型 * @return void */ - public static function checkDomain($request, $method) + public static function checkDomain($request, $method = 'GET') { // 域名规则 $rules = self::$rules['domain']; diff --git a/tests/thinkphp/library/think/routeTest.php b/tests/thinkphp/library/think/routeTest.php index 7e90beaa..01d0041c 100644 --- a/tests/thinkphp/library/think/routeTest.php +++ b/tests/thinkphp/library/think/routeTest.php @@ -193,7 +193,7 @@ class routeTest extends \PHPUnit_Framework_TestCase { $request = Request::create('http://subdomain.thinkphp.cn'); Route::domain('subdomain.thinkphp.cn', 'sub?abc=test&status=1'); - Route::checkDomain($request, 'GET'); + Route::checkDomain($request); $this->assertEquals('sub?abc=test&status=1', Route::rules('domain')['subdomain.thinkphp.cn'][0][0]); $this->assertEquals('sub', Route::getbind('module')); $this->assertEquals('test', $_GET['abc']);