X-Git-Url: https://git.heureux-cyclage.org/?a=blobdiff_plain;f=includes%2Fcache%2FMessageBlobStore.php;h=ceb51f2d3fd4f42cd90e782b6701601af763eaec;hb=b4ad29cd838ed9d2120126592c22acb5d6487f6e;hp=19c49972f72a1a4456a73bb508489e394ae827c3;hpb=f0d9768b4e9f13fe75a22800471cb5543931a066;p=lhc%2Fweb%2Fwiklou.git

diff --git a/includes/cache/MessageBlobStore.php b/includes/cache/MessageBlobStore.php
index 19c49972f7..ceb51f2d3f 100644
--- a/includes/cache/MessageBlobStore.php
+++ b/includes/cache/MessageBlobStore.php
@@ -37,7 +37,7 @@ use Wikimedia\Rdbms\Database;
  */
 class MessageBlobStore implements LoggerAwareInterface {
 
-	/* @var ResourceLoader|null */
+	/* @var ResourceLoader */
 	private $resourceloader;
 
 	/**
@@ -51,13 +51,13 @@ class MessageBlobStore implements LoggerAwareInterface {
 	protected $wanCache;
 
 	/**
-	 * @param ResourceLoader|null $rl
+	 * @param ResourceLoader $rl
 	 * @param LoggerInterface|null $logger
 	 */
-	public function __construct( ResourceLoader $rl = null, LoggerInterface $logger = null ) {
+	public function __construct( ResourceLoader $rl, LoggerInterface $logger = null ) {
 		$this->resourceloader = $rl;
 		$this->logger = $logger ?: new NullLogger();
-		$this->wanCache = ObjectCache::getMainWANInstance();
+		$this->wanCache = MediaWikiServices::getInstance()->getMainWANObjectCache();
 	}
 
 	/**
@@ -191,12 +191,6 @@ class MessageBlobStore implements LoggerAwareInterface {
 	 * @return ResourceLoader
 	 */
 	protected function getResourceLoader() {
-		// Back-compat: This class supports instantiation without a ResourceLoader object.
-		// Lazy-initialise this property because most callers don't need it.
-		if ( $this->resourceloader === null ) {
-			$this->logger->warning( __CLASS__ . ' created without a ResourceLoader instance' );
-			$this->resourceloader = MediaWikiServices::getInstance()->getResourceLoader();
-		}
 		return $this->resourceloader;
 	}