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

APP_MULTI_MODULE常量改为app_multi_module配置参数

Browse Source
This commit is contained in:
thinkphp
2016-06-14 08:12:14 +08:00
parent eb026e02a6
commit 87a3c5577c
9 changed files with 18 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -49,8 +49,7 @@ class appTest extends \PHPUnit_Framework_TestCase
public function testRun()
{
Config::set('root_namespace', ['/path/']);
App::run(Request::instance())->send();
App::run(Request::create("http://www.example.com"))->send();
$expectOutputString = '<style type="text/css">*{ padding: 0; margin: 0; } div{ padding: 4px 48px;} a{color:#2E5CD5;cursor: pointer;text-decoration: none} a:hover{text-decoration:underline; } body{ background: #fff; font-family: "Century Gothic","Microsoft yahei"; color: #333;font-size:18px} h1{ font-size: 100px; font-weight: normal; margin-bottom: 12px; } p{ line-height: 1.6em; font-size: 42px }</style><div style="padding: 24px 48px;"> <h1>:)</h1><p> ThinkPHP V5<br/><span style="font-size:30px">十年磨一剑 - 为API开发设计的高性能框架</span></p><span style="font-size:22px;">[ V5.0 版本由 <a href="http://www.qiniu.com" target="qiniu">七牛云</a> 独家赞助发布 ]</span></div><script type="text/javascript" src="http://tajs.qq.com/stats?sId=9347272" charset="UTF-8"></script><script type="text/javascript" src="http://ad.topthink.com/Public/static/client.js"></script><thinkad id="ad_bd568ce7058a1091"></thinkad>';
$this->expectOutputString($expectOutputString);

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

@@ -168,29 +168,28 @@ class routeTest extends \PHPUnit_Framework_TestCase
public function testDomain()
{
$_SERVER['HTTP_HOST'] = 'subdomain.thinkphp.cn';
$_SERVER['REQUEST_URI'] = '';
$request = Request::create('http://subdomain.thinkphp.cn');
Route::domain('subdomain.thinkphp.cn', 'sub?abc=test&status=1');
Route::checkDomain();
Route::checkDomain($request);
$this->assertEquals('sub?abc=test&status=1', Route::domain('subdomain.thinkphp.cn'));
$this->assertEquals('sub', Route::bind('module'));
$this->assertEquals('test', $_GET['abc']);
$this->assertEquals(1, $_GET['status']);
Route::domain('subdomain.thinkphp.cn', function () {return ['type' => 'module', 'module' => 'sub2'];});
Route::checkDomain();
Route::checkDomain($request);
$this->assertEquals('sub2', Route::bind('module'));
Route::domain('subdomain.thinkphp.cn', '\app\index\controller');
Route::checkDomain();
Route::checkDomain($request);
$this->assertEquals('\app\index\controller', Route::bind('namespace'));
Route::domain('subdomain.thinkphp.cn', '@\app\index\controller\blog');
Route::checkDomain();
Route::checkDomain($request);
$this->assertEquals('\app\index\controller\blog', Route::bind('class'));
Route::domain('subdomain.thinkphp.cn', '[sub3]');
Route::checkDomain();
Route::checkDomain($request);
$this->assertEquals('sub3', Route::bind('group'));
}
}

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

@@ -29,6 +29,7 @@ class urlTest extends \PHPUnit_Framework_TestCase
Route::get('blog/:name', 'index/blog');
Route::get('blog/:id', 'index/blog');
Config::set('pathinfo_depr', '/');
Config::set('url_html_suffix', '');
$this->assertEquals('/blog/thinkphp', Url::build('index/blog?name=thinkphp'));
$this->assertEquals('/blog/thinkphp.html', Url::build('index/blog', 'name=thinkphp', 'html'));
$this->assertEquals('/blog/10', Url::build('index/blog?id=10'));
@@ -41,6 +42,7 @@ class urlTest extends \PHPUnit_Framework_TestCase
public function testBuildController()
{
Config::set('url_html_suffix', '');
Route::get('blog/:id', '@index/blog/read');
$this->assertEquals('/blog/10.html', Url::build('@index/blog/read', 'id=10', 'html'));