Merge "LanguagesHelper: Move $out from contructor to doesTitleHasLanguagesOrVariants"

includes/LanguagesHelper.php

@@ -31,30 +31,26 @@ class LanguagesHelper {
 
 	private LanguageConverterFactory $languageConverterFactory;
 
-	/**
-	 * @var bool
-	 */
-	private $hasLanguages;
-
 	/**
 	 * @param LanguageConverterFactory $languageConverterFactory
-	 * @param OutputPage $out Output page to fetch language links
 	 */
 	public function __construct(
-		LanguageConverterFactory $languageConverterFactory,
-		OutputPage $out
+		LanguageConverterFactory $languageConverterFactory
 	) {
 		$this->languageConverterFactory = $languageConverterFactory;
-		$this->hasLanguages = $out->getLanguageLinks() !== [];
 	}
 
 	/**
 	 * Whether the Title is also available in other languages or variants
+	 * @param OutputPage $out Output page to fetch language links
 	 * @param Title $title
 	 * @return bool
 	 */
-	public function doesTitleHasLanguagesOrVariants( Title $title ) {
-		if ( $this->hasLanguages ) {
+	public function doesTitleHasLanguagesOrVariants(
+		OutputPage $out,
+		Title $title
+	) {
+		if ( $out->getLanguageLinks() !== [] ) {
 			return true;
 		}
 		$langConv = $this->languageConverterFactory->getLanguageConverter( $title->getPageLanguage() );

includes/Menu/PageActions/ToolbarBuilder.php

@@ -22,6 +22,7 @@ namespace MediaWiki\Minerva\Menu\PageActions;
 
 use ExtensionRegistry;
 use MediaWiki\Config\ServiceOptions;
+use MediaWiki\Context\IContextSource;
 use MediaWiki\Minerva\LanguagesHelper;
 use MediaWiki\Minerva\Menu\Entries\IMenuEntry;
 use MediaWiki\Minerva\Menu\Entries\LanguageSelectorEntry;
@@ -35,7 +36,6 @@ use MediaWiki\Title\Title;
 use MediaWiki\User\User;
 use MediaWiki\User\UserIdentity;
 use MediaWiki\Watchlist\WatchlistManager;
-use MessageLocalizer;
 use SpecialMobileHistory;
 
 class ToolbarBuilder {
@@ -48,10 +48,9 @@ class ToolbarBuilder {
 	 * @var Title Article title user is currently browsing
 	 */
 	private $title;
-	/**
-	 * @var MessageLocalizer Message localizer to generate localized texts
-	 */
-	private $messageLocalizer;
+
+	private IContextSource $context;
+
 	/**
 	 * @var IMinervaPagePermissions
 	 */
@@ -93,7 +92,7 @@ class ToolbarBuilder {
 	 * Build Group containing icons for toolbar
 	 * @param Title $title Article title user is currently browsing
 	 * @param User $user Currently logged in user
-	 * @param MessageLocalizer $msgLocalizer Message localizer to generate localized texts
+	 * @param IContextSource $context
 	 * @param IMinervaPagePermissions $permissions Minerva permissions system
 	 * @param SkinOptions $skinOptions
 	 * @param SkinUserPageHelper $relevantUserPageHelper User Page helper. The
@@ -107,7 +106,7 @@ class ToolbarBuilder {
 	public function __construct(
 		Title $title,
 		User $user,
-		MessageLocalizer $msgLocalizer,
+		IContextSource $context,
 		IMinervaPagePermissions $permissions,
 		SkinOptions $skinOptions,
 		SkinUserPageHelper $relevantUserPageHelper,
@@ -117,7 +116,7 @@ class ToolbarBuilder {
 	) {
 		$this->title = $title;
 		$this->user = $user;
-		$this->messageLocalizer = $msgLocalizer;
+		$this->context = $context;
 		$this->permissions = $permissions;
 		$this->skinOptions = $skinOptions;
 		$this->relevantUserPageHelper = $relevantUserPageHelper;
@@ -141,8 +140,11 @@ class ToolbarBuilder {
 			IMinervaPagePermissions::SWITCH_LANGUAGE ) ) {
 			$group->insertEntry( new LanguageSelectorEntry(
 				$this->title,
-				$this->languagesHelper->doesTitleHasLanguagesOrVariants( $this->title ),
-				$this->messageLocalizer,
+				$this->languagesHelper->doesTitleHasLanguagesOrVariants(
+					$this->context->getOutput(),
+					$this->title
+				),
+				$this->context,
 				true
 			) );
 		}
@@ -153,7 +155,7 @@ class ToolbarBuilder {
 			'icon' => 'star',
 			'class' => '',
 			'href' => $this->getLoginUrl( [ 'returnto' => $this->title ] ),
-			'text' => $this->messageLocalizer->msg( 'watch' ),
+			'text' => $this->context->msg( 'watch' ),
 		];
 		if ( $permissions->isAllowed( IMinervaPagePermissions::WATCHABLE ) && $watchData ) {
 			$group->insertEntry( $this->createWatchPageAction( $watchKey, $watchData ) );
@@ -192,7 +194,7 @@ class ToolbarBuilder {
 	 * @return IMenuEntry
 	 */
 	protected function createContributionsPageAction( UserIdentity $user ): IMenuEntry {
-		$label = $this->messageLocalizer->msg( 'mobile-frontend-user-page-contributions' );
+		$label = $this->context->msg( 'mobile-frontend-user-page-contributions' );
 
 		$entry = new SingleMenuEntry(
 			'page-actions-contributions',
@@ -227,7 +229,7 @@ class ToolbarBuilder {
 		$icon = $editAction['icon'] ?? $iconFallback;
 		$entry->setIcon( $icon . '-base20' )
 			->trackClicks( $key )
-			->setTitle( $this->messageLocalizer->msg( 'tooltip-' . $id ) )
+			->setTitle( $this->context->msg( 'tooltip-' . $id ) )
 			->setNodeID( $id );
 		return $entry;
 	}
@@ -255,7 +257,7 @@ class ToolbarBuilder {
 		}
 		return $entry->trackClicks( $watchKey )
 			->setIcon( $icon )
-			->setTitle( $this->messageLocalizer->msg( $watchKey ) )
+			->setTitle( $this->context->msg( $watchKey ) )
 			->setNodeID( 'ca-watch' );
 	}
 

includes/Menu/PageActions/UserNamespaceOverflowBuilder.php

@@ -20,15 +20,20 @@
 
 namespace MediaWiki\Minerva\Menu\PageActions;
 
+use MediaWiki\Context\IContextSource;
 use MediaWiki\Minerva\LanguagesHelper;
 use MediaWiki\Minerva\Menu\Entries\LanguageSelectorEntry;
 use MediaWiki\Minerva\Menu\Group;
 use MediaWiki\Minerva\Permissions\IMinervaPagePermissions;
 use MediaWiki\Title\Title;
-use MessageLocalizer;
 
 class UserNamespaceOverflowBuilder extends DefaultOverflowBuilder {
 
+	/**
+	 * @var IContextSource
+	 */
+	private $context;
+
 	/**
 	 * @var LanguagesHelper
 	 */
@@ -37,18 +42,19 @@ class UserNamespaceOverflowBuilder extends DefaultOverflowBuilder {
 	/**
 	 * Initialize the overflow menu visible on the User namespace
 	 * @param Title $title
-	 * @param MessageLocalizer $msgLocalizer
+	 * @param IContextSource $context
 	 * @param IMinervaPagePermissions $permissions
 	 * @param LanguagesHelper $languagesHelper
 	 */
 	public function __construct(
 		Title $title,
-		MessageLocalizer $msgLocalizer,
+		IContextSource $context,
 		IMinervaPagePermissions $permissions,
 		LanguagesHelper $languagesHelper
 	) {
+		$this->context = $context;
 		$this->languagesHelper = $languagesHelper;
-		parent::__construct( $title, $msgLocalizer, $permissions );
+		parent::__construct( $title, $context, $permissions );
 	}
 
 	/**
@@ -60,7 +66,10 @@ class UserNamespaceOverflowBuilder extends DefaultOverflowBuilder {
 		if ( $this->isAllowed( IMinervaPagePermissions::SWITCH_LANGUAGE ) ) {
 			$group->prependEntry( new LanguageSelectorEntry(
 				$this->getTitle(),
-				$this->languagesHelper->doesTitleHasLanguagesOrVariants( $this->getTitle() ),
+				$this->languagesHelper->doesTitleHasLanguagesOrVariants(
+					$this->context->getOutput(),
+					$this->getTitle()
+				),
 				$this->getMessageLocalizer(),
 				false,
 				// no additional classes

includes/Permissions/MinervaPagePermissions.php

@@ -27,6 +27,7 @@ use MediaWiki\Content\IContentHandlerFactory;
 use MediaWiki\MainConfigNames;
 use MediaWiki\Minerva\LanguagesHelper;
 use MediaWiki\Minerva\SkinOptions;
+use MediaWiki\Output\OutputPage;
 use MediaWiki\Permissions\Authority;
 use MediaWiki\Permissions\PermissionManager;
 use MediaWiki\Title\Title;
@@ -51,6 +52,8 @@ final class MinervaPagePermissions implements IMinervaPagePermissions {
 	 */
 	private $performer;
 
+	private OutputPage $out;
+
 	/**
 	 * @var ContentHandler
 	 */
@@ -113,6 +116,7 @@ final class MinervaPagePermissions implements IMinervaPagePermissions {
 		$this->title = $context->getTitle();
 		$this->config = $context->getConfig();
 		$this->performer = $context->getAuthority();
+		$this->out = $context->getOutput();
 		// Title may be undefined in certain contexts (T179833)
 		// TODO: Check if this is still true if we always pass a context instead of using global one
 		if ( $this->title ) {
@@ -196,7 +200,7 @@ final class MinervaPagePermissions implements IMinervaPagePermissions {
 			if ( $this->config->get( MainConfigNames::HideInterlanguageLinks ) ) {
 				return false;
 			}
-			return $this->languagesHelper->doesTitleHasLanguagesOrVariants( $this->title ) ||
+			return $this->languagesHelper->doesTitleHasLanguagesOrVariants( $this->out, $this->title ) ||
 				$this->config->get( 'MinervaAlwaysShowLanguageButton' );
 		}
 

includes/ServiceWiring.php

@@ -156,8 +156,7 @@ return [
 	},
 	'Minerva.LanguagesHelper' => static function ( MediaWikiServices $services ): LanguagesHelper {
 		return new LanguagesHelper(
-			$services->getLanguageConverterFactory(),
-			RequestContext::getMain()->getOutput()
+			$services->getLanguageConverterFactory()
 		);
 	},
 	'Minerva.SkinOptions' => static function ( MediaWikiServices $services ): SkinOptions {

includes/Skins/SkinMinerva.php

@@ -979,7 +979,10 @@ class SkinMinerva extends SkinMustache {
 			}
 		}
 
-		if ( $languagesHelper->doesTitleHasLanguagesOrVariants( $title ) && $title->isMainPage() ) {
+		if (
+			$languagesHelper->doesTitleHasLanguagesOrVariants( $this->getOutput(), $title ) &&
+			$title->isMainPage()
+		) {
 			$buttons['language'] = $this->getLanguageButton();
 		}
 

tests/phpunit/LanguagesHelperTest.php

@@ -67,11 +67,13 @@ class LanguagesHelperTest extends MediaWikiIntegrationTestCase {
 	 */
 	public function testDoesTitleHasLanguagesOrVariants( bool $hasVariants, array $langLinks, bool $expected ) {
 		$helper = new LanguagesHelper(
-			$this->getLanguageConverterFactory( $hasVariants ),
-			$this->getOutput( $langLinks )
+			$this->getLanguageConverterFactory( $hasVariants )
 		);
 
-		$this->assertSame( $expected, $helper->doesTitleHasLanguagesOrVariants( $this->getTitle() ) );
+		$this->assertSame( $expected, $helper->doesTitleHasLanguagesOrVariants(
+			$this->getOutput( $langLinks ),
+			$this->getTitle()
+		) );
 	}
 
 	public static function provideDoesTitleHasLanguagesOrVariants() {