From 0f49ae27592718aa253a483cd5f90d3c5c814b48 Mon Sep 17 00:00:00 2001
From: Umherirrender <umherirrender_de.wp@web.de>
Date: Wed, 17 Aug 2022 21:27:48 +0200
Subject: [PATCH] Use MainConfigNames constant to refer configs

Change-Id: Iddef589423d1e3f609b3cfbf6cc7437c6ad830b0
---
 includes/Rest/Handler/ParsoidHandler.php   |  5 ++-
 includes/ServiceWiring.php                 |  2 +-
 includes/api/ApiQueryUserContribs.php      |  2 +-
 includes/exception/MWExceptionRenderer.php |  4 +-
 includes/installer/Installer.php           | 52 +++++++++++-----------
 5 files changed, 33 insertions(+), 32 deletions(-)

diff --git a/includes/Rest/Handler/ParsoidHandler.php b/includes/Rest/Handler/ParsoidHandler.php
index b06ba862022..05a0a208922 100644
--- a/includes/Rest/Handler/ParsoidHandler.php
+++ b/includes/Rest/Handler/ParsoidHandler.php
@@ -25,6 +25,7 @@ use InvalidArgumentException;
 use Liuggio\StatsdClient\Factory\StatsdDataFactoryInterface;
 use LogicException;
 use MediaWiki\Logger\LoggerFactory;
+use MediaWiki\MainConfigNames;
 use MediaWiki\MediaWikiServices;
 use MediaWiki\Parser\Parsoid\HTMLTransform;
 use MediaWiki\Rest\Handler;
@@ -93,7 +94,7 @@ abstract class ParsoidHandler extends Handler {
 		$services = MediaWikiServices::getInstance();
 		// @phan-suppress-next-line PhanTypeInstantiateAbstractStatic
 		return new static(
-			$services->getMainConfig()->get( 'ParsoidSettings' ),
+			$services->getMainConfig()->get( MainConfigNames::ParsoidSettings ),
 			$services->getParsoidSiteConfig(),
 			$services->getParsoidPageConfigFactory(),
 			$services->getParsoidDataAccess()
@@ -131,7 +132,7 @@ abstract class ParsoidHandler extends Handler {
 		// We are cutting some corners here (IDN, non-ASCII casing)
 		// since domain name support is provisional.
 		// TODO use a proper validator instead
-		$server = \RequestContext::getMain()->getConfig()->get( 'Server' );
+		$server = \RequestContext::getMain()->getConfig()->get( MainConfigNames::Server );
 		$expectedDomain = wfParseUrl( $server )['host'] ?? null;
 		if ( !$expectedDomain ) {
 			throw new LogicException( 'Cannot parse $wgServer' );
diff --git a/includes/ServiceWiring.php b/includes/ServiceWiring.php
index cc9a81ee610..9b7aad5d239 100644
--- a/includes/ServiceWiring.php
+++ b/includes/ServiceWiring.php
@@ -2189,7 +2189,7 @@ return [
 	'WRStatsFactory' => static function ( MediaWikiServices $services ): WRStatsFactory {
 		return new WRStatsFactory(
 			new BagOStuffStatsStore(
-				ObjectCache::getInstance( $services->getMainConfig()->get( 'StatsCacheType' ) )
+				ObjectCache::getInstance( $services->getMainConfig()->get( MainConfigNames::StatsCacheType ) )
 			)
 		);
 	},
diff --git a/includes/api/ApiQueryUserContribs.php b/includes/api/ApiQueryUserContribs.php
index 6aadaf875f2..f0b2ac4574c 100644
--- a/includes/api/ApiQueryUserContribs.php
+++ b/includes/api/ApiQueryUserContribs.php
@@ -204,7 +204,7 @@ class ApiQueryUserContribs extends ApiQueryBase {
 		} elseif ( isset( $this->params['iprange'] ) ) {
 			// Make sure it is a valid range and within the CIDR limit
 			$ipRange = $this->params['iprange'];
-			$contribsCIDRLimit = $this->getConfig()->get( 'RangeContributionsCIDRLimit' );
+			$contribsCIDRLimit = $this->getConfig()->get( MainConfigNames::RangeContributionsCIDRLimit );
 			if ( IPUtils::isIPv4( $ipRange ) ) {
 				$type = 'IPv4';
 				$cidrLimit = $contribsCIDRLimit['IPv4'];
diff --git a/includes/exception/MWExceptionRenderer.php b/includes/exception/MWExceptionRenderer.php
index 081ea3ccc50..114a77263ff 100644
--- a/includes/exception/MWExceptionRenderer.php
+++ b/includes/exception/MWExceptionRenderer.php
@@ -374,8 +374,8 @@ class MWExceptionRenderer {
 	 */
 	private static function reportOutageHTML( Throwable $e ) {
 		$mainConfig = MediaWikiServices::getInstance()->getMainConfig();
-		$showExceptionDetails = $mainConfig->get( 'ShowExceptionDetails' );
-		$showHostnames = $mainConfig->get( 'ShowHostnames' );
+		$showExceptionDetails = $mainConfig->get( MainConfigNames::ShowExceptionDetails );
+		$showHostnames = $mainConfig->get( MainConfigNames::ShowHostnames );
 		$sorry = htmlspecialchars( self::msg(
 			'dberr-problems',
 			'Sorry! This site is experiencing technical difficulties.'
diff --git a/includes/installer/Installer.php b/includes/installer/Installer.php
index 93e71ba867d..eb268ce37a5 100644
--- a/includes/installer/Installer.php
+++ b/includes/installer/Installer.php
@@ -171,32 +171,32 @@ abstract class Installer {
 	 * @var array
 	 */
 	private const DEFAULT_VAR_NAMES = [
-		'Sitename',
-		'PasswordSender',
-		'LanguageCode',
-		'Localtimezone',
-		'RightsIcon',
-		'RightsText',
-		'RightsUrl',
-		'EnableEmail',
-		'EnableUserEmail',
-		'EnotifUserTalk',
-		'EnotifWatchlist',
-		'EmailAuthentication',
-		'DBname',
-		'DBtype',
-		'Diff3',
-		'ImageMagickConvertCommand',
-		'GitBin',
-		'ScriptPath',
-		'MetaNamespace',
-		'DeletedDirectory',
-		'EnableUploads',
-		'SecretKey',
-		'UseInstantCommons',
-		'UpgradeKey',
-		'DefaultSkin',
-		'Pingback',
+		MainConfigNames::Sitename,
+		MainConfigNames::PasswordSender,
+		MainConfigNames::LanguageCode,
+		MainConfigNames::Localtimezone,
+		MainConfigNames::RightsIcon,
+		MainConfigNames::RightsText,
+		MainConfigNames::RightsUrl,
+		MainConfigNames::EnableEmail,
+		MainConfigNames::EnableUserEmail,
+		MainConfigNames::EnotifUserTalk,
+		MainConfigNames::EnotifWatchlist,
+		MainConfigNames::EmailAuthentication,
+		MainConfigNames::DBname,
+		MainConfigNames::DBtype,
+		MainConfigNames::Diff3,
+		MainConfigNames::ImageMagickConvertCommand,
+		MainConfigNames::GitBin,
+		MainConfigNames::ScriptPath,
+		MainConfigNames::MetaNamespace,
+		MainConfigNames::DeletedDirectory,
+		MainConfigNames::EnableUploads,
+		MainConfigNames::SecretKey,
+		MainConfigNames::UseInstantCommons,
+		MainConfigNames::UpgradeKey,
+		MainConfigNames::DefaultSkin,
+		MainConfigNames::Pingback,
 	];
 
 	/**