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

改进Route类的checkDomain方法

Browse Source
This commit is contained in:
thinkphp
2016-07-29 17:13:14 +08:00
parent 14112f2420
commit 74c8daf2c0
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
library/think/Route.php
View File

@@ -624,7 +624,7 @@ class Route
* @param string $method 请求类型 * @param string $method 请求类型
* @return void * @return void
*/ */
public static function checkDomain($request, $method) public static function checkDomain($request, $method = 'GET')
{ {
// 域名规则 // 域名规则
$rules = self::$rules['domain']; $rules = self::$rules['domain'];

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

@@ -193,7 +193,7 @@ class routeTest extends \PHPUnit_Framework_TestCase
{ {
$request = Request::create('http://subdomain.thinkphp.cn'); $request = Request::create('http://subdomain.thinkphp.cn');
Route::domain('subdomain.thinkphp.cn', 'sub?abc=test&status=1'); 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?abc=test&status=1', Route::rules('domain')['subdomain.thinkphp.cn'][0][0]);
$this->assertEquals('sub', Route::getbind('module')); $this->assertEquals('sub', Route::getbind('module'));
$this->assertEquals('test', $_GET['abc']); $this->assertEquals('test', $_GET['abc']);