From 680aa8cd6658bd89a199157173557134640432e2 Mon Sep 17 00:00:00 2001 From: thinkphp Date: Thu, 21 Jan 2016 11:56:46 +0800 Subject: [PATCH] =?UTF-8?q?=E5=BA=9F=E9=99=A4IN=5FUNIT=5FTEST=E5=B8=B8?= =?UTF-8?q?=E9=87=8F=20=E5=92=8C=20View=E7=B1=BB=E7=9A=84=20parse=5Fvar?= =?UTF-8?q?=E5=8F=82=E6=95=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- base.php | 1 - library/think/View.php | 1 - tests/mock.php | 3 --- tests/thinkphp/baseTest.php | 1 - 4 files changed, 6 deletions(-) diff --git a/base.php b/base.php index b92d788c..cb3eb85e 100644 --- a/base.php +++ b/base.php @@ -41,7 +41,6 @@ defined('APP_DEBUG') or define('APP_DEBUG', false); // 是否调试模式 defined('APP_HOOK') or define('APP_HOOK', false); // 是否开启HOOK defined('ENV_PREFIX') or define('ENV_PREFIX', 'T_'); // 环境变量的配置前缀 defined('IS_API') or define('IS_API', false); // 是否API接口 -defined('IN_UNIT_TEST') or define('IN_UNIT_TEST', false); // 是否为单元测试 defined('APP_AUTO_BUILD') or define('APP_AUTO_BUILD', false); // 是否自动生成应用模块 // 应用模式 默认为普通模式 diff --git a/library/think/View.php b/library/think/View.php index c763c688..2e608cf3 100644 --- a/library/think/View.php +++ b/library/think/View.php @@ -34,7 +34,6 @@ class View 'view_layer' => VIEW_LAYER, 'parse_str' => [], 'engine_type' => 'think', - 'parse_var' => false, 'namespace' => '\\think\\view\\driver\\', ]; diff --git a/tests/mock.php b/tests/mock.php index 9059788a..849b7210 100644 --- a/tests/mock.php +++ b/tests/mock.php @@ -10,9 +10,6 @@ // +---------------------------------------------------------------------- // 测试入口文件 - -define('IN_UNIT_TEST', true); - $_SERVER['REQUEST_METHOD'] = 'GET'; // 定义项目测试基础路径 diff --git a/tests/thinkphp/baseTest.php b/tests/thinkphp/baseTest.php index 010a9ca9..d8d4941a 100644 --- a/tests/thinkphp/baseTest.php +++ b/tests/thinkphp/baseTest.php @@ -44,7 +44,6 @@ class baseTest extends \PHPUnit_Framework_TestCase $this->assertTrue(is_bool(APP_HOOK)); $this->assertNotEmpty(ENV_PREFIX); $this->assertTrue(is_bool(IS_API)); - $this->assertTrue(is_bool(IN_UNIT_TEST)); $this->assertTrue(is_bool(APP_AUTO_BUILD)); $this->assertNotEmpty(APP_MODE); $this->assertTrue(!is_null(IS_CGI));