golem
/
MinervaNeue
9
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Hygiene: move menu entries to subdirectory 

The number of generic menu entry specific files is growing which is
cluttering the Menu/ directory. Move the entries to a new subfolder.

Bug: T214540
Change-Id: I807d6f6034ee1924e3a606f5e6782c3298896825
This commit is contained in:
Stephen Niedzielski 2019-07-01 12:06:01 -06:00 committed by Jdlrobson
parent 05de7b9387
commit 4c34cce9f3
13 changed files with 26 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
includes/menu/Definitions.php
View File

@ -22,6 +22,9 @@ namespace MediaWiki\Minerva\Menu;
use IContextSource;
use MediaWiki\Special\SpecialPageFactory;
use MediaWiki\Minerva\Menu\Entries\AuthMenuEntry;
use MediaWiki\Minerva\Menu\Entries\HomeMenuEntry;
use MediaWiki\Minerva\Menu\Entries\SingleMenuEntry;
use Message;
use MinervaUI;
use MWException;

2
includes/menu/AuthMenuEntry.php → includes/menu/Entries/AuthMenuEntry.php
View File

@ -15,7 +15,7 @@
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
*/
namespace MediaWiki\Minerva\Menu;
namespace MediaWiki\Minerva\Menu\Entries;
use MessageLocalizer;
use MinervaUI;

2
includes/menu/HomeMenuEntry.php → includes/menu/Entries/HomeMenuEntry.php
View File

@ -15,7 +15,7 @@
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
*/
namespace MediaWiki\Minerva\Menu;
namespace MediaWiki\Minerva\Menu\Entries;
use MinervaUI;

2
includes/menu/IMenuEntry.php → includes/menu/Entries/IMenuEntry.php
View File

@ -15,7 +15,7 @@
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
*/
namespace MediaWiki\Minerva\Menu;
namespace MediaWiki\Minerva\Menu\Entries;
/**
* Model for a menu entry.

2
includes/menu/LanguageSelectorEntry.php → includes/menu/Entries/LanguageSelectorEntry.php
View File

@ -15,7 +15,7 @@
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
*/
namespace MediaWiki\Minerva\Menu;
namespace MediaWiki\Minerva\Menu\Entries;
use MessageLocalizer;
use MinervaUI;

2
includes/menu/MenuEntry.php → includes/menu/Entries/MenuEntry.php
View File

@ -15,7 +15,7 @@
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
*/
namespace MediaWiki\Minerva\Menu;
namespace MediaWiki\Minerva\Menu\Entries;
/**
* Model for a menu entry.

2
includes/menu/SingleMenuEntry.php → includes/menu/Entries/SingleMenuEntry.php
View File

@ -15,7 +15,7 @@
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
*/
namespace MediaWiki\Minerva\Menu;
namespace MediaWiki\Minerva\Menu\Entries;
use MinervaUI;

2
includes/menu/Group.php
View File

@ -21,6 +21,8 @@
namespace MediaWiki\Minerva\Menu;
use DomainException;
use MediaWiki\Minerva\Menu\Entries\IMenuEntry;
use MediaWiki\Minerva\Menu\Entries\MenuEntry;
/**
* Model for a menu that can be presented in a skin.

2
includes/menu/PageActions/PageActionMenuEntry.php
View File

@ -21,7 +21,7 @@
namespace MediaWiki\Minerva\Menu\PageActions;
use Message;
use MediaWiki\Minerva\Menu\IMenuEntry;
use MediaWiki\Minerva\Menu\Entries\IMenuEntry;
class PageActionMenuEntry implements IMenuEntry {

4
includes/menu/PageActions/ToolbarBuilder.php
View File

@ -22,9 +22,9 @@ namespace MediaWiki\Minerva\Menu\PageActions;
use ExtensionRegistry;
use Hooks;
use MediaWiki\Minerva\Menu\Entries\IMenuEntry;
use MediaWiki\Minerva\Menu\Entries\LanguageSelectorEntry;
use MediaWiki\Minerva\Menu\Group;
use MediaWiki\Minerva\Menu\IMenuEntry;
use MediaWiki\Minerva\Menu\LanguageSelectorEntry;
use MediaWiki\Minerva\Permissions\IMinervaPagePermissions;
use MediaWiki\Minerva\SkinOptions;
use MediaWiki\Minerva\SkinUserPageHelper;

6
tests/phpunit/unit/menu/HomeMenuEntryTest.php → tests/phpunit/menu/Entries/HomeMenuEntryTest.php
View File

@ -1,12 +1,12 @@
<?php
namespace Tests\MediaWiki\Minerva\Menu;
namespace Tests\MediaWiki\Minerva\Menu\Entries;
use MediaWiki\Minerva\Menu\HomeMenuEntry;
use MediaWiki\Minerva\Menu\Entries\HomeMenuEntry;
/**
* @group MinervaNeue
* @coversDefaultClass \MediaWiki\Minerva\Menu\HomeMenuEntry
* @coversDefaultClass \MediaWiki\Minerva\Menu\Entries\HomeMenuEntry
*/
class HomeMenuEntryTest extends \MediaWikiUnitTestCase {

6
tests/phpunit/menu/MenuEntryTest.php → tests/phpunit/menu/Entries/MenuEntryTest.php
View File

@ -1,12 +1,12 @@
<?php
namespace Tests\MediaWiki\Minerva\Menu;
namespace Tests\MediaWiki\Minerva\Menu\Entries;
use MediaWiki\Minerva\Menu\MenuEntry;
use MediaWiki\Minerva\Menu\Entries\MenuEntry;
/**
* @group MinervaNeue
* @coversDefaultClass \MediaWiki\Minerva\Menu\MenuEntry
* @coversDefaultClass \MediaWiki\Minerva\Menu\Entries\MenuEntry
*/
class MenuEntryTest extends \MediaWikiTestCase {

12
tests/phpunit/menu/GroupTest.php
View File

@ -2,8 +2,8 @@
namespace Tests\MediaWiki\Minerva\Menu;
use MediaWiki\Minerva\Menu\Entries\IMenuEntry;
use MediaWiki\Minerva\Menu\Group;
use MediaWiki\Minerva\Menu\IMenuEntry;
/**
* @group MinervaNeue
@ -36,7 +36,7 @@ class GroupTest extends \MediaWikiTestCase {
* @covers ::insert
* @covers ::search
* @covers ::getEntries
* @covers \MediaWiki\Minerva\Menu\MenuEntry::addComponent
* @covers \MediaWiki\Minerva\Menu\Entries\MenuEntry::addComponent
*/
public function testInsertingAnEntry() {
$menu = new Group();
@ -64,7 +64,7 @@ class GroupTest extends \MediaWikiTestCase {
* @covers ::insert
* @covers ::search
* @covers ::getEntries
* @covers \MediaWiki\Minerva\Menu\MenuEntry::addComponent
* @covers \MediaWiki\Minerva\Menu\Entries\MenuEntry::addComponent
*/
public function testInsertingAnEntryAfterAnother() {
$menu = new Group();
@ -116,7 +116,7 @@ class GroupTest extends \MediaWikiTestCase {
* @expectedExceptionMessage The "home" entry doesn't exist.
* @covers ::insertAfter
* @covers ::search
* @covers \MediaWiki\Minerva\Menu\MenuEntry::addComponent
* @covers \MediaWiki\Minerva\Menu\Entries\MenuEntry::addComponent
*/
public function testInsertAfterWhenTargetEntryDoesntExist() {
$menu = new Group();
@ -170,7 +170,7 @@ class GroupTest extends \MediaWikiTestCase {
/**
* @covers ::insert
* @covers ::getEntries
* @covers \MediaWiki\Minerva\Menu\MenuEntry::addComponent
* @covers \MediaWiki\Minerva\Menu\Entries\MenuEntry::addComponent
*/
public function testinsertingAnEntryWithMultipleComponents() {
$authLoginComponent = [
@ -215,7 +215,7 @@ class GroupTest extends \MediaWikiTestCase {
/**
* @covers ::insert
* @covers ::getEntries
* @covers \MediaWiki\Minerva\Menu\MenuEntry::addComponent
* @covers \MediaWiki\Minerva\Menu\Entries\MenuEntry::addComponent
*/
public function testInsertingAJavascriptOnlyEntry() {
$menu = new Group();