Additional merge fixes

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);
         }
 

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);

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);
         }
     }
 

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);
         }
     }