wikimedia/mediawiki-skins-MinervaNeue
1
0
Fork 0
mirror of https://gerrit.wikimedia.org/r/mediawiki/skins/MinervaNeue synced 2024-11-28 08:00:32 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge "Hygiene: Rename MainMenu related classes"

Browse source
This commit is contained in:
jenkins-bot 2019-08-02 15:17:05 +00:00 committed by Gerrit Code Review
parent 77d0632959 b03e24aa9c
commit 01ca1602e1
6 changed files with 15 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
includes/ServiceWiring.php
View file

@ -22,7 +22,9 @@
use MediaWiki\MediaWikiServices;
use MediaWiki\Minerva\LanguagesHelper;
use MediaWiki\Minerva\Menu\Definitions;
use MediaWiki\Minerva\Menu\Main as MainMenu;
use MediaWiki\Minerva\Menu\Main\MainMenuDirector;
use MediaWiki\Minerva\Menu\Main\DefaultMainMenuBuilder;
use MediaWiki\Minerva\Menu\Main\AdvancedMainMenuBuilder;
use MediaWiki\Minerva\Menu\PageActions as PageActionsMenu;
use MediaWiki\Minerva\Menu\User\AdvancedUserMenuBuilder;
use MediaWiki\Minerva\Menu\User\DefaultUserMenuBuilder;
@ -55,7 +57,7 @@ return [
$context->getSkin()
);
},
'Minerva.Menu.MainDirector' => function ( MediaWikiServices $services ): MainMenu\Director {
'Minerva.Menu.MainDirector' => function ( MediaWikiServices $services ): MainMenuDirector {
$context = RequestContext::getMain();
/** @var SkinOptions $options */
$options = $services->getService( 'Minerva.SkinOptions' );
@ -63,10 +65,10 @@ return [
$showMobileOptions = $options->get( SkinOptions::MOBILE_OPTIONS );
$user = $context->getUser();
$builder = $options->get( SkinOptions::AMC_MODE ) ?
new MainMenu\AdvancedBuilder( $showMobileOptions, $user, $definitions ) :
new MainMenu\DefaultBuilder( $showMobileOptions, $user, $definitions );
new AdvancedMainMenuBuilder( $showMobileOptions, $user, $definitions ) :
new DefaultMainMenuBuilder( $showMobileOptions, $user, $definitions );
return new MainMenu\Director( $builder, $context, $services->getSpecialPageFactory() );
return new MainMenuDirector( $builder, $context, $services->getSpecialPageFactory() );
},
'Minerva.Menu.PageActionsDirector' =>
function ( MediaWikiServices $services ): PageActionsMenu\PageActionsDirector {

2
includes/menu/Main/AdvancedBuilder.php → includes/menu/Main/AdvancedMainMenuBuilder.php
View file

@ -34,7 +34,7 @@ use MediaWiki\Minerva\Menu\Group;
*
* @package MediaWiki\Minerva\Menu\Main
*/
final class AdvancedBuilder implements IBuilder {
final class AdvancedMainMenuBuilder implements IMainMenuBuilder {
/**
* @var bool
*/

2
includes/menu/Main/DefaultBuilder.php → includes/menu/Main/DefaultMainMenuBuilder.php
View file

@ -30,7 +30,7 @@ use MediaWiki\Minerva\Menu\Group;
/**
* Used to build default (available for everyone by default) main menu
*/
final class DefaultBuilder implements IBuilder {
final class DefaultMainMenuBuilder implements IMainMenuBuilder {
/**
* @var bool

2
includes/menu/Main/IBuilder.php → includes/menu/Main/IMainMenuBuilder.php
View file

@ -22,7 +22,7 @@ namespace MediaWiki\Minerva\Menu\Main;
use MediaWiki\Minerva\Menu\Group;
interface IBuilder {
interface IMainMenuBuilder {
/**
* @return Group[]

8
includes/menu/Main/Director.php → includes/menu/Main/MainMenuDirector.php
View file

@ -28,10 +28,10 @@ use \MediaWiki\Special\SpecialPageFactory;
/**
* Director responsible for building Main Menu
*/
final class Director {
final class MainMenuDirector {
/**
* @var IBuilder
* @var IMainMenuBuilder
*/
private $builder;
@ -53,13 +53,13 @@ final class Director {
/**
* Director responsible for Main Menu building
*
* @param IBuilder $builder
* @param IMainMenuBuilder $builder
* @param MessageLocalizer $messageLocalizer Used for translating texts in menu toggle
* @param SpecialPageFactory $specialPageFactory Used to check for MobileMenu special page
* existence
*/
public function __construct(
IBuilder $builder,
IMainMenuBuilder $builder,
MessageLocalizer $messageLocalizer,
SpecialPageFactory $specialPageFactory
) {

2
includes/skins/SkinMinerva.php
View file

@ -19,7 +19,7 @@
*/
use MediaWiki\MediaWikiServices;
use MediaWiki\Minerva\Menu\Main\Director as MainMenuDirector;
use MediaWiki\Minerva\Menu\Main\MainMenuDirector;
use MediaWiki\Minerva\Permissions\IMinervaPagePermissions;
use MediaWiki\Minerva\SkinOptions;
use MediaWiki\Minerva\SkinUserPageHelper;