refactor(core): ♻️ use MainConfigNames constants instead of string li…

…terals Related: T305805
StarCitizenTools · May 7, 2024 · 9110ef1 · 9110ef1
1 parent 06e7a77
commit 9110ef1
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 8 deletions.
diff --git a/includes/Api/ApiWebappManifest.php b/includes/Api/ApiWebappManifest.php
@@ -23,6 +23,7 @@
 namespace MediaWiki\Skins\Citizen\Api;
 
 use ApiBase;
+use MediaWiki\MainConfigNames;
 use MediaWiki\MediaWikiServices;
 use MediaWiki\Title\Title;
 use SpecialPage;
@@ -44,11 +45,11 @@ public function execute() {
 		$config = $this->getConfig();
 		$resultObj = $this->getResult();
 		$resultObj->addValue( null, 'dir', $services->getContentLanguage()->getDir() );
-		$resultObj->addValue( null, 'lang', $config->get( 'LanguageCode' ) );
-		$resultObj->addValue( null, 'name', $config->get( 'Sitename' ) );
+		$resultObj->addValue( null, 'lang', $config->get( MainConfigNames::LanguageCode ) );
+		$resultObj->addValue( null, 'name', $config->get( MainConfigNames::Sitename ) );
 		// Need to set it manually because the default from start_url does not include script namespace
 		// E.g. index.php URLs will be thrown out of the PWA
-		$resultObj->addValue( null, 'scope', $config->get( 'Server' ) . '/' );
+		$resultObj->addValue( null, 'scope', $config->get( MainConfigNames::Server ) . '/' );
 		$resultObj->addValue( null, 'icons', $this->getIcons( $config, $services ) );
 		$resultObj->addValue( null, 'display', 'standalone' );
 		$resultObj->addValue( null, 'orientation', 'portrait' );
@@ -71,7 +72,7 @@ public function execute() {
 	 */
 	private function getIcons( $config, $services ) {
 		$icons = [];
-		$logos = $config->get( 'Logos' );
+		$logos = $config->get( MainConfigNames::Logos );
 
 		// That really shouldn't happen
 		if ( $logos !== false ) {

diff --git a/includes/Hooks/ResourceLoaderHooks.php b/includes/Hooks/ResourceLoaderHooks.php
@@ -27,6 +27,7 @@
 
 use Config;
 use ExtensionRegistry;
+use MediaWiki\MainConfigNames;
 use MediaWiki\ResourceLoader as RL;
 
 /**
@@ -80,9 +81,9 @@ public static function getCitizenSearchResourceLoaderConfig(
 			'wgCitizenSearchGateway' => $config->get( 'CitizenSearchGateway' ),
 			'wgCitizenSearchDescriptionSource' => $config->get( 'CitizenSearchDescriptionSource' ),
 			'wgCitizenMaxSearchResults' => $config->get( 'CitizenMaxSearchResults' ),
-			'wgScript' => $config->get( 'Script' ),
-			'wgScriptPath' => $config->get( 'ScriptPath' ),
-			'wgSearchSuggestCacheExpiry' => $config->get( 'SearchSuggestCacheExpiry' ),
+			'wgScript' => $config->get( MainConfigNames::Script ),
+			'wgScriptPath' => $config->get( MainConfigNames::ScriptPath ),
+			'wgSearchSuggestCacheExpiry' => $config->get( MainConfigNames::SearchSuggestCacheExpiry ),
 			'isMediaSearchExtensionEnabled' => ExtensionRegistry::getInstance()->isLoaded( 'MediaSearch' ),
 		];
 	}

diff --git a/includes/Partials/Metadata.php b/includes/Partials/Metadata.php
@@ -26,6 +26,7 @@
 namespace MediaWiki\Skins\Citizen\Partials;
 
 use Exception;
+use MediaWiki\MainConfigNames;
 use MediaWiki\MediaWikiServices;
 
 final class Metadata extends Partial {
@@ -50,7 +51,7 @@ public function addMetadata() {
 	private function addManifest() {
 		if (
 			$this->getConfigValue( 'CitizenEnableManifest' ) !== true ||
-			$this->getConfigValue( 'GroupPermissions' )['*']['read'] !== true
+			$this->getConfigValue( MainConfigNames::GroupPermissions )['*']['read'] !== true
 		) {
 			return;
 		}