Commit 78d37e4d by Qiang Xue

Fixes #5657: `yii\caching\ApcCache::mset()` and `madd()` may cause warning in some APC setup

parent 2c6d388f
......@@ -8,7 +8,8 @@ Yii Framework 2 Change Log
- Bug #5402: Debugger was not loading when there were closures in asset classes (samdark)
- Bug #5584: `yii\rbac\DbRbacManager` should not delete items when deleting a rule on a database not supporting cascade update (mdmunir)
- Bug #5601: Simple conditions in Query::where() and ActiveQuery::where() did not allow `yii\db\Expression` to be used as the value (cebe, stevekr)
- Bug #5665: The `currentPage` meta data in the RESTful result should be 1-based, similar to that in HTTP headers (qiangxue)
- Bug #5657: `yii\caching\ApcCache::mset()` and `madd()` may cause warning in some APC setup (LAV45)
- Bug #5665: The `currentPage` meta data in the RESTful result should be 1-based, similar to that in HTTP headers (qiangxue)
- Bug: Gii console command help information does not contain global options (qiangxue)
- Enh #5223: Query builder now supports selecting sub-queries as columns (qiangxue)
- Enh #5587: `json_encode` is now used with `JSON_UNESCAPED_SLASHES | JSON_UNESCAPED_UNICODE` where it makes sense, also
......
......@@ -56,10 +56,7 @@ class ApcCache extends Cache
protected function getValues($keys)
{
$values = apc_fetch($keys);
if ($values === false) {
$values = [];
}
return $values;
return is_array($values) ? $values : [];
}
/**
......@@ -84,7 +81,8 @@ class ApcCache extends Cache
*/
protected function setValues($data, $duration)
{
return array_keys(apc_store($data, null, $duration));
$result = apc_store($data, null, $duration);
return is_array($result) ? array_keys($result) : [];
}
/**
......@@ -108,7 +106,8 @@ class ApcCache extends Cache
*/
protected function addValues($data, $duration)
{
return array_keys(apc_add($data, null, $duration));
$result = apc_add($data, null, $duration);
return is_array($result) ? array_keys($result) : [];
}
/**
......
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