Update to MediaWiki 1.26.0

1 files changed, 67 insertions, 21 deletions

diff --git a/autoload.php b/autoload.php
index fd2fdcd0..c5629e0d 100644
--- a/autoload.php
+++ b/autoload.php
@@ -8,6 +8,7 @@ $wgAutoloadLocalClasses = array(
 	'AbstractContent' => __DIR__ . '/includes/content/AbstractContent.php',
 	'Action' => __DIR__ . '/includes/actions/Action.php',
 	'ActiveUsersPager' => __DIR__ . '/includes/specials/SpecialActiveusers.php',
+	'ActivityUpdateJob' => __DIR__ . '/includes/jobqueue/jobs/ActivityUpdateJob.php',
 	'AjaxDispatcher' => __DIR__ . '/includes/AjaxDispatcher.php',
 	'AjaxResponse' => __DIR__ . '/includes/AjaxResponse.php',
 	'AllMessagesTablePager' => __DIR__ . '/includes/specials/SpecialAllMessages.php',
@@ -36,14 +37,12 @@ $wgAutoloadLocalClasses = array(
 	'ApiFileRevert' => __DIR__ . '/includes/api/ApiFileRevert.php',
 	'ApiFormatBase' => __DIR__ . '/includes/api/ApiFormatBase.php',
 	'ApiFormatDbg' => __DIR__ . '/includes/api/ApiFormatDbg.php',
-	'ApiFormatDump' => __DIR__ . '/includes/api/ApiFormatDump.php',
 	'ApiFormatFeedWrapper' => __DIR__ . '/includes/api/ApiFormatFeedWrapper.php',
 	'ApiFormatJson' => __DIR__ . '/includes/api/ApiFormatJson.php',
 	'ApiFormatNone' => __DIR__ . '/includes/api/ApiFormatNone.php',
 	'ApiFormatPhp' => __DIR__ . '/includes/api/ApiFormatPhp.php',
 	'ApiFormatRaw' => __DIR__ . '/includes/api/ApiFormatRaw.php',
 	'ApiFormatTxt' => __DIR__ . '/includes/api/ApiFormatTxt.php',
-	'ApiFormatWddx' => __DIR__ . '/includes/api/ApiFormatWddx.php',
 	'ApiFormatXml' => __DIR__ . '/includes/api/ApiFormatXml.php',
 	'ApiFormatXmlRsd' => __DIR__ . '/includes/api/ApiRsd.php',
 	'ApiFormatYaml' => __DIR__ . '/includes/api/ApiFormatYaml.php',
@@ -150,6 +149,7 @@ $wgAutoloadLocalClasses = array(
 	'AutoLoader' => __DIR__ . '/includes/AutoLoader.php',
 	'AutoloadGenerator' => __DIR__ . '/includes/utils/AutoloadGenerator.php',
 	'Autopromote' => __DIR__ . '/includes/Autopromote.php',
+	'AvroValidator' => __DIR__ . '/includes/utils/AvroValidator.php',
 	'BacklinkCache' => __DIR__ . '/includes/cache/BacklinkCache.php',
 	'BacklinkJobUtils' => __DIR__ . '/includes/jobqueue/utils/BacklinkJobUtils.php',
 	'BackupDumper' => __DIR__ . '/maintenance/backup.inc',
@@ -158,6 +158,9 @@ $wgAutoloadLocalClasses = array(
 	'BagOStuff' => __DIR__ . '/includes/libs/objectcache/BagOStuff.php',
 	'BaseDump' => __DIR__ . '/maintenance/backupPrefetch.inc',
 	'BaseTemplate' => __DIR__ . '/includes/skins/BaseTemplate.php',
+	'BatchRowIterator' => __DIR__ . '/includes/utils/BatchRowIterator.php',
+	'BatchRowUpdate' => __DIR__ . '/includes/utils/BatchRowUpdate.php',
+	'BatchRowWriter' => __DIR__ . '/includes/utils/BatchRowWriter.php',
 	'BatchedQueryRunner' => __DIR__ . '/maintenance/runBatchedQuery.php',
 	'BcryptPassword' => __DIR__ . '/includes/password/BcryptPassword.php',
 	'BenchHttpHttps' => __DIR__ . '/maintenance/benchmarks/bench_HTTP_HTTPS.php',
@@ -201,12 +204,12 @@ $wgAutoloadLocalClasses = array(
 	'CategoryPage' => __DIR__ . '/includes/page/CategoryPage.php',
 	'CategoryPager' => __DIR__ . '/includes/specials/SpecialCategories.php',
 	'CategoryViewer' => __DIR__ . '/includes/CategoryViewer.php',
-	'CdbException' => __DIR__ . '/includes/CdbCompat.php',
-	'CdbReader' => __DIR__ . '/includes/CdbCompat.php',
-	'CdbWriter' => __DIR__ . '/includes/CdbCompat.php',
+	'CdbException' => __DIR__ . '/includes/compat/CdbCompat.php',
+	'CdbReader' => __DIR__ . '/includes/compat/CdbCompat.php',
+	'CdbWriter' => __DIR__ . '/includes/compat/CdbCompat.php',
 	'CgzCopyTransaction' => __DIR__ . '/maintenance/storage/recompressTracked.php',
 	'ChangePassword' => __DIR__ . '/maintenance/changePassword.php',
-	'ChangeTags' => __DIR__ . '/includes/ChangeTags.php',
+	'ChangeTags' => __DIR__ . '/includes/changetags/ChangeTags.php',
 	'ChangeTagsList' => __DIR__ . '/includes/changetags/ChangeTagsList.php',
 	'ChangeTagsLogItem' => __DIR__ . '/includes/changetags/ChangeTagsLogItem.php',
 	'ChangeTagsLogList' => __DIR__ . '/includes/changetags/ChangeTagsLogList.php',
@@ -257,6 +260,7 @@ $wgAutoloadLocalClasses = array(
 	'ConstantDependency' => __DIR__ . '/includes/cache/CacheDependency.php',
 	'Content' => __DIR__ . '/includes/content/Content.php',
 	'ContentHandler' => __DIR__ . '/includes/content/ContentHandler.php',
+	'ContentModelLogFormatter' => __DIR__ . '/includes/logging/ContentModelLogFormatter.php',
 	'ContextSource' => __DIR__ . '/includes/context/ContextSource.php',
 	'ContribsPager' => __DIR__ . '/includes/specials/SpecialContributions.php',
 	'ConvertExtensionToRegistration' => __DIR__ . '/maintenance/convertExtensionToRegistration.php',
@@ -270,6 +274,7 @@ $wgAutoloadLocalClasses = array(
 	'CopyJobQueue' => __DIR__ . '/maintenance/copyJobQueue.php',
 	'CoreParserFunctions' => __DIR__ . '/includes/parser/CoreParserFunctions.php',
 	'CoreTagHooks' => __DIR__ . '/includes/parser/CoreTagHooks.php',
+	'CoreVersionChecker' => __DIR__ . '/includes/registration/CoreVersionChecker.php',
 	'CreateAndPromote' => __DIR__ . '/maintenance/createAndPromote.php',
 	'CreateFileOp' => __DIR__ . '/includes/filebackend/FileOp.php',
 	'CreditsAction' => __DIR__ . '/includes/actions/CreditsAction.php',
@@ -279,7 +284,8 @@ $wgAutoloadLocalClasses = array(
 	'CurlHttpRequest' => __DIR__ . '/includes/HttpFunctions.php',
 	'DBAccessBase' => __DIR__ . '/includes/dao/DBAccessBase.php',
 	'DBAccessError' => __DIR__ . '/includes/db/LBFactory.php',
-	'DBConnRef' => __DIR__ . '/includes/db/LoadBalancer.php',
+	'DBAccessObjectUtils' => __DIR__ . '/includes/dao/DBAccessObjectUtils.php',
+	'DBConnRef' => __DIR__ . '/includes/db/DBConnRef.php',
 	'DBConnectionError' => __DIR__ . '/includes/db/DatabaseError.php',
 	'DBError' => __DIR__ . '/includes/db/DatabaseError.php',
 	'DBExpectedError' => __DIR__ . '/includes/db/DatabaseError.php',
@@ -310,14 +316,11 @@ $wgAutoloadLocalClasses = array(
 	'DeferredUpdates' => __DIR__ . '/includes/deferred/DeferredUpdates.php',
 	'DeleteAction' => __DIR__ . '/includes/actions/DeleteAction.php',
 	'DeleteArchivedFiles' => __DIR__ . '/maintenance/deleteArchivedFiles.php',
-	'DeleteArchivedFilesImplementation' => __DIR__ . '/maintenance/deleteArchivedFiles.inc',
 	'DeleteArchivedRevisions' => __DIR__ . '/maintenance/deleteArchivedRevisions.php',
-	'DeleteArchivedRevisionsImplementation' => __DIR__ . '/maintenance/deleteArchivedRevisions.inc',
 	'DeleteBatch' => __DIR__ . '/maintenance/deleteBatch.php',
 	'DeleteDefaultMessages' => __DIR__ . '/maintenance/deleteDefaultMessages.php',
 	'DeleteEqualMessages' => __DIR__ . '/maintenance/deleteEqualMessages.php',
 	'DeleteFileOp' => __DIR__ . '/includes/filebackend/FileOp.php',
-	'DeleteImageCache' => __DIR__ . '/maintenance/deleteImageMemcached.php',
 	'DeleteLogFormatter' => __DIR__ . '/includes/logging/DeleteLogFormatter.php',
 	'DeleteOldRevisions' => __DIR__ . '/maintenance/deleteOldRevisions.php',
 	'DeleteOrphanedRevisions' => __DIR__ . '/maintenance/deleteOrphanedRevisions.php',
@@ -383,6 +386,9 @@ $wgAutoloadLocalClasses = array(
 	'EnqueueJob' => __DIR__ . '/includes/jobqueue/jobs/EnqueueJob.php',
 	'EraseArchivedFile' => __DIR__ . '/maintenance/eraseArchivedFile.php',
 	'ErrorPageError' => __DIR__ . '/includes/exception/ErrorPageError.php',
+	'EventRelayer' => __DIR__ . '/includes/libs/eventrelayer/EventRelayer.php',
+	'EventRelayerMCRD' => __DIR__ . '/includes/libs/eventrelayer/EventRelayerMCRD.php',
+	'EventRelayerNull' => __DIR__ . '/includes/libs/eventrelayer/EventRelayer.php',
 	'Exif' => __DIR__ . '/includes/media/Exif.php',
 	'ExifBitmapHandler' => __DIR__ . '/includes/media/ExifBitmap.php',
 	'ExplodeIterator' => __DIR__ . '/includes/libs/ExplodeIterator.php',
@@ -418,6 +424,7 @@ $wgAutoloadLocalClasses = array(
 	'Field' => __DIR__ . '/includes/db/DatabaseUtility.php',
 	'File' => __DIR__ . '/includes/filerepo/file/File.php',
 	'FileBackend' => __DIR__ . '/includes/filebackend/FileBackend.php',
+	'FileBackendDBRepoWrapper' => __DIR__ . '/includes/filerepo/FileBackendDBRepoWrapper.php',
 	'FileBackendError' => __DIR__ . '/includes/filebackend/FileBackend.php',
 	'FileBackendException' => __DIR__ . '/includes/filebackend/FileBackend.php',
 	'FileBackendGroup' => __DIR__ . '/includes/filebackend/FileBackendGroup.php',
@@ -440,9 +447,9 @@ $wgAutoloadLocalClasses = array(
 	'FindHooks' => __DIR__ . '/maintenance/findHooks.php',
 	'FindMissingFiles' => __DIR__ . '/maintenance/findMissingFiles.php',
 	'FixBug20757' => __DIR__ . '/maintenance/storage/fixBug20757.php',
+	'FixDefaultJsonContentPages' => __DIR__ . '/maintenance/fixDefaultJsonContentPages.php',
 	'FixDoubleRedirects' => __DIR__ . '/maintenance/fixDoubleRedirects.php',
 	'FixExtLinksProtocolRelative' => __DIR__ . '/maintenance/fixExtLinksProtocolRelative.php',
-	'FixSlaveDesync' => __DIR__ . '/maintenance/fixSlaveDesync.php',
 	'FixTimestamps' => __DIR__ . '/maintenance/fixTimestamps.php',
 	'FixUserRegistration' => __DIR__ . '/maintenance/fixUserRegistration.php',
 	'ForeignAPIFile' => __DIR__ . '/includes/filerepo/file/ForeignAPIFile.php',
@@ -491,6 +498,7 @@ $wgAutoloadLocalClasses = array(
 	'HTMLFormField' => __DIR__ . '/includes/htmlform/HTMLFormField.php',
 	'HTMLFormFieldCloner' => __DIR__ . '/includes/htmlform/HTMLFormFieldCloner.php',
 	'HTMLFormFieldRequiredOptionsException' => __DIR__ . '/includes/htmlform/HTMLFormFieldRequiredOptionsException.php',
+	'HTMLFormFieldWithButton' => __DIR__ . '/includes/htmlform/HTMLFormFieldWithButton.php',
 	'HTMLHiddenField' => __DIR__ . '/includes/htmlform/HTMLHiddenField.php',
 	'HTMLInfoField' => __DIR__ . '/includes/htmlform/HTMLInfoField.php',
 	'HTMLIntField' => __DIR__ . '/includes/htmlform/HTMLIntField.php',
@@ -501,11 +509,15 @@ $wgAutoloadLocalClasses = array(
 	'HTMLSelectField' => __DIR__ . '/includes/htmlform/HTMLSelectField.php',
 	'HTMLSelectLimitField' => __DIR__ . '/includes/htmlform/HTMLSelectLimitField.php',
 	'HTMLSelectNamespace' => __DIR__ . '/includes/htmlform/HTMLSelectNamespace.php',
+	'HTMLSelectNamespaceWithButton' => __DIR__ . '/includes/htmlform/HTMLSelectNamespaceWithButton.php',
 	'HTMLSelectOrOtherField' => __DIR__ . '/includes/htmlform/HTMLSelectOrOtherField.php',
 	'HTMLSubmitField' => __DIR__ . '/includes/htmlform/HTMLSubmitField.php',
 	'HTMLTagFilter' => __DIR__ . '/includes/htmlform/HTMLTagFilter.php',
 	'HTMLTextAreaField' => __DIR__ . '/includes/htmlform/HTMLTextAreaField.php',
 	'HTMLTextField' => __DIR__ . '/includes/htmlform/HTMLTextField.php',
+	'HTMLTextFieldWithButton' => __DIR__ . '/includes/htmlform/HTMLTextFieldWithButton.php',
+	'HTMLTitleTextField' => __DIR__ . '/includes/htmlform/HTMLTitleTextField.php',
+	'HTMLUserTextField' => __DIR__ . '/includes/htmlform/HTMLUserTextField.php',
 	'HWLDFWordAccumulator' => __DIR__ . '/includes/diff/DairikiDiff.php',
 	'HashBagOStuff' => __DIR__ . '/includes/libs/objectcache/HashBagOStuff.php',
 	'HashConfig' => __DIR__ . '/includes/config/HashConfig.php',
@@ -527,14 +539,14 @@ $wgAutoloadLocalClasses = array(
 	'ICacheHelper' => __DIR__ . '/includes/cache/CacheHelper.php',
 	'IContextSource' => __DIR__ . '/includes/context/IContextSource.php',
 	'IDBAccessObject' => __DIR__ . '/includes/dao/IDBAccessObject.php',
-	'IDatabase' => __DIR__ . '/includes/db/Database.php',
+	'IDatabase' => __DIR__ . '/includes/db/IDatabase.php',
 	'IEContentAnalyzer' => __DIR__ . '/includes/libs/IEContentAnalyzer.php',
 	'IEUrlExtension' => __DIR__ . '/includes/libs/IEUrlExtension.php',
 	'IJobSpecification' => __DIR__ . '/includes/jobqueue/JobSpecification.php',
 	'IORMRow' => __DIR__ . '/includes/db/IORMRow.php',
 	'IORMTable' => __DIR__ . '/includes/db/IORMTable.php',
 	'IP' => __DIR__ . '/includes/utils/IP.php',
-	'IPSet' => __DIR__ . '/includes/libs/IPSet.php',
+	'IPSet' => __DIR__ . '/includes/compat/IPSetCompat.php',
 	'IPTC' => __DIR__ . '/includes/media/IPTC.php',
 	'IRCColourfulRCFeedFormatter' => __DIR__ . '/includes/rcfeed/IRCColourfulRCFeedFormatter.php',
 	'IcuCollation' => __DIR__ . '/includes/Collation.php',
@@ -566,6 +578,7 @@ $wgAutoloadLocalClasses = array(
 	'InstallerOverrides' => __DIR__ . '/mw-config/overrides.php',
 	'Interwiki' => __DIR__ . '/includes/interwiki/Interwiki.php',
 	'InvalidPassword' => __DIR__ . '/includes/password/InvalidPassword.php',
+	'IteratorDecorator' => __DIR__ . '/includes/utils/iterators/IteratorDecorator.php',
 	'IuConverter' => __DIR__ . '/languages/classes/LanguageIu.php',
 	'JSCompilerContext' => __DIR__ . '/includes/libs/jsminplus.php',
 	'JSMinPlus' => __DIR__ . '/includes/libs/jsminplus.php',
@@ -606,6 +619,7 @@ $wgAutoloadLocalClasses = array(
 	'LCStoreCDB' => __DIR__ . '/includes/cache/LocalisationCache.php',
 	'LCStoreDB' => __DIR__ . '/includes/cache/LocalisationCache.php',
 	'LCStoreNull' => __DIR__ . '/includes/cache/LocalisationCache.php',
+	'LCStoreStaticArray' => __DIR__ . '/includes/cache/LCStoreStaticArray.php',
 	'LangMemUsage' => __DIR__ . '/maintenance/language/langmemusage.php',
 	'Language' => __DIR__ . '/languages/Language.php',
 	'LanguageAr' => __DIR__ . '/languages/classes/LanguageAr.php',
@@ -666,7 +680,7 @@ $wgAutoloadLocalClasses = array(
 	'LinkHolderArray' => __DIR__ . '/includes/parser/LinkHolderArray.php',
 	'LinkSearchPage' => __DIR__ . '/includes/specials/SpecialLinkSearch.php',
 	'Linker' => __DIR__ . '/includes/Linker.php',
-	'LinksDeletionUpdate' => __DIR__ . '/includes/deferred/LinksUpdate.php',
+	'LinksDeletionUpdate' => __DIR__ . '/includes/deferred/LinksDeletionUpdate.php',
 	'LinksUpdate' => __DIR__ . '/includes/deferred/LinksUpdate.php',
 	'ListDuplicatedFilesPage' => __DIR__ . '/includes/specials/SpecialListDuplicatedFiles.php',
 	'ListVariants' => __DIR__ . '/maintenance/language/listVariants.php',
@@ -674,7 +688,7 @@ $wgAutoloadLocalClasses = array(
 	'LoadBalancer' => __DIR__ . '/includes/db/LoadBalancer.php',
 	'LoadBalancerSingle' => __DIR__ . '/includes/db/LBFactorySingle.php',
 	'LoadMonitor' => __DIR__ . '/includes/db/LoadMonitor.php',
-	'LoadMonitorMySQL' => __DIR__ . '/includes/db/LoadMonitor.php',
+	'LoadMonitorMySQL' => __DIR__ . '/includes/db/LoadMonitorMySQL.php',
 	'LoadMonitorNull' => __DIR__ . '/includes/db/LoadMonitor.php',
 	'LocalFile' => __DIR__ . '/includes/filerepo/file/LocalFile.php',
 	'LocalFileDeleteBatch' => __DIR__ . '/includes/filerepo/file/LocalFile.php',
@@ -705,7 +719,6 @@ $wgAutoloadLocalClasses = array(
 	'MWDocGen' => __DIR__ . '/maintenance/mwdocgen.php',
 	'MWException' => __DIR__ . '/includes/exception/MWException.php',
 	'MWExceptionHandler' => __DIR__ . '/includes/exception/MWExceptionHandler.php',
-	'MWFunction' => __DIR__ . '/includes/utils/MWFunction.php',
 	'MWHookException' => __DIR__ . '/includes/Hooks.php',
 	'MWHttpRequest' => __DIR__ . '/includes/HttpFunctions.php',
 	'MWMemcached' => __DIR__ . '/includes/objectcache/MemcachedClient.php',
@@ -714,7 +727,6 @@ $wgAutoloadLocalClasses = array(
 	'MWOldPassword' => __DIR__ . '/includes/password/MWOldPassword.php',
 	'MWSaltedPassword' => __DIR__ . '/includes/password/MWSaltedPassword.php',
 	'MWTidy' => __DIR__ . '/includes/parser/MWTidy.php',
-	'MWTidyWrapper' => __DIR__ . '/includes/parser/MWTidy.php',
 	'MWTimestamp' => __DIR__ . '/includes/MWTimestamp.php',
 	'MachineReadableRCFeedFormatter' => __DIR__ . '/includes/rcfeed/MachineReadableRCFeedFormatter.php',
 	'MagicWord' => __DIR__ . '/includes/MagicWord.php',
@@ -744,12 +756,28 @@ $wgAutoloadLocalClasses = array(
 	'MediaWiki\\Logger\\LegacySpi' => __DIR__ . '/includes/debug/logger/LegacySpi.php',
 	'MediaWiki\\Logger\\LoggerFactory' => __DIR__ . '/includes/debug/logger/LoggerFactory.php',
 	'MediaWiki\\Logger\\MonologSpi' => __DIR__ . '/includes/debug/logger/MonologSpi.php',
+	'MediaWiki\\Logger\\Monolog\\AvroFormatter' => __DIR__ . '/includes/debug/logger/monolog/AvroFormatter.php',
+	'MediaWiki\\Logger\\Monolog\\BufferHandler' => __DIR__ . '/includes/debug/logger/monolog/BufferHandler.php',
+	'MediaWiki\\Logger\\Monolog\\KafkaHandler' => __DIR__ . '/includes/debug/logger/monolog/KafkaHandler.php',
 	'MediaWiki\\Logger\\Monolog\\LegacyFormatter' => __DIR__ . '/includes/debug/logger/monolog/LegacyFormatter.php',
 	'MediaWiki\\Logger\\Monolog\\LegacyHandler' => __DIR__ . '/includes/debug/logger/monolog/LegacyHandler.php',
+	'MediaWiki\\Logger\\Monolog\\LineFormatter' => __DIR__ . '/includes/debug/logger/monolog/LineFormatter.php',
 	'MediaWiki\\Logger\\Monolog\\SyslogHandler' => __DIR__ . '/includes/debug/logger/monolog/SyslogHandler.php',
 	'MediaWiki\\Logger\\Monolog\\WikiProcessor' => __DIR__ . '/includes/debug/logger/monolog/WikiProcessor.php',
 	'MediaWiki\\Logger\\NullSpi' => __DIR__ . '/includes/debug/logger/NullSpi.php',
 	'MediaWiki\\Logger\\Spi' => __DIR__ . '/includes/debug/logger/Spi.php',
+	'MediaWiki\\Tidy\\Html5Depurate' => __DIR__ . '/includes/tidy/Html5Depurate.php',
+	'MediaWiki\\Tidy\\RaggettBase' => __DIR__ . '/includes/tidy/RaggettBase.php',
+	'MediaWiki\\Tidy\\RaggettExternal' => __DIR__ . '/includes/tidy/RaggettExternal.php',
+	'MediaWiki\\Tidy\\RaggettInternalHHVM' => __DIR__ . '/includes/tidy/RaggettInternalHHVM.php',
+	'MediaWiki\\Tidy\\RaggettInternalPHP' => __DIR__ . '/includes/tidy/RaggettInternalPHP.php',
+	'MediaWiki\\Tidy\\RaggettWrapper' => __DIR__ . '/includes/tidy/RaggettWrapper.php',
+	'MediaWiki\\Tidy\\TidyDriverBase' => __DIR__ . '/includes/tidy/TidyDriverBase.php',
+	'MediaWiki\\Widget\\ComplexNamespaceInputWidget' => __DIR__ . '/includes/widget/ComplexNamespaceInputWidget.php',
+	'MediaWiki\\Widget\\ComplexTitleInputWidget' => __DIR__ . '/includes/widget/ComplexTitleInputWidget.php',
+	'MediaWiki\\Widget\\NamespaceInputWidget' => __DIR__ . '/includes/widget/NamespaceInputWidget.php',
+	'MediaWiki\\Widget\\TitleInputWidget' => __DIR__ . '/includes/widget/TitleInputWidget.php',
+	'MediaWiki\\Widget\\UserInputWidget' => __DIR__ . '/includes/widget/UserInputWidget.php',
 	'MemCachedClientforWiki' => __DIR__ . '/includes/objectcache/MemcachedClient.php',
 	'MemcLockManager' => __DIR__ . '/includes/filebackend/lockmanager/MemcLockManager.php',
 	'MemcachedBagOStuff' => __DIR__ . '/includes/objectcache/MemcachedBagOStuff.php',
@@ -760,10 +788,11 @@ $wgAutoloadLocalClasses = array(
 	'MergeLogFormatter' => __DIR__ . '/includes/logging/MergeLogFormatter.php',
 	'MergeMessageFileList' => __DIR__ . '/maintenance/mergeMessageFileList.php',
 	'Message' => __DIR__ . '/includes/Message.php',
-	'MessageBlobStore' => __DIR__ . '/includes/MessageBlobStore.php',
+	'MessageBlobStore' => __DIR__ . '/includes/cache/MessageBlobStore.php',
 	'MessageCache' => __DIR__ . '/includes/cache/MessageCache.php',
 	'MessageContent' => __DIR__ . '/includes/content/MessageContent.php',
 	'MessageSpecifier' => __DIR__ . '/includes/libs/MessageSpecifier.php',
+	'MigrateFileRepoLayout' => __DIR__ . '/maintenance/migrateFileRepoLayout.php',
 	'MigrateUserGroup' => __DIR__ . '/maintenance/migrateUserGroup.php',
 	'MimeMagic' => __DIR__ . '/includes/MimeMagic.php',
 	'MinifyScript' => __DIR__ . '/maintenance/minify.php',
@@ -788,6 +817,7 @@ $wgAutoloadLocalClasses = array(
 	'MultiHttpClient' => __DIR__ . '/includes/libs/MultiHttpClient.php',
 	'MultiWriteBagOStuff' => __DIR__ . '/includes/objectcache/MultiWriteBagOStuff.php',
 	'MutableConfig' => __DIR__ . '/includes/config/MutableConfig.php',
+	'MutableContext' => __DIR__ . '/includes/context/MutableContext.php',
 	'MwSql' => __DIR__ . '/maintenance/sql.php',
 	'MyLocalSettingsGenerator' => __DIR__ . '/mw-config/overrides.php',
 	'MySQLField' => __DIR__ . '/includes/db/DatabaseMysqlBase.php',
@@ -804,6 +834,7 @@ $wgAutoloadLocalClasses = array(
 	'NewPagesPager' => __DIR__ . '/includes/specials/SpecialNewpages.php',
 	'NewUsersLogFormatter' => __DIR__ . '/includes/logging/NewUsersLogFormatter.php',
 	'NolinesImageGallery' => __DIR__ . '/includes/gallery/NolinesImageGallery.php',
+	'NotRecursiveIterator' => __DIR__ . '/includes/utils/iterators/NotRecursiveIterator.php',
 	'NukeNS' => __DIR__ . '/maintenance/nukeNS.php',
 	'NukePage' => __DIR__ . '/maintenance/nukePage.php',
 	'NullFileJournal' => __DIR__ . '/includes/filebackend/filejournal/FileJournal.php',
@@ -811,6 +842,7 @@ $wgAutoloadLocalClasses = array(
 	'NullJob' => __DIR__ . '/includes/jobqueue/jobs/NullJob.php',
 	'NullLockManager' => __DIR__ . '/includes/filebackend/lockmanager/LockManager.php',
 	'NullRepo' => __DIR__ . '/includes/filerepo/NullRepo.php',
+	'OOUIHTMLForm' => __DIR__ . '/includes/htmlform/OOUIHTMLForm.php',
 	'ORAField' => __DIR__ . '/includes/db/DatabaseOracle.php',
 	'ORAResult' => __DIR__ . '/includes/db/DatabaseOracle.php',
 	'ORMIterator' => __DIR__ . '/includes/db/ORMIterator.php',
@@ -873,6 +905,7 @@ $wgAutoloadLocalClasses = array(
 	'Password' => __DIR__ . '/includes/password/Password.php',
 	'PasswordError' => __DIR__ . '/includes/password/PasswordError.php',
 	'PasswordFactory' => __DIR__ . '/includes/password/PasswordFactory.php',
+	'PasswordPolicyChecks' => __DIR__ . '/includes/password/PasswordPolicyChecks.php',
 	'PatchSql' => __DIR__ . '/maintenance/patchSql.php',
 	'PathRouter' => __DIR__ . '/includes/PathRouter.php',
 	'PathRouterPatternReplacer' => __DIR__ . '/includes/PathRouter.php',
@@ -890,6 +923,7 @@ $wgAutoloadLocalClasses = array(
 	'PoolWorkArticleView' => __DIR__ . '/includes/poolcounter/PoolWorkArticleView.php',
 	'PopulateBacklinkNamespace' => __DIR__ . '/maintenance/populateBacklinkNamespace.php',
 	'PopulateCategory' => __DIR__ . '/maintenance/populateCategory.php',
+	'PopulateContentModel' => __DIR__ . '/maintenance/populateContentModel.php',
 	'PopulateFilearchiveSha1' => __DIR__ . '/maintenance/populateFilearchiveSha1.php',
 	'PopulateImageSha1' => __DIR__ . '/maintenance/populateImageSha1.php',
 	'PopulateLogSearch' => __DIR__ . '/maintenance/populateLogSearch.php',
@@ -926,6 +960,7 @@ $wgAutoloadLocalClasses = array(
 	'ProfilerXhprof' => __DIR__ . '/includes/profiler/ProfilerXhprof.php',
 	'Protect' => __DIR__ . '/maintenance/protect.php',
 	'ProtectAction' => __DIR__ . '/includes/actions/ProtectAction.php',
+	'ProtectLogFormatter' => __DIR__ . '/includes/logging/ProtectLogFormatter.php',
 	'ProtectedPagesPager' => __DIR__ . '/includes/specials/SpecialProtectedpages.php',
 	'ProtectedTitlesPager' => __DIR__ . '/includes/specials/SpecialProtectedtitles.php',
 	'ProtectionForm' => __DIR__ . '/includes/ProtectionForm.php',
@@ -980,6 +1015,7 @@ $wgAutoloadLocalClasses = array(
 	'RenderAction' => __DIR__ . '/includes/actions/RenderAction.php',
 	'ReplacementArray' => __DIR__ . '/includes/libs/ReplacementArray.php',
 	'Replacer' => __DIR__ . '/includes/libs/replacers/Replacer.php',
+	'ReplicatedBagOStuff' => __DIR__ . '/includes/libs/objectcache/ReplicatedBagOStuff.php',
 	'RepoGroup' => __DIR__ . '/includes/filerepo/RepoGroup.php',
 	'RequestContext' => __DIR__ . '/includes/context/RequestContext.php',
 	'ResetUserTokens' => __DIR__ . '/maintenance/resetUserTokens.php',
@@ -989,11 +1025,15 @@ $wgAutoloadLocalClasses = array(
 	'ResourceLoaderEditToolbarModule' => __DIR__ . '/includes/resourceloader/ResourceLoaderEditToolbarModule.php',
 	'ResourceLoaderFileModule' => __DIR__ . '/includes/resourceloader/ResourceLoaderFileModule.php',
 	'ResourceLoaderFilePath' => __DIR__ . '/includes/resourceloader/ResourceLoaderFilePath.php',
+	'ResourceLoaderForeignApiModule' => __DIR__ . '/includes/resourceloader/ResourceLoaderForeignApiModule.php',
 	'ResourceLoaderImage' => __DIR__ . '/includes/resourceloader/ResourceLoaderImage.php',
 	'ResourceLoaderImageModule' => __DIR__ . '/includes/resourceloader/ResourceLoaderImageModule.php',
+	'ResourceLoaderJqueryMsgModule' => __DIR__ . '/includes/resourceloader/ResourceLoaderJqueryMsgModule.php',
 	'ResourceLoaderLanguageDataModule' => __DIR__ . '/includes/resourceloader/ResourceLoaderLanguageDataModule.php',
 	'ResourceLoaderLanguageNamesModule' => __DIR__ . '/includes/resourceloader/ResourceLoaderLanguageNamesModule.php',
 	'ResourceLoaderModule' => __DIR__ . '/includes/resourceloader/ResourceLoaderModule.php',
+	'ResourceLoaderOOUIImageModule' => __DIR__ . '/includes/resourceloader/ResourceLoaderOOUIImageModule.php',
+	'ResourceLoaderRawFileModule' => __DIR__ . '/includes/resourceloader/ResourceLoaderRawFileModule.php',
 	'ResourceLoaderSiteModule' => __DIR__ . '/includes/resourceloader/ResourceLoaderSiteModule.php',
 	'ResourceLoaderSkinModule' => __DIR__ . '/includes/resourceloader/ResourceLoaderSkinModule.php',
 	'ResourceLoaderSpecialCharacterDataModule' => __DIR__ . '/includes/resourceloader/ResourceLoaderSpecialCharacterDataModule.php',
@@ -1030,19 +1070,21 @@ $wgAutoloadLocalClasses = array(
 	'RevisionList' => __DIR__ . '/includes/RevisionList.php',
 	'RevisionListBase' => __DIR__ . '/includes/RevisionList.php',
 	'RevisiondeleteAction' => __DIR__ . '/includes/actions/RevisiondeleteAction.php',
+	'RiffExtractor' => __DIR__ . '/includes/libs/RiffExtractor.php',
 	'RightsLogFormatter' => __DIR__ . '/includes/logging/RightsLogFormatter.php',
 	'RollbackAction' => __DIR__ . '/includes/actions/RollbackAction.php',
 	'RollbackEdits' => __DIR__ . '/maintenance/rollbackEdits.php',
+	'RowUpdateGenerator' => __DIR__ . '/includes/utils/RowUpdateGenerator.php',
 	'RunJobs' => __DIR__ . '/maintenance/runJobs.php',
 	'RunningStat' => __DIR__ . '/includes/libs/RunningStat.php',
 	'SQLiteField' => __DIR__ . '/includes/db/DatabaseSqlite.php',
 	'SVGMetadataExtractor' => __DIR__ . '/includes/media/SVGMetadataExtractor.php',
 	'SVGReader' => __DIR__ . '/includes/media/SVGMetadataExtractor.php',
+	'SamplingStatsdClient' => __DIR__ . '/includes/libs/SamplingStatsdClient.php',
 	'Sanitizer' => __DIR__ . '/includes/Sanitizer.php',
 	'SavepointPostgres' => __DIR__ . '/includes/db/DatabasePostgres.php',
 	'ScopedCallback' => __DIR__ . '/includes/libs/ScopedCallback.php',
 	'ScopedLock' => __DIR__ . '/includes/filebackend/lockmanager/ScopedLock.php',
-	'ScopedPHPTimeout' => __DIR__ . '/includes/libs/ScopedPHPTimeout.php',
 	'SearchDatabase' => __DIR__ . '/includes/search/SearchDatabase.php',
 	'SearchDump' => __DIR__ . '/maintenance/dumpIterator.php',
 	'SearchEngine' => __DIR__ . '/includes/search/SearchEngine.php',
@@ -1098,6 +1140,7 @@ $wgAutoloadLocalClasses = array(
 	'SpecialBookSources' => __DIR__ . '/includes/specials/SpecialBooksources.php',
 	'SpecialCachedPage' => __DIR__ . '/includes/specials/SpecialCachedPage.php',
 	'SpecialCategories' => __DIR__ . '/includes/specials/SpecialCategories.php',
+	'SpecialChangeContentModel' => __DIR__ . '/includes/specials/SpecialChangeContentModel.php',
 	'SpecialChangeEmail' => __DIR__ . '/includes/specials/SpecialChangeEmail.php',
 	'SpecialChangePassword' => __DIR__ . '/includes/specials/SpecialChangePassword.php',
 	'SpecialComparePages' => __DIR__ . '/includes/specials/SpecialComparePages.php',
@@ -1290,18 +1333,20 @@ $wgAutoloadLocalClasses = array(
 	'UserMailer' => __DIR__ . '/includes/mail/UserMailer.php',
 	'UserNotLoggedIn' => __DIR__ . '/includes/exception/UserNotLoggedIn.php',
 	'UserOptions' => __DIR__ . '/maintenance/userOptions.inc',
+	'UserPasswordPolicy' => __DIR__ . '/includes/password/UserPasswordPolicy.php',
 	'UserRightsProxy' => __DIR__ . '/includes/UserRightsProxy.php',
 	'UsercreateTemplate' => __DIR__ . '/includes/templates/Usercreate.php',
 	'UserloginTemplate' => __DIR__ . '/includes/templates/Userlogin.php',
 	'UserrightsPage' => __DIR__ . '/includes/specials/SpecialUserrights.php',
 	'UsersPager' => __DIR__ . '/includes/specials/SpecialListusers.php',
-	'UtfNormal' => __DIR__ . '/includes/libs/normal/UtfNormal.php',
+	'UtfNormal' => __DIR__ . '/includes/compat/normal/UtfNormal.php',
 	'UzConverter' => __DIR__ . '/languages/classes/LanguageUz.php',
 	'VFormHTMLForm' => __DIR__ . '/includes/htmlform/VFormHTMLForm.php',
 	'ValidateRegistrationFile' => __DIR__ . '/maintenance/validateRegistrationFile.php',
 	'ViewAction' => __DIR__ . '/includes/actions/ViewAction.php',
 	'VirtualRESTService' => __DIR__ . '/includes/libs/virtualrest/VirtualRESTService.php',
 	'VirtualRESTServiceClient' => __DIR__ . '/includes/libs/virtualrest/VirtualRESTServiceClient.php',
+	'WANObjectCache' => __DIR__ . '/includes/libs/objectcache/WANObjectCache.php',
 	'WaitForSlave' => __DIR__ . '/maintenance/waitForSlave.php',
 	'WantedCategoriesPage' => __DIR__ . '/includes/specials/SpecialWantedcategories.php',
 	'WantedFilesPage' => __DIR__ . '/includes/specials/SpecialWantedfiles.php',
@@ -1330,6 +1375,7 @@ $wgAutoloadLocalClasses = array(
 	'WebInstallerUpgrade' => __DIR__ . '/includes/installer/WebInstallerPage.php',
 	'WebInstallerUpgradeDoc' => __DIR__ . '/includes/installer/WebInstallerPage.php',
 	'WebInstallerWelcome' => __DIR__ . '/includes/installer/WebInstallerPage.php',
+	'WebPHandler' => __DIR__ . '/includes/media/WebP.php',
 	'WebRequest' => __DIR__ . '/includes/WebRequest.php',
 	'WebRequestUpload' => __DIR__ . '/includes/WebRequest.php',
 	'WebResponse' => __DIR__ . '/includes/WebResponse.php',
@@ -1359,7 +1405,7 @@ $wgAutoloadLocalClasses = array(
 	'Xml' => __DIR__ . '/includes/Xml.php',
 	'XmlDumpWriter' => __DIR__ . '/includes/Export.php',
 	'XmlJsCode' => __DIR__ . '/includes/Xml.php',
-	'XmlSelect' => __DIR__ . '/includes/Xml.php',
+	'XmlSelect' => __DIR__ . '/includes/XmlSelect.php',
 	'XmlTypeCheck' => __DIR__ . '/includes/libs/XmlTypeCheck.php',
 	'ZhConverter' => __DIR__ . '/languages/classes/LanguageZh.php',
 	'ZipDirectoryReader' => __DIR__ . '/includes/utils/ZipDirectoryReader.php',