From 316d205115cb95edbcfcf9ae13e16d8ab20a54a3 Mon Sep 17 00:00:00 2001
From: Amir Sarabadani <Ladsgroup@gmail.com>
Date: Tue, 9 Jul 2019 12:51:49 +0200
Subject: [PATCH] Stop using wfDebugLog in LocalisationCache

Using logger interface, this would fix some unit tests, plus it
avoids using global functions and ease the way for proper dependency
injection

Change-Id: I9a545c70ace08e2fd0b832d75d6a2362a83af21e
---
 .../cache/localisation/LocalisationCache.php  | 22 ++++++++++++-------
 1 file changed, 14 insertions(+), 8 deletions(-)

diff --git a/includes/cache/localisation/LocalisationCache.php b/includes/cache/localisation/LocalisationCache.php
index bb84f97289..c4a7e897c4 100644
--- a/includes/cache/localisation/LocalisationCache.php
+++ b/includes/cache/localisation/LocalisationCache.php
@@ -22,6 +22,7 @@
 
 use CLDRPluralRuleParser\Evaluator;
 use CLDRPluralRuleParser\Error as CLDRPluralRuleError;
+use MediaWiki\Logger\LoggerFactory;
 use MediaWiki\MediaWikiServices;
 
 /**
@@ -69,6 +70,11 @@ class LocalisationCache {
 	 */
 	private $store;
 
+	/**
+	 * @var \Psr\Log\LoggerInterface
+	 */
+	private $logger;
+
 	/**
 	 * A 2-d associative array, code/key, where presence indicates that the item
 	 * is loaded. Value arbitrary.
@@ -193,6 +199,7 @@ class LocalisationCache {
 		global $wgCacheDirectory;
 
 		$this->conf = $conf;
+		$this->logger = LoggerFactory::getInstance( 'localisation' );
 
 		$directory = !empty( $conf['storeDirectory'] ) ? $conf['storeDirectory'] : $wgCacheDirectory;
 		$storeArg = [];
@@ -227,8 +234,7 @@ class LocalisationCache {
 					);
 			}
 		}
-
-		wfDebugLog( 'caches', static::class . ": using store $storeClass" );
+		$this->logger->debug( static::class . ": using store $storeClass" );
 
 		$this->store = new $storeClass( $storeArg );
 		foreach ( [ 'manualRecache', 'forceRecache' ] as $var ) {
@@ -401,7 +407,7 @@ class LocalisationCache {
 	 */
 	public function isExpired( $code ) {
 		if ( $this->forceRecache && !isset( $this->recachedLangs[$code] ) ) {
-			wfDebug( __METHOD__ . "($code): forced reload\n" );
+			$this->logger->debug( __METHOD__ . "($code): forced reload\n" );
 
 			return true;
 		}
@@ -411,7 +417,7 @@ class LocalisationCache {
 		$preload = $this->store->get( $code, 'preload' );
 		// Different keys may expire separately for some stores
 		if ( $deps === null || $keys === null || $preload === null ) {
-			wfDebug( __METHOD__ . "($code): cache missing, need to make one\n" );
+			$this->logger->debug( __METHOD__ . "($code): cache missing, need to make one\n" );
 
 			return true;
 		}
@@ -422,7 +428,7 @@ class LocalisationCache {
 			// anymore (e.g. uninstalled extensions)
 			// When this happens, always expire the cache
 			if ( !$dep instanceof CacheDependency || $dep->isExpired() ) {
-				wfDebug( __METHOD__ . "($code): cache for $code expired due to " .
+				$this->logger->debug( __METHOD__ . "($code): cache for $code expired due to " .
 					get_class( $dep ) . "\n" );
 
 				return true;
@@ -590,7 +596,7 @@ class LocalisationCache {
 		try {
 			$compiledRules = Evaluator::compile( $rules );
 		} catch ( CLDRPluralRuleError $e ) {
-			wfDebugLog( 'l10n', $e->getMessage() );
+			$this->logger->debug( $e->getMessage() );
 
 			return [];
 		}
@@ -830,10 +836,10 @@ class LocalisationCache {
 		# Load the primary localisation from the source file
 		$data = $this->readSourceFilesAndRegisterDeps( $code, $deps );
 		if ( $data === false ) {
-			wfDebug( __METHOD__ . ": no localisation file for $code, using fallback to en\n" );
+			$this->logger->debug( __METHOD__ . ": no localisation file for $code, using fallback to en\n" );
 			$coreData['fallback'] = 'en';
 		} else {
-			wfDebug( __METHOD__ . ": got localisation for $code from source\n" );
+			$this->logger->debug( __METHOD__ . ": got localisation for $code from source\n" );
 
 			# Merge primary localisation
 			foreach ( $data as $key => $value ) {
-- 
2.20.1