diff options
Diffstat (limited to 'includes')
81 files changed, 228 insertions, 50 deletions
diff --git a/includes/Category/Category.php b/includes/Category/Category.php index 294f277ede18..b7c6ce4bfc1d 100644 --- a/includes/Category/Category.php +++ b/includes/Category/Category.php @@ -23,7 +23,7 @@ namespace MediaWiki\Category; -use DeferredUpdates; +use MediaWiki\Deferred\DeferredUpdates; use MediaWiki\MediaWikiServices; use MediaWiki\Page\PageIdentity; use MediaWiki\Title\Title; diff --git a/includes/MainConfigSchema.php b/includes/MainConfigSchema.php index 92fb65aa278b..f06f9df05af1 100644 --- a/includes/MainConfigSchema.php +++ b/includes/MainConfigSchema.php @@ -46,6 +46,7 @@ use LayeredParameterizedPassword; use LocalisationCache; use LocalRepo; use LogFormatter; +use MediaWiki\Deferred\SiteStatsUpdate; use MediaWiki\Request\WebRequest; use MediaWiki\Settings\Source\JsonSchemaTrait; use MediaWiki\Title\NamespaceInfo; @@ -72,7 +73,6 @@ use RenameuserLogFormatter; use ReplicatedBagOStuff; use RevertedTagUpdateJob; use RightsLogFormatter; -use SiteStatsUpdate; use SqlBagOStuff; use TagLogFormatter; use TextContentHandler; diff --git a/includes/MediaWiki.php b/includes/MediaWiki.php index 3c7c2d4151de..f8ef7e888cd6 100644 --- a/includes/MediaWiki.php +++ b/includes/MediaWiki.php @@ -23,6 +23,8 @@ use Liuggio\StatsdClient\Sender\SocketSender; use MediaWiki\Config\Config; use MediaWiki\Config\ConfigException; +use MediaWiki\Deferred\DeferredUpdates; +use MediaWiki\Deferred\TransactionRoundDefiningUpdate; use MediaWiki\HookContainer\ProtectedHookAccessorTrait; use MediaWiki\Logger\LoggerFactory; use MediaWiki\MainConfigNames; diff --git a/includes/ResourceLoader/ResourceLoader.php b/includes/ResourceLoader/ResourceLoader.php index acf3e3f6b7ee..76426600a65c 100644 --- a/includes/ResourceLoader/ResourceLoader.php +++ b/includes/ResourceLoader/ResourceLoader.php @@ -23,7 +23,6 @@ namespace MediaWiki\ResourceLoader; use BagOStuff; -use DeferredUpdates; use Exception; use ExtensionRegistry; use HashBagOStuff; @@ -34,6 +33,7 @@ use Less_Environment; use Less_Parser; use MediaWiki\CommentStore\CommentStore; use MediaWiki\Config\Config; +use MediaWiki\Deferred\DeferredUpdates; use MediaWiki\HookContainer\HookContainer; use MediaWiki\Html\Html; use MediaWiki\Html\HtmlJsCode; diff --git a/includes/ServiceWiring.php b/includes/ServiceWiring.php index 78124310a164..d354f620ac69 100644 --- a/includes/ServiceWiring.php +++ b/includes/ServiceWiring.php @@ -78,6 +78,7 @@ use MediaWiki\Content\IContentHandlerFactory; use MediaWiki\Content\Renderer\ContentRenderer; use MediaWiki\Content\Transform\ContentTransformer; use MediaWiki\DAO\WikiAwareEntity; +use MediaWiki\Deferred\DeferredUpdates; use MediaWiki\Edit\ParsoidOutputStash; use MediaWiki\Edit\SimpleParsoidOutputStash; use MediaWiki\EditPage\Constraint\EditConstraintFactory; diff --git a/includes/Setup.php b/includes/Setup.php index 2844b1dc0336..5853424046e3 100644 --- a/includes/Setup.php +++ b/includes/Setup.php @@ -52,6 +52,7 @@ // phpcs:disable MediaWiki.Usage.DeprecatedGlobalVariables use MediaWiki\Config\SiteConfiguration; +use MediaWiki\Deferred\DeferredUpdates; use MediaWiki\HookContainer\FauxGlobalHookArray; use MediaWiki\HookContainer\HookRunner; use MediaWiki\Logger\LoggerFactory; diff --git a/includes/SiteStats/SiteStatsInit.php b/includes/SiteStats/SiteStatsInit.php index 5d1f92ab3769..c3a081da05cc 100644 --- a/includes/SiteStats/SiteStatsInit.php +++ b/includes/SiteStats/SiteStatsInit.php @@ -20,9 +20,9 @@ namespace MediaWiki\SiteStats; +use MediaWiki\Deferred\SiteStatsUpdate; use MediaWiki\MainConfigNames; use MediaWiki\MediaWikiServices; -use SiteStatsUpdate; use Wikimedia\Rdbms\IDatabase; use Wikimedia\Rdbms\IReadableDatabase; diff --git a/includes/Storage/DerivedPageDataUpdater.php b/includes/Storage/DerivedPageDataUpdater.php index ec518672eebd..763626829bca 100644 --- a/includes/Storage/DerivedPageDataUpdater.php +++ b/includes/Storage/DerivedPageDataUpdater.php @@ -23,8 +23,6 @@ namespace MediaWiki\Storage; use CategoryMembershipChangeJob; use Content; use ContentHandler; -use DeferrableUpdate; -use DeferredUpdates; use IDBAccessObject; use InvalidArgumentException; use JobQueueGroup; @@ -33,7 +31,11 @@ use LogicException; use MediaWiki\Config\ServiceOptions; use MediaWiki\Content\IContentHandlerFactory; use MediaWiki\Content\Transform\ContentTransformer; +use MediaWiki\Deferred\DeferrableUpdate; +use MediaWiki\Deferred\DeferredUpdates; use MediaWiki\Deferred\LinksUpdate\LinksUpdate; +use MediaWiki\Deferred\SearchUpdate; +use MediaWiki\Deferred\SiteStatsUpdate; use MediaWiki\Edit\PreparedEdit; use MediaWiki\HookContainer\HookContainer; use MediaWiki\HookContainer\HookRunner; @@ -67,8 +69,6 @@ use Psr\Log\LoggerInterface; use Psr\Log\NullLogger; use RefreshSecondaryDataUpdate; use RevertedTagUpdateJob; -use SearchUpdate; -use SiteStatsUpdate; use WANObjectCache; use Wikimedia\Assert\Assert; use Wikimedia\Rdbms\ILBFactory; diff --git a/includes/Storage/Hook/RevisionDataUpdatesHook.php b/includes/Storage/Hook/RevisionDataUpdatesHook.php index e5d32deff570..bf81a9138944 100644 --- a/includes/Storage/Hook/RevisionDataUpdatesHook.php +++ b/includes/Storage/Hook/RevisionDataUpdatesHook.php @@ -2,7 +2,7 @@ namespace MediaWiki\Storage\Hook; -use DeferrableUpdate; +use MediaWiki\Deferred\DeferrableUpdate; use MediaWiki\Revision\RenderedRevision; use MediaWiki\Title\Title; diff --git a/includes/Storage/PageUpdater.php b/includes/Storage/PageUpdater.php index 9701b53e3d86..aac8127147cf 100644 --- a/includes/Storage/PageUpdater.php +++ b/includes/Storage/PageUpdater.php @@ -20,11 +20,9 @@ namespace MediaWiki\Storage; -use AtomicSectionUpdate; use ChangeTags; use Content; use ContentHandler; -use DeferredUpdates; use InvalidArgumentException; use LogicException; use ManualLogEntry; @@ -32,6 +30,8 @@ use MediaWiki\CommentStore\CommentStoreComment; use MediaWiki\Config\ServiceOptions; use MediaWiki\Content\IContentHandlerFactory; use MediaWiki\Content\ValidationParams; +use MediaWiki\Deferred\AtomicSectionUpdate; +use MediaWiki\Deferred\DeferredUpdates; use MediaWiki\HookContainer\HookContainer; use MediaWiki\HookContainer\HookRunner; use MediaWiki\MainConfigNames; diff --git a/includes/Storage/RevertedTagUpdate.php b/includes/Storage/RevertedTagUpdate.php index 13345fa02c90..e97044fcaabc 100644 --- a/includes/Storage/RevertedTagUpdate.php +++ b/includes/Storage/RevertedTagUpdate.php @@ -21,10 +21,10 @@ namespace MediaWiki\Storage; use ChangeTags; -use DeferrableUpdate; use FormatJson; use MediaWiki\ChangeTags\ChangeTagsStore; use MediaWiki\Config\ServiceOptions; +use MediaWiki\Deferred\DeferrableUpdate; use MediaWiki\MainConfigNames; use MediaWiki\Revision\RevisionRecord; use MediaWiki\Revision\RevisionStore; diff --git a/includes/actions/RollbackAction.php b/includes/actions/RollbackAction.php index 31954245cf7e..b06bf70998dd 100644 --- a/includes/actions/RollbackAction.php +++ b/includes/actions/RollbackAction.php @@ -23,6 +23,7 @@ use MediaWiki\CommentFormatter\CommentFormatter; use MediaWiki\Config\ConfigException; use MediaWiki\Content\IContentHandlerFactory; +use MediaWiki\Deferred\DeferredUpdates; use MediaWiki\Linker\Linker; use MediaWiki\MainConfigNames; use MediaWiki\MediaWikiServices; diff --git a/includes/api/ApiPurge.php b/includes/api/ApiPurge.php index 69c50ae66fce..7e1f70d0088e 100644 --- a/includes/api/ApiPurge.php +++ b/includes/api/ApiPurge.php @@ -18,6 +18,7 @@ * @file */ +use MediaWiki\Deferred\DeferredUpdates; use MediaWiki\Logger\LoggerFactory; use MediaWiki\Page\WikiPageFactory; use MediaWiki\Permissions\PermissionStatus; diff --git a/includes/api/ApiRollback.php b/includes/api/ApiRollback.php index 46464258a108..2c5d98187126 100644 --- a/includes/api/ApiRollback.php +++ b/includes/api/ApiRollback.php @@ -20,6 +20,7 @@ * @file */ +use MediaWiki\Deferred\DeferredUpdates; use MediaWiki\MainConfigNames; use MediaWiki\Page\RollbackPageFactory; use MediaWiki\ParamValidator\TypeDef\UserDef; diff --git a/includes/auth/AuthManager.php b/includes/auth/AuthManager.php index 43316ad592b2..509bf39e9c8a 100644 --- a/includes/auth/AuthManager.php +++ b/includes/auth/AuthManager.php @@ -26,6 +26,8 @@ namespace MediaWiki\Auth; use Language; use MediaWiki\Block\BlockManager; use MediaWiki\Config\Config; +use MediaWiki\Deferred\DeferredUpdates; +use MediaWiki\Deferred\SiteStatsUpdate; use MediaWiki\HookContainer\HookContainer; use MediaWiki\HookContainer\HookRunner; use MediaWiki\Languages\LanguageConverterFactory; @@ -1594,7 +1596,7 @@ class AuthManager implements LoggerAwareInterface { $state['userid'] = $user->getId(); // Update user count - \DeferredUpdates::addUpdate( \SiteStatsUpdate::factory( [ 'users' => 1 ] ) ); + DeferredUpdates::addUpdate( SiteStatsUpdate::factory( [ 'users' => 1 ] ) ); // Watch user's userpage and talk page $this->watchlistManager->addWatchIgnoringRights( $user, $user->getUserPage() ); @@ -1944,10 +1946,10 @@ class AuthManager implements LoggerAwareInterface { $user->saveSettings(); // Update user count - \DeferredUpdates::addUpdate( \SiteStatsUpdate::factory( [ 'users' => 1 ] ) ); + DeferredUpdates::addUpdate( SiteStatsUpdate::factory( [ 'users' => 1 ] ) ); // Watch user's userpage and talk page (except temp users) if ( $source !== self::AUTOCREATE_SOURCE_TEMP ) { - \DeferredUpdates::addCallableUpdate( function () use ( $user ) { + DeferredUpdates::addCallableUpdate( function () use ( $user ) { $this->watchlistManager->addWatchIgnoringRights( $user, $user->getUserPage() ); } ); } diff --git a/includes/auth/LocalPasswordPrimaryAuthenticationProvider.php b/includes/auth/LocalPasswordPrimaryAuthenticationProvider.php index aa748800e773..35a5d2ce6b56 100644 --- a/includes/auth/LocalPasswordPrimaryAuthenticationProvider.php +++ b/includes/auth/LocalPasswordPrimaryAuthenticationProvider.php @@ -21,6 +21,7 @@ namespace MediaWiki\Auth; +use MediaWiki\Deferred\DeferredUpdates; use MediaWiki\MainConfigNames; use MediaWiki\User\User; use MediaWiki\User\UserRigorOptions; @@ -138,7 +139,7 @@ class LocalPasswordPrimaryAuthenticationProvider if ( $this->getPasswordFactory()->needsUpdate( $pwhash ) ) { $newHash = $this->getPasswordFactory()->newFromPlaintext( $req->password ); $fname = __METHOD__; - \DeferredUpdates::addCallableUpdate( function () use ( $newHash, $oldRow, $fname ) { + DeferredUpdates::addCallableUpdate( function () use ( $newHash, $oldRow, $fname ) { $dbw = $this->dbProvider->getPrimaryDatabase(); $dbw->newUpdateQueryBuilder() ->update( 'user' ) diff --git a/includes/block/DatabaseBlockStore.php b/includes/block/DatabaseBlockStore.php index 1eebf20a0824..6e9fef8fe403 100644 --- a/includes/block/DatabaseBlockStore.php +++ b/includes/block/DatabaseBlockStore.php @@ -22,11 +22,11 @@ namespace MediaWiki\Block; -use AutoCommitUpdate; -use DeferredUpdates; use InvalidArgumentException; use MediaWiki\CommentStore\CommentStore; use MediaWiki\Config\ServiceOptions; +use MediaWiki\Deferred\AutoCommitUpdate; +use MediaWiki\Deferred\DeferredUpdates; use MediaWiki\HookContainer\HookContainer; use MediaWiki\HookContainer\HookRunner; use MediaWiki\MainConfigNames; diff --git a/includes/cache/HtmlCacheUpdater.php b/includes/cache/HtmlCacheUpdater.php index fabd515eda65..ca28633c5260 100644 --- a/includes/cache/HtmlCacheUpdater.php +++ b/includes/cache/HtmlCacheUpdater.php @@ -18,6 +18,9 @@ * @file */ +use MediaWiki\Deferred\CdnCacheUpdate; +use MediaWiki\Deferred\DeferredUpdates; +use MediaWiki\Deferred\HtmlFileCacheUpdate; use MediaWiki\HookContainer\HookContainer; use MediaWiki\HookContainer\HookRunner; use MediaWiki\Page\PageIdentity; diff --git a/includes/changes/RecentChange.php b/includes/changes/RecentChange.php index 00913b0081e0..858e4d4133aa 100644 --- a/includes/changes/RecentChange.php +++ b/includes/changes/RecentChange.php @@ -22,6 +22,7 @@ use MediaWiki\ChangeTags\Taggable; use MediaWiki\Config\Config; +use MediaWiki\Deferred\DeferredUpdates; use MediaWiki\HookContainer\HookRunner; use MediaWiki\MainConfigNames; use MediaWiki\MediaWikiServices; diff --git a/includes/config-schema.php b/includes/config-schema.php index f89915a581fe..3bf74402cbe2 100644 --- a/includes/config-schema.php +++ b/includes/config-schema.php @@ -2131,7 +2131,7 @@ return [ 'JobQueueIncludeInMaxLagFactor' => false, 'SpecialPageCacheUpdates' => [ 'Statistics' => [ - 0 => 'SiteStatsUpdate', + 0 => 'MediaWiki\\Deferred\\SiteStatsUpdate', 1 => 'cacheUpdate', ], ], diff --git a/includes/content/ContentHandler.php b/includes/content/ContentHandler.php index d07a9c0aecf6..a31d0bc4d7cb 100644 --- a/includes/content/ContentHandler.php +++ b/includes/content/ContentHandler.php @@ -31,6 +31,7 @@ use MediaWiki\Content\Renderer\ContentParseParams; use MediaWiki\Content\Transform\PreloadTransformParams; use MediaWiki\Content\Transform\PreSaveTransformParams; use MediaWiki\Content\ValidationParams; +use MediaWiki\Deferred\DeferrableUpdate; use MediaWiki\Diff\TextDiffer\ManifoldTextDiffer; use MediaWiki\HookContainer\HookRunner; use MediaWiki\HookContainer\ProtectedHookAccessorTrait; diff --git a/includes/db/MWLBFactory.php b/includes/db/MWLBFactory.php index b861dcb58d05..5629520f4838 100644 --- a/includes/db/MWLBFactory.php +++ b/includes/db/MWLBFactory.php @@ -24,6 +24,7 @@ use Liuggio\StatsdClient\Factory\StatsdDataFactoryInterface; use MediaWiki\Config\Config; use MediaWiki\Config\ServiceOptions; +use MediaWiki\Deferred\DeferredUpdates; use MediaWiki\Logger\LoggerFactory; use MediaWiki\MainConfigNames; use Wikimedia\Rdbms\ChronologyProtector; diff --git a/includes/debug/logger/monolog/BufferHandler.php b/includes/debug/logger/monolog/BufferHandler.php index 426336984c4e..5215c4876ccd 100644 --- a/includes/debug/logger/monolog/BufferHandler.php +++ b/includes/debug/logger/monolog/BufferHandler.php @@ -20,7 +20,7 @@ namespace MediaWiki\Logger\Monolog; -use DeferredUpdates; +use MediaWiki\Deferred\DeferredUpdates; use Monolog\Handler\BufferHandler as BaseBufferHandler; /** diff --git a/includes/deferred/AtomicSectionUpdate.php b/includes/deferred/AtomicSectionUpdate.php index 07517c7ef251..f309808060d3 100644 --- a/includes/deferred/AtomicSectionUpdate.php +++ b/includes/deferred/AtomicSectionUpdate.php @@ -1,5 +1,7 @@ <?php +namespace MediaWiki\Deferred; + use Wikimedia\Rdbms\IDatabase; /** @@ -54,3 +56,6 @@ class AtomicSectionUpdate implements DeferrableUpdate, DeferrableCallback { return $this->fname; } } + +/** @deprecated since 1.42 */ +class_alias( AtomicSectionUpdate::class, 'AtomicSectionUpdate' ); diff --git a/includes/deferred/AutoCommitUpdate.php b/includes/deferred/AutoCommitUpdate.php index c1da75cff7fb..0ee51e984afc 100644 --- a/includes/deferred/AutoCommitUpdate.php +++ b/includes/deferred/AutoCommitUpdate.php @@ -1,5 +1,7 @@ <?php +namespace MediaWiki\Deferred; + use Wikimedia\Rdbms\IDatabase; /** @@ -64,3 +66,6 @@ class AutoCommitUpdate implements DeferrableUpdate, DeferrableCallback { return $this->fname; } } + +/** @deprecated since 1.42 */ +class_alias( AutoCommitUpdate::class, 'AutoCommitUpdate' ); diff --git a/includes/deferred/CdnCacheUpdate.php b/includes/deferred/CdnCacheUpdate.php index 94da46be5726..7ce750f9aaf0 100644 --- a/includes/deferred/CdnCacheUpdate.php +++ b/includes/deferred/CdnCacheUpdate.php @@ -18,9 +18,15 @@ * @file */ +namespace MediaWiki\Deferred; + +use CdnPurgeJob; +use Exception; +use InvalidArgumentException; use MediaWiki\MainConfigNames; use MediaWiki\MediaWikiServices; use MediaWiki\Page\PageReference; +use RuntimeException; use Wikimedia\Assert\Assert; use Wikimedia\IPUtils; @@ -344,3 +350,6 @@ class CdnCacheUpdate implements DeferrableUpdate, MergeableUpdate { return false; } } + +/** @deprecated since 1.42 */ +class_alias( CdnCacheUpdate::class, 'CdnCacheUpdate' ); diff --git a/includes/deferred/DataUpdate.php b/includes/deferred/DataUpdate.php index de2efaaab157..cee214ccf648 100644 --- a/includes/deferred/DataUpdate.php +++ b/includes/deferred/DataUpdate.php @@ -21,6 +21,8 @@ * @file */ +namespace MediaWiki\Deferred; + /** * Abstract base class for update jobs that do something with some secondary * data extracted from article. @@ -74,3 +76,6 @@ abstract class DataUpdate implements DeferrableUpdate { } } + +/** @deprecated since 1.42 */ +class_alias( DataUpdate::class, 'DataUpdate' ); diff --git a/includes/deferred/DeferrableCallback.php b/includes/deferred/DeferrableCallback.php index e8364051850c..86bb7c3dd47f 100644 --- a/includes/deferred/DeferrableCallback.php +++ b/includes/deferred/DeferrableCallback.php @@ -1,5 +1,7 @@ <?php +namespace MediaWiki\Deferred; + /** * Callback wrapper that has an originating method * @@ -13,3 +15,6 @@ interface DeferrableCallback { */ public function getOrigin(); } + +/** @deprecated since 1.42 */ +class_alias( DeferrableCallback::class, 'DeferrableCallback' ); diff --git a/includes/deferred/DeferrableUpdate.php b/includes/deferred/DeferrableUpdate.php index 8368a5f49702..93aa11b8f8fe 100644 --- a/includes/deferred/DeferrableUpdate.php +++ b/includes/deferred/DeferrableUpdate.php @@ -1,5 +1,7 @@ <?php +namespace MediaWiki\Deferred; + /** * Interface that deferrable updates should implement. Basically required so we * can validate input on DeferredUpdates::addUpdate() @@ -14,3 +16,6 @@ interface DeferrableUpdate { */ public function doUpdate(); } + +/** @deprecated since 1.42 */ +class_alias( DeferrableUpdate::class, 'DeferrableUpdate' ); diff --git a/includes/deferred/DeferredUpdates.php b/includes/deferred/DeferredUpdates.php index b4a1b6dc8350..4f5b9da8a454 100644 --- a/includes/deferred/DeferredUpdates.php +++ b/includes/deferred/DeferredUpdates.php @@ -18,7 +18,13 @@ * @file */ +namespace MediaWiki\Deferred; + +use ErrorPageError; +use LogicException; use MediaWiki\Logger\LoggerFactory; +use MWExceptionHandler; +use Throwable; use Wikimedia\Rdbms\IDatabase; use Wikimedia\ScopedCallback; @@ -465,3 +471,6 @@ class DeferredUpdates { self::getScopeStack()->onRunUpdateEnd( $update ); } } + +/** @deprecated since 1.42 */ +class_alias( DeferredUpdates::class, 'DeferredUpdates' ); diff --git a/includes/deferred/DeferredUpdatesScope.php b/includes/deferred/DeferredUpdatesScope.php index 756184ed1de7..9f1bb6b68da0 100644 --- a/includes/deferred/DeferredUpdatesScope.php +++ b/includes/deferred/DeferredUpdatesScope.php @@ -18,6 +18,8 @@ * @file */ +namespace MediaWiki\Deferred; + /** * DeferredUpdates helper class for managing DeferrableUpdate::doUpdate() nesting levels * caused by nested calls to DeferredUpdates::doUpdates() @@ -275,3 +277,6 @@ class DeferredUpdatesScope { return $processed; } } + +/** @deprecated since 1.42 */ +class_alias( DeferredUpdatesScope::class, 'DeferredUpdatesScope' ); diff --git a/includes/deferred/DeferredUpdatesScopeMediaWikiStack.php b/includes/deferred/DeferredUpdatesScopeMediaWikiStack.php index add54ff337a7..95d4b81a537a 100644 --- a/includes/deferred/DeferredUpdatesScopeMediaWikiStack.php +++ b/includes/deferred/DeferredUpdatesScopeMediaWikiStack.php @@ -18,6 +18,8 @@ * @file */ +namespace MediaWiki\Deferred; + use MediaWiki\MediaWikiServices; use Wikimedia\Rdbms\DBTransactionError; @@ -131,3 +133,6 @@ class DeferredUpdatesScopeMediaWikiStack extends DeferredUpdatesScopeStack { $lbFactory->rollbackPrimaryChanges( __METHOD__ ); } } + +/** @deprecated since 1.42 */ +class_alias( DeferredUpdatesScopeMediaWikiStack::class, 'DeferredUpdatesScopeMediaWikiStack' ); diff --git a/includes/deferred/DeferredUpdatesScopeStack.php b/includes/deferred/DeferredUpdatesScopeStack.php index 3962a4048a89..e07c3223f952 100644 --- a/includes/deferred/DeferredUpdatesScopeStack.php +++ b/includes/deferred/DeferredUpdatesScopeStack.php @@ -18,6 +18,10 @@ * @file */ +namespace MediaWiki\Deferred; + +use LogicException; + /** * DeferredUpdates helper class for tracking DeferrableUpdate::doUpdate() nesting levels * caused by nested calls to DeferredUpdates::doUpdates() @@ -120,3 +124,6 @@ class DeferredUpdatesScopeStack { // Overridden in DeferredUpdatesScopeMediaWikiStack::onRunUpdateFailed } } + +/** @deprecated since 1.42 */ +class_alias( DeferredUpdatesScopeStack::class, 'DeferredUpdatesScopeStack' ); diff --git a/includes/deferred/EnqueueableDataUpdate.php b/includes/deferred/EnqueueableDataUpdate.php index 925da36894c4..bd959ae8aff7 100644 --- a/includes/deferred/EnqueueableDataUpdate.php +++ b/includes/deferred/EnqueueableDataUpdate.php @@ -1,4 +1,7 @@ <?php + +namespace MediaWiki\Deferred; + /** * Interface that marks a DataUpdate as enqueuable via the JobQueue * @@ -15,3 +18,6 @@ interface EnqueueableDataUpdate { */ public function getAsJobSpecification(); } + +/** @deprecated since 1.42 */ +class_alias( EnqueueableDataUpdate::class, 'EnqueueableDataUpdate' ); diff --git a/includes/deferred/Hook/UserEditCountUpdateHook.php b/includes/deferred/Hook/UserEditCountUpdateHook.php index 23724b1db22a..c54ed926dd0f 100644 --- a/includes/deferred/Hook/UserEditCountUpdateHook.php +++ b/includes/deferred/Hook/UserEditCountUpdateHook.php @@ -2,7 +2,7 @@ namespace MediaWiki\Hook; -use UserEditCountInfo; +use MediaWiki\Deferred\UserEditCountInfo; /** * This is a hook handler interface, see docs/Hooks.md. diff --git a/includes/deferred/HtmlFileCacheUpdate.php b/includes/deferred/HtmlFileCacheUpdate.php index 110516755f3a..a8e8b25389fb 100644 --- a/includes/deferred/HtmlFileCacheUpdate.php +++ b/includes/deferred/HtmlFileCacheUpdate.php @@ -18,6 +18,9 @@ * @file */ +namespace MediaWiki\Deferred; + +use HTMLFileCache; use MediaWiki\Cache\CacheKeyHelper; use MediaWiki\Page\PageIdentity; use Wikimedia\Assert\Assert; @@ -69,3 +72,6 @@ class HtmlFileCacheUpdate implements DeferrableUpdate, MergeableUpdate { } } } + +/** @deprecated since 1.42 */ +class_alias( HtmlFileCacheUpdate::class, 'HtmlFileCacheUpdate' ); diff --git a/includes/deferred/JobQueueEnqueueUpdate.php b/includes/deferred/JobQueueEnqueueUpdate.php index 1516a8a218d7..d75b6c2dc22d 100644 --- a/includes/deferred/JobQueueEnqueueUpdate.php +++ b/includes/deferred/JobQueueEnqueueUpdate.php @@ -20,8 +20,13 @@ * @file */ +namespace MediaWiki\Deferred; + +use IJobSpecification; use MediaWiki\JobQueue\JobQueueGroupFactory; use MediaWiki\MediaWikiServices; +use MWExceptionHandler; +use Throwable; use Wikimedia\Assert\Assert; /** @@ -74,3 +79,6 @@ class JobQueueEnqueueUpdate implements DeferrableUpdate, MergeableUpdate { } } } + +/** @deprecated since 1.42 */ +class_alias( JobQueueEnqueueUpdate::class, 'JobQueueEnqueueUpdate' ); diff --git a/includes/deferred/LinksUpdate/LinksDeletionUpdate.php b/includes/deferred/LinksUpdate/LinksDeletionUpdate.php index e3d01411333e..ee92fcbeafce 100644 --- a/includes/deferred/LinksUpdate/LinksDeletionUpdate.php +++ b/includes/deferred/LinksUpdate/LinksDeletionUpdate.php @@ -22,11 +22,11 @@ namespace MediaWiki\Deferred\LinksUpdate; -use DeferredUpdates; -use EnqueueableDataUpdate; use InvalidArgumentException; use JobSpecification; use MediaWiki\Category\Category; +use MediaWiki\Deferred\DeferredUpdates; +use MediaWiki\Deferred\EnqueueableDataUpdate; use MediaWiki\MainConfigNames; use MediaWiki\MediaWikiServices; use MWException; diff --git a/includes/deferred/LinksUpdate/LinksUpdate.php b/includes/deferred/LinksUpdate/LinksUpdate.php index d5789d6a7e9e..e4ab1bef655a 100644 --- a/includes/deferred/LinksUpdate/LinksUpdate.php +++ b/includes/deferred/LinksUpdate/LinksUpdate.php @@ -22,11 +22,11 @@ namespace MediaWiki\Deferred\LinksUpdate; -use AutoCommitUpdate; use BacklinkCache; -use DataUpdate; -use DeferredUpdates; use Job; +use MediaWiki\Deferred\AutoCommitUpdate; +use MediaWiki\Deferred\DataUpdate; +use MediaWiki\Deferred\DeferredUpdates; use MediaWiki\HookContainer\ProtectedHookAccessorTrait; use MediaWiki\Logger\LoggerFactory; use MediaWiki\MainConfigNames; diff --git a/includes/deferred/MWCallableUpdate.php b/includes/deferred/MWCallableUpdate.php index 905f7ca4a714..3a50aa84982e 100644 --- a/includes/deferred/MWCallableUpdate.php +++ b/includes/deferred/MWCallableUpdate.php @@ -1,5 +1,7 @@ <?php +namespace MediaWiki\Deferred; + use Wikimedia\Rdbms\IDatabase; /** @@ -67,3 +69,6 @@ class MWCallableUpdate return $this->trxRoundRequirement; } } + +/** @deprecated since 1.42 */ +class_alias( MWCallableUpdate::class, 'MWCallableUpdate' ); diff --git a/includes/deferred/MergeableUpdate.php b/includes/deferred/MergeableUpdate.php index 7a7ebc8da157..a82afa350109 100644 --- a/includes/deferred/MergeableUpdate.php +++ b/includes/deferred/MergeableUpdate.php @@ -1,5 +1,7 @@ <?php +namespace MediaWiki\Deferred; + /** * Interface that deferrable updates can implement to signal that updates can be combined. * @@ -26,3 +28,6 @@ interface MergeableUpdate extends DeferrableUpdate { */ public function merge( MergeableUpdate $update ); } + +/** @deprecated since 1.42 */ +class_alias( MergeableUpdate::class, 'MergeableUpdate' ); diff --git a/includes/deferred/MessageCacheUpdate.php b/includes/deferred/MessageCacheUpdate.php index a3a7a40f1874..530c95a78073 100644 --- a/includes/deferred/MessageCacheUpdate.php +++ b/includes/deferred/MessageCacheUpdate.php @@ -20,6 +20,8 @@ * @file */ +namespace MediaWiki\Deferred; + use MediaWiki\MediaWikiServices; use Wikimedia\Assert\Assert; @@ -59,3 +61,6 @@ class MessageCacheUpdate implements DeferrableUpdate, MergeableUpdate { } } } + +/** @deprecated since 1.42 */ +class_alias( MessageCacheUpdate::class, 'MessageCacheUpdate' ); diff --git a/includes/deferred/SearchUpdate.php b/includes/deferred/SearchUpdate.php index ef68ad8d9d6d..dbddc49183fc 100644 --- a/includes/deferred/SearchUpdate.php +++ b/includes/deferred/SearchUpdate.php @@ -23,12 +23,16 @@ * @ingroup Search */ +namespace MediaWiki\Deferred; + +use Content; use MediaWiki\Logger\LoggerFactory; use MediaWiki\MainConfigNames; use MediaWiki\MediaWikiServices; use MediaWiki\Page\ExistingPageRecord; use MediaWiki\Page\PageIdentity; use MediaWiki\Page\PageStore; +use SearchEngine; /** * Database independent search index updater @@ -213,3 +217,6 @@ class SearchUpdate implements DeferrableUpdate { return $search->normalizeText( trim( $t ) ); } } + +/** @deprecated since 1.42 */ +class_alias( SearchUpdate::class, 'SearchUpdate' ); diff --git a/includes/deferred/SendPasswordResetEmailUpdate.php b/includes/deferred/SendPasswordResetEmailUpdate.php index 710f303cf950..49aa04b5a0ba 100644 --- a/includes/deferred/SendPasswordResetEmailUpdate.php +++ b/includes/deferred/SendPasswordResetEmailUpdate.php @@ -20,6 +20,8 @@ * @file */ +namespace MediaWiki\Deferred; + use MediaWiki\Auth\AuthManager; use MediaWiki\Logger\LoggerFactory; @@ -62,3 +64,6 @@ class SendPasswordResetEmailUpdate implements DeferrableUpdate { } } + +/** @deprecated since 1.42 */ +class_alias( SendPasswordResetEmailUpdate::class, 'SendPasswordResetEmailUpdate' ); diff --git a/includes/deferred/SiteStatsUpdate.php b/includes/deferred/SiteStatsUpdate.php index 30830af563cd..25f9ea6e45fa 100644 --- a/includes/deferred/SiteStatsUpdate.php +++ b/includes/deferred/SiteStatsUpdate.php @@ -17,9 +17,13 @@ * * @file */ + +namespace MediaWiki\Deferred; + use MediaWiki\MainConfigNames; use MediaWiki\MediaWikiServices; use MediaWiki\SiteStats\SiteStats; +use UnexpectedValueException; use Wikimedia\Assert\Assert; use Wikimedia\Rdbms\IDatabase; @@ -205,3 +209,6 @@ class SiteStatsUpdate implements DeferrableUpdate, MergeableUpdate { return $activeUsers; } } + +/** @deprecated since 1.42 */ +class_alias( SiteStatsUpdate::class, 'SiteStatsUpdate' ); diff --git a/includes/deferred/TransactionRoundAwareUpdate.php b/includes/deferred/TransactionRoundAwareUpdate.php index 60d82139c386..6e5cc5b7556a 100644 --- a/includes/deferred/TransactionRoundAwareUpdate.php +++ b/includes/deferred/TransactionRoundAwareUpdate.php @@ -1,5 +1,7 @@ <?php +namespace MediaWiki\Deferred; + /** * Deferrable update that specifies whether it must run outside of any explicit * LBFactory transaction round or must run inside of a round owned by doUpdate(). @@ -19,3 +21,6 @@ interface TransactionRoundAwareUpdate { */ public function getTransactionRoundRequirement(); } + +/** @deprecated since 1.42 */ +class_alias( TransactionRoundAwareUpdate::class, 'TransactionRoundAwareUpdate' ); diff --git a/includes/deferred/TransactionRoundDefiningUpdate.php b/includes/deferred/TransactionRoundDefiningUpdate.php index 5732ca094ecf..59c455499b71 100644 --- a/includes/deferred/TransactionRoundDefiningUpdate.php +++ b/includes/deferred/TransactionRoundDefiningUpdate.php @@ -1,5 +1,7 @@ <?php +namespace MediaWiki\Deferred; + /** * Deferrable update that must run outside of any explicit LBFactory transaction round * @@ -38,3 +40,6 @@ class TransactionRoundDefiningUpdate return self::TRX_ROUND_ABSENT; } } + +/** @deprecated since 1.42 */ +class_alias( TransactionRoundDefiningUpdate::class, 'TransactionRoundDefiningUpdate' ); diff --git a/includes/deferred/UserEditCountInfo.php b/includes/deferred/UserEditCountInfo.php index 5fd10005e852..df480efaa43f 100644 --- a/includes/deferred/UserEditCountInfo.php +++ b/includes/deferred/UserEditCountInfo.php @@ -1,5 +1,8 @@ <?php +namespace MediaWiki\Deferred; + +use InvalidArgumentException; use MediaWiki\User\UserIdentity; /** @@ -49,3 +52,6 @@ class UserEditCountInfo { return $this->increment; } } + +/** @deprecated since 1.42 */ +class_alias( UserEditCountInfo::class, 'UserEditCountInfo' ); diff --git a/includes/deferred/UserEditCountUpdate.php b/includes/deferred/UserEditCountUpdate.php index 5e297e7f5dca..d5208cae38df 100644 --- a/includes/deferred/UserEditCountUpdate.php +++ b/includes/deferred/UserEditCountUpdate.php @@ -20,9 +20,12 @@ * @file */ +namespace MediaWiki\Deferred; + use MediaWiki\HookContainer\HookRunner; use MediaWiki\MediaWikiServices; use MediaWiki\User\UserIdentity; +use RuntimeException; use Wikimedia\Assert\Assert; /** @@ -102,3 +105,6 @@ class UserEditCountUpdate implements DeferrableUpdate, MergeableUpdate { $hookRunner->onUserEditCountUpdate( array_values( $this->infoByUser ) ); } } + +/** @deprecated since 1.42 */ +class_alias( UserEditCountUpdate::class, 'UserEditCountUpdate' ); diff --git a/includes/editpage/EditPage.php b/includes/editpage/EditPage.php index f42f0badb0a3..af61e224fb63 100644 --- a/includes/editpage/EditPage.php +++ b/includes/editpage/EditPage.php @@ -24,7 +24,6 @@ use Article; use CategoryPage; use Content; use ContentHandler; -use DeferredUpdates; use DeprecationHelper; use DerivativeContext; use ErrorPageError; @@ -37,6 +36,7 @@ use MediaWiki\CommentStore\CommentStore; use MediaWiki\CommentStore\CommentStoreComment; use MediaWiki\Config\Config; use MediaWiki\Content\IContentHandlerFactory; +use MediaWiki\Deferred\DeferredUpdates; use MediaWiki\EditPage\Constraint\AccidentalRecreationConstraint; use MediaWiki\EditPage\Constraint\AutoSummaryMissingSummaryConstraint; use MediaWiki\EditPage\Constraint\ChangeTagsConstraint; diff --git a/includes/filerepo/file/LocalFile.php b/includes/filerepo/file/LocalFile.php index a27748ca2dd5..b2fc79e3d646 100644 --- a/includes/filerepo/file/LocalFile.php +++ b/includes/filerepo/file/LocalFile.php @@ -19,7 +19,10 @@ */ use MediaWiki\CommentStore\CommentStoreComment; +use MediaWiki\Deferred\AutoCommitUpdate; +use MediaWiki\Deferred\DeferredUpdates; use MediaWiki\Deferred\LinksUpdate\LinksUpdate; +use MediaWiki\Deferred\SiteStatsUpdate; use MediaWiki\FileRepo\File\FileSelectQueryBuilder; use MediaWiki\Logger\LoggerFactory; use MediaWiki\MainConfigNames; diff --git a/includes/filerepo/file/LocalFileRestoreBatch.php b/includes/filerepo/file/LocalFileRestoreBatch.php index 90b4c468228c..3218b39a4c8b 100644 --- a/includes/filerepo/file/LocalFileRestoreBatch.php +++ b/includes/filerepo/file/LocalFileRestoreBatch.php @@ -18,6 +18,8 @@ * @file */ +use MediaWiki\Deferred\DeferredUpdates; +use MediaWiki\Deferred\SiteStatsUpdate; use MediaWiki\FileRepo\File\FileSelectQueryBuilder; use MediaWiki\MediaWikiServices; use MediaWiki\Status\Status; diff --git a/includes/import/WikiImporter.php b/includes/import/WikiImporter.php index 9e4699d2606f..9032baf62fc0 100644 --- a/includes/import/WikiImporter.php +++ b/includes/import/WikiImporter.php @@ -27,6 +27,8 @@ use MediaWiki\Cache\CacheKeyHelper; use MediaWiki\Config\Config; use MediaWiki\Content\IContentHandlerFactory; +use MediaWiki\Deferred\DeferredUpdates; +use MediaWiki\Deferred\SiteStatsUpdate; use MediaWiki\HookContainer\HookContainer; use MediaWiki\HookContainer\HookRunner; use MediaWiki\MainConfigNames; diff --git a/includes/installer/Installer.php b/includes/installer/Installer.php index 5b8f9b459d7b..ff363a6cf796 100644 --- a/includes/installer/Installer.php +++ b/includes/installer/Installer.php @@ -29,6 +29,7 @@ use MediaWiki\Config\Config; use MediaWiki\Config\GlobalVarConfig; use MediaWiki\Config\HashConfig; use MediaWiki\Config\MultiConfig; +use MediaWiki\Deferred\SiteStatsUpdate; use MediaWiki\HookContainer\HookContainer; use MediaWiki\HookContainer\StaticHookRegistry; use MediaWiki\Interwiki\NullInterwikiLookup; diff --git a/includes/jobqueue/JobQueueGroup.php b/includes/jobqueue/JobQueueGroup.php index 40b20169dff8..6d4eba58763f 100644 --- a/includes/jobqueue/JobQueueGroup.php +++ b/includes/jobqueue/JobQueueGroup.php @@ -18,6 +18,8 @@ * @file */ +use MediaWiki\Deferred\DeferredUpdates; +use MediaWiki\Deferred\JobQueueEnqueueUpdate; use Wikimedia\Rdbms\ReadOnlyMode; use Wikimedia\UUID\GlobalIdGenerator; diff --git a/includes/jobqueue/JobRunner.php b/includes/jobqueue/JobRunner.php index 1ac8817a0998..b6e35d78ddfe 100644 --- a/includes/jobqueue/JobRunner.php +++ b/includes/jobqueue/JobRunner.php @@ -23,6 +23,7 @@ use Liuggio\StatsdClient\Factory\StatsdDataFactoryInterface; use MediaWiki\Config\ServiceOptions; +use MediaWiki\Deferred\DeferredUpdates; use MediaWiki\Http\Telemetry; use MediaWiki\MainConfigNames; use Psr\Log\LoggerInterface; diff --git a/includes/jobqueue/jobs/CdnPurgeJob.php b/includes/jobqueue/jobs/CdnPurgeJob.php index 9b98275a75bc..e897f5c0f897 100644 --- a/includes/jobqueue/jobs/CdnPurgeJob.php +++ b/includes/jobqueue/jobs/CdnPurgeJob.php @@ -18,6 +18,8 @@ * @file */ +use MediaWiki\Deferred\CdnCacheUpdate; + /** * Job to purge a set of URLs from CDN * diff --git a/includes/jobqueue/jobs/RecentChangesUpdateJob.php b/includes/jobqueue/jobs/RecentChangesUpdateJob.php index 17cd328d998f..47922d7512a0 100644 --- a/includes/jobqueue/jobs/RecentChangesUpdateJob.php +++ b/includes/jobqueue/jobs/RecentChangesUpdateJob.php @@ -18,6 +18,7 @@ * @file */ +use MediaWiki\Deferred\SiteStatsUpdate; use MediaWiki\HookContainer\HookRunner; use MediaWiki\MainConfigNames; use MediaWiki\MediaWikiServices; diff --git a/includes/jobqueue/utils/PurgeJobUtils.php b/includes/jobqueue/utils/PurgeJobUtils.php index 76127eb84803..3897984c6930 100644 --- a/includes/jobqueue/utils/PurgeJobUtils.php +++ b/includes/jobqueue/utils/PurgeJobUtils.php @@ -20,6 +20,8 @@ * * @file */ +use MediaWiki\Deferred\AutoCommitUpdate; +use MediaWiki\Deferred\DeferredUpdates; use MediaWiki\MainConfigNames; use MediaWiki\MediaWikiServices; use Wikimedia\Rdbms\IDatabase; diff --git a/includes/language/MessageCache.php b/includes/language/MessageCache.php index a2a4091f4cc8..c84b898438d7 100644 --- a/includes/language/MessageCache.php +++ b/includes/language/MessageCache.php @@ -19,6 +19,8 @@ */ use MediaWiki\Config\ServiceOptions; +use MediaWiki\Deferred\DeferredUpdates; +use MediaWiki\Deferred\MessageCacheUpdate; use MediaWiki\HookContainer\HookContainer; use MediaWiki\HookContainer\HookRunner; use MediaWiki\Languages\LanguageConverterFactory; diff --git a/includes/libs/filebackend/FileBackendMultiWrite.php b/includes/libs/filebackend/FileBackendMultiWrite.php index dfa157a4cda7..3b74e4b56d65 100644 --- a/includes/libs/filebackend/FileBackendMultiWrite.php +++ b/includes/libs/filebackend/FileBackendMultiWrite.php @@ -21,6 +21,7 @@ * @ingroup FileBackend */ +use MediaWiki\Deferred\DeferredUpdates; use Wikimedia\Timestamp\ConvertibleTimestamp; /** diff --git a/includes/logging/ManualLogEntry.php b/includes/logging/ManualLogEntry.php index f17dee02a972..95098fe8a961 100644 --- a/includes/logging/ManualLogEntry.php +++ b/includes/logging/ManualLogEntry.php @@ -24,6 +24,7 @@ */ use MediaWiki\ChangeTags\Taggable; +use MediaWiki\Deferred\DeferredUpdates; use MediaWiki\HookContainer\HookRunner; use MediaWiki\Linker\LinkTarget; use MediaWiki\MediaWikiServices; diff --git a/includes/objectcache/ObjectCache.php b/includes/objectcache/ObjectCache.php index 09bedf09bd1a..1af726c0fe74 100644 --- a/includes/objectcache/ObjectCache.php +++ b/includes/objectcache/ObjectCache.php @@ -21,6 +21,7 @@ * @ingroup Cache */ +use MediaWiki\Deferred\DeferredUpdates; use MediaWiki\Http\Telemetry; use MediaWiki\Logger\LoggerFactory; use MediaWiki\MainConfigNames; diff --git a/includes/page/DeletePage.php b/includes/page/DeletePage.php index ca63716dc869..30e27594683d 100644 --- a/includes/page/DeletePage.php +++ b/includes/page/DeletePage.php @@ -6,8 +6,6 @@ use BadMethodCallException; use BagOStuff; use ChangeTags; use Content; -use DeferrableUpdate; -use DeferredUpdates; use DeletePageJob; use Exception; use JobQueueGroup; @@ -16,8 +14,12 @@ use ManualLogEntry; use MediaWiki\Cache\BacklinkCacheFactory; use MediaWiki\CommentStore\CommentStore; use MediaWiki\Config\ServiceOptions; +use MediaWiki\Deferred\DeferrableUpdate; +use MediaWiki\Deferred\DeferredUpdates; use MediaWiki\Deferred\LinksUpdate\LinksDeletionUpdate; use MediaWiki\Deferred\LinksUpdate\LinksUpdate; +use MediaWiki\Deferred\SearchUpdate; +use MediaWiki\Deferred\SiteStatsUpdate; use MediaWiki\HookContainer\HookContainer; use MediaWiki\HookContainer\HookRunner; use MediaWiki\Language\RawMessage; @@ -33,8 +35,6 @@ use MediaWiki\Status\Status; use MediaWiki\Title\NamespaceInfo; use MediaWiki\User\UserFactory; use Message; -use SearchUpdate; -use SiteStatsUpdate; use StatusValue; use Wikimedia\IPUtils; use Wikimedia\Message\ITextFormatter; diff --git a/includes/page/Hook/PageDeletionDataUpdatesHook.php b/includes/page/Hook/PageDeletionDataUpdatesHook.php index f6b7b9f06c07..0b4a388e6152 100644 --- a/includes/page/Hook/PageDeletionDataUpdatesHook.php +++ b/includes/page/Hook/PageDeletionDataUpdatesHook.php @@ -2,7 +2,7 @@ namespace MediaWiki\Page\Hook; -use DeferrableUpdate; +use MediaWiki\Deferred\DeferrableUpdate; use MediaWiki\Revision\RevisionRecord; use MediaWiki\Title\Title; diff --git a/includes/page/Hook/WikiPageDeletionUpdatesHook.php b/includes/page/Hook/WikiPageDeletionUpdatesHook.php index 9b0b5f68ff1e..551ac278a8f6 100644 --- a/includes/page/Hook/WikiPageDeletionUpdatesHook.php +++ b/includes/page/Hook/WikiPageDeletionUpdatesHook.php @@ -3,7 +3,7 @@ namespace MediaWiki\Page\Hook; use Content; -use DeferrableUpdate; +use MediaWiki\Deferred\DeferrableUpdate; use WikiPage; /** diff --git a/includes/page/MovePage.php b/includes/page/MovePage.php index 4d60e47ada96..bfb84d2ff501 100644 --- a/includes/page/MovePage.php +++ b/includes/page/MovePage.php @@ -20,10 +20,8 @@ namespace MediaWiki\Page; -use AtomicSectionUpdate; use ChangeTags; use ContentHandler; -use DeferredUpdates; use File; use LogFormatter; use ManualLogEntry; @@ -31,6 +29,8 @@ use MediaWiki\Collation\CollationFactory; use MediaWiki\CommentStore\CommentStoreComment; use MediaWiki\Config\ServiceOptions; use MediaWiki\Content\IContentHandlerFactory; +use MediaWiki\Deferred\AtomicSectionUpdate; +use MediaWiki\Deferred\DeferredUpdates; use MediaWiki\EditPage\SpamChecker; use MediaWiki\HookContainer\HookContainer; use MediaWiki\HookContainer\HookRunner; diff --git a/includes/page/WikiCategoryPage.php b/includes/page/WikiCategoryPage.php index ac8630fabc9c..1d507e77c9fe 100644 --- a/includes/page/WikiCategoryPage.php +++ b/includes/page/WikiCategoryPage.php @@ -19,6 +19,7 @@ */ use MediaWiki\Category\Category; +use MediaWiki\Deferred\DeferredUpdates; use MediaWiki\MediaWikiServices; /** diff --git a/includes/page/WikiPage.php b/includes/page/WikiPage.php index 1d4adfce7120..3c7721ddada8 100644 --- a/includes/page/WikiPage.php +++ b/includes/page/WikiPage.php @@ -21,6 +21,7 @@ use MediaWiki\Category\Category; use MediaWiki\CommentStore\CommentStoreComment; use MediaWiki\DAO\WikiAwareEntityTrait; +use MediaWiki\Deferred\DeferredUpdates; use MediaWiki\Edit\PreparedEdit; use MediaWiki\HookContainer\ProtectedHookAccessorTrait; use MediaWiki\Linker\LinkTarget; diff --git a/includes/revisiondelete/RevDelList.php b/includes/revisiondelete/RevDelList.php index 49633456b376..f3d32b9a9119 100644 --- a/includes/revisiondelete/RevDelList.php +++ b/includes/revisiondelete/RevDelList.php @@ -19,6 +19,7 @@ * @ingroup RevisionDelete */ +use MediaWiki\Deferred\DeferredUpdates; use MediaWiki\Page\PageIdentity; use MediaWiki\Revision\RevisionRecord; use MediaWiki\Status\Status; diff --git a/includes/session/SessionBackend.php b/includes/session/SessionBackend.php index 2e25aae9cd2e..839f2766d395 100644 --- a/includes/session/SessionBackend.php +++ b/includes/session/SessionBackend.php @@ -24,6 +24,7 @@ namespace MediaWiki\Session; use CachedBagOStuff; +use MediaWiki\Deferred\DeferredUpdates; use MediaWiki\HookContainer\HookContainer; use MediaWiki\HookContainer\HookRunner; use MediaWiki\MainConfigNames; @@ -699,7 +700,7 @@ final class SessionBackend { if ( !MediaWikiServices::getInstance()->getReadOnlyMode()->isReadOnly() ) { // Promise that the token set here will be valid; save it at end of request $user = $this->user; - \DeferredUpdates::addCallableUpdate( static function () use ( $user ) { + DeferredUpdates::addCallableUpdate( static function () use ( $user ) { $user->saveSettings(); } ); } diff --git a/includes/specials/SpecialEditWatchlist.php b/includes/specials/SpecialEditWatchlist.php index 6f0c48582158..e4b4abfb524c 100644 --- a/includes/specials/SpecialEditWatchlist.php +++ b/includes/specials/SpecialEditWatchlist.php @@ -28,13 +28,13 @@ namespace MediaWiki\Specials; -use DeferredUpdates; use EditWatchlistCheckboxSeriesField; use EditWatchlistNormalHTMLForm; use GenderCache; use HTMLForm; use LogicException; use MediaWiki\Cache\LinkBatchFactory; +use MediaWiki\Deferred\DeferredUpdates; use MediaWiki\Html\Html; use MediaWiki\Linker\LinkRenderer; use MediaWiki\Linker\LinkTarget; diff --git a/includes/specials/SpecialMovePage.php b/includes/specials/SpecialMovePage.php index ce56fe41a31b..0456b01bb80a 100644 --- a/includes/specials/SpecialMovePage.php +++ b/includes/specials/SpecialMovePage.php @@ -20,7 +20,6 @@ namespace MediaWiki\Specials; -use DeferredUpdates; use DoubleRedirectJob; use ErrorPageError; use File; @@ -29,6 +28,7 @@ use LogPage; use MediaWiki\Cache\LinkBatchFactory; use MediaWiki\CommentStore\CommentStore; use MediaWiki\Content\IContentHandlerFactory; +use MediaWiki\Deferred\DeferredUpdates; use MediaWiki\Html\Html; use MediaWiki\MainConfigNames; use MediaWiki\Page\MovePageFactory; diff --git a/includes/specials/SpecialRunJobs.php b/includes/specials/SpecialRunJobs.php index 80dcd97718e7..1c31e54818df 100644 --- a/includes/specials/SpecialRunJobs.php +++ b/includes/specials/SpecialRunJobs.php @@ -23,13 +23,13 @@ namespace MediaWiki\Specials; -use DeferredUpdates; use FormatJson; use HttpStatus; use JobRunner; +use MediaWiki\Deferred\DeferredUpdates; +use MediaWiki\Deferred\TransactionRoundDefiningUpdate; use MediaWiki\MainConfigNames; use MediaWiki\SpecialPage\UnlistedSpecialPage; -use TransactionRoundDefiningUpdate; use Wikimedia\Rdbms\ReadOnlyMode; /** diff --git a/includes/specials/SpecialSearch.php b/includes/specials/SpecialSearch.php index c86869f9c781..73549e04a163 100644 --- a/includes/specials/SpecialSearch.php +++ b/includes/specials/SpecialSearch.php @@ -25,9 +25,9 @@ namespace MediaWiki\Specials; -use DeferredUpdates; use ISearchResultSet; use MediaWiki\Content\IContentHandlerFactory; +use MediaWiki\Deferred\DeferredUpdates; use MediaWiki\Html\Html; use MediaWiki\Interwiki\InterwikiLookup; use MediaWiki\Languages\LanguageConverterFactory; diff --git a/includes/title/Title.php b/includes/title/Title.php index b2b41aeb1d6b..29d9752dd7cb 100644 --- a/includes/title/Title.php +++ b/includes/title/Title.php @@ -24,10 +24,7 @@ namespace MediaWiki\Title; -use AtomicSectionUpdate; -use AutoCommitUpdate; use DBAccessObjectUtils; -use DeferredUpdates; use DeprecationHelper; use HTMLCacheUpdateJob; use IDBAccessObject; @@ -37,6 +34,9 @@ use Language; use LinkCache; use MapCacheLRU; use MediaWiki\DAO\WikiAwareEntityTrait; +use MediaWiki\Deferred\AtomicSectionUpdate; +use MediaWiki\Deferred\AutoCommitUpdate; +use MediaWiki\Deferred\DeferredUpdates; use MediaWiki\HookContainer\HookRunner; use MediaWiki\Html\Html; use MediaWiki\Interwiki\InterwikiLookup; diff --git a/includes/user/PasswordReset.php b/includes/user/PasswordReset.php index 5513127bb328..9c4dbcdc0dea 100644 --- a/includes/user/PasswordReset.php +++ b/includes/user/PasswordReset.php @@ -22,12 +22,13 @@ namespace MediaWiki\User; -use DeferredUpdates; use LogicException; use MapCacheLRU; use MediaWiki\Auth\AuthManager; use MediaWiki\Auth\TemporaryPasswordAuthenticationRequest; use MediaWiki\Config\ServiceOptions; +use MediaWiki\Deferred\DeferredUpdates; +use MediaWiki\Deferred\SendPasswordResetEmailUpdate; use MediaWiki\HookContainer\HookContainer; use MediaWiki\HookContainer\HookRunner; use MediaWiki\MainConfigNames; @@ -36,7 +37,6 @@ use Message; use Psr\Log\LoggerAwareInterface; use Psr\Log\LoggerAwareTrait; use Psr\Log\LoggerInterface; -use SendPasswordResetEmailUpdate; use StatusValue; use Wikimedia\Rdbms\IConnectionProvider; diff --git a/includes/user/TalkPageNotificationManager.php b/includes/user/TalkPageNotificationManager.php index 1a687daaba26..a5e2e380d782 100644 --- a/includes/user/TalkPageNotificationManager.php +++ b/includes/user/TalkPageNotificationManager.php @@ -21,8 +21,8 @@ namespace MediaWiki\User; -use DeferredUpdates; use MediaWiki\Config\ServiceOptions; +use MediaWiki\Deferred\DeferredUpdates; use MediaWiki\HookContainer\HookContainer; use MediaWiki\HookContainer\HookRunner; use MediaWiki\MainConfigNames; diff --git a/includes/user/UserEditTracker.php b/includes/user/UserEditTracker.php index 436e84d41891..e54273a5d278 100644 --- a/includes/user/UserEditTracker.php +++ b/includes/user/UserEditTracker.php @@ -3,12 +3,12 @@ namespace MediaWiki\User; use DBAccessObjectUtils; -use DeferredUpdates; use IDBAccessObject; use InvalidArgumentException; use JobQueueGroup; +use MediaWiki\Deferred\DeferredUpdates; +use MediaWiki\Deferred\UserEditCountUpdate; use UserEditCountInitJob; -use UserEditCountUpdate; use Wikimedia\Rdbms\IConnectionProvider; use Wikimedia\Timestamp\ConvertibleTimestamp; diff --git a/includes/user/UserGroupManager.php b/includes/user/UserGroupManager.php index 253d3dc0245f..2cca40809735 100644 --- a/includes/user/UserGroupManager.php +++ b/includes/user/UserGroupManager.php @@ -21,12 +21,12 @@ namespace MediaWiki\User; use DBAccessObjectUtils; -use DeferredUpdates; use IDBAccessObject; use InvalidArgumentException; use JobQueueGroup; use ManualLogEntry; use MediaWiki\Config\ServiceOptions; +use MediaWiki\Deferred\DeferredUpdates; use MediaWiki\HookContainer\HookContainer; use MediaWiki\HookContainer\HookRunner; use MediaWiki\MainConfigNames; diff --git a/includes/watcheditem/WatchedItemStore.php b/includes/watcheditem/WatchedItemStore.php index e88f0e150ed9..7aa918d6c6ec 100644 --- a/includes/watcheditem/WatchedItemStore.php +++ b/includes/watcheditem/WatchedItemStore.php @@ -3,6 +3,7 @@ use Liuggio\StatsdClient\Factory\StatsdDataFactoryInterface; use MediaWiki\Cache\LinkBatchFactory; use MediaWiki\Config\ServiceOptions; +use MediaWiki\Deferred\DeferredUpdates; use MediaWiki\Linker\LinkTarget; use MediaWiki\MainConfigNames; use MediaWiki\Page\PageIdentity; |