php/yii2
1
0
Fork 0
mirror of https://github.com/yiisoft/yii2.git synced 2025-11-02 13:02:24 +08:00
Code Issues Packages Projects Releases Wiki Activity

Fixes #14081: Added yii\caching\CacheInterface to make custom cache extensions adoption easier

Browse Source
This commit is contained in:
SilverFire - Dmitry Naumenko
2017-05-01 16:18:18 +03:00
committed by Alexander Makarov
parent 2b7e8be1e8
commit cb53b2feec
22 changed files with 249 additions and 61 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
framework/widgets/FragmentCache.php
View File

@ -9,7 +9,7 @@ namespace yii\widgets;
use Yii;
use yii\base\Widget;
use yii\caching\Cache;
use yii\caching\CacheInterface;
use yii\caching\Dependency;
use yii\di\Instance;
@ -25,7 +25,7 @@ use yii\di\Instance;
class FragmentCache extends Widget
{
/**
* @var Cache|array|string the cache object or the application component ID of the cache object.
* @var CacheInterface|array|string the cache object or the application component ID of the cache object.
* After the FragmentCache object is created, if you want to change this property,
* you should only assign it with a cache object.
* Starting from version 2.0.2, this can also be a configuration array for creating the object.
@ -84,9 +84,9 @@ class FragmentCache extends Widget
{
parent::init();
$this->cache = $this->enabled ? Instance::ensure($this->cache, Cache::className()) : null;
$this->cache = $this->enabled ? Instance::ensure($this->cache, 'yii\caching\CacheInterface') : null;
if ($this->cache instanceof Cache && $this->getCachedContent() === false) {
if ($this->cache instanceof CacheInterface && $this->getCachedContent() === false) {
$this->getView()->cacheStack[] = $this;
ob_start();
ob_implicit_flush(false);
@ -103,7 +103,7 @@ class FragmentCache extends Widget
{
if (($content = $this->getCachedContent()) !== false) {
echo $content;
} elseif ($this->cache instanceof Cache) {
} elseif ($this->cache instanceof CacheInterface) {
array_pop($this->getView()->cacheStack);
$content = ob_get_clean();
@ -140,7 +140,7 @@ class FragmentCache extends Widget
$this->_content = false;
if (!($this->cache instanceof Cache)) {
if (!($this->cache instanceof CacheInterface)) {
return $this->_content;
}