From f8ca668982e7a69392ba815278f478c757634894 Mon Sep 17 00:00:00 2001 From: Kijin Sung Date: Fri, 8 Jan 2016 13:40:06 +0900 Subject: [PATCH 1/2] Don't hide E_WARNING --- config/config.inc.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/config/config.inc.php b/config/config.inc.php index df3193a58..dba0615b4 100644 --- a/config/config.inc.php +++ b/config/config.inc.php @@ -9,11 +9,11 @@ */ if(version_compare(PHP_VERSION, '5.4.0', '<')) { - @error_reporting(E_ALL ^ E_NOTICE ^ E_DEPRECATED ^ E_WARNING); + @error_reporting(E_ALL ^ E_NOTICE ^ E_DEPRECATED); } else { - @error_reporting(E_ALL ^ E_NOTICE ^ E_DEPRECATED ^ E_WARNING ^ E_STRICT); + @error_reporting(E_ALL ^ E_NOTICE ^ E_DEPRECATED ^ E_STRICT); } if(!defined('__XE__')) From afbbc965abb49146ac9a77a28efe1aa5c7e24518 Mon Sep 17 00:00:00 2001 From: Kijin Sung Date: Fri, 8 Jan 2016 13:49:22 +0900 Subject: [PATCH 2/2] Don't hide E_WARNING in unit tests --- codeception.dist.yml | 2 +- tests/unit/classes/context/ContextTest.php | 3 ++- tests/unit/classes/validator/ValidatorTest.php | 2 +- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/codeception.dist.yml b/codeception.dist.yml index db57ec19b..dd472bf20 100644 --- a/codeception.dist.yml +++ b/codeception.dist.yml @@ -8,4 +8,4 @@ settings: bootstrap: _bootstrap.php colors: true memory_limit: 1024M - error_level: "E_ALL & ~E_WARNING & ~E_STRICT & ~E_DEPRECATED & ~E_NOTICE" + error_level: "E_ALL & ~E_STRICT & ~E_DEPRECATED & ~E_NOTICE" diff --git a/tests/unit/classes/context/ContextTest.php b/tests/unit/classes/context/ContextTest.php index 068c304c9..f9614bca8 100644 --- a/tests/unit/classes/context/ContextTest.php +++ b/tests/unit/classes/context/ContextTest.php @@ -27,7 +27,8 @@ class ContextTest extends \Codeception\TestCase\Test public function testSetGetVars() { $this->assertEquals(Context::get('var1'), null); - context::set('var1', 'val1'); + Context::getInstance()->context = new stdClass; + Context::set('var1', 'val1'); $this->assertEquals(Context::get('var1'), 'val1'); Context::set('var2', 'val2'); diff --git a/tests/unit/classes/validator/ValidatorTest.php b/tests/unit/classes/validator/ValidatorTest.php index 2b2e45f46..cc21d28db 100644 --- a/tests/unit/classes/validator/ValidatorTest.php +++ b/tests/unit/classes/validator/ValidatorTest.php @@ -10,7 +10,7 @@ class ValidatorTest extends \Codeception\TestCase\Test public function _before() { global $lang; - + if(!$lang) $lang = new stdClass(); $lang->filter = new stdClass(); $lang->filter->isnull = 'isnull'; $lang->filter->outofrange = 'outofrange';