refactor(core): ♻️ use SkinComponentUtils to get SpecialPages URLs

StarCitizenTools · Jan 2, 2025 · dfa0aa4 · dfa0aa4
1 parent d67bcb1
commit dfa0aa4
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 20 deletions.
diff --git a/includes/Components/CitizenComponentLink.php b/includes/Components/CitizenComponentLink.php
@@ -4,13 +4,8 @@
 
 namespace MediaWiki\Skins\Citizen\Components;
 
-/**
- * TODO: Update to new classes when we move to MW 1.43
- * - MediaWiki\Html\Html
- * - MediaWiki\Linker\Linker
- */
-use Html;
-use Linker;
+use MediaWiki\Html\Html;
+use MediaWiki\Linker\Linker;
 use MessageLocalizer;
 
 /**

diff --git a/includes/Components/CitizenComponentPageHeading.php b/includes/Components/CitizenComponentPageHeading.php
@@ -5,12 +5,12 @@
 namespace MediaWiki\Skins\Citizen\Components;
 
 use MediaWiki\MediaWikiServices;
+use MediaWiki\Skin\SkinComponentUtils;
 use MediaWiki\Title\Title;
 use MediaWiki\User\UserIdentity;
 use MessageLocalizer;
 use MWTimestamp;
 use OutputPage;
-use SpecialPage;
 use Wikimedia\IPUtils;
 
 /**
@@ -119,8 +119,7 @@ private function buildUserTagline(): string {
 
 			if ( $editCount ) {
 				$msgEditCount = $localizer->msg( 'usereditcount' )->numParams( sprintf( '%s', number_format( $editCount, 0 ) ) );
-				// TODO: Replace with SkinComponentUtils on 1.43
-				$editCountHref = SpecialPage::getTitleFor( 'Contributions', $user )->getLocalURL();
+				$editCountHref = SkinComponentUtils::makeSpecialUrlSubpage( 'Contributions', $user );
 				$tagline .= "<span id=\"citizen-tagline-user-editcount\" data-user-editcount=\"$editCount\"><a href=\"$editCountHref\">$msgEditCount</a></span>";
 			}
 

diff --git a/includes/Components/CitizenComponentSearchBox.php b/includes/Components/CitizenComponentSearchBox.php
@@ -5,8 +5,8 @@
 namespace MediaWiki\Skins\Citizen\Components;
 
 use ExtensionRegistry;
+use MediaWiki\Skin\SkinComponentUtils;
 use MessageLocalizer;
-use SpecialPage;
 
 /**
  * CitizenComponentSearchBox component
@@ -71,8 +71,7 @@ public function getTemplateData(): array {
 			'array-keyboard-hint' => $this->getKeyboardHintData(),
 			'msg-citizen-search-footer' => $this->getFooterMessage(),
 			'msg-citizen-search-toggle-shortcut' => '[/]',
-			// TODO: Replace with SkinComponentUtils on 1.43
-			'html-random-href' => SpecialPage::getTitleFor( 'Randompage' )->getLocalURL()
+			'html-random-href' => SkinComponentUtils::makeSpecialUrl( 'Randompage' )
 		];
 		return $searchBoxData;
 	}

diff --git a/includes/Hooks/SkinHooks.php b/includes/Hooks/SkinHooks.php
@@ -26,20 +26,20 @@
 namespace MediaWiki\Skins\Citizen\Hooks;
 
 use ExtensionRegistry;
-use Html;
+use MediaWiki\Html\Html;
 use Language;
 use MediaWiki\Hook\BeforePageDisplayHook;
 use MediaWiki\Hook\SidebarBeforeOutputHook;
 use MediaWiki\Hook\SkinBuildSidebarHook;
 use MediaWiki\Hook\SkinEditSectionLinksHook;
 use MediaWiki\ResourceLoader as RL;
+use MediaWiki\Skin\SkinComponentUtils;
 use MediaWiki\Skins\Citizen\GetConfigTrait;
 use MediaWiki\Skins\Hook\SkinPageReadyConfigHook;
 use MediaWiki\Title\Title;
 use OutputPage;
 use Skin;
 use SkinTemplate;
-use SpecialPage;
 
 /**
  * Hooks to run relating the skin
@@ -111,8 +111,7 @@ public function onSkinBuildSidebar( $skin, &$bar ): void {
 		$name = empty( $globalToolsId ) ? 'navigation' : preg_replace( '/^p-/', '', $globalToolsId );
 		$bar[$name]['specialpages'] = [
 			'text'  => $skin->msg( 'specialpages' ),
-			// TODO: Replace with SkinComponentUtils on 1.43
-			'href'  => SpecialPage::getTitleFor( 'Specialpages' )->getLocalURL(),
+			'href'  => SkinComponentUtils::makeSpecialUrl( 'Specialpages' ),
 			'title' => $skin->msg( 'tooltip-t-specialpages' ),
 			'icon'  => 'specialPages',
 			'id'    => 't-specialpages',
@@ -122,11 +121,10 @@ public function onSkinBuildSidebar( $skin, &$bar ): void {
 			$isUploadWizardEnabled = ExtensionRegistry::getInstance()->isLoaded( 'Upload Wizard' );
 			$bar[$name]['upload'] = [
 				'text'  => $skin->msg( 'upload' ),
-				// TODO: Replace with SkinComponentUtils on 1.43
-				'href'  => SpecialPage::getTitleFor( $isUploadWizardEnabled ?
+				'href'  => SkinComponentUtils::makeSpecialUrl( $isUploadWizardEnabled ?
 					'UploadWizard' :
 					'Upload'
-				)->getLocalURL(),
+				),
 				'title' => $skin->msg( 'tooltip-t-upload' ),
 				'icon'  => 'upload',
 				'id'    => 't-upload',