* @author Timo Tijhof
*/
+use MediaWiki\MediaWikiServices;
use Psr\Log\LoggerAwareInterface;
use Psr\Log\LoggerInterface;
use Psr\Log\NullLogger;
*/
class MessageBlobStore implements LoggerAwareInterface {
- /* @var ResourceLoader|null */
+ /* @var ResourceLoader */
private $resourceloader;
/**
/**
* @param ResourceLoader $rl
- * @param LoggerInterface $logger
+ * @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();
}
/**
* @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 = new ResourceLoader();
- }
return $this->resourceloader;
}