From 802c0c94a81d89ea3409dc62ef08a3ec7967fd44 Mon Sep 17 00:00:00 2001 From: Rinat Silnov Date: Sun, 5 May 2013 19:18:04 +0400 Subject: [PATCH 1/2] Check apc.enable_cli for ApcTestCase unit tests --- tests/unit/framework/caching/ApcCacheTest.php | 2 ++ 1 file changed, 2 insertions(+) diff --git a/tests/unit/framework/caching/ApcCacheTest.php b/tests/unit/framework/caching/ApcCacheTest.php index 74ede2a..604efde 100644 --- a/tests/unit/framework/caching/ApcCacheTest.php +++ b/tests/unit/framework/caching/ApcCacheTest.php @@ -17,6 +17,8 @@ class ApcCacheTest extends CacheTest { if(!extension_loaded("apc")) { $this->markTestSkipped("APC not installed. Skipping."); + } else if ('cli' === PHP_SAPI && !ini_get('apc.enable_cli')) { + $this->markTestSkipped("APC cli is not enabled. Skipping."); } if($this->_cacheInstance === null) { From 47c643fbff9ebfc28a5760789c719278a8ccfc2d Mon Sep 17 00:00:00 2001 From: Rinat Silnov Date: Sun, 5 May 2013 19:25:36 +0400 Subject: [PATCH 2/2] Call static::dumpAsString in VarDumper::dump This way we can extend VarDumper::dumpAsString --- framework/helpers/base/VarDumper.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/framework/helpers/base/VarDumper.php b/framework/helpers/base/VarDumper.php index 43b0cd8..5268568 100644 --- a/framework/helpers/base/VarDumper.php +++ b/framework/helpers/base/VarDumper.php @@ -39,7 +39,7 @@ class VarDumper */ public static function dump($var, $depth = 10, $highlight = false) { - echo self::dumpAsString($var, $depth, $highlight); + echo static::dumpAsString($var, $depth, $highlight); } /**