Merge "Guard against uncountable tag values"

[lhc/web/wiklou.git] / includes / cache / MessageBlobStore.php

diff --git a/includes/cache/MessageBlobStore.php b/includes/cache/MessageBlobStore.php
index 14baeeb..65e659d 100644 (file)
--- a/includes/cache/MessageBlobStore.php
+++ b/includes/cache/MessageBlobStore.php
@@ -26,6 +26,7 @@
 use Psr\Log\LoggerAwareInterface;
 use Psr\Log\LoggerInterface;
 use Psr\Log\NullLogger;
+use Wikimedia\Rdbms\Database;
 
 /**
  * This class generates message blobs for use by ResourceLoader modules.
@@ -49,8 +50,8 @@ class MessageBlobStore implements LoggerAwareInterface {
        protected $wanCache;
 
        /**
-        * @param ResourceLoader $rl
-        * @param LoggerInterface $logger
+        * @param ResourceLoader|null $rl
+        * @param LoggerInterface|null $logger
         */
        public function __construct( ResourceLoader $rl = null, LoggerInterface $logger = null ) {
                $this->resourceloader = $rl;
@@ -127,14 +128,6 @@ class MessageBlobStore implements LoggerAwareInterface {
                return $this->getBlobs( $modules, $lang );
        }
 
-       /**
-        * @deprecated since 1.27 Obsolete. Used to populate a cache table in the database.
-        * @return bool
-        */
-       public function insertMessageBlob( $name, ResourceLoaderModule $module, $lang ) {
-               return false;
-       }
-
        /**
         * @since 1.27
         * @param ResourceLoaderModule $module