Skip to content

Y
yii2
Commit 0ab4f8f1 by Qiang Xue
Options

Merge branch 'master' of https://github.com/yiisoft/yii2

parents 9841d6c6 309c5812
Showing with 3 additions and 1 deletion
framework/helpers/base/VarDumper.php
...@@ -39,7 +39,7 @@ class VarDumper ...@@ -39,7 +39,7 @@ class VarDumper
*/ */
public static function dump($var, $depth = 10, $highlight = false) public static function dump($var, $depth = 10, $highlight = false)
{ {
echo self::dumpAsString($var, $depth, $highlight); echo static::dumpAsString($var, $depth, $highlight);
} }
/** /**
......
tests/unit/framework/caching/ApcCacheTest.php
...@@ -17,6 +17,8 @@ class ApcCacheTest extends CacheTest ...@@ -17,6 +17,8 @@ class ApcCacheTest extends CacheTest
{ {
if(!extension_loaded("apc")) { if(!extension_loaded("apc")) {
$this->markTestSkipped("APC not installed. Skipping."); $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) { if($this->_cacheInstance === null) {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment