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

改进view类 调整模板引擎的配置参数定义和传入方式

Browse Source
This commit is contained in:
thinkphp
2016-04-26 17:00:55 +08:00
parent 6e79350a79
commit 7c74dd9591
5 changed files with 60 additions and 94 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
tests/thinkphp/library/think/viewTest.php
View File

@@ -46,25 +46,6 @@ class viewTest extends \PHPUnit_Framework_TestCase
$this->assertAttributeEquals($expect_data, 'data', $view_instance);
}
/**
* 测试配置
* @return mixed
* @access public
*/
public function testConfig()
{
$view_instance = \think\View::instance([]);
$data = $view_instance->config('key2', 'value2');
$data = $view_instance->config('key3', 'value3');
$data = $view_instance->config('key3', 'value_cover');
//基础配置替换
$data = $view_instance->config(array('engine_type' => 'php'));
//目标结果
$this->assertAttributeContains('value2', "config", $view_instance);
$this->assertAttributeContains('value_cover', "config", $view_instance);
$this->assertAttributeContains('php', "config", $view_instance);
}
/**
* 测试引擎设置
* @return mixed
@@ -73,11 +54,11 @@ class viewTest extends \PHPUnit_Framework_TestCase
public function testEngine()
{
$view_instance = \think\View::instance();
$data = $view_instance->engine('php');
$data = $view_instance->engine(['type' => 'php', 'view_path' => '', 'view_suffix' => '.php', 'view_depr' => DS]);
$php_engine = new \think\view\driver\Php(['view_path' => '', 'view_suffix' => '.php', 'view_depr' => DS]);
$this->assertAttributeEquals($php_engine, 'engine', $view_instance);
//测试模板引擎驱动
$data = $view_instance->engine('think');
$data = $view_instance->engine(['type' => 'think', 'view_path' => '', 'view_suffix' => '.html', 'view_depr' => DS]);
$think_engine = new \think\view\driver\Think(['view_path' => '', 'view_suffix' => '.html', 'view_depr' => DS]);
$this->assertAttributeEquals($think_engine, 'engine', $view_instance);
}