wikimedia/mediawiki-skins-MinervaNeue
1
0
Fork 0
mirror of https://gerrit.wikimedia.org/r/mediawiki/skins/MinervaNeue synced 2024-09-23 10:19:05 +00:00
Code Issues Packages Projects Releases Wiki Activity

Inject service UserIdentityUtils in DefaultMainMenuBuilder

Browse source 
Change-Id: I5f21dac80707a0dbc81ee8910feee74108363624
This commit is contained in:
Fomafix 2024-02-27 14:48:47 +00:00
parent 0f8800ac42
commit 2d65be33ab
2 changed files with 16 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
includes/Menu/Main/DefaultMainMenuBuilder.php
View file

@ -20,11 +20,11 @@
namespace MediaWiki\Minerva\Menu\Main;
use MediaWiki\MediaWikiServices;
use MediaWiki\Minerva\Menu\Definitions;
use MediaWiki\Minerva\Menu\Entries\SingleMenuEntry;
use MediaWiki\Minerva\Menu\Group;
use MediaWiki\User\UserIdentity;
use MediaWiki\User\UserIdentityUtils;
/**
* Used to build default (available for everyone by default) main menu
@ -52,6 +52,8 @@ final class DefaultMainMenuBuilder implements IMainMenuBuilder {
*/
private $definitions;
private UserIdentityUtils $userIdentityUtils;
/**
* Initialize the Default Main Menu builder
*
@ -59,12 +61,20 @@ final class DefaultMainMenuBuilder implements IMainMenuBuilder {
* @param bool $showDonateLink whether to show the donate link
* @param UserIdentity $user The current user
* @param Definitions $definitions A menu items definitions set
* @param UserIdentityUtils $userIdentityUtils
*/
public function __construct( $showMobileOptions, $showDonateLink, UserIdentity $user, Definitions $definitions ) {
public function __construct(
$showMobileOptions,
$showDonateLink,
UserIdentity $user,
Definitions $definitions,
UserIdentityUtils $userIdentityUtils
) {
$this->showMobileOptions = $showMobileOptions;
$this->showDonateLink = $showDonateLink;
$this->user = $user;
$this->definitions = $definitions;
$this->userIdentityUtils = $userIdentityUtils;
}
/**
@ -103,8 +113,7 @@ final class DefaultMainMenuBuilder implements IMainMenuBuilder {
public function getSettingsGroup(): Group {
$group = new Group( 'pt-preferences' );
// Show settings group for anon and temp users
$userIdentityUtils = MediaWikiServices::getInstance()->getUserIdentityUtils();
$isTemp = $userIdentityUtils->isTemp( $this->user );
$isTemp = $this->userIdentityUtils->isTemp( $this->user );
if ( $this->showMobileOptions && ( !$this->user->isRegistered() || $isTemp ) ) {
$this->definitions->insertMobileOptionsItem( $group );
}
@ -129,8 +138,7 @@ final class DefaultMainMenuBuilder implements IMainMenuBuilder {
[ 'login' ]
);
}
$userIdentityUtils = MediaWikiServices::getInstance()->getUserIdentityUtils();
$isTemp = $userIdentityUtils->isTemp( $this->user );
$isTemp = $this->userIdentityUtils->isTemp( $this->user );
if ( $isTemp ) {
$excludeKeyList[] = 'mycontris';
}

3
includes/ServiceWiring.php
View file

@ -68,13 +68,14 @@ return [
/** @var SkinOptions $options */
$options = $services->getService( 'Minerva.SkinOptions' );
$definitions = $services->getService( 'Minerva.Menu.Definitions' );
$userIdentityUtils = $services->getUserIdentityUtils();
$showMobileOptions = $options->get( SkinOptions::MOBILE_OPTIONS );
$user = $context->getUser();
// Add a donate link (see https://phabricator.wikimedia.org/T219793)
$showDonateLink = $options->get( SkinOptions::SHOW_DONATE );
$builder = $options->get( SkinOptions::MAIN_MENU_EXPANDED ) ?
new AdvancedMainMenuBuilder( $showMobileOptions, $showDonateLink, $definitions ) :
new DefaultMainMenuBuilder( $showMobileOptions, $showDonateLink, $user, $definitions );
new DefaultMainMenuBuilder( $showMobileOptions, $showDonateLink, $user, $definitions, $userIdentityUtils );
return new MainMenuDirector( $builder );
},