From bd2773b3cdb656680c1a86992f65441259557c75 Mon Sep 17 00:00:00 2001 From: "Mark A. Hershberger" Date: Thu, 17 Jun 2010 22:28:06 +0000 Subject: [PATCH] Organise sub-dirs in AutoLoader.php --- includes/AutoLoader.php | 48 +++++++++++++++++++++++------------------ 1 file changed, 27 insertions(+), 21 deletions(-) diff --git a/includes/AutoLoader.php b/includes/AutoLoader.php index bb631714bb..1893cd9d04 100644 --- a/includes/AutoLoader.php +++ b/includes/AutoLoader.php @@ -50,7 +50,6 @@ $wgAutoloadLocalClasses = array( 'DiffHistoryBlob' => 'includes/HistoryBlob.php', 'DjVuImage' => 'includes/DjVuImage.php', 'DoubleReplacer' => 'includes/StringUtils.php', - 'DoubleRedirectJob' => 'includes/job/DoubleRedirectJob.php', 'DublinCoreRdf' => 'includes/Metadata.php', 'Dump7ZipOutput' => 'includes/Export.php', 'DumpBZip2Output' => 'includes/Export.php', @@ -65,10 +64,8 @@ $wgAutoloadLocalClasses = array( 'DumpPipeOutput' => 'includes/Export.php', 'eAccelBagOStuff' => 'includes/BagOStuff.php', 'EditPage' => 'includes/EditPage.php', - 'EmaillingJob' => 'includes/job/EmaillingJob.php', 'EmailNotification' => 'includes/UserMailer.php', 'EnhancedChangesList' => 'includes/ChangesList.php', - 'EnotifNotifyJob' => 'includes/job/EnotifNotifyJob.php', 'ErrorPageError' => 'includes/Exception.php', 'Exif' => 'includes/Exif.php', 'ExplodeIterator' => 'includes/StringUtils.php', @@ -77,9 +74,6 @@ $wgAutoloadLocalClasses = array( 'ExternalStoreHttp' => 'includes/ExternalStoreHttp.php', 'ExternalStore' => 'includes/ExternalStore.php', 'ExternalUser' => 'includes/ExternalUser.php', - 'ExternalUser_Hardcoded' => 'includes/extauth/Hardcoded.php', - 'ExternalUser_MediaWiki' => 'includes/extauth/MediaWiki.php', - 'ExternalUser_vB' => 'includes/extauth/vB.php', 'FatalError' => 'includes/Exception.php', 'FakeTitle' => 'includes/FakeTitle.php', 'FakeMemCachedClient' => 'includes/ObjectCache.php', @@ -93,8 +87,6 @@ $wgAutoloadLocalClasses = array( 'ForkController' => 'includes/ForkController.php', 'FormatExif' => 'includes/Exif.php', 'FormOptions' => 'includes/FormOptions.php', - 'GIFMetadataExtractor' => 'includes/media/GIFMetadataExtractor.php', - 'GIFHandler' => 'includes/media/GIF.php', 'GlobalDependency' => 'includes/CacheDependency.php', 'HashBagOStuff' => 'includes/BagOStuff.php', 'HashtableReplacer' => 'includes/StringUtils.php', @@ -134,7 +126,6 @@ $wgAutoloadLocalClasses = array( 'IndexPager' => 'includes/Pager.php', 'Interwiki' => 'includes/Interwiki.php', 'IP' => 'includes/IP.php', - 'Job' => 'includes/job/JobQueue.php', 'JSMin' => 'includes/JSMin.php', 'LCStore_DB' => 'includes/LocalisationCache.php', 'LCStore_CDB' => 'includes/LocalisationCache.php', @@ -158,8 +149,6 @@ $wgAutoloadLocalClasses = array( 'MagicWord' => 'includes/MagicWord.php', 'MailAddress' => 'includes/UserMailer.php', 'MathRenderer' => 'includes/Math.php', - 'MediaTransformError' => 'includes/media/MediaTransformOutput.php', - 'MediaTransformOutput' => 'includes/media/MediaTransformOutput.php', 'MediaWikiBagOStuff' => 'includes/BagOStuff.php', 'MediaWiki_I18N' => 'includes/SkinTemplate.php', 'MediaWiki' => 'includes/Wiki.php', @@ -194,8 +183,6 @@ $wgAutoloadLocalClasses = array( 'RCCacheEntry' => 'includes/ChangesList.php', 'RdfMetaData' => 'includes/Metadata.php', 'RecentChange' => 'includes/RecentChange.php', - 'RefreshLinksJob' => 'includes/job/RefreshLinksJob.php', - 'RefreshLinksJob2' => 'includes/job/RefreshLinksJob.php', 'RegexlikeReplacer' => 'includes/StringUtils.php', 'ReplacementArray' => 'includes/StringUtils.php', 'Replacer' => 'includes/StringUtils.php', @@ -226,20 +213,12 @@ $wgAutoloadLocalClasses = array( 'StubObject' => 'includes/StubObject.php', 'StringUtils' => 'includes/StringUtils.php', 'TablePager' => 'includes/Pager.php', - 'ThumbnailImage' => 'includes/media/MediaTransformOutput.php', - 'TiffHandler' => 'includes/media/Tiff.php', 'TitleDependency' => 'includes/CacheDependency.php', 'Title' => 'includes/Title.php', 'TitleArray' => 'includes/TitleArray.php', 'TitleArrayFromResult' => 'includes/TitleArray.php', 'TitleListDependency' => 'includes/CacheDependency.php', - 'TransformParameterError' => 'includes/media/MediaTransformOutput.php', 'UnlistedSpecialPage' => 'includes/SpecialPage.php', - 'UploadBase' => 'includes/upload/UploadBase.php', - 'UploadFromStash' => 'includes/upload/UploadFromStash.php', - 'UploadFromFile' => 'includes/upload/UploadFromFile.php', - 'UploadFromUrl' => 'includes/upload/UploadFromUrl.php', - 'UploadFromUrlJob' => 'includes/job/UploadFromUrlJob.php', 'User' => 'includes/User.php', 'UserArray' => 'includes/UserArray.php', 'UserArrayFromResult' => 'includes/UserArray.php', @@ -349,6 +328,11 @@ $wgAutoloadLocalClasses = array( 'Spyc' => 'includes/api/ApiFormatYaml_spyc.php', 'UsageException' => 'includes/api/ApiMain.php', + # includes/extauth + 'ExternalUser_Hardcoded' => 'includes/extauth/Hardcoded.php', + 'ExternalUser_MediaWiki' => 'includes/extauth/MediaWiki.php', + 'ExternalUser_vB' => 'includes/extauth/vB.php', + # includes/json 'Services_JSON' => 'includes/json/Services_JSON.php', 'Services_JSON_Error' => 'includes/json/Services_JSON.php', @@ -440,14 +424,30 @@ $wgAutoloadLocalClasses = array( 'SqliteInstaller' => 'includes/installer/SqliteInstaller.php', 'OracleInstaller' => 'includes/installer/OracleInstaller.php', + # includes/job + 'DoubleRedirectJob' => 'includes/job/DoubleRedirectJob.php', + 'EmaillingJob' => 'includes/job/EmaillingJob.php', + 'EnotifNotifyJob' => 'includes/job/EnotifNotifyJob.php', + 'Job' => 'includes/job/JobQueue.php', + 'RefreshLinksJob' => 'includes/job/RefreshLinksJob.php', + 'RefreshLinksJob2' => 'includes/job/RefreshLinksJob.php', + 'UploadFromUrlJob' => 'includes/job/UploadFromUrlJob.php', + # includes/media 'BitmapHandler' => 'includes/media/Bitmap.php', 'BitmapHandler_ClientOnly' => 'includes/media/Bitmap_ClientOnly.php', 'BmpHandler' => 'includes/media/BMP.php', 'DjVuHandler' => 'includes/media/DjVu.php', + 'GIFHandler' => 'includes/media/GIF.php', + 'GIFMetadataExtractor' => 'includes/media/GIFMetadataExtractor.php', 'ImageHandler' => 'includes/media/Generic.php', 'MediaHandler' => 'includes/media/Generic.php', + 'MediaTransformError' => 'includes/media/MediaTransformOutput.php', + 'MediaTransformOutput' => 'includes/media/MediaTransformOutput.php', 'SvgHandler' => 'includes/media/SVG.php', + 'ThumbnailImage' => 'includes/media/MediaTransformOutput.php', + 'TiffHandler' => 'includes/media/Tiff.php', + 'TransformParameterError' => 'includes/media/MediaTransformOutput.php', # includes/normal 'UtfNormal' => 'includes/normal/UtfNormal.php', @@ -621,6 +621,12 @@ $wgAutoloadLocalClasses = array( 'UsercreateTemplate' => 'includes/templates/Userlogin.php', 'UserloginTemplate' => 'includes/templates/Userlogin.php', + # includes/upload + 'UploadBase' => 'includes/upload/UploadBase.php', + 'UploadFromStash' => 'includes/upload/UploadFromStash.php', + 'UploadFromFile' => 'includes/upload/UploadFromFile.php', + 'UploadFromUrl' => 'includes/upload/UploadFromUrl.php', + # languages 'Language' => 'languages/Language.php', 'FakeConverter' => 'languages/Language.php', -- 2.20.1