From 2a9d4efc45a549654b54f716698bd37c354c3190 Mon Sep 17 00:00:00 2001
From: Alexander Makarov <sam@rmcreative.ru>
Date: Thu, 20 Jul 2017 17:32:45 +0300
Subject: [PATCH] Additional merge fixes

---
 framework/base/BaseObject.php      | 12 ++----------
 framework/filters/PageCache.php    |  2 +-
 framework/i18n/DbMessageSource.php |  2 +-
 framework/rbac/DbManager.php       |  2 +-
 4 files changed, 5 insertions(+), 13 deletions(-)

diff --git a/framework/base/BaseObject.php b/framework/base/BaseObject.php
index 714dd63..2405228 100644
--- a/framework/base/BaseObject.php
+++ b/framework/base/BaseObject.php
@@ -77,15 +77,6 @@ use Yii;
 class BaseObject implements Configurable
 {
     /**
-     * Returns the fully qualified name of this class.
-     * @return string the fully qualified name of this class.
-     */
-    public static function className()
-    {
-        return get_called_class();
-    }
-
-    /**
      * Constructor.
      * The default implementation does two things:
      *
@@ -132,7 +123,8 @@ class BaseObject implements Configurable
         $getter = 'get' . $name;
         if (method_exists($this, $getter)) {
             return $this->$getter();
-        } elseif (method_exists($this, 'set' . $name)) {
+        }
+        if (method_exists($this, 'set' . $name)) {
             throw new InvalidCallException('Getting write-only property: ' . get_class($this) . '::' . $name);
         }
 
diff --git a/framework/filters/PageCache.php b/framework/filters/PageCache.php
index 2d61fc6..162ea31 100644
--- a/framework/filters/PageCache.php
+++ b/framework/filters/PageCache.php
@@ -156,7 +156,7 @@ class PageCache extends ActionFilter
             return true;
         }
 
-        $this->cache = Instance::ensure($this->cache, Cache::class);
+        $this->cache = Instance::ensure($this->cache, CacheInterface::class);
 
         if (is_array($this->dependency)) {
             $this->dependency = Yii::createObject($this->dependency);
diff --git a/framework/i18n/DbMessageSource.php b/framework/i18n/DbMessageSource.php
index 01ecefe..7a515a8 100644
--- a/framework/i18n/DbMessageSource.php
+++ b/framework/i18n/DbMessageSource.php
@@ -92,7 +92,7 @@ class DbMessageSource extends MessageSource
         parent::init();
         $this->db = Instance::ensure($this->db, Connection::class);
         if ($this->enableCaching) {
-            $this->cache = Instance::ensure($this->cache, Cache::class);
+            $this->cache = Instance::ensure($this->cache, CacheInterface::class);
         }
     }
 
diff --git a/framework/rbac/DbManager.php b/framework/rbac/DbManager.php
index 20dcbc5..c386524 100644
--- a/framework/rbac/DbManager.php
+++ b/framework/rbac/DbManager.php
@@ -111,7 +111,7 @@ class DbManager extends BaseManager
         parent::init();
         $this->db = Instance::ensure($this->db, Connection::class);
         if ($this->cache !== null) {
-            $this->cache = Instance::ensure($this->cache, Cache::class);
+            $this->cache = Instance::ensure($this->cache, CacheInterface::class);
         }
     }