From 9e28936e81d79629ba0683a4ad868d7625401749 Mon Sep 17 00:00:00 2001 From: Alexandre Emsenhuber Date: Sat, 5 Apr 2014 11:06:37 +0200 Subject: [PATCH] Correctly order AutoLoader class definitions - Group per directory - Sort by class name for each directory Change-Id: If4771f2868c2183f60a6321533142a1ad5cdc7cd --- includes/AutoLoader.php | 36 +++++++++++++++++++----------------- 1 file changed, 19 insertions(+), 17 deletions(-) diff --git a/includes/AutoLoader.php b/includes/AutoLoader.php index b4a97a3863..52b292fadf 100644 --- a/includes/AutoLoader.php +++ b/includes/AutoLoader.php @@ -45,7 +45,6 @@ $wgAutoloadLocalClasses = array( 'CategoryPage' => 'includes/CategoryPage.php', 'CategoryViewer' => 'includes/CategoryViewer.php', 'ChangesFeed' => 'includes/ChangesFeed.php', - 'ChangesListSpecialPage' => 'includes/specialpage/ChangesListSpecialPage.php', 'ChangeTags' => 'includes/ChangeTags.php', 'ChannelFeed' => 'includes/Feed.php', 'Collation' => 'includes/Collation.php', @@ -80,7 +79,6 @@ $wgAutoloadLocalClasses = array( 'FileDeleteForm' => 'includes/FileDeleteForm.php', 'ForkController' => 'includes/ForkController.php', 'FormOptions' => 'includes/FormOptions.php', - 'FormSpecialPage' => 'includes/specialpage/FormSpecialPage.php', 'GitInfo' => 'includes/GitInfo.php', 'HistoryBlob' => 'includes/HistoryBlob.php', 'HistoryBlobCurStub' => 'includes/HistoryBlob.php', @@ -120,7 +118,6 @@ $wgAutoloadLocalClasses = array( 'ImageQueryPage' => 'includes/ImageQueryPage.php', 'ImportStreamSource' => 'includes/Import.php', 'ImportStringSource' => 'includes/Import.php', - 'IncludableSpecialPage' => 'includes/specialpage/IncludableSpecialPage.php', 'IndexPager' => 'includes/Pager.php', 'Interwiki' => 'includes/interwiki/Interwiki.php', 'LCStore' => 'includes/cache/LocalisationCache.php', @@ -168,8 +165,6 @@ $wgAutoloadLocalClasses = array( 'QueryPage' => 'includes/QueryPage.php', 'QuickTemplate' => 'includes/SkinTemplate.php', 'RawMessage' => 'includes/Message.php', - 'RedirectSpecialArticle' => 'includes/specialpage/RedirectSpecialPage.php', - 'RedirectSpecialPage' => 'includes/specialpage/RedirectSpecialPage.php', 'ReverseChronologicalPager' => 'includes/Pager.php', 'RevisionItem' => 'includes/RevisionList.php', 'RevisionItemBase' => 'includes/RevisionList.php', @@ -183,17 +178,6 @@ $wgAutoloadLocalClasses = array( 'SiteStatsInit' => 'includes/SiteStats.php', 'Skin' => 'includes/Skin.php', 'SkinTemplate' => 'includes/SkinTemplate.php', - 'SpecialCreateAccount' => 'includes/specials/SpecialCreateAccount.php', - 'SpecialListAdmins' => 'includes/specials/SpecialListusers.php', - 'SpecialListBots' => 'includes/specials/SpecialListusers.php', - 'SpecialMycontributions' => 'includes/specials/SpecialMyRedirectPages.php', - 'SpecialMypage' => 'includes/specials/SpecialMyRedirectPages.php', - 'SpecialMytalk' => 'includes/specials/SpecialMyRedirectPages.php', - 'SpecialMyuploads' => 'includes/specials/SpecialMyRedirectPages.php', - 'SpecialAllMyUploads' => 'includes/specials/SpecialMyRedirectPages.php', - 'SpecialPage' => 'includes/specialpage/SpecialPage.php', - 'SpecialPageFactory' => 'includes/specialpage/SpecialPageFactory.php', - 'SpecialRedirectToSpecial' => 'includes/specialpage/RedirectSpecialPage.php', 'SquidPurgeClient' => 'includes/SquidPurgeClient.php', 'SquidPurgeClientPool' => 'includes/SquidPurgeClient.php', 'StatCounter' => 'includes/StatCounter.php', @@ -210,7 +194,6 @@ $wgAutoloadLocalClasses = array( 'TitleArray' => 'includes/TitleArray.php', 'TitleArrayFromResult' => 'includes/TitleArrayFromResult.php', 'TitlePrefixSearch' => 'includes/PrefixSearch.php', - 'UnlistedSpecialPage' => 'includes/specialpage/UnlistedSpecialPage.php', 'UploadSourceAdapter' => 'includes/Import.php', 'UppercaseCollation' => 'includes/Collation.php', 'User' => 'includes/User.php', @@ -933,6 +916,17 @@ $wgAutoloadLocalClasses = array( 'Sites' => 'includes/site/SiteSQLStore.php', 'SiteStore' => 'includes/site/SiteStore.php', + # includes/specialpage + 'ChangesListSpecialPage' => 'includes/specialpage/ChangesListSpecialPage.php', + 'FormSpecialPage' => 'includes/specialpage/FormSpecialPage.php', + 'IncludableSpecialPage' => 'includes/specialpage/IncludableSpecialPage.php', + 'RedirectSpecialArticle' => 'includes/specialpage/RedirectSpecialPage.php', + 'RedirectSpecialPage' => 'includes/specialpage/RedirectSpecialPage.php', + 'SpecialPage' => 'includes/specialpage/SpecialPage.php', + 'SpecialPageFactory' => 'includes/specialpage/SpecialPageFactory.php', + 'SpecialRedirectToSpecial' => 'includes/specialpage/RedirectSpecialPage.php', + 'UnlistedSpecialPage' => 'includes/specialpage/UnlistedSpecialPage.php', + # includes/specials 'ActiveUsersPager' => 'includes/specials/SpecialActiveusers.php', 'AllmessagesTablePager' => 'includes/specials/SpecialAllmessages.php', @@ -981,6 +975,7 @@ $wgAutoloadLocalClasses = array( 'ShortPagesPage' => 'includes/specials/SpecialShortpages.php', 'SpecialActiveUsers' => 'includes/specials/SpecialActiveusers.php', 'SpecialAllmessages' => 'includes/specials/SpecialAllmessages.php', + 'SpecialAllMyUploads' => 'includes/specials/SpecialMyRedirectPages.php', 'SpecialAllpages' => 'includes/specials/SpecialAllpages.php', 'SpecialBlankpage' => 'includes/specials/SpecialBlankpage.php', 'SpecialBlock' => 'includes/specials/SpecialBlock.php', @@ -992,6 +987,7 @@ $wgAutoloadLocalClasses = array( 'SpecialChangePassword' => 'includes/specials/SpecialChangePassword.php', 'SpecialComparePages' => 'includes/specials/SpecialComparePages.php', 'SpecialContributions' => 'includes/specials/SpecialContributions.php', + 'SpecialCreateAccount' => 'includes/specials/SpecialCreateAccount.php', 'SpecialDiff' => 'includes/specials/SpecialDiff.php', 'SpecialEditWatchlist' => 'includes/specials/SpecialEditWatchlist.php', 'SpecialEmailUser' => 'includes/specials/SpecialEmailuser.php', @@ -1000,12 +996,18 @@ $wgAutoloadLocalClasses = array( 'SpecialFilepath' => 'includes/specials/SpecialFilepath.php', 'SpecialImport' => 'includes/specials/SpecialImport.php', 'SpecialJavaScriptTest' => 'includes/specials/SpecialJavaScriptTest.php', + 'SpecialListAdmins' => 'includes/specials/SpecialListusers.php', + 'SpecialListBots' => 'includes/specials/SpecialListusers.php', 'SpecialListFiles' => 'includes/specials/SpecialListfiles.php', 'SpecialListGroupRights' => 'includes/specials/SpecialListgrouprights.php', 'SpecialListUsers' => 'includes/specials/SpecialListusers.php', 'SpecialLockdb' => 'includes/specials/SpecialLockdb.php', 'SpecialLog' => 'includes/specials/SpecialLog.php', 'SpecialMergeHistory' => 'includes/specials/SpecialMergeHistory.php', + 'SpecialMycontributions' => 'includes/specials/SpecialMyRedirectPages.php', + 'SpecialMypage' => 'includes/specials/SpecialMyRedirectPages.php', + 'SpecialMytalk' => 'includes/specials/SpecialMyRedirectPages.php', + 'SpecialMyuploads' => 'includes/specials/SpecialMyRedirectPages.php', 'SpecialNewFiles' => 'includes/specials/SpecialNewimages.php', 'SpecialNewpages' => 'includes/specials/SpecialNewpages.php', 'SpecialPasswordReset' => 'includes/specials/SpecialPasswordReset.php', -- 2.20.1