No OneTemporary
Actions

Size

86 KB

Referenced Files

None

Subscribers

None

View Options

	diff --git a/RELEASE-NOTES-1.44 b/RELEASE-NOTES-1.44
	index 460eed85b5f..a1d7c8d3477 100644
	--- a/RELEASE-NOTES-1.44
	+++ b/RELEASE-NOTES-1.44
	@@ -428,6 +428,8 @@ because of Phabricator reports.
	- ChangeTagsLogList
	- ChangeTagsRevisionItem
	- ChangeTagsRevisionList
	+ - MediaWiki\Cache:
	+ - HTMLFileCache
	- MediaWiki\Exception:
	- BadRequestError
	- BadTitleError
	@@ -475,6 +477,8 @@ because of Phabricator reports.
	- MetadataStorageHelper
	- OldLocalFile
	- UnregisteredLocalFile
	+ - MediaWiki\Interwiki:
	+ - Interwiki
	- MediaWiki\JobQueue:
	- GenericParameterJob
	- IJobSpecification
	@@ -578,6 +582,21 @@ because of Phabricator reports.
	- SkinFallback
	- SkinMustache
	- SkinTemplate
	+ - Wikimedia\ArrayUtils:
	+ - ArrayUtils
	+ - Wikimedia\HashRing:
	+ - HashRing
	+ - Wikimedia\HtmlArmor:
	+ - HtmlArmor
	+ - Wikimedia\Http:
	+ - HttpStatus
	+ - Wikimedia\MapCacheLRU:
	+ - MapCacheLRU
	+ - Wikimedia\StringUtils:
	+ - ExplodeIterator
	+ - StringUtils
	+ - Wikimedia\Timing:
	+ - Timing
	* WikiPage::doEditUpdates(), deprecated since 1.32, is now emitting warnings.
	Use DerivedPageDataUpdater::doUpdates() instead.
	* IDatabase::setTransactionListener() is now deprecated without replacement.
	diff --git a/autoload.php b/autoload.php
	index ebaf4847384..3109ec44d5e 100644
	--- a/autoload.php
	+++ b/autoload.php
	@@ -577,7 +577,7 @@ $wgAutoloadLocalClasses = [
	'HtmlCacheUpdater' => __DIR__ . '/includes/cache/HTMLCacheUpdater.php',
	'HtmlFileCacheUpdate' => __DIR__ . '/includes/deferred/HtmlFileCacheUpdate.php',
	'HttpError' => __DIR__ . '/includes/exception/HttpError.php',
	- 'HttpStatus' => __DIR__ . '/includes/libs/HttpStatus.php',
	+ 'HttpStatus' => __DIR__ . '/includes/libs/http/HttpStatus.php',
	'IApiMessage' => __DIR__ . '/includes/api/IApiMessage.php',
	'IBufferingStatsdDataFactory' => __DIR__ . '/includes/libs/Stats/IBufferingStatsdDataFactory.php',
	'IContextSource' => __DIR__ . '/includes/context/IContextSource.php',
	@@ -1085,6 +1085,7 @@ $wgAutoloadLocalClasses = [
	'MediaWiki\\Cache\\FileCacheBase' => __DIR__ . '/includes/cache/FileCacheBase.php',
	'MediaWiki\\Cache\\GenderCache' => __DIR__ . '/includes/cache/GenderCache.php',
	'MediaWiki\\Cache\\HTMLCacheUpdater' => __DIR__ . '/includes/cache/HTMLCacheUpdater.php',
	+ 'MediaWiki\\Cache\\HTMLFileCache' => __DIR__ . '/includes/cache/HTMLFileCache.php',
	'MediaWiki\\Cache\\Hook\\BacklinkCacheGetConditionsHook' => __DIR__ . '/includes/cache/Hook/BacklinkCacheGetConditionsHook.php',
	'MediaWiki\\Cache\\Hook\\BacklinkCacheGetPrefixHook' => __DIR__ . '/includes/cache/Hook/BacklinkCacheGetPrefixHook.php',
	'MediaWiki\\Cache\\Hook\\HTMLFileCache__useFileCacheHook' => __DIR__ . '/includes/cache/Hook/HTMLFileCache__useFileCacheHook.php',
	@@ -1869,6 +1870,7 @@ $wgAutoloadLocalClasses = [
	'MediaWiki\\Installer\\WebInstallerWelcome' => __DIR__ . '/includes/installer/WebInstallerWelcome.php',
	'MediaWiki\\Interwiki\\ClassicInterwikiLookup' => __DIR__ . '/includes/interwiki/ClassicInterwikiLookup.php',
	'MediaWiki\\Interwiki\\Hook\\InterwikiLoadPrefixHook' => __DIR__ . '/includes/interwiki/Hook/InterwikiLoadPrefixHook.php',
	+ 'MediaWiki\\Interwiki\\Interwiki' => __DIR__ . '/includes/interwiki/Interwiki.php',
	'MediaWiki\\Interwiki\\InterwikiLookup' => __DIR__ . '/includes/interwiki/InterwikiLookup.php',
	'MediaWiki\\Interwiki\\InterwikiLookupAdapter' => __DIR__ . '/includes/interwiki/InterwikiLookupAdapter.php',
	'MediaWiki\\Interwiki\\NullInterwikiLookup' => __DIR__ . '/includes/interwiki/NullInterwikiLookup.php',
	@@ -3649,6 +3651,7 @@ $wgAutoloadLocalClasses = [
	'WikiRevision' => __DIR__ . '/includes/import/WikiRevision.php',
	'WikiStatsOutput' => __DIR__ . '/maintenance/language/StatOutputs.php',
	'WikiTextStructure' => __DIR__ . '/includes/content/WikiTextStructure.php',
	+ 'Wikimedia\\ArrayUtils\\ArrayUtils' => __DIR__ . '/includes/libs/ArrayUtils.php',
	'Wikimedia\\Composer\\ComposerInstalled' => __DIR__ . '/includes/libs/composer/ComposerInstalled.php',
	'Wikimedia\\Composer\\ComposerJson' => __DIR__ . '/includes/libs/composer/ComposerJson.php',
	'Wikimedia\\Composer\\ComposerLock' => __DIR__ . '/includes/libs/composer/ComposerLock.php',
	@@ -3707,11 +3710,15 @@ $wgAutoloadLocalClasses = [
	'Wikimedia\\FileBackend\\HTTPFileStreamer' => __DIR__ . '/includes/libs/filebackend/HTTPFileStreamer.php',
	'Wikimedia\\FileBackend\\MemoryFileBackend' => __DIR__ . '/includes/libs/filebackend/MemoryFileBackend.php',
	'Wikimedia\\FileBackend\\SwiftFileBackend' => __DIR__ . '/includes/libs/filebackend/SwiftFileBackend.php',
	+ 'Wikimedia\\HashRing\\HashRing' => __DIR__ . '/includes/libs/HashRing.php',
	+ 'Wikimedia\\HtmlArmor\\HtmlArmor' => __DIR__ . '/includes/libs/HtmlArmor.php',
	'Wikimedia\\Http\\HttpAcceptNegotiator' => __DIR__ . '/includes/libs/http/HttpAcceptNegotiator.php',
	'Wikimedia\\Http\\HttpAcceptParser' => __DIR__ . '/includes/libs/http/HttpAcceptParser.php',
	+ 'Wikimedia\\Http\\HttpStatus' => __DIR__ . '/includes/libs/http/HttpStatus.php',
	'Wikimedia\\Http\\MultiHttpClient' => __DIR__ . '/includes/libs/http/MultiHttpClient.php',
	'Wikimedia\\Http\\TelemetryHeadersInterface' => __DIR__ . '/includes/libs/http/TelemetryHeadersInterface.php',
	'Wikimedia\\LightweightObjectStore\\ExpirationAwareness' => __DIR__ . '/includes/libs/objectcache/utils/ExpirationAwareness.php',
	+ 'Wikimedia\\MapCacheLRU\\MapCacheLRU' => __DIR__ . '/includes/libs/MapCacheLRU.php',
	'Wikimedia\\Message\\DataMessageValue' => __DIR__ . '/includes/libs/Message/DataMessageValue.php',
	'Wikimedia\\Message\\IMessageFormatterFactory' => __DIR__ . '/includes/libs/Message/IMessageFormatterFactory.php',
	'Wikimedia\\Message\\ITextFormatter' => __DIR__ . '/includes/libs/Message/ITextFormatter.php',
	@@ -3913,6 +3920,8 @@ $wgAutoloadLocalClasses = [
	'Wikimedia\\Stats\\StatsUtils' => __DIR__ . '/includes/libs/Stats/StatsUtils.php',
	'Wikimedia\\Stats\\StatsdAwareInterface' => __DIR__ . '/includes/libs/Stats/StatsdAwareInterface.php',
	'Wikimedia\\Stats\\UnitTestingHelper' => __DIR__ . '/includes/libs/Stats/UnitTestingHelper.php',
	+ 'Wikimedia\\StringUtils\\ExplodeIterator' => __DIR__ . '/includes/libs/ExplodeIterator.php',
	+ 'Wikimedia\\StringUtils\\StringUtils' => __DIR__ . '/includes/libs/StringUtils.php',
	'Wikimedia\\Telemetry\\Clock' => __DIR__ . '/includes/libs/telemetry/Clock.php',
	'Wikimedia\\Telemetry\\CompositePropagator' => __DIR__ . '/includes/libs/telemetry/CompositePropagator.php',
	'Wikimedia\\Telemetry\\ContextPropagatorInterface' => __DIR__ . '/includes/libs/telemetry/ContextPropagatorInterface.php',
	@@ -3931,6 +3940,7 @@ $wgAutoloadLocalClasses = [
	'Wikimedia\\Telemetry\\TracerInterface' => __DIR__ . '/includes/libs/telemetry/TracerInterface.php',
	'Wikimedia\\Telemetry\\TracerState' => __DIR__ . '/includes/libs/telemetry/TracerState.php',
	'Wikimedia\\Telemetry\\W3CTraceContextPropagator' => __DIR__ . '/includes/libs/telemetry/W3CTraceContextPropagator.php',
	+ 'Wikimedia\\Timing\\Timing' => __DIR__ . '/includes/libs/Timing.php',
	'Wikimedia\\UUID\\GlobalIdGenerator' => __DIR__ . '/includes/libs/uuid/GlobalIdGenerator.php',
	'Wikimedia\\WRStats\\ArrayStatsStore' => __DIR__ . '/includes/libs/WRStats/ArrayStatsStore.php',
	'Wikimedia\\WRStats\\BagOStuffStatsStore' => __DIR__ . '/includes/libs/WRStats/BagOStuffStatsStore.php',
	diff --git a/includes/Category/CategoryViewer.php b/includes/Category/CategoryViewer.php
	index d0966cc783c..ea1180b0854 100644
	--- a/includes/Category/CategoryViewer.php
	+++ b/includes/Category/CategoryViewer.php
	@@ -23,7 +23,6 @@
	namespace MediaWiki\Category;

	use Collation;
	-use HtmlArmor;
	use ImageGalleryBase;
	use ImageGalleryClassNotFoundException;
	use InvalidArgumentException;
	@@ -42,6 +41,7 @@ use MediaWiki\Page\PageReference;
	use MediaWiki\Parser\ParserOutputFlags;
	use MediaWiki\Title\Title;
	use MediaWiki\Title\TitleValue;
	+use Wikimedia\HtmlArmor\HtmlArmor;
	use Wikimedia\Rdbms\SelectQueryBuilder;

	class CategoryViewer extends ContextSource {
	diff --git a/includes/CommentFormatter/CommentParser.php b/includes/CommentFormatter/CommentParser.php
	index 4859a63fdf1..7a69c2dbe95 100644
	--- a/includes/CommentFormatter/CommentParser.php
	+++ b/includes/CommentFormatter/CommentParser.php
	@@ -2,7 +2,6 @@

	namespace MediaWiki\CommentFormatter;

	-use HtmlArmor;
	use MediaWiki\Cache\LinkBatch;
	use MediaWiki\Cache\LinkBatchFactory;
	use MediaWiki\Cache\LinkCache;
	@@ -24,7 +23,8 @@ use MediaWiki\Title\Title;
	use MediaWiki\Title\TitleParser;
	use MediaWiki\Title\TitleValue;
	use MediaWiki\WikiMap\WikiMap;
	-use StringUtils;
	+use Wikimedia\HtmlArmor\HtmlArmor;
	+use Wikimedia\StringUtils\StringUtils;

	/**
	* The text processing backend for CommentFormatter.
	diff --git a/includes/ExternalLinks/LinkFilter.php b/includes/ExternalLinks/LinkFilter.php
	index e47b5751a19..6ad05b61cb4 100644
	--- a/includes/ExternalLinks/LinkFilter.php
	+++ b/includes/ExternalLinks/LinkFilter.php
	@@ -24,11 +24,11 @@ use MediaWiki\Content\Content;
	use MediaWiki\Content\TextContent;
	use MediaWiki\MainConfigNames;
	use MediaWiki\MediaWikiServices;
	-use StringUtils;
	use Wikimedia\IPUtils;
	use Wikimedia\Rdbms\IExpression;
	use Wikimedia\Rdbms\LikeMatch;
	use Wikimedia\Rdbms\LikeValue;
	+use Wikimedia\StringUtils\StringUtils;

	/**
	* Utilities for formatting and querying the externallinks table.
	diff --git a/includes/GlobalFunctions.php b/includes/GlobalFunctions.php
	index 82b69a70887..a76681e54d9 100644
	--- a/includes/GlobalFunctions.php
	+++ b/includes/GlobalFunctions.php
	@@ -35,6 +35,7 @@ use MediaWiki\Utils\UrlUtils;
	use Wikimedia\AtEase\AtEase;
	use Wikimedia\FileBackend\FileBackend;
	use Wikimedia\FileBackend\FSFile\TempFSFile;
	+use Wikimedia\Http\HttpStatus;
	use Wikimedia\Message\MessageParam;
	use Wikimedia\Message\MessageSpecifier;
	use Wikimedia\ParamValidator\TypeDef\ExpiryDef;
	diff --git a/includes/MediaWikiEntryPoint.php b/includes/MediaWikiEntryPoint.php
	index 16ec75375e2..d2bab7993e5 100644
	--- a/includes/MediaWikiEntryPoint.php
	+++ b/includes/MediaWikiEntryPoint.php
	@@ -21,7 +21,6 @@
	namespace MediaWiki;

	use Exception;
	-use HttpStatus;
	use Liuggio\StatsdClient\Sender\SocketSender;
	use Liuggio\StatsdClient\StatsdClient;
	use LogicException;
	@@ -49,6 +48,7 @@ use Psr\Log\LoggerInterface;
	use RuntimeException;
	use Throwable;
	use Wikimedia\AtEase\AtEase;
	+use Wikimedia\Http\HttpStatus;
	use Wikimedia\Rdbms\ChronologyProtector;
	use Wikimedia\Rdbms\LBFactory;
	use Wikimedia\Rdbms\ReadOnlyMode;
	diff --git a/includes/Output/OutputPage.php b/includes/Output/OutputPage.php
	index 22120e5928a..d0f99772fad 100644
	--- a/includes/Output/OutputPage.php
	+++ b/includes/Output/OutputPage.php
	@@ -24,7 +24,6 @@ namespace MediaWiki\Output;

	use CSSJanus;
	use Exception;
	-use HtmlArmor;
	use InvalidArgumentException;
	use MediaWiki\Cache\LinkCache;
	use MediaWiki\Config\Config;
	@@ -73,6 +72,7 @@ use OOUI\Theme;
	use RuntimeException;
	use Wikimedia\Assert\Assert;
	use Wikimedia\Bcp47Code\Bcp47Code;
	+use Wikimedia\HtmlArmor\HtmlArmor;
	use Wikimedia\Message\MessageParam;
	use Wikimedia\Message\MessageSpecifier;
	use Wikimedia\Parsoid\Core\LinkTarget as ParsoidLinkTarget;
	diff --git a/includes/Permissions/GrantsLocalization.php b/includes/Permissions/GrantsLocalization.php
	index 577b485d4c4..f35660c44ef 100644
	--- a/includes/Permissions/GrantsLocalization.php
	+++ b/includes/Permissions/GrantsLocalization.php
	@@ -20,12 +20,12 @@

	namespace MediaWiki\Permissions;

	-use HtmlArmor;
	use MediaWiki\Html\Html;
	use MediaWiki\Language\Language;
	use MediaWiki\Languages\LanguageFactory;
	use MediaWiki\Linker\LinkRenderer;
	use MediaWiki\SpecialPage\SpecialPage;
	+use Wikimedia\HtmlArmor\HtmlArmor;

	/**
	* This separate service is needed because the ::getGrantsLink method requires a LinkRenderer
	diff --git a/includes/Request/WebResponse.php b/includes/Request/WebResponse.php
	index 03077f663bb..9e1b76dd6a2 100644
	--- a/includes/Request/WebResponse.php
	+++ b/includes/Request/WebResponse.php
	@@ -22,11 +22,11 @@

	namespace MediaWiki\Request;

	-use HttpStatus;
	use MediaWiki\HookContainer\HookRunner;
	use MediaWiki\MainConfigNames;
	use MediaWiki\MediaWikiServices;
	use RuntimeException;
	+use Wikimedia\Http\HttpStatus;

	/**
	* Allow programs to request this object from WebRequest::response()
	diff --git a/includes/ResourceLoader/ResourceLoader.php b/includes/ResourceLoader/ResourceLoader.php
	index 48f961637f2..cef7c9ce844 100644
	--- a/includes/ResourceLoader/ResourceLoader.php
	+++ b/includes/ResourceLoader/ResourceLoader.php
	@@ -23,7 +23,6 @@
	namespace MediaWiki\ResourceLoader;

	use Exception;
	-use HttpStatus;
	use InvalidArgumentException;
	use Less_Environment;
	use Less_Parser;
	@@ -53,6 +52,7 @@ use stdClass;
	use Throwable;
	use UnexpectedValueException;
	use Wikimedia\DependencyStore\DependencyStore;
	+use Wikimedia\Http\HttpStatus;
	use Wikimedia\Minify\CSSMin;
	use Wikimedia\Minify\IdentityMinifierState;
	use Wikimedia\Minify\IndexMap;
	diff --git a/includes/Rest/Response.php b/includes/Rest/Response.php
	index 222dce8cb31..8f27e97e092 100644
	--- a/includes/Rest/Response.php
	+++ b/includes/Rest/Response.php
	@@ -2,8 +2,8 @@

	namespace MediaWiki\Rest;

	-use HttpStatus;
	use Psr\Http\Message\StreamInterface;
	+use Wikimedia\Http\HttpStatus;

	class Response implements ResponseInterface {

	diff --git a/includes/Rest/ResponseFactory.php b/includes/Rest/ResponseFactory.php
	index 4ecd787a2b9..387d92dcf8a 100644
	--- a/includes/Rest/ResponseFactory.php
	+++ b/includes/Rest/ResponseFactory.php
	@@ -2,12 +2,12 @@

	namespace MediaWiki\Rest;

	-use HttpStatus;
	use InvalidArgumentException;
	use MediaWiki\Exception\MWExceptionHandler;
	use MediaWiki\Language\LanguageCode;
	use stdClass;
	use Throwable;
	+use Wikimedia\Http\HttpStatus;
	use Wikimedia\Message\ITextFormatter;
	use Wikimedia\Message\MessageValue;

	diff --git a/includes/Rest/Router.php b/includes/Rest/Router.php
	index 6960a07f8db..8713d66b6a5 100644
	--- a/includes/Rest/Router.php
	+++ b/includes/Rest/Router.php
	@@ -2,7 +2,6 @@

	namespace MediaWiki\Rest;

	-use HttpStatus;
	use MediaWiki\Config\ServiceOptions;
	use MediaWiki\HookContainer\HookContainer;
	use MediaWiki\MainConfigNames;
	@@ -17,6 +16,7 @@ use MediaWiki\Rest\Reporter\ErrorReporter;
	use MediaWiki\Rest\Validator\Validator;
	use MediaWiki\Session\Session;
	use Throwable;
	+use Wikimedia\Http\HttpStatus;
	use Wikimedia\Message\MessageValue;
	use Wikimedia\ObjectCache\BagOStuff;
	use Wikimedia\ObjectFactory\ObjectFactory;
	diff --git a/includes/Setup.php b/includes/Setup.php
	index 052f553e878..3f30d537dde 100644
	--- a/includes/Setup.php
	+++ b/includes/Setup.php
	@@ -80,6 +80,7 @@ use MediaWiki\StubObject\StubUserLang;
	use MediaWiki\Title\Title;
	use MediaWiki\User\User;
	use Psr\Log\LoggerInterface;
	+use Wikimedia\Http\HttpStatus;
	use Wikimedia\RequestTimeout\RequestTimeout;
	use Wikimedia\Telemetry\SpanInterface;
	use Wikimedia\Telemetry\TracerState;
	diff --git a/includes/WebStart.php b/includes/WebStart.php
	index 7b18a907f61..639a09c1341 100644
	--- a/includes/WebStart.php
	+++ b/includes/WebStart.php
	@@ -27,6 +27,7 @@

	use MediaWiki\Context\RequestContext;
	use MediaWiki\Settings\SettingsBuilder;
	+use Wikimedia\Http\HttpStatus;

	# T17461: Make IE8 turn off content sniffing. Everybody else should ignore this
	# We're adding it here so that it's always set, even for alternate entry
	diff --git a/includes/actions/ActionEntryPoint.php b/includes/actions/ActionEntryPoint.php
	index 099c7f9ec54..51854c13c62 100644
	--- a/includes/actions/ActionEntryPoint.php
	+++ b/includes/actions/ActionEntryPoint.php
	@@ -2,7 +2,7 @@

	namespace MediaWiki\Actions;

	-use HTMLFileCache;
	+use MediaWiki\Cache\HTMLFileCache;
	use MediaWiki\Context\RequestContext;
	use MediaWiki\Exception\BadTitleError;
	use MediaWiki\Exception\ErrorPageError;
	diff --git a/includes/actions/HistoryAction.php b/includes/actions/HistoryAction.php
	index 7e0439d199b..da5df5f4650 100644
	--- a/includes/actions/HistoryAction.php
	+++ b/includes/actions/HistoryAction.php
	@@ -23,7 +23,7 @@

	namespace MediaWiki\Actions;

	-use HTMLFileCache;
	+use MediaWiki\Cache\HTMLFileCache;
	use MediaWiki\Feed\ChannelFeed;
	use MediaWiki\Feed\FeedItem;
	use MediaWiki\Feed\FeedUtils;
	diff --git a/includes/actions/pagers/HistoryPager.php b/includes/actions/pagers/HistoryPager.php
	index 5eee82db7d5..803fcae85a1 100644
	--- a/includes/actions/pagers/HistoryPager.php
	+++ b/includes/actions/pagers/HistoryPager.php
	@@ -23,8 +23,6 @@

	namespace MediaWiki\Pager;

	-use HtmlArmor;
	-use MapCacheLRU;
	use MediaWiki\Actions\HistoryAction;
	use MediaWiki\Cache\LinkBatchFactory;
	use MediaWiki\ChangeTags\ChangeTags;
	@@ -45,6 +43,8 @@ use MediaWiki\SpecialPage\SpecialPage;
	use MediaWiki\User\UserIdentityValue;
	use MediaWiki\Watchlist\WatchlistManager;
	use stdClass;
	+use Wikimedia\HtmlArmor\HtmlArmor;
	+use Wikimedia\MapCacheLRU\MapCacheLRU;
	use Wikimedia\Rdbms\IDBAccessObject;

	/**
	diff --git a/includes/api/ApiFormatBase.php b/includes/api/ApiFormatBase.php
	index 636704e30f4..5cd160fc146 100644
	--- a/includes/api/ApiFormatBase.php
	+++ b/includes/api/ApiFormatBase.php
	@@ -22,7 +22,6 @@

	namespace MediaWiki\Api;

	-use HttpStatus;
	use MediaWiki\Context\DerivativeContext;
	use MediaWiki\Html\Html;
	use MediaWiki\Json\FormatJson;
	@@ -30,6 +29,7 @@ use MediaWiki\MainConfigNames;
	use MediaWiki\MediaWikiServices;
	use MediaWiki\Output\OutputPage;
	use MediaWiki\SpecialPage\SpecialPage;
	+use Wikimedia\Http\HttpStatus;
	use Wikimedia\ParamValidator\ParamValidator;

	/**
	diff --git a/includes/api/ApiQuerySearch.php b/includes/api/ApiQuerySearch.php
	index d6f7c0d3603..a29180930bb 100644
	--- a/includes/api/ApiQuerySearch.php
	+++ b/includes/api/ApiQuerySearch.php
	@@ -22,7 +22,6 @@

	namespace MediaWiki\Api;

	-use HtmlArmor;
	use ISearchResultSet;
	use MediaWiki\Search\TitleMatcher;
	use MediaWiki\Status\Status;
	@@ -30,6 +29,7 @@ use SearchEngine;
	use SearchEngineConfig;
	use SearchEngineFactory;
	use SearchResult;
	+use Wikimedia\HtmlArmor\HtmlArmor;
	use Wikimedia\ParamValidator\ParamValidator;
	use Wikimedia\ParamValidator\TypeDef\EnumDef;

	diff --git a/includes/cache/HTMLFileCache.php b/includes/cache/HTMLFileCache.php
	index 7c6a3127d2a..84ac8ff5b2e 100644
	--- a/includes/cache/HTMLFileCache.php
	+++ b/includes/cache/HTMLFileCache.php
	@@ -21,8 +21,9 @@
	* @ingroup Cache
	*/

	-use MediaWiki\Cache\CacheKeyHelper;
	-use MediaWiki\Cache\FileCacheBase;
	+namespace MediaWiki\Cache;
	+
	+use InvalidArgumentException;
	use MediaWiki\Context\IContextSource;
	use MediaWiki\HookContainer\HookRunner;
	use MediaWiki\MainConfigNames;
	@@ -238,3 +239,6 @@ class HTMLFileCache extends FileCacheBase {
	return true;
	}
	}
	+
	+/** @deprecated class alias since 1.44 */
	+class_alias( HTMLFileCache::class, 'HTMLFileCache' );
	diff --git a/includes/cache/LinkCache.php b/includes/cache/LinkCache.php
	index e8feb73e645..53852ab4647 100644
	--- a/includes/cache/LinkCache.php
	+++ b/includes/cache/LinkCache.php
	@@ -24,7 +24,6 @@
	namespace MediaWiki\Cache;

	use InvalidArgumentException;
	-use MapCacheLRU;
	use MediaWiki\MainConfigNames;
	use MediaWiki\MediaWikiServices;
	use MediaWiki\Page\PageIdentity;
	@@ -37,6 +36,7 @@ use Psr\Log\LoggerAwareInterface;
	use Psr\Log\LoggerInterface;
	use Psr\Log\NullLogger;
	use stdClass;
	+use Wikimedia\MapCacheLRU\MapCacheLRU;
	use Wikimedia\ObjectCache\WANObjectCache;
	use Wikimedia\Parsoid\Core\LinkTarget;
	use Wikimedia\Rdbms\Database;
	diff --git a/includes/collation/IcuCollation.php b/includes/collation/IcuCollation.php
	index b1418bd3924..da7ae779934 100644
	--- a/includes/collation/IcuCollation.php
	+++ b/includes/collation/IcuCollation.php
	@@ -21,6 +21,7 @@
	use MediaWiki\Language\Language;
	use MediaWiki\Languages\LanguageFactory;
	use MediaWiki\MediaWikiServices;
	+use Wikimedia\ArrayUtils\ArrayUtils;

	/**
	* @since 1.16.3
	diff --git a/includes/context/ContextSource.php b/includes/context/ContextSource.php
	index 5b579354718..49e41a48f05 100644
	--- a/includes/context/ContextSource.php
	+++ b/includes/context/ContextSource.php
	@@ -31,11 +31,11 @@ use MediaWiki\Session\CsrfTokenSet;
	use MediaWiki\Skin\Skin;
	use MediaWiki\Title\Title;
	use MediaWiki\User\User;
	-use Timing;
	use Wikimedia\Bcp47Code\Bcp47Code;
	use Wikimedia\Message\MessageParam;
	use Wikimedia\Message\MessageSpecifier;
	use Wikimedia\NonSerializable\NonSerializableTrait;
	+use Wikimedia\Timing\Timing;

	/**
	* The simplest way of implementing IContextSource is to hold a RequestContext as a
	diff --git a/includes/context/DerivativeContext.php b/includes/context/DerivativeContext.php
	index cc7688f2ea2..e8fb0bf3330 100644
	--- a/includes/context/DerivativeContext.php
	+++ b/includes/context/DerivativeContext.php
	@@ -33,10 +33,10 @@ use MediaWiki\Session\CsrfTokenSet;
	use MediaWiki\Skin\Skin;
	use MediaWiki\Title\Title;
	use MediaWiki\User\User;
	-use Timing;
	use Wikimedia\Assert\Assert;
	use Wikimedia\Message\MessageParam;
	use Wikimedia\Message\MessageSpecifier;
	+use Wikimedia\Timing\Timing;

	/**
	* An IContextSource implementation which will inherit context from another source
	diff --git a/includes/context/IContextSource.php b/includes/context/IContextSource.php
	index afa9c9408f2..af264f8483d 100644
	--- a/includes/context/IContextSource.php
	+++ b/includes/context/IContextSource.php
	@@ -31,7 +31,7 @@ use MediaWiki\Session\CsrfTokenSetProvider;
	use MediaWiki\Skin\Skin;
	use MediaWiki\Title\Title;
	use MediaWiki\User\User;
	-use Timing;
	+use Wikimedia\Timing\Timing;

	/**
	* Interface for objects which can provide a MediaWiki context on request
	diff --git a/includes/context/RequestContext.php b/includes/context/RequestContext.php
	index 538ec1cf4ee..82eb3eaf186 100644
	--- a/includes/context/RequestContext.php
	+++ b/includes/context/RequestContext.php
	@@ -48,7 +48,6 @@ use MediaWiki\Title\Title;
	use MediaWiki\User\User;
	use MediaWiki\User\UserRigorOptions;
	use RuntimeException;
	-use Timing;
	use Wikimedia\Assert\Assert;
	use Wikimedia\AtEase\AtEase;
	use Wikimedia\Bcp47Code\Bcp47Code;
	@@ -57,6 +56,7 @@ use Wikimedia\Message\MessageParam;
	use Wikimedia\Message\MessageSpecifier;
	use Wikimedia\NonSerializable\NonSerializableTrait;
	use Wikimedia\ScopedCallback;
	+use Wikimedia\Timing\Timing;

	/**
	* Group all the pieces relevant to the context of a request into one instance
	diff --git a/includes/deferred/HtmlFileCacheUpdate.php b/includes/deferred/HtmlFileCacheUpdate.php
	index 85ca29b825c..f96fc037a9c 100644
	--- a/includes/deferred/HtmlFileCacheUpdate.php
	+++ b/includes/deferred/HtmlFileCacheUpdate.php
	@@ -20,8 +20,8 @@

	namespace MediaWiki\Deferred;

	-use HTMLFileCache;
	use MediaWiki\Cache\CacheKeyHelper;
	+use MediaWiki\Cache\HTMLFileCache;
	use MediaWiki\Page\PageIdentity;
	use Wikimedia\Assert\Assert;

	diff --git a/includes/exception/HttpError.php b/includes/exception/HttpError.php
	index 743a761a473..0223c40ac54 100644
	--- a/includes/exception/HttpError.php
	+++ b/includes/exception/HttpError.php
	@@ -20,9 +20,9 @@

	namespace MediaWiki\Exception;

	-use HttpStatus;
	use MediaWiki\Logger\LoggerFactory;
	use MediaWiki\Message\Message;
	+use Wikimedia\Http\HttpStatus;

	/**
	* Show an error that looks like an HTTP server error.
	diff --git a/includes/exception/MWExceptionRenderer.php b/includes/exception/MWExceptionRenderer.php
	index 4c3894de2ae..fa015f1df9a 100644
	--- a/includes/exception/MWExceptionRenderer.php
	+++ b/includes/exception/MWExceptionRenderer.php
	@@ -21,7 +21,6 @@
	namespace MediaWiki\Exception;

	use Exception;
	-use HttpStatus;
	use LocalisationCache;
	use MediaWiki\Context\RequestContext;
	use MediaWiki\Html\Html;
	@@ -32,6 +31,7 @@ use MediaWiki\Message\Message;
	use MediaWiki\Request\WebRequest;
	use Throwable;
	use Wikimedia\AtEase;
	+use Wikimedia\Http\HttpStatus;
	use Wikimedia\Message\MessageParam;
	use Wikimedia\Message\MessageSpecifier;
	use Wikimedia\Rdbms\DBConnectionError;
	diff --git a/includes/filerepo/FileBackendDBRepoWrapper.php b/includes/filerepo/FileBackendDBRepoWrapper.php
	index 60980c1cb4b..1e72798b8ca 100644
	--- a/includes/filerepo/FileBackendDBRepoWrapper.php
	+++ b/includes/filerepo/FileBackendDBRepoWrapper.php
	@@ -22,13 +22,13 @@ namespace MediaWiki\FileRepo;

	use Closure;
	use InvalidArgumentException;
	-use MapCacheLRU;
	use MediaWiki\MainConfigNames;
	use MediaWiki\MediaWikiServices;
	use MediaWiki\Output\StreamFile;
	use Shellbox\Command\BoxedCommand;
	use StatusValue;
	use Wikimedia\FileBackend\FileBackend;
	+use Wikimedia\MapCacheLRU\MapCacheLRU;
	use Wikimedia\Rdbms\IDatabase;

	/**
	diff --git a/includes/filerepo/RepoGroup.php b/includes/filerepo/RepoGroup.php
	index 516ef0bf3c3..b41b17664d3 100644
	--- a/includes/filerepo/RepoGroup.php
	+++ b/includes/filerepo/RepoGroup.php
	@@ -21,12 +21,12 @@
	namespace MediaWiki\FileRepo;

	use InvalidArgumentException;
	-use MapCacheLRU;
	use MediaWiki\FileRepo\File\File;
	use MediaWiki\Linker\LinkTarget;
	use MediaWiki\Page\PageIdentity;
	use MediaWiki\Title\Title;
	use MWFileProps;
	+use Wikimedia\MapCacheLRU\MapCacheLRU;
	use Wikimedia\Mime\MimeAnalyzer;
	use Wikimedia\ObjectCache\WANObjectCache;

	diff --git a/includes/htmlform/HTMLFormField.php b/includes/htmlform/HTMLFormField.php
	index e789477722c..c3f83950fa3 100644
	--- a/includes/htmlform/HTMLFormField.php
	+++ b/includes/htmlform/HTMLFormField.php
	@@ -2,7 +2,6 @@

	namespace MediaWiki\HTMLForm;

	-use HtmlArmor;
	use InvalidArgumentException;
	use MediaWiki\Context\RequestContext;
	use MediaWiki\Html\Html;
	@@ -15,6 +14,7 @@ use MediaWiki\Message\Message;
	use MediaWiki\Request\WebRequest;
	use MediaWiki\Status\Status;
	use StatusValue;
	+use Wikimedia\HtmlArmor\HtmlArmor;
	use Wikimedia\Message\MessageParam;
	use Wikimedia\Message\MessageSpecifier;

	diff --git a/includes/installer/WebInstaller.php b/includes/installer/WebInstaller.php
	index dde6f0e9506..cf7597d54e8 100644
	--- a/includes/installer/WebInstaller.php
	+++ b/includes/installer/WebInstaller.php
	@@ -24,7 +24,6 @@
	namespace MediaWiki\Installer;

	use Exception;
	-use HtmlArmor;
	use MediaWiki\Context\RequestContext;
	use MediaWiki\Html\Html;
	use MediaWiki\Installer\Task\TaskFactory;
	@@ -35,6 +34,7 @@ use MediaWiki\MediaWikiServices;
	use MediaWiki\Message\Message;
	use MediaWiki\Request\WebRequest;
	use MediaWiki\Status\Status;
	+use Wikimedia\HtmlArmor\HtmlArmor;

	/**
	* Class for the core installer web interface.
	diff --git a/includes/interwiki/ClassicInterwikiLookup.php b/includes/interwiki/ClassicInterwikiLookup.php
	index 13be7333f15..0952622e774 100644
	--- a/includes/interwiki/ClassicInterwikiLookup.php
	+++ b/includes/interwiki/ClassicInterwikiLookup.php
	@@ -20,8 +20,6 @@

	namespace MediaWiki\Interwiki;

	-use Interwiki;
	-use MapCacheLRU;
	use MediaWiki\Config\ServiceOptions;
	use MediaWiki\HookContainer\HookContainer;
	use MediaWiki\HookContainer\HookRunner;
	@@ -29,6 +27,7 @@ use MediaWiki\Language\Language;
	use MediaWiki\Languages\LanguageNameUtils;
	use MediaWiki\MainConfigNames;
	use MediaWiki\WikiMap\WikiMap;
	+use Wikimedia\MapCacheLRU\MapCacheLRU;
	use Wikimedia\ObjectCache\WANObjectCache;
	use Wikimedia\Rdbms\IConnectionProvider;

	diff --git a/includes/interwiki/Interwiki.php b/includes/interwiki/Interwiki.php
	index 2a3f5596349..d97f97151c9 100644
	--- a/includes/interwiki/Interwiki.php
	+++ b/includes/interwiki/Interwiki.php
	@@ -18,6 +18,8 @@
	* @file
	*/

	+namespace MediaWiki\Interwiki;
	+
	/**
	* An interwiki record value object.
	*
	@@ -136,3 +138,6 @@ class Interwiki {
	}

	}
	+
	+/** @deprecated class alias since 1.44 */
	+class_alias( Interwiki::class, 'Interwiki' );
	diff --git a/includes/interwiki/InterwikiLookup.php b/includes/interwiki/InterwikiLookup.php
	index db9d1b5e948..c3421c7c31a 100644
	--- a/includes/interwiki/InterwikiLookup.php
	+++ b/includes/interwiki/InterwikiLookup.php
	@@ -20,8 +20,6 @@

	namespace MediaWiki\Interwiki;

	-use Interwiki;
	-
	/**
	* Service interface for looking up Interwiki records.
	*
	diff --git a/includes/interwiki/InterwikiLookupAdapter.php b/includes/interwiki/InterwikiLookupAdapter.php
	index e8c755e2f12..285c0756dca 100644
	--- a/includes/interwiki/InterwikiLookupAdapter.php
	+++ b/includes/interwiki/InterwikiLookupAdapter.php
	@@ -20,7 +20,6 @@

	namespace MediaWiki\Interwiki;

	-use Interwiki;
	use MediaWiki\Site\MediaWikiSite;
	use MediaWiki\Site\Site;
	use MediaWiki\Site\SiteLookup;
	diff --git a/includes/jobqueue/JobQueueFederated.php b/includes/jobqueue/JobQueueFederated.php
	index 97f1c2254d5..3b0240c77d6 100644
	--- a/includes/jobqueue/JobQueueFederated.php
	+++ b/includes/jobqueue/JobQueueFederated.php
	@@ -21,12 +21,12 @@
	namespace MediaWiki\JobQueue;

	use AppendIterator;
	-use ArrayUtils;
	use Exception;
	-use HashRing;
	use InvalidArgumentException;
	use MediaWiki\JobQueue\Exceptions\JobQueueError;
	use UnexpectedValueException;
	+use Wikimedia\ArrayUtils\ArrayUtils;
	+use Wikimedia\HashRing\HashRing;

	/**
	* Enqueue and run background jobs via a federated queue, for wiki farms.
	diff --git a/includes/jobqueue/JobQueueGroup.php b/includes/jobqueue/JobQueueGroup.php
	index 91fbb2d03ac..14012a3128d 100644
	--- a/includes/jobqueue/JobQueueGroup.php
	+++ b/includes/jobqueue/JobQueueGroup.php
	@@ -21,11 +21,11 @@
	namespace MediaWiki\JobQueue;

	use InvalidArgumentException;
	-use MapCacheLRU;
	use MediaWiki\Deferred\DeferredUpdates;
	use MediaWiki\Deferred\JobQueueEnqueueUpdate;
	use MediaWiki\JobQueue\Exceptions\JobQueueError;
	use MediaWiki\MediaWikiServices;
	+use Wikimedia\MapCacheLRU\MapCacheLRU;
	use Wikimedia\ObjectCache\WANObjectCache;
	use Wikimedia\Rdbms\ReadOnlyMode;
	use Wikimedia\Stats\StatsFactory;
	diff --git a/includes/language/ConverterRule.php b/includes/language/ConverterRule.php
	index 558206a93d0..3fcbee6a8a7 100644
	--- a/includes/language/ConverterRule.php
	+++ b/includes/language/ConverterRule.php
	@@ -22,7 +22,7 @@
	namespace MediaWiki\Language;

	use MediaWiki\Logger\LoggerFactory;
	-use StringUtils;
	+use Wikimedia\StringUtils\StringUtils;

	/**
	* The rules used for language conversion, this processes the rules
	diff --git a/includes/language/Language.php b/includes/language/Language.php
	index a0665adc8cf..118d420dfa7 100644
	--- a/includes/language/Language.php
	+++ b/includes/language/Language.php
	@@ -62,13 +62,13 @@ use MediaWiki\Utils\MWTimestamp;
	use MediaWiki\Xml\XmlSelect;
	use NumberFormatter;
	use RuntimeException;
	-use StringUtils;
	use UtfNormal\Validator as UtfNormalValidator;
	use Wikimedia\AtEase\AtEase;
	use Wikimedia\Bcp47Code\Bcp47Code;
	use Wikimedia\DebugInfo\DebugInfoTrait;
	use Wikimedia\Message\MessageParam;
	use Wikimedia\Message\MessageSpecifier;
	+use Wikimedia\StringUtils\StringUtils;
	use Wikimedia\Timestamp\ConvertibleTimestamp;

	/**
	diff --git a/includes/language/LanguageConverter.php b/includes/language/LanguageConverter.php
	index 6eac9cca54c..124f4da35e7 100644
	--- a/includes/language/LanguageConverter.php
	+++ b/includes/language/LanguageConverter.php
	@@ -42,9 +42,9 @@ use MediaWiki\StubObject\StubUserLang;
	use MediaWiki\Title\Title;
	use MediaWiki\User\User;
	use RuntimeException;
	-use StringUtils;
	use UnexpectedValueException;
	use Wikimedia\ObjectCache\BagOStuff;
	+use Wikimedia\StringUtils\StringUtils;

	/**
	* Base class for multi-variant language conversion.
	diff --git a/includes/language/LanguageFactory.php b/includes/language/LanguageFactory.php
	index bffb1f16bc3..4809b142cc7 100644
	--- a/includes/language/LanguageFactory.php
	+++ b/includes/language/LanguageFactory.php
	@@ -23,7 +23,6 @@ namespace MediaWiki\Languages;
	use InvalidArgumentException;
	use LocalisationCache;
	use LogicException;
	-use MapCacheLRU;
	use MediaWiki\Config\Config;
	use MediaWiki\Config\ServiceOptions;
	use MediaWiki\HookContainer\HookContainer;
	@@ -33,6 +32,7 @@ use MediaWiki\Language\LanguageConverter;
	use MediaWiki\MainConfigNames;
	use MediaWiki\Title\NamespaceInfo;
	use Wikimedia\Bcp47Code\Bcp47Code;
	+use Wikimedia\MapCacheLRU\MapCacheLRU;

	/**
	* Internationalisation code
	diff --git a/includes/libs/ArrayUtils.php b/includes/libs/ArrayUtils.php
	index e1f64a1c213..0601e122892 100644
	--- a/includes/libs/ArrayUtils.php
	+++ b/includes/libs/ArrayUtils.php
	@@ -20,6 +20,8 @@
	* @file
	*/

	+namespace Wikimedia\ArrayUtils;
	+
	/**
	* A collection of static methods to play with arrays.
	*
	@@ -251,3 +253,6 @@ class ArrayUtils {
	return $outputArrays;
	}
	}
	+
	+/** @deprecated class alias since 1.44 */
	+class_alias( ArrayUtils::class, 'ArrayUtils' );
	diff --git a/includes/libs/ExplodeIterator.php b/includes/libs/ExplodeIterator.php
	index 461ae9b52ce..ba260565c89 100644
	--- a/includes/libs/ExplodeIterator.php
	+++ b/includes/libs/ExplodeIterator.php
	@@ -18,6 +18,10 @@
	* @file
	*/

	+namespace Wikimedia\StringUtils;
	+
	+use Iterator;
	+
	/**
	* An iterator which works exactly like:
	*
	@@ -117,3 +121,6 @@ class ExplodeIterator implements Iterator {
	return $this->curPos !== false;
	}
	}
	+
	+/** @deprecated class alias since 1.44 */
	+class_alias( ExplodeIterator::class, 'ExplodeIterator' );
	diff --git a/includes/libs/HashRing.php b/includes/libs/HashRing.php
	index 64d755c2726..c201026627c 100644
	--- a/includes/libs/HashRing.php
	+++ b/includes/libs/HashRing.php
	@@ -20,6 +20,12 @@
	* @file
	*/

	+namespace Wikimedia\HashRing;
	+
	+use InvalidArgumentException;
	+use RuntimeException;
	+use UnexpectedValueException;
	+
	/**
	* Convenience class for weighted consistent hash rings
	*
	@@ -453,3 +459,6 @@ class HashRing {
	}
	}
	}
	+
	+/** @deprecated class alias since 1.44 */
	+class_alias( HashRing::class, 'HashRing' );
	diff --git a/includes/libs/HtmlArmor.php b/includes/libs/HtmlArmor.php
	index 5d6dbbf8074..95e17ab24c9 100644
	--- a/includes/libs/HtmlArmor.php
	+++ b/includes/libs/HtmlArmor.php
	@@ -20,6 +20,8 @@
	* @author Kunal Mehta <legoktm@debian.org>
	*/

	+namespace Wikimedia\HtmlArmor;
	+
	/**
	* Marks HTML that shouldn't be escaped
	*
	@@ -60,3 +62,6 @@ class HtmlArmor {
	}
	}
	}
	+
	+/** @deprecated class alias since 1.44 */
	+class_alias( HtmlArmor::class, 'HtmlArmor' );
	diff --git a/includes/libs/MapCacheLRU.php b/includes/libs/MapCacheLRU.php
	index e53390e4e7e..aa7f6f76301 100644
	--- a/includes/libs/MapCacheLRU.php
	+++ b/includes/libs/MapCacheLRU.php
	@@ -17,6 +17,11 @@
	*
	* @file
	*/
	+
	+namespace Wikimedia\MapCacheLRU;
	+
	+use InvalidArgumentException;
	+use UnexpectedValueException;
	use Wikimedia\LightweightObjectStore\ExpirationAwareness;

	/**
	@@ -411,3 +416,6 @@ class MapCacheLRU implements ExpirationAwareness {
	$this->wallClockOverride =& $time;
	}
	}
	+
	+/** @deprecated class alias since 1.44 */
	+class_alias( MapCacheLRU::class, 'MapCacheLRU' );
	diff --git a/includes/libs/StringUtils.php b/includes/libs/StringUtils.php
	index 0a974d4b794..5945f96c9fb 100644
	--- a/includes/libs/StringUtils.php
	+++ b/includes/libs/StringUtils.php
	@@ -1,5 +1,9 @@
	<?php

	+namespace Wikimedia\StringUtils;
	+
	+use ArrayIterator;
	+use InvalidArgumentException;
	use MediaWiki\Libs\UnpackFailedException;
	use Wikimedia\Assert\Assert;
	use Wikimedia\AtEase\AtEase;
	@@ -370,3 +374,6 @@ class StringUtils {
	return $result;
	}
	}
	+
	+/** @deprecated class alias since 1.44 */
	+class_alias( StringUtils::class, 'StringUtils' );
	diff --git a/includes/libs/Timing.php b/includes/libs/Timing.php
	index 1083ab9f6dd..e0d3e416c6e 100644
	--- a/includes/libs/Timing.php
	+++ b/includes/libs/Timing.php
	@@ -18,6 +18,8 @@
	* @file
	*/

	+namespace Wikimedia\Timing;
	+
	use Psr\Log\LoggerAwareInterface;
	use Psr\Log\LoggerInterface;
	use Psr\Log\NullLogger;
	@@ -188,3 +190,6 @@ class Timing implements LoggerAwareInterface {
	return $this->entries[$name] ?? null;
	}
	}
	+
	+/** @deprecated class alias since 1.44 */
	+class_alias( Timing::class, 'Timing' );
	diff --git a/includes/libs/filebackend/FSFileBackend.php b/includes/libs/filebackend/FSFileBackend.php
	index 92ae176ee7e..1c2d255f77f 100644
	--- a/includes/libs/filebackend/FSFileBackend.php
	+++ b/includes/libs/filebackend/FSFileBackend.php
	@@ -43,7 +43,6 @@

	namespace Wikimedia\FileBackend;

	-use MapCacheLRU;
	use Shellbox\Command\BoxedCommand;
	use Shellbox\Shellbox;
	use StatusValue;
	@@ -53,6 +52,7 @@ use Wikimedia\FileBackend\FileIteration\FSFileBackendFileList;
	use Wikimedia\FileBackend\FileOpHandle\FSFileOpHandle;
	use Wikimedia\FileBackend\FSFile\FSFile;
	use Wikimedia\FileBackend\FSFile\TempFSFile;
	+use Wikimedia\MapCacheLRU\MapCacheLRU;
	use Wikimedia\Timestamp\ConvertibleTimestamp;

	/**
	diff --git a/includes/libs/filebackend/FileBackendMultiWrite.php b/includes/libs/filebackend/FileBackendMultiWrite.php
	index 7c59e161e39..b276966321d 100644
	--- a/includes/libs/filebackend/FileBackendMultiWrite.php
	+++ b/includes/libs/filebackend/FileBackendMultiWrite.php
	@@ -28,7 +28,7 @@ use LockManager;
	use LogicException;
	use Shellbox\Command\BoxedCommand;
	use StatusValue;
	-use StringUtils;
	+use Wikimedia\StringUtils\StringUtils;
	use Wikimedia\Timestamp\ConvertibleTimestamp;

	/**
	diff --git a/includes/libs/filebackend/FileBackendStore.php b/includes/libs/filebackend/FileBackendStore.php
	index f06d358dab6..dc9e12d7361 100644
	--- a/includes/libs/filebackend/FileBackendStore.php
	+++ b/includes/libs/filebackend/FileBackendStore.php
	@@ -25,7 +25,6 @@ namespace Wikimedia\FileBackend;

	use InvalidArgumentException;
	use LockManager;
	-use MapCacheLRU;
	use Shellbox\Command\BoxedCommand;
	use StatusValue;
	use Traversable;
	@@ -42,6 +41,7 @@ use Wikimedia\FileBackend\FileOps\MoveFileOp;
	use Wikimedia\FileBackend\FileOps\NullFileOp;
	use Wikimedia\FileBackend\FileOps\StoreFileOp;
	use Wikimedia\FileBackend\FSFile\FSFile;
	+use Wikimedia\MapCacheLRU\MapCacheLRU;
	use Wikimedia\ObjectCache\BagOStuff;
	use Wikimedia\ObjectCache\EmptyBagOStuff;
	use Wikimedia\ObjectCache\WANObjectCache;
	diff --git a/includes/libs/filebackend/HTTPFileStreamer.php b/includes/libs/filebackend/HTTPFileStreamer.php
	index bdd92abab68..8dfb524a4ad 100644
	--- a/includes/libs/filebackend/HTTPFileStreamer.php
	+++ b/includes/libs/filebackend/HTTPFileStreamer.php
	@@ -22,8 +22,8 @@

	namespace Wikimedia\FileBackend;

	-use HttpStatus;
	use Wikimedia\AtEase\AtEase;
	+use Wikimedia\Http\HttpStatus;
	use Wikimedia\Timestamp\ConvertibleTimestamp;

	/**
	diff --git a/includes/libs/filebackend/SwiftFileBackend.php b/includes/libs/filebackend/SwiftFileBackend.php
	index 01cd1e3b45d..5fac471164d 100644
	--- a/includes/libs/filebackend/SwiftFileBackend.php
	+++ b/includes/libs/filebackend/SwiftFileBackend.php
	@@ -26,7 +26,6 @@ namespace Wikimedia\FileBackend;

	use Exception;
	use LockManager;
	-use MapCacheLRU;
	use Psr\Log\LoggerInterface;
	use Shellbox\Command\BoxedCommand;
	use StatusValue;
	@@ -36,6 +35,7 @@ use Wikimedia\FileBackend\FileIteration\SwiftFileBackendDirList;
	use Wikimedia\FileBackend\FileIteration\SwiftFileBackendFileList;
	use Wikimedia\FileBackend\FileOpHandle\SwiftFileOpHandle;
	use Wikimedia\Http\MultiHttpClient;
	+use Wikimedia\MapCacheLRU\MapCacheLRU;
	use Wikimedia\ObjectCache\BagOStuff;
	use Wikimedia\ObjectCache\EmptyBagOStuff;
	use Wikimedia\ObjectCache\WANObjectCache;
	diff --git a/includes/libs/HttpStatus.php b/includes/libs/http/HttpStatus.php
	similarity index 96%
	rename from includes/libs/HttpStatus.php
	rename to includes/libs/http/HttpStatus.php
	index a596093b56b..ca57f93e6a6 100644
	--- a/includes/libs/HttpStatus.php
	+++ b/includes/libs/http/HttpStatus.php
	@@ -20,6 +20,10 @@
	* @file
	*/

	+namespace Wikimedia\Http;
	+
	+use InvalidArgumentException;
	+
	/**
	* @todo document
	*/
	@@ -148,3 +152,6 @@ class HttpStatus {
	}

	}
	+
	+/** @deprecated class alias since 1.44 */
	+class_alias( HttpStatus::class, 'HttpStatus' );
	diff --git a/includes/libs/lockmanager/MemcLockManager.php b/includes/libs/lockmanager/MemcLockManager.php
	index e66d9f38df3..f1a76aedc2d 100644
	--- a/includes/libs/lockmanager/MemcLockManager.php
	+++ b/includes/libs/lockmanager/MemcLockManager.php
	@@ -18,6 +18,7 @@
	* @file
	*/

	+use Wikimedia\MapCacheLRU\MapCacheLRU;
	use Wikimedia\ObjectCache\MemcachedBagOStuff;
	use Wikimedia\ObjectCache\MemcachedPhpBagOStuff;
	use Wikimedia\WaitConditionLoop;
	diff --git a/includes/libs/objectcache/RedisBagOStuff.php b/includes/libs/objectcache/RedisBagOStuff.php
	index b4fe3857bbc..76029e88269 100644
	--- a/includes/libs/objectcache/RedisBagOStuff.php
	+++ b/includes/libs/objectcache/RedisBagOStuff.php
	@@ -19,10 +19,10 @@
	*/
	namespace Wikimedia\ObjectCache;

	-use ArrayUtils;
	use Exception;
	use Redis;
	use RedisException;
	+use Wikimedia\ArrayUtils\ArrayUtils;

	/**
	* Store data in Redis.
	diff --git a/includes/libs/objectcache/WANObjectCache.php b/includes/libs/objectcache/WANObjectCache.php
	index 64ce81c95a3..3a9584b1425 100644
	--- a/includes/libs/objectcache/WANObjectCache.php
	+++ b/includes/libs/objectcache/WANObjectCache.php
	@@ -23,13 +23,13 @@ namespace Wikimedia\ObjectCache;
	use ArrayIterator;
	use Closure;
	use Exception;
	-use MapCacheLRU;
	use Psr\Log\LoggerAwareInterface;
	use Psr\Log\LoggerInterface;
	use Psr\Log\NullLogger;
	use RuntimeException;
	use UnexpectedValueException;
	use Wikimedia\LightweightObjectStore\ExpirationAwareness;
	+use Wikimedia\MapCacheLRU\MapCacheLRU;
	use Wikimedia\Stats\StatsFactory;
	use Wikimedia\Telemetry\NoopTracer;
	use Wikimedia\Telemetry\SpanInterface;
	diff --git a/includes/libs/rdbms/loadbalancer/LoadBalancer.php b/includes/libs/rdbms/loadbalancer/LoadBalancer.php
	index 2e607f1513d..5115075c1b9 100644
	--- a/includes/libs/rdbms/loadbalancer/LoadBalancer.php
	+++ b/includes/libs/rdbms/loadbalancer/LoadBalancer.php
	@@ -19,7 +19,6 @@
	*/
	namespace Wikimedia\Rdbms;

	-use ArrayUtils;
	use InvalidArgumentException;
	use LogicException;
	use Psr\Log\LoggerInterface;
	@@ -27,6 +26,7 @@ use Psr\Log\NullLogger;
	use RuntimeException;
	use Throwable;
	use UnexpectedValueException;
	+use Wikimedia\ArrayUtils\ArrayUtils;
	use Wikimedia\ObjectCache\BagOStuff;
	use Wikimedia\ObjectCache\EmptyBagOStuff;
	use Wikimedia\ObjectCache\WANObjectCache;
	diff --git a/includes/linker/Hook/HtmlPageLinkRendererBeginHook.php b/includes/linker/Hook/HtmlPageLinkRendererBeginHook.php
	index 2d3519c7591..f49f031b99f 100644
	--- a/includes/linker/Hook/HtmlPageLinkRendererBeginHook.php
	+++ b/includes/linker/Hook/HtmlPageLinkRendererBeginHook.php
	@@ -2,9 +2,9 @@

	namespace MediaWiki\Linker\Hook;

	-use HtmlArmor;
	use MediaWiki\Linker\LinkRenderer;
	use MediaWiki\Linker\LinkTarget;
	+use Wikimedia\HtmlArmor\HtmlArmor;

	/**
	* This is a hook handler interface, see docs/Hooks.md.
	diff --git a/includes/linker/Hook/HtmlPageLinkRendererEndHook.php b/includes/linker/Hook/HtmlPageLinkRendererEndHook.php
	index fb3af10480b..ccd3f982095 100644
	--- a/includes/linker/Hook/HtmlPageLinkRendererEndHook.php
	+++ b/includes/linker/Hook/HtmlPageLinkRendererEndHook.php
	@@ -2,9 +2,9 @@

	namespace MediaWiki\Linker\Hook;

	-use HtmlArmor;
	use MediaWiki\Linker\LinkRenderer;
	use MediaWiki\Linker\LinkTarget;
	+use Wikimedia\HtmlArmor\HtmlArmor;

	/**
	* This is a hook handler interface, see docs/Hooks.md.
	diff --git a/includes/linker/LinkRenderer.php b/includes/linker/LinkRenderer.php
	index 55ad7f847c8..b61931f1ce5 100644
	--- a/includes/linker/LinkRenderer.php
	+++ b/includes/linker/LinkRenderer.php
	@@ -20,7 +20,6 @@
	*/
	namespace MediaWiki\Linker;

	-use HtmlArmor;
	use MediaWiki\Cache\LinkCache;
	use MediaWiki\Config\ServiceOptions;
	use MediaWiki\HookContainer\HookContainer;
	@@ -37,6 +36,7 @@ use MediaWiki\Title\Title;
	use MediaWiki\Title\TitleFormatter;
	use MediaWiki\Title\TitleValue;
	use Wikimedia\Assert\Assert;
	+use Wikimedia\HtmlArmor\HtmlArmor;
	use Wikimedia\Parsoid\Core\LinkTarget;

	/**
	diff --git a/includes/linker/Linker.php b/includes/linker/Linker.php
	index 6abb6a546bb..a9be358d815 100644
	--- a/includes/linker/Linker.php
	+++ b/includes/linker/Linker.php
	@@ -22,7 +22,6 @@

	namespace MediaWiki\Linker;

	-use HtmlArmor;
	use MediaTransformError;
	use MediaTransformOutput;
	use MediaWiki\Context\ContextSource;
	@@ -46,6 +45,7 @@ use MediaWiki\User\ExternalUserNames;
	use MediaWiki\User\UserIdentityValue;
	use MessageLocalizer;
	use Wikimedia\Assert\Assert;
	+use Wikimedia\HtmlArmor\HtmlArmor;
	use Wikimedia\Rdbms\SelectQueryBuilder;
	use Wikimedia\RemexHtml\Serializer\SerializerNode;

	diff --git a/includes/linker/UserLinkRenderer.php b/includes/linker/UserLinkRenderer.php
	index 3be859b3c7a..9f302e5eb80 100644
	--- a/includes/linker/UserLinkRenderer.php
	+++ b/includes/linker/UserLinkRenderer.php
	@@ -3,8 +3,6 @@ declare( strict_types=1 );

	namespace MediaWiki\Linker;

	-use HtmlArmor;
	-use MapCacheLRU;
	use MediaWiki\Context\IContextSource;
	use MediaWiki\Html\Html;
	use MediaWiki\SpecialPage\SpecialPageFactory;
	@@ -14,7 +12,9 @@ use MediaWiki\User\TempUser\TempUserConfig;
	use MediaWiki\User\TempUser\TempUserDetailsLookup;
	use MediaWiki\User\UserIdentity;
	use MessageLocalizer;
	+use Wikimedia\HtmlArmor\HtmlArmor;
	use Wikimedia\IPUtils;
	+use Wikimedia\MapCacheLRU\MapCacheLRU;

	/**
	* Service class that renders HTML for user-related links.
	diff --git a/includes/logging/LogEventsList.php b/includes/logging/LogEventsList.php
	index 98bba431b4a..3c03c3dc400 100644
	--- a/includes/logging/LogEventsList.php
	+++ b/includes/logging/LogEventsList.php
	@@ -26,7 +26,6 @@
	namespace MediaWiki\Logging;

	use InvalidArgumentException;
	-use MapCacheLRU;
	use MediaWiki\Block\DatabaseBlockStore;
	use MediaWiki\ChangeTags\ChangeTags;
	use MediaWiki\Context\ContextSource;
	@@ -56,6 +55,7 @@ use MediaWiki\Title\Title;
	use MediaWiki\User\UserIdentity;
	use MessageLocalizer;
	use stdClass;
	+use Wikimedia\MapCacheLRU\MapCacheLRU;

	class LogEventsList extends ContextSource {
	public const NO_ACTION_LINK = 1;
	diff --git a/includes/logging/LogFormatter.php b/includes/logging/LogFormatter.php
	index 621c5ab8e1a..5b3ee372b33 100644
	--- a/includes/logging/LogFormatter.php
	+++ b/includes/logging/LogFormatter.php
	@@ -25,7 +25,6 @@

	namespace MediaWiki\Logging;

	-use HtmlArmor;
	use MediaWiki\Api\ApiQueryBase;
	use MediaWiki\Api\ApiResult;
	use MediaWiki\CommentFormatter\CommentFormatter;
	@@ -45,6 +44,7 @@ use MediaWiki\User\User;
	use MediaWiki\User\UserEditTracker;
	use MediaWiki\User\UserIdentity;
	use stdClass;
	+use Wikimedia\HtmlArmor\HtmlArmor;
	use Wikimedia\Message\MessageParam;
	use Wikimedia\Message\MessageSpecifier;

	diff --git a/includes/media/BmpHandler.php b/includes/media/BmpHandler.php
	index 6d5d7af67f5..da1a8174814 100644
	--- a/includes/media/BmpHandler.php
	+++ b/includes/media/BmpHandler.php
	@@ -23,6 +23,7 @@

	use MediaWiki\FileRepo\File\File;
	use MediaWiki\Libs\UnpackFailedException;
	+use Wikimedia\StringUtils\StringUtils;

	/**
	* Handler for Microsoft's bitmap format; getimagesize() doesn't
	diff --git a/includes/media/JpegMetadataExtractor.php b/includes/media/JpegMetadataExtractor.php
	index b4ba8df5a0b..feabc5950d6 100644
	--- a/includes/media/JpegMetadataExtractor.php
	+++ b/includes/media/JpegMetadataExtractor.php
	@@ -23,6 +23,7 @@

	use MediaWiki\Libs\UnpackFailedException;
	use Wikimedia\AtEase\AtEase;
	+use Wikimedia\StringUtils\StringUtils;
	use Wikimedia\XMPReader\Reader as XMPReader;

	/**
	diff --git a/includes/media/XCFHandler.php b/includes/media/XCFHandler.php
	index 05b87fdcc94..6d0533d23d7 100644
	--- a/includes/media/XCFHandler.php
	+++ b/includes/media/XCFHandler.php
	@@ -28,6 +28,7 @@

	use MediaWiki\FileRepo\File\File;
	use MediaWiki\Libs\UnpackFailedException;
	+use Wikimedia\StringUtils\StringUtils;

	/**
	* Handler for the Gimp's native file format; getimagesize() doesn't
	diff --git a/includes/objectcache/SqlBagOStuff.php b/includes/objectcache/SqlBagOStuff.php
	index 49d4156f0de..80e456f32a8 100644
	--- a/includes/objectcache/SqlBagOStuff.php
	+++ b/includes/objectcache/SqlBagOStuff.php
	@@ -22,6 +22,7 @@
	*/

	use MediaWiki\MediaWikiServices;
	+use Wikimedia\ArrayUtils\ArrayUtils;
	use Wikimedia\AtEase\AtEase;
	use Wikimedia\ObjectCache\MediumSpecificBagOStuff;
	use Wikimedia\Rdbms\Blob;
	diff --git a/includes/page/Article.php b/includes/page/Article.php
	index 44bbd539e08..fb3a6377791 100644
	--- a/includes/page/Article.php
	+++ b/includes/page/Article.php
	@@ -20,11 +20,10 @@

	namespace MediaWiki\Page;

	-use HtmlArmor;
	-use HTMLFileCache;
	use LogicException;
	use MediaWiki\Block\DatabaseBlock;
	use MediaWiki\Block\DatabaseBlockStore;
	+use MediaWiki\Cache\HTMLFileCache;
	use MediaWiki\CommentFormatter\CommentFormatter;
	use MediaWiki\Context\IContextSource;
	use MediaWiki\Context\RequestContext;
	@@ -60,6 +59,7 @@ use MediaWiki\Title\Title;
	use MediaWiki\User\Options\UserOptionsLookup;
	use MediaWiki\User\UserIdentity;
	use MediaWiki\User\UserNameUtils;
	+use Wikimedia\HtmlArmor\HtmlArmor;
	use Wikimedia\IPUtils;
	use Wikimedia\NonSerializable\NonSerializableTrait;
	use Wikimedia\Rdbms\IConnectionProvider;
	diff --git a/includes/page/MovePage.php b/includes/page/MovePage.php
	index 943fa7d4da8..60f869005fc 100644
	--- a/includes/page/MovePage.php
	+++ b/includes/page/MovePage.php
	@@ -53,10 +53,10 @@ use MediaWiki\User\UserEditTracker;
	use MediaWiki\User\UserFactory;
	use MediaWiki\User\UserIdentity;
	use MediaWiki\Watchlist\WatchedItemStoreInterface;
	-use StringUtils;
	use Wikimedia\Rdbms\IConnectionProvider;
	use Wikimedia\Rdbms\IDatabase;
	use Wikimedia\Rdbms\IDBAccessObject;
	+use Wikimedia\StringUtils\StringUtils;

	/**
	* Handles the backend logic of moving a page from one title
	diff --git a/includes/page/PageProps.php b/includes/page/PageProps.php
	index 7069b37474c..91e9cfaf21d 100644
	--- a/includes/page/PageProps.php
	+++ b/includes/page/PageProps.php
	@@ -20,10 +20,10 @@

	namespace MediaWiki\Page;

	-use MapCacheLRU;
	use MediaWiki\Cache\LinkBatchFactory;
	use MediaWiki\Title\Title;
	use MediaWiki\Title\TitleArrayFromResult;
	+use Wikimedia\MapCacheLRU\MapCacheLRU;
	use Wikimedia\Rdbms\IConnectionProvider;

	/**
	diff --git a/includes/page/ParserOutputAccess.php b/includes/page/ParserOutputAccess.php
	index c238b37aed6..76faea7bbc3 100644
	--- a/includes/page/ParserOutputAccess.php
	+++ b/includes/page/ParserOutputAccess.php
	@@ -20,7 +20,6 @@
	namespace MediaWiki\Page;

	use InvalidArgumentException;
	-use MapCacheLRU;
	use MediaWiki\Logger\Spi as LoggerSpi;
	use MediaWiki\MainConfigNames;
	use MediaWiki\MediaWikiServices;
	@@ -43,6 +42,7 @@ use MediaWiki\Status\Status;
	use MediaWiki\Title\TitleFormatter;
	use MediaWiki\WikiMap\WikiMap;
	use Wikimedia\Assert\Assert;
	+use Wikimedia\MapCacheLRU\MapCacheLRU;
	use Wikimedia\Parsoid\Parsoid;
	use Wikimedia\Rdbms\ChronologyProtector;
	use Wikimedia\Rdbms\ILBFactory;
	diff --git a/includes/page/RedirectStore.php b/includes/page/RedirectStore.php
	index a77e722d9d0..72eb5644a32 100644
	--- a/includes/page/RedirectStore.php
	+++ b/includes/page/RedirectStore.php
	@@ -21,13 +21,13 @@

	namespace MediaWiki\Page;

	-use MapCacheLRU;
	use MediaWiki\FileRepo\RepoGroup;
	use MediaWiki\Linker\LinkTarget;
	use MediaWiki\Title\Title;
	use MediaWiki\Title\TitleParser;
	use MediaWiki\Title\TitleValue;
	use Psr\Log\LoggerInterface;
	+use Wikimedia\MapCacheLRU\MapCacheLRU;
	use Wikimedia\Rdbms\IConnectionProvider;

	/**
	diff --git a/includes/pager/ContributionsPager.php b/includes/pager/ContributionsPager.php
	index fdebeb41f92..849b73b62d9 100644
	--- a/includes/pager/ContributionsPager.php
	+++ b/includes/pager/ContributionsPager.php
	@@ -21,9 +21,7 @@

	namespace MediaWiki\Pager;

	-use HtmlArmor;
	use InvalidArgumentException;
	-use MapCacheLRU;
	use MediaWiki\Cache\LinkBatchFactory;
	use MediaWiki\ChangeTags\ChangeTags;
	use MediaWiki\CommentFormatter\CommentFormatter;
	@@ -47,6 +45,8 @@ use MediaWiki\User\UserFactory;
	use MediaWiki\User\UserIdentity;
	use MediaWiki\User\UserRigorOptions;
	use stdClass;
	+use Wikimedia\HtmlArmor\HtmlArmor;
	+use Wikimedia\MapCacheLRU\MapCacheLRU;
	use Wikimedia\Rdbms\FakeResultWrapper;
	use Wikimedia\Rdbms\IResultWrapper;

	diff --git a/includes/pager/IndexPager.php b/includes/pager/IndexPager.php
	index b751fe09bf7..d33d8be8f85 100644
	--- a/includes/pager/IndexPager.php
	+++ b/includes/pager/IndexPager.php
	@@ -20,7 +20,6 @@

	namespace MediaWiki\Pager;

	-use HtmlArmor;
	use MediaWiki\Context\ContextSource;
	use MediaWiki\Context\IContextSource;
	use MediaWiki\Html\Html;
	@@ -29,6 +28,7 @@ use MediaWiki\MediaWikiServices;
	use MediaWiki\Navigation\PagerNavigationBuilder;
	use MediaWiki\Request\WebRequest;
	use stdClass;
	+use Wikimedia\HtmlArmor\HtmlArmor;
	use Wikimedia\Rdbms\IReadableDatabase;
	use Wikimedia\Rdbms\IResultWrapper;

	diff --git a/includes/parser/BlockLevelPass.php b/includes/parser/BlockLevelPass.php
	index 24285efbf67..f4a35080007 100644
	--- a/includes/parser/BlockLevelPass.php
	+++ b/includes/parser/BlockLevelPass.php
	@@ -27,7 +27,7 @@
	namespace MediaWiki\Parser;

	use LogicException;
	-use StringUtils;
	+use Wikimedia\StringUtils\StringUtils;

	class BlockLevelPass {
	/** @var bool */
	diff --git a/includes/parser/CoreTagHooks.php b/includes/parser/CoreTagHooks.php
	index 861d3a6a708..05df7669008 100644
	--- a/includes/parser/CoreTagHooks.php
	+++ b/includes/parser/CoreTagHooks.php
	@@ -28,8 +28,8 @@ use MediaWiki\Html\Html;
	use MediaWiki\Language\LanguageCode;
	use MediaWiki\MainConfigNames;
	use MediaWiki\MediaWikiServices;
	-use StringUtils;
	use UnexpectedValueException;
	+use Wikimedia\StringUtils\StringUtils;

	/**
	* Various tag hooks, registered in every Parser
	diff --git a/includes/parser/LinkHolderArray.php b/includes/parser/LinkHolderArray.php
	index 0d763484d9e..b8e11022a47 100644
	--- a/includes/parser/LinkHolderArray.php
	+++ b/includes/parser/LinkHolderArray.php
	@@ -23,7 +23,6 @@

	namespace MediaWiki\Parser;

	-use HtmlArmor;
	use MediaWiki\Cache\LinkCache;
	use MediaWiki\HookContainer\HookContainer;
	use MediaWiki\HookContainer\HookRunner;
	@@ -32,6 +31,7 @@ use MediaWiki\Linker\Linker;
	use MediaWiki\MainConfigNames;
	use MediaWiki\MediaWikiServices;
	use MediaWiki\Title\Title;
	+use Wikimedia\HtmlArmor\HtmlArmor;

	/**
	* @internal for using in Parser only.
	diff --git a/includes/parser/MagicWord.php b/includes/parser/MagicWord.php
	index 94677e1a991..c63072db824 100644
	--- a/includes/parser/MagicWord.php
	+++ b/includes/parser/MagicWord.php
	@@ -22,8 +22,8 @@ namespace MediaWiki\Parser;

	use MediaWiki\Language\Language;
	use MediaWiki\MediaWikiServices;
	-use StringUtils;
	use UnexpectedValueException;
	+use Wikimedia\StringUtils\StringUtils;

	/**
	* This class encapsulates "magic words" such as "#redirect", __NOTOC__, etc.
	diff --git a/includes/parser/Parser.php b/includes/parser/Parser.php
	index 45244c7ae9d..12cd05aff88 100644
	--- a/includes/parser/Parser.php
	+++ b/includes/parser/Parser.php
	@@ -25,12 +25,10 @@ namespace MediaWiki\Parser;

	use BadMethodCallException;
	use Exception;
	-use HtmlArmor;
	use ImageGalleryBase;
	use ImageGalleryClassNotFoundException;
	use InvalidArgumentException;
	use LogicException;
	-use MapCacheLRU;
	use MediaHandler;
	use MediaWiki\Cache\CacheKeyHelper;
	use MediaWiki\Category\TrackingCategories;
	@@ -84,10 +82,11 @@ use MediaWiki\Xml\Xml;
	use Psr\Log\LoggerInterface;
	use RuntimeException;
	use SectionProfiler;
	-use StringUtils;
	use UnexpectedValueException;
	use Wikimedia\Bcp47Code\Bcp47CodeValue;
	+use Wikimedia\HtmlArmor\HtmlArmor;
	use Wikimedia\IPUtils;
	+use Wikimedia\MapCacheLRU\MapCacheLRU;
	use Wikimedia\Message\MessageParam;
	use Wikimedia\Message\MessageSpecifier;
	use Wikimedia\ObjectCache\WANObjectCache;
	@@ -102,6 +101,7 @@ use Wikimedia\Parsoid\Utils\DOMCompat;
	use Wikimedia\Parsoid\Utils\DOMUtils;
	use Wikimedia\RemexHtml\Serializer\SerializerNode;
	use Wikimedia\ScopedCallback;
	+use Wikimedia\StringUtils\StringUtils;

	/**
	* @defgroup Parser Parser
	diff --git a/includes/parser/ParserObserver.php b/includes/parser/ParserObserver.php
	index bb28e0d073b..584f6a01570 100644
	--- a/includes/parser/ParserObserver.php
	+++ b/includes/parser/ParserObserver.php
	@@ -28,13 +28,13 @@

	namespace MediaWiki\Parser;

	-use MapCacheLRU;
	use MediaWiki\Cache\CacheKeyHelper;
	use MediaWiki\Content\Content;
	use MediaWiki\Page\PageReference;
	use MediaWiki\Title\Title;
	use Psr\Log\LoggerInterface;
	use RuntimeException;
	+use Wikimedia\MapCacheLRU\MapCacheLRU;

	/**
	* For observing and detecting parser behaviors, such as duplicate parses
	diff --git a/includes/parser/Sanitizer.php b/includes/parser/Sanitizer.php
	index 74a235f6af9..a2c71938a82 100644
	--- a/includes/parser/Sanitizer.php
	+++ b/includes/parser/Sanitizer.php
	@@ -31,13 +31,13 @@ use LogicException;
	use MediaWiki\HookContainer\HookRunner;
	use MediaWiki\MediaWikiServices;
	use MediaWiki\Tidy\RemexCompatFormatter;
	-use StringUtils;
	use UnexpectedValueException;
	use Wikimedia\RemexHtml\HTMLData;
	use Wikimedia\RemexHtml\Serializer\Serializer as RemexSerializer;
	use Wikimedia\RemexHtml\Tokenizer\Tokenizer as RemexTokenizer;
	use Wikimedia\RemexHtml\TreeBuilder\Dispatcher as RemexDispatcher;
	use Wikimedia\RemexHtml\TreeBuilder\TreeBuilder as RemexTreeBuilder;
	+use Wikimedia\StringUtils\StringUtils;

	/**
	* HTML sanitizer for MediaWiki
	diff --git a/includes/poolcounter/PoolCounterRedis.php b/includes/poolcounter/PoolCounterRedis.php
	index 84968d220e0..034373b553f 100644
	--- a/includes/poolcounter/PoolCounterRedis.php
	+++ b/includes/poolcounter/PoolCounterRedis.php
	@@ -20,11 +20,11 @@

	namespace MediaWiki\PoolCounter;

	-use ArrayUtils;
	use Exception;
	-use HashRing;
	use MediaWiki\Status\Status;
	use RedisException;
	+use Wikimedia\ArrayUtils\ArrayUtils;
	+use Wikimedia\HashRing\HashRing;
	use Wikimedia\ObjectCache\RedisConnectionPool;
	use Wikimedia\ObjectCache\RedisConnRef;

	diff --git a/includes/recentchanges/ChangesList.php b/includes/recentchanges/ChangesList.php
	index abe1c8be448..1d598483c1c 100644
	--- a/includes/recentchanges/ChangesList.php
	+++ b/includes/recentchanges/ChangesList.php
	@@ -20,8 +20,6 @@

	namespace MediaWiki\RecentChanges;

	-use HtmlArmor;
	-use MapCacheLRU;
	use MediaWiki\ChangeTags\ChangeTags;
	use MediaWiki\CommentFormatter\RowCommentFormatter;
	use MediaWiki\Context\ContextSource;
	@@ -52,6 +50,8 @@ use MediaWiki\Watchlist\WatchedItem;
	use OOUI\IconWidget;
	use RuntimeException;
	use stdClass;
	+use Wikimedia\HtmlArmor\HtmlArmor;
	+use Wikimedia\MapCacheLRU\MapCacheLRU;
	use Wikimedia\Rdbms\IResultWrapper;

	/**
	diff --git a/includes/recentchanges/EnhancedChangesList.php b/includes/recentchanges/EnhancedChangesList.php
	index 542e6f1f48e..b1481e25b13 100644
	--- a/includes/recentchanges/EnhancedChangesList.php
	+++ b/includes/recentchanges/EnhancedChangesList.php
	@@ -21,7 +21,6 @@
	namespace MediaWiki\RecentChanges;

	use DomainException;
	-use HtmlArmor;
	use MediaWiki\Context\IContextSource;
	use MediaWiki\Html\Html;
	use MediaWiki\Html\TemplateParser;
	@@ -31,6 +30,7 @@ use MediaWiki\Parser\Sanitizer;
	use MediaWiki\Revision\RevisionRecord;
	use MediaWiki\SpecialPage\SpecialPage;
	use MediaWiki\Title\Title;
	+use Wikimedia\HtmlArmor\HtmlArmor;

	/**
	* Generate a list of changes using an Enhanced system (uses javascript).
	diff --git a/includes/recentchanges/RCCacheEntryFactory.php b/includes/recentchanges/RCCacheEntryFactory.php
	index 2353074a9e9..e27d07f9e3e 100644
	--- a/includes/recentchanges/RCCacheEntryFactory.php
	+++ b/includes/recentchanges/RCCacheEntryFactory.php
	@@ -20,8 +20,6 @@

	namespace MediaWiki\RecentChanges;

	-use HtmlArmor;
	-use MapCacheLRU;
	use MediaWiki\Context\IContextSource;
	use MediaWiki\Linker\Linker;
	use MediaWiki\Linker\LinkRenderer;
	@@ -31,6 +29,8 @@ use MediaWiki\Revision\RevisionRecord;
	use MediaWiki\SpecialPage\SpecialPage;
	use MediaWiki\Title\Title;
	use MediaWiki\User\ExternalUserNames;
	+use Wikimedia\HtmlArmor\HtmlArmor;
	+use Wikimedia\MapCacheLRU\MapCacheLRU;

	/**
	* Create a RCCacheEntry from a RecentChange to use in EnhancedChangesList
	diff --git a/includes/registration/MissingExtensionException.php b/includes/registration/MissingExtensionException.php
	index f521ddeaa09..1fc282c5a35 100644
	--- a/includes/registration/MissingExtensionException.php
	+++ b/includes/registration/MissingExtensionException.php
	@@ -3,8 +3,8 @@
	namespace MediaWiki\Registration;

	use Exception;
	-use HttpStatus;
	use MediaWiki\Html\TemplateParser;
	+use Wikimedia\Http\HttpStatus;
	use Wikimedia\ObjectCache\EmptyBagOStuff;

	/**
	diff --git a/includes/search/Hook/ShowSearchHitTitleHook.php b/includes/search/Hook/ShowSearchHitTitleHook.php
	index b1f2c2f6df0..e220947be8a 100644
	--- a/includes/search/Hook/ShowSearchHitTitleHook.php
	+++ b/includes/search/Hook/ShowSearchHitTitleHook.php
	@@ -2,10 +2,10 @@

	namespace MediaWiki\Search\Hook;

	-use HtmlArmor;
	use MediaWiki\Specials\SpecialSearch;
	use MediaWiki\Title\Title;
	use SearchResult;
	+use Wikimedia\HtmlArmor\HtmlArmor;

	/**
	* This is a hook handler interface, see docs/Hooks.md.
	diff --git a/includes/search/ISearchResultSet.php b/includes/search/ISearchResultSet.php
	index 21fc19a26f2..28caff7a83c 100644
	--- a/includes/search/ISearchResultSet.php
	+++ b/includes/search/ISearchResultSet.php
	@@ -1,6 +1,7 @@
	<?php

	use MediaWiki\Title\Title;
	+use Wikimedia\HtmlArmor\HtmlArmor;

	/**
	* A set of SearchEngine results.
	diff --git a/includes/search/SearchResultSet.php b/includes/search/SearchResultSet.php
	index 7f28e3aee3b..b3c122ebb45 100644
	--- a/includes/search/SearchResultSet.php
	+++ b/includes/search/SearchResultSet.php
	@@ -22,6 +22,7 @@
	*/

	use MediaWiki\Title\Title;
	+use Wikimedia\HtmlArmor\HtmlArmor;

	/**
	* @ingroup Search
	diff --git a/includes/search/searchwidgets/FullSearchResultWidget.php b/includes/search/searchwidgets/FullSearchResultWidget.php
	index ec7d829494d..593ce8b20b5 100644
	--- a/includes/search/searchwidgets/FullSearchResultWidget.php
	+++ b/includes/search/searchwidgets/FullSearchResultWidget.php
	@@ -2,7 +2,6 @@

	namespace MediaWiki\Search\SearchWidgets;

	-use HtmlArmor;
	use MediaTransformOutput;
	use MediaWiki\Category\Category;
	use MediaWiki\FileRepo\File\File;
	@@ -19,6 +18,7 @@ use MediaWiki\Title\Title;
	use MediaWiki\User\Options\UserOptionsManager;
	use SearchResult;
	use ThumbnailImage;
	+use Wikimedia\HtmlArmor\HtmlArmor;

	/**
	* Renders a 'full' multi-line search result with metadata.
	diff --git a/includes/search/searchwidgets/InterwikiSearchResultWidget.php b/includes/search/searchwidgets/InterwikiSearchResultWidget.php
	index 8b85739397f..8fdd2a33e7b 100644
	--- a/includes/search/searchwidgets/InterwikiSearchResultWidget.php
	+++ b/includes/search/searchwidgets/InterwikiSearchResultWidget.php
	@@ -2,11 +2,11 @@

	namespace MediaWiki\Search\SearchWidgets;

	-use HtmlArmor;
	use MediaWiki\Html\Html;
	use MediaWiki\Linker\LinkRenderer;
	use MediaWiki\Specials\SpecialSearch;
	use SearchResult;
	+use Wikimedia\HtmlArmor\HtmlArmor;

	/**
	* Renders an enhanced interwiki result
	diff --git a/includes/skins/components/SkinComponentCopyright.php b/includes/skins/components/SkinComponentCopyright.php
	index 97bd86dde2e..f0fb38257e5 100644
	--- a/includes/skins/components/SkinComponentCopyright.php
	+++ b/includes/skins/components/SkinComponentCopyright.php
	@@ -2,7 +2,6 @@

	namespace MediaWiki\Skin;

	-use HtmlArmor;
	use MediaWiki\Config\Config;
	use MediaWiki\HookContainer\ProtectedHookAccessorTrait;
	use MediaWiki\MainConfigNames;
	@@ -12,6 +11,7 @@ use MediaWiki\SpecialPage\SpecialPage;
	use MediaWiki\Title\Title;
	use MediaWiki\User\User;
	use MessageLocalizer;
	+use Wikimedia\HtmlArmor\HtmlArmor;

	class SkinComponentCopyright implements SkinComponent {
	use ProtectedHookAccessorTrait;
	diff --git a/includes/specialpage/PageQueryPage.php b/includes/specialpage/PageQueryPage.php
	index 706e7e8910f..e2646b092d0 100644
	--- a/includes/specialpage/PageQueryPage.php
	+++ b/includes/specialpage/PageQueryPage.php
	@@ -23,7 +23,6 @@

	namespace MediaWiki\SpecialPage;

	-use HtmlArmor;
	use MediaWiki\Html\Html;
	use MediaWiki\Language\ILanguageConverter;
	use MediaWiki\Linker\Linker;
	@@ -31,6 +30,7 @@ use MediaWiki\MediaWikiServices;
	use MediaWiki\Skin\Skin;
	use MediaWiki\Title\Title;
	use stdClass;
	+use Wikimedia\HtmlArmor\HtmlArmor;
	use Wikimedia\Rdbms\IDatabase;
	use Wikimedia\Rdbms\IResultWrapper;

	diff --git a/includes/specials/SpecialAncientPages.php b/includes/specials/SpecialAncientPages.php
	index fd0c8726595..ab9d7d3e10a 100644
	--- a/includes/specials/SpecialAncientPages.php
	+++ b/includes/specials/SpecialAncientPages.php
	@@ -20,7 +20,6 @@

	namespace MediaWiki\Specials;

	-use HtmlArmor;
	use MediaWiki\Cache\LinkBatchFactory;
	use MediaWiki\Language\ILanguageConverter;
	use MediaWiki\Languages\LanguageConverterFactory;
	@@ -28,6 +27,7 @@ use MediaWiki\Skin\Skin;
	use MediaWiki\SpecialPage\QueryPage;
	use MediaWiki\Title\NamespaceInfo;
	use MediaWiki\Title\Title;
	+use Wikimedia\HtmlArmor\HtmlArmor;
	use Wikimedia\Rdbms\IConnectionProvider;

	/**
	diff --git a/includes/specials/SpecialBlock.php b/includes/specials/SpecialBlock.php
	index 71ba0c9d3d0..f5cab123d14 100644
	--- a/includes/specials/SpecialBlock.php
	+++ b/includes/specials/SpecialBlock.php
	@@ -20,7 +20,6 @@

	namespace MediaWiki\Specials;

	-use HtmlArmor;
	use MediaWiki\Block\AnonIpBlockTarget;
	use MediaWiki\Block\BlockActionInfo;
	use MediaWiki\Block\BlockPermissionCheckerFactory;
	@@ -65,6 +64,7 @@ use OOUI\FieldLayout;
	use OOUI\HtmlSnippet;
	use OOUI\LabelWidget;
	use OOUI\Widget;
	+use Wikimedia\HtmlArmor\HtmlArmor;
	use Wikimedia\Message\MessageSpecifier;

	/**
	diff --git a/includes/specials/SpecialFewestRevisions.php b/includes/specials/SpecialFewestRevisions.php
	index e8acb2cf8a3..ba98d3d090b 100644
	--- a/includes/specials/SpecialFewestRevisions.php
	+++ b/includes/specials/SpecialFewestRevisions.php
	@@ -20,7 +20,6 @@

	namespace MediaWiki\Specials;

	-use HtmlArmor;
	use MediaWiki\Cache\LinkBatchFactory;
	use MediaWiki\Html\Html;
	use MediaWiki\Language\ILanguageConverter;
	@@ -31,6 +30,7 @@ use MediaWiki\SpecialPage\QueryPage;
	use MediaWiki\Title\NamespaceInfo;
	use MediaWiki\Title\Title;
	use stdClass;
	+use Wikimedia\HtmlArmor\HtmlArmor;
	use Wikimedia\Rdbms\IConnectionProvider;
	use Wikimedia\Rdbms\IDatabase;
	use Wikimedia\Rdbms\IResultWrapper;
	diff --git a/includes/specials/SpecialMIMESearch.php b/includes/specials/SpecialMIMESearch.php
	index 56f815dc1de..266db48907f 100644
	--- a/includes/specials/SpecialMIMESearch.php
	+++ b/includes/specials/SpecialMIMESearch.php
	@@ -20,7 +20,6 @@

	namespace MediaWiki\Specials;

	-use HtmlArmor;
	use MediaWiki\Cache\LinkBatchFactory;
	use MediaWiki\FileRepo\File\File;
	use MediaWiki\FileRepo\File\FileSelectQueryBuilder;
	@@ -34,6 +33,7 @@ use MediaWiki\Skin\Skin;
	use MediaWiki\SpecialPage\QueryPage;
	use MediaWiki\Title\Title;
	use stdClass;
	+use Wikimedia\HtmlArmor\HtmlArmor;
	use Wikimedia\Rdbms\IConnectionProvider;

	/**
	diff --git a/includes/specials/SpecialMostLinkedCategories.php b/includes/specials/SpecialMostLinkedCategories.php
	index 27ec3226f9a..8141e9b86eb 100644
	--- a/includes/specials/SpecialMostLinkedCategories.php
	+++ b/includes/specials/SpecialMostLinkedCategories.php
	@@ -22,7 +22,6 @@

	namespace MediaWiki\Specials;

	-use HtmlArmor;
	use MediaWiki\Cache\LinkBatchFactory;
	use MediaWiki\Html\Html;
	use MediaWiki\Language\ILanguageConverter;
	@@ -32,6 +31,7 @@ use MediaWiki\Skin\Skin;
	use MediaWiki\SpecialPage\QueryPage;
	use MediaWiki\Title\Title;
	use stdClass;
	+use Wikimedia\HtmlArmor\HtmlArmor;
	use Wikimedia\Rdbms\IConnectionProvider;
	use Wikimedia\Rdbms\IDatabase;
	use Wikimedia\Rdbms\IResultWrapper;
	diff --git a/includes/specials/SpecialMovePage.php b/includes/specials/SpecialMovePage.php
	index 050e59e8c48..751947b5b92 100644
	--- a/includes/specials/SpecialMovePage.php
	+++ b/includes/specials/SpecialMovePage.php
	@@ -58,11 +58,11 @@ use OOUI\PanelLayout;
	use OOUI\TextInputWidget;
	use SearchEngineFactory;
	use StatusValue;
	-use StringUtils;
	use Wikimedia\Rdbms\IConnectionProvider;
	use Wikimedia\Rdbms\IDBAccessObject;
	use Wikimedia\Rdbms\IExpression;
	use Wikimedia\Rdbms\LikeValue;
	+use Wikimedia\StringUtils\StringUtils;

	/**
	* Implement Special:Movepage for changing page titles
	diff --git a/includes/specials/SpecialNewPages.php b/includes/specials/SpecialNewPages.php
	index eb2fdedb34c..6e97a530574 100644
	--- a/includes/specials/SpecialNewPages.php
	+++ b/includes/specials/SpecialNewPages.php
	@@ -20,7 +20,6 @@

	namespace MediaWiki\Specials;

	-use HtmlArmor;
	use MediaWiki\Cache\LinkBatchFactory;
	use MediaWiki\ChangeTags\ChangeTagsStore;
	use MediaWiki\CommentFormatter\RowCommentFormatter;
	@@ -39,6 +38,7 @@ use MediaWiki\Title\NamespaceInfo;
	use MediaWiki\Title\Title;
	use MediaWiki\User\Options\UserOptionsLookup;
	use MediaWiki\User\TempUser\TempUserConfig;
	+use Wikimedia\HtmlArmor\HtmlArmor;

	/**
	* List of newly created pages
	diff --git a/includes/specials/SpecialRecentChanges.php b/includes/specials/SpecialRecentChanges.php
	index 755004292a5..67904b4c73d 100644
	--- a/includes/specials/SpecialRecentChanges.php
	+++ b/includes/specials/SpecialRecentChanges.php
	@@ -20,7 +20,6 @@

	namespace MediaWiki\Specials;

	-use HtmlArmor;
	use MediaWiki\ChangeTags\ChangeTags;
	use MediaWiki\ChangeTags\ChangeTagsStore;
	use MediaWiki\Context\IContextSource;
	@@ -43,6 +42,7 @@ use MediaWiki\Watchlist\WatchedItemStoreInterface;
	use MediaWiki\Xml\Xml;
	use OOUI\ButtonWidget;
	use OOUI\HtmlSnippet;
	+use Wikimedia\HtmlArmor\HtmlArmor;
	use Wikimedia\Rdbms\IReadableDatabase;
	use Wikimedia\Rdbms\IResultWrapper;
	use Wikimedia\Rdbms\RawSQLExpression;
	diff --git a/includes/specials/SpecialRunJobs.php b/includes/specials/SpecialRunJobs.php
	index cb1d2ec57f7..b5e3a9cd62f 100644
	--- a/includes/specials/SpecialRunJobs.php
	+++ b/includes/specials/SpecialRunJobs.php
	@@ -20,13 +20,13 @@

	namespace MediaWiki\Specials;

	-use HttpStatus;
	use MediaWiki\Deferred\DeferredUpdates;
	use MediaWiki\Deferred\TransactionRoundDefiningUpdate;
	use MediaWiki\JobQueue\JobRunner;
	use MediaWiki\Json\FormatJson;
	use MediaWiki\MainConfigNames;
	use MediaWiki\SpecialPage\UnlistedSpecialPage;
	+use Wikimedia\Http\HttpStatus;
	use Wikimedia\Rdbms\ReadOnlyMode;

	/**
	diff --git a/includes/specials/SpecialUnwatchedPages.php b/includes/specials/SpecialUnwatchedPages.php
	index 2b76c135d83..c062a33a7cb 100644
	--- a/includes/specials/SpecialUnwatchedPages.php
	+++ b/includes/specials/SpecialUnwatchedPages.php
	@@ -22,7 +22,6 @@

	namespace MediaWiki\Specials;

	-use HtmlArmor;
	use MediaWiki\Cache\LinkBatchFactory;
	use MediaWiki\Html\Html;
	use MediaWiki\Language\ILanguageConverter;
	@@ -32,6 +31,7 @@ use MediaWiki\Skin\Skin;
	use MediaWiki\SpecialPage\QueryPage;
	use MediaWiki\Title\Title;
	use stdClass;
	+use Wikimedia\HtmlArmor\HtmlArmor;
	use Wikimedia\Rdbms\IConnectionProvider;
	use Wikimedia\Rdbms\IDatabase;
	use Wikimedia\Rdbms\IResultWrapper;
	diff --git a/includes/specials/SpecialVersion.php b/includes/specials/SpecialVersion.php
	index e1c9388f188..ab1851b9479 100644
	--- a/includes/specials/SpecialVersion.php
	+++ b/includes/specials/SpecialVersion.php
	@@ -23,7 +23,6 @@
	namespace MediaWiki\Specials;

	use Closure;
	-use HtmlArmor;
	use MediaWiki\Config\Config;
	use MediaWiki\HookContainer\HookRunner;
	use MediaWiki\Html\Html;
	@@ -42,6 +41,7 @@ use MediaWiki\Utils\MWTimestamp;
	use MediaWiki\Utils\UrlUtils;
	use Symfony\Component\Yaml\Yaml;
	use Wikimedia\Composer\ComposerInstalled;
	+use Wikimedia\HtmlArmor\HtmlArmor;
	use Wikimedia\Parsoid\Core\SectionMetadata;
	use Wikimedia\Parsoid\Core\TOCData;
	use Wikimedia\Rdbms\IConnectionProvider;
	diff --git a/includes/specials/SpecialWantedCategories.php b/includes/specials/SpecialWantedCategories.php
	index f8a989053e6..2256639fb67 100644
	--- a/includes/specials/SpecialWantedCategories.php
	+++ b/includes/specials/SpecialWantedCategories.php
	@@ -22,7 +22,6 @@

	namespace MediaWiki\Specials;

	-use HtmlArmor;
	use MediaWiki\Cache\LinkBatchFactory;
	use MediaWiki\Language\ILanguageConverter;
	use MediaWiki\Languages\LanguageConverterFactory;
	@@ -30,6 +29,7 @@ use MediaWiki\Skin\Skin;
	use MediaWiki\SpecialPage\WantedQueryPage;
	use MediaWiki\Title\Title;
	use stdClass;
	+use Wikimedia\HtmlArmor\HtmlArmor;
	use Wikimedia\Rdbms\IConnectionProvider;

	/**
	diff --git a/includes/specials/pagers/NewPagesPager.php b/includes/specials/pagers/NewPagesPager.php
	index 45b822b34ff..f447642a8ce 100644
	--- a/includes/specials/pagers/NewPagesPager.php
	+++ b/includes/specials/pagers/NewPagesPager.php
	@@ -21,7 +21,6 @@

	namespace MediaWiki\Pager;

	-use MapCacheLRU;
	use MediaWiki\Cache\LinkBatchFactory;
	use MediaWiki\ChangeTags\ChangeTags;
	use MediaWiki\ChangeTags\ChangeTagsStore;
	@@ -45,6 +44,7 @@ use MediaWiki\Title\Title;
	use MediaWiki\User\TempUser\TempUserConfig;
	use MediaWiki\User\UserIdentityValue;
	use stdClass;
	+use Wikimedia\MapCacheLRU\MapCacheLRU;
	use Wikimedia\Rdbms\IExpression;

	/**
	diff --git a/includes/title/Title.php b/includes/title/Title.php
	index 536608aeab2..c94702246ee 100644
	--- a/includes/title/Title.php
	+++ b/includes/title/Title.php
	@@ -25,7 +25,6 @@
	namespace MediaWiki\Title;

	use InvalidArgumentException;
	-use MapCacheLRU;
	use MediaWiki\Cache\LinkCache;
	use MediaWiki\Context\RequestContext;
	use MediaWiki\DAO\WikiAwareEntityTrait;
	@@ -60,6 +59,7 @@ use stdClass;
	use Stringable;
	use Wikimedia\Assert\Assert;
	use Wikimedia\Assert\PreconditionException;
	+use Wikimedia\MapCacheLRU\MapCacheLRU;
	use Wikimedia\Parsoid\Core\LinkTarget as ParsoidLinkTarget;
	use Wikimedia\Parsoid\Core\LinkTargetTrait;
	use Wikimedia\Rdbms\DBAccessObjectUtils;
	diff --git a/includes/user/PasswordReset.php b/includes/user/PasswordReset.php
	index 35fee177cbc..931adb0453d 100644
	--- a/includes/user/PasswordReset.php
	+++ b/includes/user/PasswordReset.php
	@@ -22,7 +22,6 @@ namespace MediaWiki\User;

	use Iterator;
	use LogicException;
	-use MapCacheLRU;
	use MediaWiki\Auth\AuthManager;
	use MediaWiki\Auth\TemporaryPasswordAuthenticationRequest;
	use MediaWiki\Config\ServiceOptions;
	@@ -38,6 +37,7 @@ use Psr\Log\LoggerAwareInterface;
	use Psr\Log\LoggerAwareTrait;
	use Psr\Log\LoggerInterface;
	use StatusValue;
	+use Wikimedia\MapCacheLRU\MapCacheLRU;

	/**
	* Password reset helper for functionality shared by the web UI and the API.
	diff --git a/includes/user/TempUser/FilteredRadixSerialMapping.php b/includes/user/TempUser/FilteredRadixSerialMapping.php
	index f681a8f76db..cf4255f0ff0 100644
	--- a/includes/user/TempUser/FilteredRadixSerialMapping.php
	+++ b/includes/user/TempUser/FilteredRadixSerialMapping.php
	@@ -2,7 +2,7 @@

	namespace MediaWiki\User\TempUser;

	-use ArrayUtils;
	+use Wikimedia\ArrayUtils\ArrayUtils;

	/**
	* Since "base" is an overused term in class names and mostly means something
	diff --git a/includes/user/TempUser/TempUserDetailsLookup.php b/includes/user/TempUser/TempUserDetailsLookup.php
	index a84730d1c3a..2099449f38a 100644
	--- a/includes/user/TempUser/TempUserDetailsLookup.php
	+++ b/includes/user/TempUser/TempUserDetailsLookup.php
	@@ -5,9 +5,9 @@ namespace MediaWiki\User\TempUser;
	use ArrayIterator;
	use CallbackFilterIterator;
	use IteratorIterator;
	-use MapCacheLRU;
	use MediaWiki\User\Registration\UserRegistrationLookup;
	use MediaWiki\User\UserIdentity;
	+use Wikimedia\MapCacheLRU\MapCacheLRU;

	/**
	* Caching lookup service for metadata related to temporary accounts, such as expiration.
	diff --git a/includes/watchlist/WatchedItemStore.php b/includes/watchlist/WatchedItemStore.php
	index dcc87332b1c..4471b5cc402 100644
	--- a/includes/watchlist/WatchedItemStore.php
	+++ b/includes/watchlist/WatchedItemStore.php
	@@ -4,7 +4,6 @@ namespace MediaWiki\Watchlist;

	use DateInterval;
	use LogicException;
	-use MapCacheLRU;
	use MediaWiki\Cache\LinkBatchFactory;
	use MediaWiki\Config\ServiceOptions;
	use MediaWiki\Deferred\DeferredUpdates;
	@@ -19,6 +18,7 @@ use MediaWiki\User\UserIdentity;
	use MediaWiki\Utils\MWTimestamp;
	use stdClass;
	use Wikimedia\Assert\Assert;
	+use Wikimedia\MapCacheLRU\MapCacheLRU;
	use Wikimedia\ObjectCache\BagOStuff;
	use Wikimedia\ObjectCache\HashBagOStuff;
	use Wikimedia\ParamValidator\TypeDef\ExpiryDef;
	diff --git a/maintenance/benchmarks/benchmarkLruHash.php b/maintenance/benchmarks/benchmarkLruHash.php
	index 9e827fde98b..48f5335d837 100644
	--- a/maintenance/benchmarks/benchmarkLruHash.php
	+++ b/maintenance/benchmarks/benchmarkLruHash.php
	@@ -20,6 +20,7 @@
	*/

	use MediaWiki\Maintenance\Benchmarker;
	+use Wikimedia\MapCacheLRU\MapCacheLRU;
	use Wikimedia\ObjectCache\BagOStuff;
	use Wikimedia\ObjectCache\HashBagOStuff;

	diff --git a/maintenance/grep.php b/maintenance/grep.php
	index cb769e8a968..dd04a4d7810 100644
	--- a/maintenance/grep.php
	+++ b/maintenance/grep.php
	@@ -10,6 +10,7 @@ use MediaWiki\Title\Title;
	use MediaWiki\WikiMap\WikiMap;
	use Wikimedia\Rdbms\IExpression;
	use Wikimedia\Rdbms\LikeValue;
	+use Wikimedia\StringUtils\StringUtils;

	// @codeCoverageIgnoreStart
	require_once __DIR__ . '/Maintenance.php';
	diff --git a/maintenance/language/generateCollationData.php b/maintenance/language/generateCollationData.php
	index 2f3ce683872..cee6cd0accc 100644
	--- a/maintenance/language/generateCollationData.php
	+++ b/maintenance/language/generateCollationData.php
	@@ -27,6 +27,7 @@ require_once __DIR__ . '/../Maintenance.php';

	use MediaWiki\Maintenance\Maintenance;
	use Wikimedia\StaticArrayWriter;
	+use Wikimedia\StringUtils\StringUtils;

	/**
	* Generate first letter data files for Collation.php
	diff --git a/maintenance/rebuildFileCache.php b/maintenance/rebuildFileCache.php
	index 732a5d8905f..6cb5338c0ed 100644
	--- a/maintenance/rebuildFileCache.php
	+++ b/maintenance/rebuildFileCache.php
	@@ -22,6 +22,7 @@
	*/

	use MediaWiki\Actions\Action;
	+use MediaWiki\Cache\HTMLFileCache;
	use MediaWiki\Context\RequestContext;
	use MediaWiki\Debug\MWDebug;
	use MediaWiki\MainConfigNames;
	diff --git a/tests/phan/TaintCheckAnnotationsTest.php b/tests/phan/TaintCheckAnnotationsTest.php
	index f6ec9cfb802..ff0a03b39d9 100644
	--- a/tests/phan/TaintCheckAnnotationsTest.php
	+++ b/tests/phan/TaintCheckAnnotationsTest.php
	@@ -32,6 +32,7 @@ use MediaWiki\Title\TitleValue;
	use Shellbox\Command\UnboxedResult;
	use Shellbox\Shellbox;
	use Wikimedia\Rdbms\DeleteQueryBuilder;
	+use Wikimedia\HtmlArmor\HtmlArmor;
	use Wikimedia\Rdbms\Expression;
	use Wikimedia\Rdbms\InsertQueryBuilder;
	use Wikimedia\Rdbms\RawSQLExpression;
	diff --git a/tests/phpunit/includes/filerepo/file/LocalFileTest.php b/tests/phpunit/includes/filerepo/file/LocalFileTest.php
	index 33fbad1f653..c3935f68d8b 100644
	--- a/tests/phpunit/includes/filerepo/file/LocalFileTest.php
	+++ b/tests/phpunit/includes/filerepo/file/LocalFileTest.php
	@@ -22,6 +22,7 @@ use MediaWiki\Title\Title;
	use MediaWiki\User\UserIdentity;
	use MediaWiki\WikiMap\WikiMap;
	use PHPUnit\Framework\Assert;
	+use Wikimedia\ArrayUtils\ArrayUtils;
	use Wikimedia\FileBackend\FSFileBackend;
	use Wikimedia\TestingAccessWrapper;

	diff --git a/tests/phpunit/includes/linker/LinkRendererTest.php b/tests/phpunit/includes/linker/LinkRendererTest.php
	index 1916208f98d..ab1ca814c34 100644
	--- a/tests/phpunit/includes/linker/LinkRendererTest.php
	+++ b/tests/phpunit/includes/linker/LinkRendererTest.php
	@@ -10,6 +10,7 @@ use MediaWiki\Page\PageReference;
	use MediaWiki\Page\PageReferenceValue;
	use MediaWiki\Title\Title;
	use MediaWiki\Title\TitleValue;
	+use Wikimedia\HtmlArmor\HtmlArmor;

	/**
	* @covers \MediaWiki\Linker\LinkRenderer
	diff --git a/tests/phpunit/includes/parser/ParserMethodsTest.php b/tests/phpunit/includes/parser/ParserMethodsTest.php
	index 267976aff5f..98d3436a7cf 100644
	--- a/tests/phpunit/includes/parser/ParserMethodsTest.php
	+++ b/tests/phpunit/includes/parser/ParserMethodsTest.php
	@@ -2,7 +2,6 @@

	namespace MediaWiki\Tests\Parser;

	-use HtmlArmor;
	use LogicException;
	use MediaWiki\Content\WikitextContent;
	use MediaWiki\Language\RawMessage;
	@@ -18,6 +17,7 @@ use MediaWiki\User\User;
	use MediaWiki\User\UserIdentityValue;
	use MediaWikiLangTestCase;
	use MockTitleTrait;
	+use Wikimedia\HtmlArmor\HtmlArmor;

	/**
	* @group Database
	diff --git a/tests/phpunit/includes/session/CookieSessionProviderTest.php b/tests/phpunit/includes/session/CookieSessionProviderTest.php
	index 6490dda48a8..bbe24094257 100644
	--- a/tests/phpunit/includes/session/CookieSessionProviderTest.php
	+++ b/tests/phpunit/includes/session/CookieSessionProviderTest.php
	@@ -2,7 +2,6 @@

	namespace MediaWiki\Tests\Session;

	-use ArrayUtils;
	use InvalidArgumentException;
	use MediaWiki\Config\HashConfig;
	use MediaWiki\MainConfigNames;
	@@ -19,6 +18,7 @@ use MediaWikiIntegrationTestCase;
	use Psr\Log\LogLevel;
	use Psr\Log\NullLogger;
	use TestLogger;
	+use Wikimedia\ArrayUtils\ArrayUtils;
	use Wikimedia\TestingAccessWrapper;

	/**
	diff --git a/tests/phpunit/includes/session/ImmutableSessionProviderWithCookieTest.php b/tests/phpunit/includes/session/ImmutableSessionProviderWithCookieTest.php
	index c9d1edff4ae..3fdd41fc610 100644
	--- a/tests/phpunit/includes/session/ImmutableSessionProviderWithCookieTest.php
	+++ b/tests/phpunit/includes/session/ImmutableSessionProviderWithCookieTest.php
	@@ -2,7 +2,6 @@

	namespace MediaWiki\Tests\Session;

	-use ArrayUtils;
	use BadMethodCallException;
	use InvalidArgumentException;
	use MediaWiki\Config\HashConfig;
	@@ -19,6 +18,7 @@ use MediaWiki\Session\UserInfo;
	use MediaWikiIntegrationTestCase;
	use Psr\Log\NullLogger;
	use TestLogger;
	+use Wikimedia\ArrayUtils\ArrayUtils;
	use Wikimedia\TestingAccessWrapper;

	/**
	diff --git a/tests/phpunit/includes/specials/SpecialPageExecutor.php b/tests/phpunit/includes/specials/SpecialPageExecutor.php
	index 6450bc49315..a951eef47e9 100644
	--- a/tests/phpunit/includes/specials/SpecialPageExecutor.php
	+++ b/tests/phpunit/includes/specials/SpecialPageExecutor.php
	@@ -10,6 +10,7 @@ use MediaWiki\Request\FauxResponse;
	use MediaWiki\Request\WebRequest;
	use MediaWiki\SpecialPage\SpecialPage;
	use MediaWiki\User\LoggedOutEditToken;
	+use Wikimedia\Http\HttpStatus;

	/**
	* @author Addshore
	diff --git a/tests/phpunit/includes/user/LocalIdLookupTest.php b/tests/phpunit/includes/user/LocalIdLookupTest.php
	index dd06d6cf6f8..0181c400f33 100644
	--- a/tests/phpunit/includes/user/LocalIdLookupTest.php
	+++ b/tests/phpunit/includes/user/LocalIdLookupTest.php
	@@ -7,6 +7,7 @@ use MediaWiki\User\CentralId\CentralIdLookup;
	use MediaWiki\User\CentralId\LocalIdLookup;
	use MediaWiki\User\UserIdentity;
	use MediaWiki\User\UserIdentityValue;
	+use Wikimedia\ArrayUtils\ArrayUtils;
	use Wikimedia\Rdbms\IDBAccessObject;

	/**
	diff --git a/tests/phpunit/integration/includes/Permissions/GrantsLocalizationTest.php b/tests/phpunit/integration/includes/Permissions/GrantsLocalizationTest.php
	index 39629eb9f08..00d4f1528db 100644
	--- a/tests/phpunit/integration/includes/Permissions/GrantsLocalizationTest.php
	+++ b/tests/phpunit/integration/includes/Permissions/GrantsLocalizationTest.php
	@@ -2,12 +2,12 @@

	namespace MediaWiki\Tests\Integration\Permissions;

	-use HtmlArmor;
	use MediaWiki\Html\Html;
	use MediaWiki\Message\Message;
	use MediaWiki\Permissions\GrantsLocalization;
	use MediaWiki\SpecialPage\SpecialPage;
	use MediaWikiIntegrationTestCase;
	+use Wikimedia\HtmlArmor\HtmlArmor;

	/**
	* @author Zabe
	diff --git a/tests/phpunit/mocks/DummyServicesTrait.php b/tests/phpunit/mocks/DummyServicesTrait.php
	index 16bcf7d0277..b2ceb3823aa 100644
	--- a/tests/phpunit/mocks/DummyServicesTrait.php
	+++ b/tests/phpunit/mocks/DummyServicesTrait.php
	@@ -21,7 +21,6 @@

	namespace MediaWiki\Tests\Unit;

	-use Interwiki;
	use InvalidArgumentException;
	use MediaWiki\Cache\CacheKeyHelper;
	use MediaWiki\Cache\GenderCache;
	@@ -30,6 +29,7 @@ use MediaWiki\CommentFormatter\CommentParserFactory;
	use MediaWiki\CommentStore\CommentStore;
	use MediaWiki\Config\ServiceOptions;
	use MediaWiki\Content\IContentHandlerFactory;
	+use MediaWiki\Interwiki\Interwiki;
	use MediaWiki\Interwiki\InterwikiLookup;
	use MediaWiki\Language\Language;
	use MediaWiki\Languages\LanguageNameUtils;
	diff --git a/tests/phpunit/mocks/TestLocalisationCache.php b/tests/phpunit/mocks/TestLocalisationCache.php
	index b7a267c4108..e75b6aca034 100644
	--- a/tests/phpunit/mocks/TestLocalisationCache.php
	+++ b/tests/phpunit/mocks/TestLocalisationCache.php
	@@ -2,6 +2,7 @@

	use MediaWiki\MainConfigNames;
	use MediaWiki\MediaWikiServices;
	+use Wikimedia\MapCacheLRU\MapCacheLRU;
	use Wikimedia\TestingAccessWrapper;

	/**
	diff --git a/tests/phpunit/unit/includes/libs/ArrayUtilsTest.php b/tests/phpunit/unit/includes/libs/ArrayUtilsTest.php
	index 684d6207db3..a4b1c448703 100644
	--- a/tests/phpunit/unit/includes/libs/ArrayUtilsTest.php
	+++ b/tests/phpunit/unit/includes/libs/ArrayUtilsTest.php
	@@ -2,12 +2,12 @@

	namespace Wikimedia\Tests;

	-use ArrayUtils;
	use MediaWikiCoversValidator;
	use PHPUnit\Framework\TestCase;
	+use Wikimedia\ArrayUtils\ArrayUtils;

	/**
	- * @covers \ArrayUtils
	+ * @covers \Wikimedia\ArrayUtils\ArrayUtils
	*/
	class ArrayUtilsTest extends TestCase {

	diff --git a/tests/phpunit/unit/includes/libs/HashRingTest.php b/tests/phpunit/unit/includes/libs/HashRingTest.php
	index 4eb98cc2e5f..b5ae0dbbf70 100644
	--- a/tests/phpunit/unit/includes/libs/HashRingTest.php
	+++ b/tests/phpunit/unit/includes/libs/HashRingTest.php
	@@ -2,14 +2,14 @@

	namespace Wikimedia\Tests;

	-use HashRing;
	use MediaWikiCoversValidator;
	use PHPUnit\Framework\TestCase;
	+use Wikimedia\HashRing\HashRing;
	use Wikimedia\TestingAccessWrapper;

	/**
	* @group HashRing
	- * @covers \HashRing
	+ * @covers \Wikimedia\HashRing\HashRing
	*/
	class HashRingTest extends TestCase {

	diff --git a/tests/phpunit/unit/includes/libs/HtmlArmorTest.php b/tests/phpunit/unit/includes/libs/HtmlArmorTest.php
	index f9edcfac85c..107d067a867 100644
	--- a/tests/phpunit/unit/includes/libs/HtmlArmorTest.php
	+++ b/tests/phpunit/unit/includes/libs/HtmlArmorTest.php
	@@ -2,12 +2,12 @@

	namespace Wikimedia\Tests;

	-use HtmlArmor;
	use MediaWikiCoversValidator;
	use PHPUnit\Framework\TestCase;
	+use Wikimedia\HtmlArmor\HtmlArmor;

	/**
	- * @covers \HtmlArmor
	+ * @covers \Wikimedia\HtmlArmor\HtmlArmor
	*/
	class HtmlArmorTest extends TestCase {

	diff --git a/tests/phpunit/unit/includes/libs/MapCacheLRUTest.php b/tests/phpunit/unit/includes/libs/MapCacheLRUTest.php
	index b261973246d..d9c62f0c609 100644
	--- a/tests/phpunit/unit/includes/libs/MapCacheLRUTest.php
	+++ b/tests/phpunit/unit/includes/libs/MapCacheLRUTest.php
	@@ -2,14 +2,14 @@

	namespace Wikimedia\Tests;

	-use MapCacheLRU;
	use MediaWikiCoversValidator;
	use PHPUnit\Framework\TestCase;
	use UnexpectedValueException;
	+use Wikimedia\MapCacheLRU\MapCacheLRU;

	/**
	* @group Cache
	- * @covers \MapCacheLRU
	+ * @covers \Wikimedia\MapCacheLRU\MapCacheLRU
	*/
	class MapCacheLRUTest extends TestCase {

	diff --git a/tests/phpunit/unit/includes/libs/StringUtilsTest.php b/tests/phpunit/unit/includes/libs/StringUtilsTest.php
	index ef1fb6bc908..9cffb5644d0 100644
	--- a/tests/phpunit/unit/includes/libs/StringUtilsTest.php
	+++ b/tests/phpunit/unit/includes/libs/StringUtilsTest.php
	@@ -4,10 +4,10 @@ namespace Wikimedia\Tests;

	use MediaWikiCoversValidator;
	use PHPUnit\Framework\TestCase;
	-use StringUtils;
	+use Wikimedia\StringUtils\StringUtils;

	/**
	- * @covers \StringUtils
	+ * @covers \Wikimedia\StringUtils\StringUtils
	*/
	class StringUtilsTest extends TestCase {

	diff --git a/tests/phpunit/unit/includes/libs/TimingTest.php b/tests/phpunit/unit/includes/libs/TimingTest.php
	index 6c52ed265bb..3a815d9e957 100644
	--- a/tests/phpunit/unit/includes/libs/TimingTest.php
	+++ b/tests/phpunit/unit/includes/libs/TimingTest.php
	@@ -23,10 +23,10 @@ namespace Wikimedia\Tests;

	use MediaWikiCoversValidator;
	use PHPUnit\Framework\TestCase;
	-use Timing;
	+use Wikimedia\Timing\Timing;

	/**
	- * @covers \Timing
	+ * @covers \Wikimedia\Timing\Timing
	*/
	class TimingTest extends TestCase {

	diff --git a/tests/phpunit/unit/includes/utils/UrlUtilsProviders.php b/tests/phpunit/unit/includes/utils/UrlUtilsProviders.php
	index cfa05e708a2..b236c113ce7 100644
	--- a/tests/phpunit/unit/includes/utils/UrlUtilsProviders.php
	+++ b/tests/phpunit/unit/includes/utils/UrlUtilsProviders.php
	@@ -1,6 +1,7 @@
	<?php

	use MediaWiki\Utils\UrlUtils;
	+use Wikimedia\ArrayUtils\ArrayUtils;

	/**
	* Shared data providers for UrlUtilsTest and some GlobalFunctions tests
	diff --git a/tests/phpunit/unit/includes/watchlist/WatchedItemStoreUnitTest.php b/tests/phpunit/unit/includes/watchlist/WatchedItemStoreUnitTest.php
	index ee0067fbd21..8c387d43d76 100644
	--- a/tests/phpunit/unit/includes/watchlist/WatchedItemStoreUnitTest.php
	+++ b/tests/phpunit/unit/includes/watchlist/WatchedItemStoreUnitTest.php
	@@ -26,6 +26,7 @@ use MediaWiki\Watchlist\ActivityUpdateJob;
	use MediaWiki\Watchlist\WatchedItem;
	use MediaWiki\Watchlist\WatchedItemStore;
	use PHPUnit\Framework\MockObject\MockObject;
	+use Wikimedia\MapCacheLRU\MapCacheLRU;
	use Wikimedia\ObjectCache\HashBagOStuff;
	use Wikimedia\Rdbms\DeleteQueryBuilder;
	use Wikimedia\Rdbms\Expression;

File Metadata

Mime Type: text/x-diff
Expires: Sat, Jul 5, 5:31 AM (8 h, 2 m)
Storage Engine: blob
Storage Format: Raw Data
Storage Handle: 227442
Default Alt Text: (86 KB)

No OneTemporaryActions

View Options

File Metadata

Event Timeline

No OneTemporary
Actions