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

修正单元测试 删除controller类show方法 用 display方法替代

Browse Source
This commit is contained in:
thinkphp
2016-04-18 18:08:08 +08:00
parent 2e6ba63ed9
commit da9c1a8a81
4 changed files with 17 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
library/think/Controller.php
View File

@@ -82,7 +82,7 @@ class Controller
} }
/** /**
* 加载模板和页面输出 可以返回输出内容 * 加载模板输出
* @access public * @access public
* @param string $template 模板文件名 * @param string $template 模板文件名
* @param array $vars 模板输出变量 * @param array $vars 模板输出变量
@@ -95,7 +95,7 @@ class Controller
} }
/** /**
* 加载模板和页面输出 可以返回输出内容 * 渲染内容输出
* @access public * @access public
* @param string $template 模板文件名 * @param string $template 模板文件名
* @param array $vars 模板输出变量 * @param array $vars 模板输出变量
@@ -107,18 +107,6 @@ class Controller
return $this->view->display($template, $vars, $config); return $this->view->display($template, $vars, $config);
} }
/**
* 渲染内容输出
* @access public
* @param string $content 内容
* @param array $vars 模板输出变量
* @return mixed
*/
public function show($content, $vars = [])
{
return $this->view->show($content, $vars);
}
/** /**
* 模板变量赋值 * 模板变量赋值
* @access protected * @access protected

8
library/think/View.php
View File

@@ -30,9 +30,11 @@ class View
'engine_config' => [], 'engine_config' => [],
]; ];
public function __construct(array $config = []) public function __construct($config = [])
{ {
$this->config($config); if (is_array($config)) {
$this->config($config);
}
} }
/** /**
@@ -41,7 +43,7 @@ class View
* @param array $config 配置参数 * @param array $config 配置参数
* @return object * @return object
*/ */
public static function instance(array $config = []) public static function instance($config = [])
{ {
if (is_null(self::$instance)) { if (is_null(self::$instance)) {
self::$instance = new self($config); self::$instance = new self($config);

18
tests/thinkphp/library/think/controllerTest.php
View File

@@ -124,17 +124,15 @@ class controllerTest extends \PHPUnit_Framework_TestCase
$viewFetch = $view->fetch($template, ['name' => 'ThinkPHP']); $viewFetch = $view->fetch($template, ['name' => 'ThinkPHP']);
$controllerFetch = $controller->fetch($template, ['name' => 'ThinkPHP']); $controllerFetch = $controller->fetch($template, ['name' => 'ThinkPHP']);
$this->assertEquals($controllerFetch, $viewFetch); $this->assertEquals($controllerFetch, $viewFetch);
$controllerFetch = $controller->display($template, ['name' => 'ThinkPHP']);
$this->assertEquals($controllerFetch, $viewFetch);
} }
public function testShow() public function testDisplay()
{ {
$controller = new Foo; $controller = new Foo;
$view = $this->getView($controller); $view = $this->getView($controller);
$template = dirname(__FILE__) . '/display.html'; $template = dirname(__FILE__) . '/display.html';
$viewFetch = $view->show($template, ['name' => 'ThinkPHP']); $viewFetch = $view->display($template, ['name' => 'ThinkPHP']);
$controllerFetch = $controller->show($template, ['name' => 'ThinkPHP']); $controllerFetch = $controller->display($template, ['name' => 'ThinkPHP']);
$this->assertEquals($controllerFetch, $viewFetch); $this->assertEquals($controllerFetch, $viewFetch);
} }
@@ -148,16 +146,6 @@ class controllerTest extends \PHPUnit_Framework_TestCase
$this->assertAttributeEquals($expect, 'data', $view); $this->assertAttributeEquals($expect, 'data', $view);
} }
public function testEngine()
{
$controller = new Foo;
$view = $this->getView($controller);
$view->engine = null;
$this->assertEquals(null, $view->engine);
$controller->engine('php');
$this->assertEquals('php', $view->engine);
}
public function testValidate() public function testValidate()
{ {
$controller = new Foo; $controller = new Foo;

14
tests/thinkphp/library/think/templateTest.php
View File

@@ -319,14 +319,14 @@ EOF;
$template = new Template(); $template = new Template();
$template->assign('name', 'name'); $template->assign('name', 'name');
$config = [ $config = [
'strip_space' => true, 'strip_space' => true,
'view_path' => dirname(__FILE__) . '/', 'view_path' => dirname(__FILE__) . '/',
'cache_id' => '__CACHE_ID__', 'cache_id' => '__CACHE_ID__',
'display_cache'=> true 'display_cache' => true,
]; ];
$data = ['name' => 'value']; $data = ['name' => 'value'];
$template->layout('layout')->display('display', $data, $config); $template->layout('layout')->display('display', $data, $config);
$this->expectOutputString('value'); $this->expectOutputString('<div>value</div>');
} }
public function testFetch() public function testFetch()
@@ -385,7 +385,7 @@ EOF;
$template->fetch($content); $template->fetch($content);
$this->expectOutputString($content2); $this->expectOutputString($content2);
// $template->parse($content); // $template->parse($content);
// var_dump($content); // var_dump($content);
} }
public function testVarAssign() public function testVarAssign()
@@ -406,7 +406,7 @@ EOF;
public function testIsCache() public function testIsCache()
{ {
$template = new Template(['cache_id' => '__CACHE_ID__','display_cache' => true]); $template = new Template(['cache_id' => '__CACHE_ID__', 'display_cache' => true]);
$this->assertTrue(!$template->isCache('__CACHE_ID__')); $this->assertTrue(!$template->isCache('__CACHE_ID__'));
$template->display_cache = false; $template->display_cache = false;
$this->assertTrue(!$template->isCache('__CACHE_ID__')); $this->assertTrue(!$template->isCache('__CACHE_ID__'));