Merge "Move LinksUpdate and LinksDeletionUpdate into the new namespace"

19 files changed, 51 insertions, 16 deletions

diff --git a/autoload.php b/autoload.php
index fa1940419eb6..f0d0c8b8561f 100644
--- a/autoload.php
+++ b/autoload.php
@@ -762,8 +762,8 @@ $wgAutoloadLocalClasses = [
 	'LinkFilter' => __DIR__ . '/includes/LinkFilter.php',
 	'LinkHolderArray' => __DIR__ . '/includes/parser/LinkHolderArray.php',
 	'Linker' => __DIR__ . '/includes/Linker.php',
-	'LinksDeletionUpdate' => __DIR__ . '/includes/deferred/LinksDeletionUpdate.php',
-	'LinksUpdate' => __DIR__ . '/includes/deferred/LinksUpdate.php',
+	'LinksDeletionUpdate' => __DIR__ . '/includes/deferred/LinksUpdate/LinksDeletionUpdate.php',
+	'LinksUpdate' => __DIR__ . '/includes/deferred/LinksUpdate/LinksUpdate.php',
 	'ListToggle' => __DIR__ . '/includes/ListToggle.php',
 	'ListVariants' => __DIR__ . '/maintenance/language/listVariants.php',
 	'LoadBalancer' => __DIR__ . '/includes/libs/rdbms/loadbalancer/LoadBalancer.php',
diff --git a/includes/Storage/DerivedPageDataUpdater.php b/includes/Storage/DerivedPageDataUpdater.php
index e6998a516087..541d7fb467aa 100644
--- a/includes/Storage/DerivedPageDataUpdater.php
+++ b/includes/Storage/DerivedPageDataUpdater.php
@@ -31,10 +31,10 @@ use IDBAccessObject;
 use InvalidArgumentException;
 use JobQueueGroup;
 use Language;
-use LinksUpdate;
 use LogicException;
 use MediaWiki\Content\IContentHandlerFactory;
 use MediaWiki\Content\Transform\ContentTransformer;
+use MediaWiki\Deferred\LinksUpdate\LinksUpdate;
 use MediaWiki\Edit\PreparedEdit;
 use MediaWiki\HookContainer\HookContainer;
 use MediaWiki\HookContainer\HookRunner;
diff --git a/includes/deferred/Hook/LinksUpdateAfterInsertHook.php b/includes/deferred/Hook/LinksUpdateAfterInsertHook.php
index b3a469c4a520..c251ff2964cb 100644
--- a/includes/deferred/Hook/LinksUpdateAfterInsertHook.php
+++ b/includes/deferred/Hook/LinksUpdateAfterInsertHook.php
@@ -2,7 +2,7 @@
 
 namespace MediaWiki\Hook;
 
-use LinksUpdate;
+use MediaWiki\Deferred\LinksUpdate\LinksUpdate;
 
 /**
  * This is a hook handler interface, see docs/Hooks.md.
diff --git a/includes/deferred/Hook/LinksUpdateCompleteHook.php b/includes/deferred/Hook/LinksUpdateCompleteHook.php
index 20f53ce3e89d..c58461da292c 100644
--- a/includes/deferred/Hook/LinksUpdateCompleteHook.php
+++ b/includes/deferred/Hook/LinksUpdateCompleteHook.php
@@ -2,7 +2,7 @@
 
 namespace MediaWiki\Hook;
 
-use LinksUpdate;
+use MediaWiki\Deferred\LinksUpdate\LinksUpdate;
 
 /**
  * This is a hook handler interface, see docs/Hooks.md.
diff --git a/includes/deferred/Hook/LinksUpdateConstructedHook.php b/includes/deferred/Hook/LinksUpdateConstructedHook.php
index 8cbba5397762..d2af1c14e079 100644
--- a/includes/deferred/Hook/LinksUpdateConstructedHook.php
+++ b/includes/deferred/Hook/LinksUpdateConstructedHook.php
@@ -2,7 +2,7 @@
 
 namespace MediaWiki\Hook;
 
-use LinksUpdate;
+use MediaWiki\Deferred\LinksUpdate\LinksUpdate;
 
 /**
  * This is a hook handler interface, see docs/Hooks.md.
diff --git a/includes/deferred/Hook/LinksUpdateHook.php b/includes/deferred/Hook/LinksUpdateHook.php
index a4ffdba4ec38..b26f952b81eb 100644
--- a/includes/deferred/Hook/LinksUpdateHook.php
+++ b/includes/deferred/Hook/LinksUpdateHook.php
@@ -2,7 +2,7 @@
 
 namespace MediaWiki\Hook;
 
-use LinksUpdate;
+use MediaWiki\Deferred\LinksUpdate\LinksUpdate;
 
 /**
  * This is a hook handler interface, see docs/Hooks.md.
diff --git a/includes/deferred/LinksDeletionUpdate.php b/includes/deferred/LinksUpdate/LinksDeletionUpdate.php
index d7f52ad0734d..eb9ccde544cc 100644
--- a/includes/deferred/LinksDeletionUpdate.php
+++ b/includes/deferred/LinksUpdate/LinksDeletionUpdate.php
@@ -20,7 +20,17 @@
  * @file
  */
 
+namespace MediaWiki\Deferred\LinksUpdate;
+
+use Category;
+use DeferredUpdates;
+use EnqueueableDataUpdate;
+use InvalidArgumentException;
+use JobSpecification;
 use MediaWiki\MediaWikiServices;
+use MWException;
+use ParserOutput;
+use WikiPage;
 
 /**
  * Update object handling the cleanup of links tables after a page was deleted.
@@ -127,3 +137,6 @@ class LinksDeletionUpdate extends LinksUpdate implements EnqueueableDataUpdate {
 		];
 	}
 }
+
+/** @deprecated since 1.38 */
+class_alias( LinksDeletionUpdate::class, 'LinksDeletionUpdate' );
diff --git a/includes/deferred/LinksUpdate.php b/includes/deferred/LinksUpdate/LinksUpdate.php
index 6f87e3a48a86..4662e8fb40c9 100644
--- a/includes/deferred/LinksUpdate.php
+++ b/includes/deferred/LinksUpdate/LinksUpdate.php
@@ -20,12 +20,14 @@
  * @file
  */
 
-use MediaWiki\Deferred\LinksUpdate\ExternalLinksTable;
-use MediaWiki\Deferred\LinksUpdate\LinksTable;
-use MediaWiki\Deferred\LinksUpdate\LinksTableGroup;
-use MediaWiki\Deferred\LinksUpdate\PageLinksTable;
-use MediaWiki\Deferred\LinksUpdate\PagePropsTable;
-use MediaWiki\Deferred\LinksUpdate\TitleLinksTable;
+namespace MediaWiki\Deferred\LinksUpdate;
+
+use AutoCommitUpdate;
+use BacklinkCache;
+use DataUpdate;
+use DeferredUpdates;
+use Job;
+use JobQueueGroup;
 use MediaWiki\HookContainer\ProtectedHookAccessorTrait;
 use MediaWiki\Logger\LoggerFactory;
 use MediaWiki\MediaWikiServices;
@@ -34,6 +36,11 @@ use MediaWiki\Page\PageReference;
 use MediaWiki\Page\PageReferenceValue;
 use MediaWiki\Revision\RevisionRecord;
 use MediaWiki\User\UserIdentity;
+use MWException;
+use ParserOutput;
+use RefreshLinksJob;
+use RuntimeException;
+use Title;
 use Wikimedia\Rdbms\IDatabase;
 use Wikimedia\ScopedCallback;
 
@@ -596,3 +603,6 @@ class LinksUpdate extends DataUpdate {
 		return $this->mRecursive;
 	}
 }
+
+/** @deprecated since 1.38 */
+class_alias( LinksUpdate::class, 'LinksUpdate' );
diff --git a/includes/deferred/RefreshSecondaryDataUpdate.php b/includes/deferred/RefreshSecondaryDataUpdate.php
index 97ca1d143a55..3858b3532c7c 100644
--- a/includes/deferred/RefreshSecondaryDataUpdate.php
+++ b/includes/deferred/RefreshSecondaryDataUpdate.php
@@ -20,6 +20,7 @@
  * @file
  */
 
+use MediaWiki\Deferred\LinksUpdate\LinksUpdate;
 use MediaWiki\Revision\RevisionRecord;
 use MediaWiki\Storage\DerivedPageDataUpdater;
 use MediaWiki\User\UserIdentity;
diff --git a/includes/filerepo/file/LocalFile.php b/includes/filerepo/file/LocalFile.php
index c839b21c500a..4dab0e0af3e7 100644
--- a/includes/filerepo/file/LocalFile.php
+++ b/includes/filerepo/file/LocalFile.php
@@ -21,6 +21,7 @@
  * @ingroup FileAbstraction
  */
 
+use MediaWiki\Deferred\LinksUpdate\LinksUpdate;
 use MediaWiki\Logger\LoggerFactory;
 use MediaWiki\MediaWikiServices;
 use MediaWiki\Permissions\Authority;
diff --git a/includes/jobqueue/jobs/DeleteLinksJob.php b/includes/jobqueue/jobs/DeleteLinksJob.php
index d587d23e4204..074a1386097f 100644
--- a/includes/jobqueue/jobs/DeleteLinksJob.php
+++ b/includes/jobqueue/jobs/DeleteLinksJob.php
@@ -21,6 +21,8 @@
  * @ingroup JobQueue
  */
 
+use MediaWiki\Deferred\LinksUpdate\LinksDeletionUpdate;
+use MediaWiki\Deferred\LinksUpdate\LinksUpdate;
 use MediaWiki\MediaWikiServices;
 
 /**
diff --git a/includes/jobqueue/jobs/RefreshLinksJob.php b/includes/jobqueue/jobs/RefreshLinksJob.php
index 72f98e80c9cc..459bf966c5cd 100644
--- a/includes/jobqueue/jobs/RefreshLinksJob.php
+++ b/includes/jobqueue/jobs/RefreshLinksJob.php
@@ -21,6 +21,7 @@
  * @ingroup JobQueue
  */
 use Liuggio\StatsdClient\Factory\StatsdDataFactoryInterface;
+use MediaWiki\Deferred\LinksUpdate\LinksUpdate;
 use MediaWiki\Logger\LoggerFactory;
 use MediaWiki\MediaWikiServices;
 use MediaWiki\Page\PageIdentity;
diff --git a/includes/page/DeletePage.php b/includes/page/DeletePage.php
index be56338ed1a2..aede631c6360 100644
--- a/includes/page/DeletePage.php
+++ b/includes/page/DeletePage.php
@@ -12,12 +12,12 @@ use DeferredUpdates;
 use DeletePageJob;
 use Exception;
 use JobQueueGroup;
-use LinksDeletionUpdate;
-use LinksUpdate;
 use LogicException;
 use ManualLogEntry;
 use MediaWiki\Cache\BacklinkCacheFactory;
 use MediaWiki\Config\ServiceOptions;
+use MediaWiki\Deferred\LinksUpdate\LinksDeletionUpdate;
+use MediaWiki\Deferred\LinksUpdate\LinksUpdate;
 use MediaWiki\HookContainer\HookContainer;
 use MediaWiki\HookContainer\HookRunner;
 use MediaWiki\Logger\LoggerFactory;
diff --git a/maintenance/namespaceDupes.php b/maintenance/namespaceDupes.php
index 64624156eaba..ac7392d881cd 100644
--- a/maintenance/namespaceDupes.php
+++ b/maintenance/namespaceDupes.php
@@ -26,6 +26,7 @@
 
 require_once __DIR__ . '/Maintenance.php';
 
+use MediaWiki\Deferred\LinksUpdate\LinksDeletionUpdate;
 use MediaWiki\Linker\LinkTarget;
 use MediaWiki\MediaWikiServices;
 use Wikimedia\Rdbms\IDatabase;
diff --git a/tests/phpunit/includes/Storage/DerivedPageDataUpdaterTest.php b/tests/phpunit/includes/Storage/DerivedPageDataUpdaterTest.php
index cd39948d453a..b57333c3db68 100644
--- a/tests/phpunit/includes/Storage/DerivedPageDataUpdaterTest.php
+++ b/tests/phpunit/includes/Storage/DerivedPageDataUpdaterTest.php
@@ -9,8 +9,8 @@ use ContentHandler;
 use DeferredUpdates;
 use DummyContentHandlerForTesting;
 use JobQueueGroup;
-use LinksUpdate;
 use MediaWiki\Config\ServiceOptions;
+use MediaWiki\Deferred\LinksUpdate\LinksUpdate;
 use MediaWiki\MediaWikiServices;
 use MediaWiki\Revision\MutableRevisionRecord;
 use MediaWiki\Revision\MutableRevisionSlots;
diff --git a/tests/phpunit/includes/content/WikitextContentTest.php b/tests/phpunit/includes/content/WikitextContentTest.php
index 7c39b38864bc..de6dc0e43a44 100644
--- a/tests/phpunit/includes/content/WikitextContentTest.php
+++ b/tests/phpunit/includes/content/WikitextContentTest.php
@@ -1,5 +1,6 @@
 <?php
 
+use MediaWiki\Deferred\LinksUpdate\LinksDeletionUpdate;
 use MediaWiki\MediaWikiServices;
 
 /**
diff --git a/tests/phpunit/includes/deferred/LinksDeletionUpdateTest.php b/tests/phpunit/includes/deferred/LinksDeletionUpdateTest.php
index 82db3d71ba6b..53b954b9c6e6 100644
--- a/tests/phpunit/includes/deferred/LinksDeletionUpdateTest.php
+++ b/tests/phpunit/includes/deferred/LinksDeletionUpdateTest.php
@@ -1,5 +1,8 @@
 <?php
 
+use MediaWiki\Deferred\LinksUpdate\LinksDeletionUpdate;
+use MediaWiki\Deferred\LinksUpdate\LinksUpdate;
+
 /**
  * @covers LinksDeletionUpdate
  * @covers LinksUpdate
diff --git a/tests/phpunit/includes/deferred/LinksUpdateTest.php b/tests/phpunit/includes/deferred/LinksUpdateTest.php
index 111621e153aa..3007011324f0 100644
--- a/tests/phpunit/includes/deferred/LinksUpdateTest.php
+++ b/tests/phpunit/includes/deferred/LinksUpdateTest.php
@@ -1,5 +1,6 @@
 <?php
 
+use MediaWiki\Deferred\LinksUpdate\LinksUpdate;
 use MediaWiki\Page\PageIdentityValue;
 use PHPUnit\Framework\MockObject\MockObject;
 use Wikimedia\TestingAccessWrapper;
diff --git a/tests/phpunit/includes/page/WikiPageDbTest.php b/tests/phpunit/includes/page/WikiPageDbTest.php
index 1ca1f8a22db4..27ca6558eb06 100644
--- a/tests/phpunit/includes/page/WikiPageDbTest.php
+++ b/tests/phpunit/includes/page/WikiPageDbTest.php
@@ -1,6 +1,7 @@
 <?php
 
 use MediaWiki\Content\Renderer\ContentRenderer;
+use MediaWiki\Deferred\LinksUpdate\LinksDeletionUpdate;
 use MediaWiki\Edit\PreparedEdit;
 use MediaWiki\MediaWikiServices;
 use MediaWiki\Page\PageIdentity;