Add namespace to remaining parts of Wikimedia\ObjectCache

Bug: T353458
Change-Id: I3b736346550953e3b2977c14dc3eb10edc07cf97

RELEASE-NOTES-1.43

@@ -686,6 +686,7 @@ because of Phabricator reports.
     - MultiWriteBagOStuff
     - RESTBagOStuff
     - RedisBagOStuff
+    - WANObjectCache
     - WinCacheBagOStuff
   - Wikimedia\Rdbms:
     - DBAccessObjectUtils

autoload.php

@@ -3424,6 +3424,8 @@ $wgAutoloadLocalClasses = [
 	'Wikimedia\\ObjectCache\\MultiWriteBagOStuff' => __DIR__ . '/includes/libs/objectcache/MultiWriteBagOStuff.php',
 	'Wikimedia\\ObjectCache\\RESTBagOStuff' => __DIR__ . '/includes/libs/objectcache/RESTBagOStuff.php',
 	'Wikimedia\\ObjectCache\\RedisBagOStuff' => __DIR__ . '/includes/libs/objectcache/RedisBagOStuff.php',
+	'Wikimedia\\ObjectCache\\Serialized\\SerializedValueContainer' => __DIR__ . '/includes/libs/objectcache/serialized/SerializedValueContainer.php',
+	'Wikimedia\\ObjectCache\\WANObjectCache' => __DIR__ . '/includes/libs/objectcache/WANObjectCache.php',
 	'Wikimedia\\ParamValidator\\Callbacks' => __DIR__ . '/includes/libs/ParamValidator/Callbacks.php',
 	'Wikimedia\\ParamValidator\\ParamValidator' => __DIR__ . '/includes/libs/ParamValidator/ParamValidator.php',
 	'Wikimedia\\ParamValidator\\SimpleCallbacks' => __DIR__ . '/includes/libs/ParamValidator/SimpleCallbacks.php',

includes/MediaWikiServices.php

@@ -202,12 +202,12 @@ use SearchEngineConfig;
 use SearchEngineFactory;
 use SkinFactory;
 use UploadRevisionImporter;
-use WANObjectCache;
 use WikiImporterFactory;
 use Wikimedia\EventRelayer\EventRelayerGroup;
 use Wikimedia\Message\IMessageFormatterFactory;
 use Wikimedia\NonSerializable\NonSerializableTrait;
 use Wikimedia\ObjectCache\BagOStuff;
+use Wikimedia\ObjectCache\WANObjectCache;
 use Wikimedia\ObjectFactory\ObjectFactory;
 use Wikimedia\Parsoid\Config\DataAccess;
 use Wikimedia\Rdbms\ChronologyProtector;

includes/Permissions/RestrictionStore.php

@@ -16,7 +16,7 @@ use MediaWiki\Page\PageStore;
 use MediaWiki\Title\Title;
 use MediaWiki\Title\TitleValue;
 use stdClass;
-use WANObjectCache;
+use Wikimedia\ObjectCache\WANObjectCache;
 use Wikimedia\Rdbms\Database;
 use Wikimedia\Rdbms\DBAccessObjectUtils;
 use Wikimedia\Rdbms\IDBAccessObject;

includes/ResourceLoader/MessageBlobStore.php

@@ -27,7 +27,7 @@ use MediaWiki\MediaWikiServices;
 use Psr\Log\LoggerAwareInterface;
 use Psr\Log\LoggerInterface;
 use Psr\Log\NullLogger;
-use WANObjectCache;
+use Wikimedia\ObjectCache\WANObjectCache;
 use Wikimedia\Rdbms\Database;
 
 /**

includes/Rest/Handler/PageHistoryCountHandler.php

@@ -17,10 +17,10 @@ use MediaWiki\Storage\NameTableAccessException;
 use MediaWiki\Storage\NameTableStore;
 use MediaWiki\Storage\NameTableStoreFactory;
 use MediaWiki\User\TempUser\TempUserConfig;
-use WANObjectCache;
 use Wikimedia\Message\MessageValue;
 use Wikimedia\Message\ParamType;
 use Wikimedia\Message\ScalarParam;
+use Wikimedia\ObjectCache\WANObjectCache;
 use Wikimedia\ParamValidator\ParamValidator;
 use Wikimedia\Rdbms\IConnectionProvider;
 use Wikimedia\Rdbms\IExpression;

includes/Revision/RevisionStore.php

@@ -63,10 +63,10 @@ use RuntimeException;
 use StatusValue;
 use stdClass;
 use Traversable;
-use WANObjectCache;
 use Wikimedia\Assert\Assert;
 use Wikimedia\IPUtils;
 use Wikimedia\ObjectCache\BagOStuff;
+use Wikimedia\ObjectCache\WANObjectCache;
 use Wikimedia\Rdbms\Database;
 use Wikimedia\Rdbms\DBAccessObjectUtils;
 use Wikimedia\Rdbms\IDatabase;

includes/Revision/RevisionStoreFactory.php

@@ -36,9 +36,9 @@ use MediaWiki\Title\TitleFactory;
 use MediaWiki\User\ActorStore;
 use MediaWiki\User\ActorStoreFactory;
 use Psr\Log\LoggerInterface;
-use WANObjectCache;
 use Wikimedia\Assert\Assert;
 use Wikimedia\ObjectCache\BagOStuff;
+use Wikimedia\ObjectCache\WANObjectCache;
 use Wikimedia\Rdbms\ILBFactory;
 
 /**

includes/ServiceWiring.php

@@ -250,6 +250,7 @@ use Wikimedia\Message\IMessageFormatterFactory;
 use Wikimedia\ObjectCache\BagOStuff;
 use Wikimedia\ObjectCache\EmptyBagOStuff;
 use Wikimedia\ObjectCache\HashBagOStuff;
+use Wikimedia\ObjectCache\WANObjectCache;
 use Wikimedia\ObjectFactory\ObjectFactory;
 use Wikimedia\Parsoid\Config\DataAccess;
 use Wikimedia\Parsoid\Parsoid;

includes/Storage/BlobStoreFactory.php

@@ -23,7 +23,7 @@ namespace MediaWiki\Storage;
 use ExternalStoreAccess;
 use MediaWiki\Config\ServiceOptions;
 use MediaWiki\MainConfigNames;
-use WANObjectCache;
+use Wikimedia\ObjectCache\WANObjectCache;
 use Wikimedia\Rdbms\ILBFactory;
 
 /**

includes/Storage/DerivedPageDataUpdater.php

@@ -69,8 +69,8 @@ use Psr\Log\LoggerAwareInterface;
 use Psr\Log\LoggerInterface;
 use Psr\Log\NullLogger;
 use RevertedTagUpdateJob;
-use WANObjectCache;
 use Wikimedia\Assert\Assert;
+use Wikimedia\ObjectCache\WANObjectCache;
 use Wikimedia\Rdbms\IDBAccessObject;
 use Wikimedia\Rdbms\ILBFactory;
 use WikiPage;

includes/Storage/NameTableStore.php

@@ -21,9 +21,9 @@
 namespace MediaWiki\Storage;
 
 use Psr\Log\LoggerInterface;
-use WANObjectCache;
 use Wikimedia\Assert\Assert;
 use Wikimedia\LightweightObjectStore\ExpirationAwareness;
+use Wikimedia\ObjectCache\WANObjectCache;
 use Wikimedia\Rdbms\Database;
 use Wikimedia\Rdbms\IDatabase;
 use Wikimedia\Rdbms\ILoadBalancer;

includes/Storage/NameTableStoreFactory.php

@@ -22,7 +22,7 @@ namespace MediaWiki\Storage;
 
 use InvalidArgumentException;
 use Psr\Log\LoggerInterface;
-use WANObjectCache;
+use Wikimedia\ObjectCache\WANObjectCache;
 use Wikimedia\Rdbms\ILBFactory;
 
 class NameTableStoreFactory {

includes/Storage/PageUpdaterFactory.php

@@ -42,7 +42,7 @@ use MediaWiki\User\UserNameUtils;
 use MessageCache;
 use ParserCache;
 use Psr\Log\LoggerInterface;
-use WANObjectCache;
+use Wikimedia\ObjectCache\WANObjectCache;
 use Wikimedia\Rdbms\ILBFactory;
 
 /**

includes/Storage/SqlBlobStore.php

@@ -31,9 +31,9 @@ use ExternalStoreException;
 use HistoryBlobUtils;
 use InvalidArgumentException;
 use StatusValue;
-use WANObjectCache;
 use Wikimedia\Assert\Assert;
 use Wikimedia\AtEase\AtEase;
+use Wikimedia\ObjectCache\WANObjectCache;
 use Wikimedia\Rdbms\DBAccessObjectUtils;
 use Wikimedia\Rdbms\IDatabase;
 use Wikimedia\Rdbms\IDBAccessObject;

includes/actions/InfoAction.php

@@ -24,9 +24,11 @@
 
 use MediaWiki\Cache\LinkBatchFactory;
 use MediaWiki\Category\Category;
+use MediaWiki\Content\ContentHandler;
 use MediaWiki\Context\IContextSource;
 use MediaWiki\EditPage\TemplatesOnThisPageFormatter;
 use MediaWiki\Html\Html;
+use MediaWiki\Language\Language;
 use MediaWiki\Languages\LanguageNameUtils;
 use MediaWiki\Linker\Linker;
 use MediaWiki\Linker\LinkRenderer;
@@ -48,6 +50,7 @@ use MediaWiki\Title\NamespaceInfo;
 use MediaWiki\Title\Title;
 use MediaWiki\User\UserFactory;
 use MediaWiki\Watchlist\WatchedItemStoreInterface;
+use Wikimedia\ObjectCache\WANObjectCache;
 use Wikimedia\Rdbms\Database;
 use Wikimedia\Rdbms\IConnectionProvider;
 use Wikimedia\Rdbms\IDBAccessObject;

includes/cache/BacklinkCache.php

@@ -42,7 +42,7 @@ use MediaWiki\Title\TitleValue;
 use Psr\Log\LoggerInterface;
 use RuntimeException;
 use stdClass;
-use WANObjectCache;
+use Wikimedia\ObjectCache\WANObjectCache;
 use Wikimedia\Rdbms\Database;
 use Wikimedia\Rdbms\IConnectionProvider;
 use Wikimedia\Rdbms\IReadableDatabase;

includes/cache/BacklinkCacheFactory.php

@@ -28,7 +28,7 @@ use MediaWiki\HookContainer\HookContainer;
 use MediaWiki\Linker\LinksMigration;
 use MediaWiki\Page\PageReference;
 use Psr\Log\LoggerInterface;
-use WANObjectCache;
+use Wikimedia\ObjectCache\WANObjectCache;
 use Wikimedia\Rdbms\IConnectionProvider;
 
 /**

includes/cache/LinkCache.php

@@ -38,7 +38,7 @@ use Psr\Log\LoggerAwareInterface;
 use Psr\Log\LoggerInterface;
 use Psr\Log\NullLogger;
 use stdClass;
-use WANObjectCache;
+use Wikimedia\ObjectCache\WANObjectCache;
 use Wikimedia\Rdbms\Database;
 use Wikimedia\Rdbms\IDBAccessObject;
 use Wikimedia\Rdbms\ILoadBalancer;

includes/changetags/ChangeTags.php

@@ -22,6 +22,7 @@ use MediaWiki\Context\IContextSource;
 use MediaWiki\Context\RequestContext;
 use MediaWiki\HookContainer\HookRunner;
 use MediaWiki\Html\Html;
+use MediaWiki\Language\Language;
 use MediaWiki\Language\RawMessage;
 use MediaWiki\MainConfigNames;
 use MediaWiki\MediaWikiServices;
@@ -34,6 +35,7 @@ use MediaWiki\Status\Status;
 use MediaWiki\Title\Title;
 use MediaWiki\User\UserIdentity;
 use MediaWiki\Xml\XmlSelect;
+use Wikimedia\ObjectCache\WANObjectCache;
 use Wikimedia\Rdbms\IReadableDatabase;
 
 /**

includes/changetags/ChangeTagsStore.php

@@ -34,7 +34,7 @@ use MediaWiki\User\UserFactory;
 use MediaWiki\User\UserIdentity;
 use Psr\Log\LoggerInterface;
 use RecentChange;
-use WANObjectCache;
+use Wikimedia\ObjectCache\WANObjectCache;
 use Wikimedia\Rdbms\Database;
 use Wikimedia\Rdbms\IConnectionProvider;
 use Wikimedia\Rdbms\IReadableDatabase;

includes/db/MWLBFactory.php

@@ -29,6 +29,7 @@ use MediaWiki\Deferred\DeferredUpdates;
 use MediaWiki\Logger\LoggerFactory;
 use MediaWiki\MainConfigNames;
 use Wikimedia\ObjectCache\BagOStuff;
+use Wikimedia\ObjectCache\WANObjectCache;
 use Wikimedia\Rdbms\ChronologyProtector;
 use Wikimedia\Rdbms\ConfiguredReadOnlyMode;
 use Wikimedia\Rdbms\DatabaseDomain;

includes/debug/MW.php

@@ -4,6 +4,7 @@ use MediaWiki\MediaWikiServices;
 use MediaWiki\Revision\RevisionRecord;
 use MediaWiki\Title\Title;
 use MediaWiki\User\User;
+use Wikimedia\ObjectCache\WANObjectCache;
 
 /**
  * Helper class to reduce typing in manual debugging tools like shell.php.

includes/filebackend/FileBackendGroup.php

@@ -36,9 +36,9 @@ use MediaWiki\Output\StreamFile;
 use MediaWiki\Status\Status;
 use MimeAnalyzer;
 use Profiler;
-use WANObjectCache;
 use Wikimedia\FileBackend\FileBackend;
 use Wikimedia\ObjectCache\BagOStuff;
+use Wikimedia\ObjectCache\WANObjectCache;
 use Wikimedia\ObjectFactory\ObjectFactory;
 use Wikimedia\Rdbms\ReadOnlyMode;
 

includes/filerepo/FileRepo.php

@@ -19,6 +19,7 @@ use MediaWiki\User\UserIdentity;
 use MediaWiki\Utils\MWTimestamp;
 use Wikimedia\AtEase\AtEase;
 use Wikimedia\FileBackend\FileBackend;
+use Wikimedia\ObjectCache\WANObjectCache;
 use Wikimedia\Rdbms\IDBAccessObject;
 
 /**

includes/filerepo/ForeignAPIRepo.php

@@ -26,6 +26,7 @@ use MediaWiki\MediaWikiServices;
 use MediaWiki\Page\PageIdentity;
 use MediaWiki\Title\Title;
 use Wikimedia\FileBackend\FileBackend;
+use Wikimedia\ObjectCache\WANObjectCache;
 
 /**
  * A foreign repository for a remote MediaWiki accessible through api.php requests.

includes/filerepo/LocalRepo.php

@@ -28,6 +28,7 @@ use MediaWiki\Status\Status;
 use MediaWiki\Storage\BlobStore;
 use MediaWiki\Title\Title;
 use MediaWiki\WikiMap\WikiMap;
+use Wikimedia\ObjectCache\WANObjectCache;
 use Wikimedia\Rdbms\Database;
 use Wikimedia\Rdbms\IConnectionProvider;
 use Wikimedia\Rdbms\IDatabase;

includes/filerepo/RepoGroup.php

@@ -21,6 +21,7 @@
 use MediaWiki\Linker\LinkTarget;
 use MediaWiki\Page\PageIdentity;
 use MediaWiki\Title\Title;
+use Wikimedia\ObjectCache\WANObjectCache;
 
 /**
  * Prioritized list of file repositories.

includes/filerepo/file/File.php

@@ -9,6 +9,7 @@
 use MediaWiki\Config\ConfigException;
 use MediaWiki\Context\IContextSource;
 use MediaWiki\HookContainer\ProtectedHookAccessorTrait;
+use MediaWiki\Language\Language;
 use MediaWiki\Linker\LinkTarget;
 use MediaWiki\Logger\LoggerFactory;
 use MediaWiki\MainConfigNames;
@@ -20,6 +21,7 @@ use MediaWiki\Status\Status;
 use MediaWiki\Title\Title;
 use MediaWiki\User\UserIdentity;
 use Wikimedia\FileBackend\FileBackend;
+use Wikimedia\ObjectCache\WANObjectCache;
 
 /**
  * Base code for files.

includes/filerepo/file/ForeignDBFile.php

@@ -18,10 +18,12 @@
  * @file
  */
 
+use MediaWiki\Language\Language;
 use MediaWiki\MediaWikiServices;
 use MediaWiki\Status\Status;
 use MediaWiki\Title\Title;
 use MediaWiki\User\UserIdentity;
+use Wikimedia\ObjectCache\WANObjectCache;
 use Wikimedia\Rdbms\DBUnexpectedError;
 
 /**

includes/filerepo/file/LocalFile.php

@@ -19,12 +19,14 @@
  */
 
 use MediaWiki\CommentStore\CommentStoreComment;
+use MediaWiki\Content\ContentHandler;
 use MediaWiki\Context\RequestContext;
 use MediaWiki\Deferred\AutoCommitUpdate;
 use MediaWiki\Deferred\DeferredUpdates;
 use MediaWiki\Deferred\LinksUpdate\LinksUpdate;
 use MediaWiki\Deferred\SiteStatsUpdate;
 use MediaWiki\FileRepo\File\FileSelectQueryBuilder;
+use MediaWiki\Language\Language;
 use MediaWiki\Logger\LoggerFactory;
 use MediaWiki\MainConfigNames;
 use MediaWiki\MediaWikiServices;

includes/interwiki/ClassicInterwikiLookup.php

@@ -28,7 +28,7 @@ use MediaWiki\HookContainer\HookRunner;
 use MediaWiki\Language\Language;
 use MediaWiki\MainConfigNames;
 use MediaWiki\WikiMap\WikiMap;
-use WANObjectCache;
+use Wikimedia\ObjectCache\WANObjectCache;
 use Wikimedia\Rdbms\IConnectionProvider;
 
 /**

includes/jobqueue/JobQueue.php

@@ -21,6 +21,7 @@
 use Liuggio\StatsdClient\Factory\StatsdDataFactoryInterface;
 use MediaWiki\JobQueue\JobFactory;
 use MediaWiki\MediaWikiServices;
+use Wikimedia\ObjectCache\WANObjectCache;
 use Wikimedia\RequestTimeout\TimeoutException;
 use Wikimedia\UUID\GlobalIdGenerator;
 

includes/jobqueue/JobQueueGroup.php

@@ -21,6 +21,7 @@
 use MediaWiki\Deferred\DeferredUpdates;
 use MediaWiki\Deferred\JobQueueEnqueueUpdate;
 use MediaWiki\MediaWikiServices;
+use Wikimedia\ObjectCache\WANObjectCache;
 use Wikimedia\Rdbms\ReadOnlyMode;
 use Wikimedia\UUID\GlobalIdGenerator;
 

includes/jobqueue/JobQueueGroupFactory.php

@@ -26,7 +26,7 @@ use LogicException;
 use MediaWiki\Config\ServiceOptions;
 use MediaWiki\MainConfigNames;
 use MediaWiki\WikiMap\WikiMap;
-use WANObjectCache;
+use Wikimedia\ObjectCache\WANObjectCache;
 use Wikimedia\Rdbms\ReadOnlyMode;
 use Wikimedia\UUID\GlobalIdGenerator;
 

includes/jobqueue/JobQueueMemory.php

@@ -19,6 +19,7 @@
  */
 
 use Wikimedia\ObjectCache\HashBagOStuff;
+use Wikimedia\ObjectCache\WANObjectCache;
 
 /**
  * PHP memory-backed job queue storage, for testing.

includes/language/MessageCache.php

@@ -19,12 +19,14 @@
  */
 
 use MediaWiki\Config\ServiceOptions;
+use MediaWiki\Content\Content;
 use MediaWiki\Context\RequestContext;
 use MediaWiki\Deferred\DeferredUpdates;
 use MediaWiki\Deferred\MessageCacheUpdate;
 use MediaWiki\HookContainer\HookContainer;
 use MediaWiki\HookContainer\HookRunner;
 use MediaWiki\Language\ILanguageConverter;
+use MediaWiki\Language\Language;
 use MediaWiki\Languages\LanguageConverterFactory;
 use MediaWiki\Languages\LanguageFactory;
 use MediaWiki\Languages\LanguageFallback;
@@ -46,6 +48,7 @@ use Psr\Log\LoggerInterface;
 use Wikimedia\LightweightObjectStore\ExpirationAwareness;
 use Wikimedia\ObjectCache\BagOStuff;
 use Wikimedia\ObjectCache\EmptyBagOStuff;
+use Wikimedia\ObjectCache\WANObjectCache;
 use Wikimedia\Rdbms\Database;
 use Wikimedia\Rdbms\IDBAccessObject;
 use Wikimedia\Rdbms\IExpression;

includes/libs/filebackend/FileBackendStore.php

@@ -26,6 +26,7 @@ use Wikimedia\AtEase\AtEase;
 use Wikimedia\FileBackend\FileBackend;
 use Wikimedia\ObjectCache\BagOStuff;
 use Wikimedia\ObjectCache\EmptyBagOStuff;
+use Wikimedia\ObjectCache\WANObjectCache;
 use Wikimedia\Timestamp\ConvertibleTimestamp;
 
 /**

includes/libs/filebackend/SwiftFileBackend.php

@@ -30,6 +30,7 @@ use Wikimedia\FileBackend\FileBackend;
 use Wikimedia\Http\MultiHttpClient;
 use Wikimedia\ObjectCache\BagOStuff;
 use Wikimedia\ObjectCache\EmptyBagOStuff;
+use Wikimedia\ObjectCache\WANObjectCache;
 use Wikimedia\RequestTimeout\TimeoutException;
 
 /**

includes/libs/objectcache/MediumSpecificBagOStuff.php

@@ -21,8 +21,8 @@ namespace Wikimedia\ObjectCache;
 
 use InvalidArgumentException;
 use JsonSerializable;
-use SerializedValueContainer;
 use stdClass;
+use Wikimedia\ObjectCache\Serialized\SerializedValueContainer;
 use Wikimedia\WaitConditionLoop;
 
 /**

includes/libs/objectcache/WANObjectCache.php

@@ -18,14 +18,20 @@
  * @file
  */
 
+namespace Wikimedia\ObjectCache;
+
+use ArrayIterator;
+use Closure;
+use Exception;
+use IBufferingStatsdDataFactory;
+use MapCacheLRU;
 use Psr\Log\LoggerAwareInterface;
 use Psr\Log\LoggerInterface;
 use Psr\Log\NullLogger;
+use RuntimeException;
+use UnexpectedValueException;
 use Wikimedia\LightweightObjectStore\ExpirationAwareness;
 use Wikimedia\LightweightObjectStore\StorageAwareness;
-use Wikimedia\ObjectCache\BagOStuff;
-use Wikimedia\ObjectCache\EmptyBagOStuff;
-use Wikimedia\ObjectCache\IStoreKeyEncoder;
 use Wikimedia\Stats\StatsFactory;
 
 /**
@@ -3121,3 +3127,6 @@ class WANObjectCache implements
 		}
 	}
 }
+
+/** @deprecated class alias since 1.43 */
+class_alias( WANObjectCache::class, 'WANObjectCache' );

includes/libs/objectcache/serialized/SerializedValueContainer.php

@@ -1,5 +1,9 @@
 <?php
 
+namespace Wikimedia\ObjectCache\Serialized;
+
+use stdClass;
+
 /**
  * Helper class for segmenting large cache values without relying
  * on serializing classes.
@@ -35,3 +39,6 @@ class SerializedValueContainer {
 		);
 	}
 }
+
+/** @deprecated class alias since 1.43 */
+class_alias( SerializedValueContainer::class, 'SerializedValueContainer' );

includes/libs/rdbms/lbfactory/LBFactory.php

@@ -27,9 +27,9 @@ use Psr\Log\LoggerInterface;
 use Psr\Log\NullLogger;
 use RuntimeException;
 use Throwable;
-use WANObjectCache;
 use Wikimedia\ObjectCache\BagOStuff;
 use Wikimedia\ObjectCache\EmptyBagOStuff;
+use Wikimedia\ObjectCache\WANObjectCache;
 use Wikimedia\RequestTimeout\CriticalSectionProvider;
 use Wikimedia\ScopedCallback;
 

includes/libs/rdbms/loadbalancer/LoadBalancer.php

@@ -29,9 +29,9 @@ use Psr\Log\NullLogger;
 use RuntimeException;
 use Throwable;
 use UnexpectedValueException;
-use WANObjectCache;
 use Wikimedia\ObjectCache\BagOStuff;
 use Wikimedia\ObjectCache\EmptyBagOStuff;
+use Wikimedia\ObjectCache\WANObjectCache;
 use Wikimedia\ScopedCallback;
 
 /**

includes/libs/rdbms/loadmonitor/ILoadMonitor.php

@@ -21,8 +21,8 @@ namespace Wikimedia\Rdbms;
 
 use Psr\Log\LoggerAwareInterface;
 use StatsdAwareInterface;
-use WANObjectCache;
 use Wikimedia\ObjectCache\BagOStuff;
+use Wikimedia\ObjectCache\WANObjectCache;
 
 /**
  * Database load monitoring interface

includes/libs/rdbms/loadmonitor/LoadMonitor.php

@@ -24,9 +24,9 @@ use NullStatsdDataFactory;
 use Psr\Log\LoggerInterface;
 use Psr\Log\NullLogger;
 use RuntimeException;
-use WANObjectCache;
 use Wikimedia\ObjectCache\BagOStuff;
 use Wikimedia\ObjectCache\IStoreKeyEncoder;
+use Wikimedia\ObjectCache\WANObjectCache;
 use Wikimedia\Rdbms\Platform\ISQLPlatform;
 use Wikimedia\ScopedCallback;
 

includes/linker/LinkTargetStore.php

@@ -24,8 +24,8 @@ use InvalidArgumentException;
 use MediaWiki\Title\TitleValue;
 use RuntimeException;
 use stdClass;
-use WANObjectCache;
 use Wikimedia\ObjectCache\BagOStuff;
+use Wikimedia\ObjectCache\WANObjectCache;
 use Wikimedia\Rdbms\IConnectionProvider;
 use Wikimedia\Rdbms\IDatabase;
 

includes/parser/Parser.php

@@ -98,9 +98,9 @@ use SectionProfiler;
 use StringUtils;
 use StripState;
 use UnexpectedValueException;
-use WANObjectCache;
 use Wikimedia\Bcp47Code\Bcp47CodeValue;
 use Wikimedia\IPUtils;
+use Wikimedia\ObjectCache\WANObjectCache;
 use Wikimedia\Parsoid\Core\SectionMetadata;
 use Wikimedia\Parsoid\Core\TOCData;
 use Wikimedia\Parsoid\DOM\Comment;

includes/parser/ParserCacheFactory.php

@@ -29,8 +29,8 @@ use MediaWiki\Page\WikiPageFactory;
 use MediaWiki\Title\TitleFactory;
 use ParserCache;
 use Psr\Log\LoggerInterface;
-use WANObjectCache;
 use Wikimedia\ObjectCache\BagOStuff;
+use Wikimedia\ObjectCache\WANObjectCache;
 use Wikimedia\Stats\StatsFactory;
 use Wikimedia\UUID\GlobalIdGenerator;
 

includes/parser/ParserFactory.php

@@ -39,6 +39,7 @@ use MediaWiki\User\UserFactory;
 use MediaWiki\User\UserNameUtils;
 use MediaWiki\Utils\UrlUtils;
 use Psr\Log\LoggerInterface;
+use Wikimedia\ObjectCache\WANObjectCache;
 
 /**
  * @since 1.32

includes/parser/ParserOptions.php

@@ -23,6 +23,7 @@
 
 use MediaWiki\Context\IContextSource;
 use MediaWiki\HookContainer\HookRunner;
+use MediaWiki\Language\Language;
 use MediaWiki\MainConfigNames;
 use MediaWiki\MediaWikiServices;
 use MediaWiki\Parser\Parser;

includes/parser/Preprocessor.php

@@ -22,6 +22,7 @@
  */
 
 use MediaWiki\Parser\Parser;
+use Wikimedia\ObjectCache\WANObjectCache;
 
 /**
  * @ingroup Parser

includes/parser/Preprocessor_Hash.php

@@ -22,6 +22,7 @@
  */
 
 use MediaWiki\Parser\Parser;
+use Wikimedia\ObjectCache\WANObjectCache;
 
 /**
  * Differences from DOM schema:

includes/parser/RevisionOutputCache.php

@@ -31,7 +31,7 @@ use MediaWiki\Revision\RevisionRecord;
 use MediaWiki\Utils\MWTimestamp;
 use ParserOptions;
 use Psr\Log\LoggerInterface;
-use WANObjectCache;
+use Wikimedia\ObjectCache\WANObjectCache;
 use Wikimedia\Stats\StatsFactory;
 use Wikimedia\UUID\GlobalIdGenerator;
 

includes/skins/Skin.php

@@ -44,6 +44,7 @@ use MediaWiki\User\User;
 use MediaWiki\User\UserIdentity;
 use MediaWiki\User\UserIdentityValue;
 use MediaWiki\WikiMap\WikiMap;
+use Wikimedia\ObjectCache\WANObjectCache;
 use Wikimedia\Rdbms\IDBAccessObject;
 
 /**

includes/user/User.php

@@ -59,11 +59,11 @@ use RuntimeException;
 use stdClass;
 use Stringable;
 use UnexpectedValueException;
-use WANObjectCache;
 use Wikimedia\Assert\Assert;
 use Wikimedia\Assert\PreconditionException;
 use Wikimedia\DebugInfo\DebugInfoTrait;
 use Wikimedia\IPUtils;
+use Wikimedia\ObjectCache\WANObjectCache;
 use Wikimedia\Rdbms\Database;
 use Wikimedia\Rdbms\DBAccessObjectUtils;
 use Wikimedia\Rdbms\DBExpectedError;

tests/phpunit/includes/ResourceLoader/MessageBlobStoreTest.php

@@ -7,8 +7,8 @@ use MediaWiki\ResourceLoader\ResourceLoader;
 use MediaWikiCoversValidator;
 use PHPUnit\Framework\TestCase;
 use Psr\Log\NullLogger;
-use WANObjectCache;
 use Wikimedia\ObjectCache\HashBagOStuff;
+use Wikimedia\ObjectCache\WANObjectCache;
 
 /**
  * @group ResourceLoader

tests/phpunit/includes/Revision/RevisionStoreDbTest.php

@@ -36,9 +36,9 @@ use MediaWiki\Utils\MWTimestamp;
 use MediaWikiIntegrationTestCase;
 use PHPUnit\Framework\MockObject\MockObject;
 use StatusValue;
-use WANObjectCache;
 use Wikimedia\Assert\PreconditionException;
 use Wikimedia\ObjectCache\HashBagOStuff;
+use Wikimedia\ObjectCache\WANObjectCache;
 use Wikimedia\Rdbms\Database;
 use Wikimedia\Rdbms\DatabaseDomain;
 use Wikimedia\Rdbms\DatabaseSqlite;

tests/phpunit/includes/SiteStats/SiteStatsTest.php

@@ -2,6 +2,7 @@
 
 use MediaWiki\SiteStats\SiteStats;
 use Wikimedia\ObjectCache\HashBagOStuff;
+use Wikimedia\ObjectCache\WANObjectCache;
 use Wikimedia\Rdbms\Platform\ISQLPlatform;
 
 /**

tests/phpunit/includes/Storage/NameTableStoreTest.php

@@ -7,10 +7,10 @@ use MediaWiki\Storage\NameTableStore;
 use MediaWikiIntegrationTestCase;
 use PHPUnit\Framework\MockObject\MockObject;
 use Psr\Log\NullLogger;
-use WANObjectCache;
 use Wikimedia\ObjectCache\BagOStuff;
 use Wikimedia\ObjectCache\EmptyBagOStuff;
 use Wikimedia\ObjectCache\HashBagOStuff;
+use Wikimedia\ObjectCache\WANObjectCache;
 use Wikimedia\Rdbms\IDatabase;
 use Wikimedia\Rdbms\InsertQueryBuilder;
 use Wikimedia\Rdbms\LoadBalancer;

tests/phpunit/includes/Storage/SqlBlobStoreTest.php

@@ -11,8 +11,8 @@ use MediaWiki\Storage\BlobAccessException;
 use MediaWiki\Storage\SqlBlobStore;
 use MediaWikiIntegrationTestCase;
 use StatusValue;
-use WANObjectCache;
 use Wikimedia\ObjectCache\HashBagOStuff;
+use Wikimedia\ObjectCache\WANObjectCache;
 use Wikimedia\Rdbms\LoadBalancer;
 
 /**

tests/phpunit/includes/cache/LinkCacheTest.php

@@ -7,6 +7,7 @@ use MediaWiki\Title\Title;
 use MediaWiki\Title\TitleValue;
 use Wikimedia\ObjectCache\EmptyBagOStuff;
 use Wikimedia\ObjectCache\HashBagOStuff;
+use Wikimedia\ObjectCache\WANObjectCache;
 use Wikimedia\Rdbms\IDBAccessObject;
 
 /**

tests/phpunit/includes/filerepo/LocalRepoTest.php

@@ -6,6 +6,7 @@ use MediaWiki\Title\Title;
 use MediaWiki\WikiMap\WikiMap;
 use Wikimedia\ObjectCache\EmptyBagOStuff;
 use Wikimedia\ObjectCache\HashBagOStuff;
+use Wikimedia\ObjectCache\WANObjectCache;
 
 /**
  * @group Database

tests/phpunit/includes/filerepo/file/LocalFileTest.php

@@ -13,6 +13,7 @@ use MediaWiki\Title\Title;
 use MediaWiki\User\UserIdentity;
 use MediaWiki\WikiMap\WikiMap;
 use Wikimedia\ObjectCache\HashBagOStuff;
+use Wikimedia\ObjectCache\WANObjectCache;
 use Wikimedia\TestingAccessWrapper;
 
 /**

tests/phpunit/includes/interwiki/ClassicInterwikiLookupTest.php

@@ -4,6 +4,7 @@ use MediaWiki\Config\ServiceOptions;
 use MediaWiki\Interwiki\ClassicInterwikiLookup;
 use MediaWiki\MainConfigNames;
 use MediaWiki\WikiMap\WikiMap;
+use Wikimedia\ObjectCache\WANObjectCache;
 
 /**
  * @covers \MediaWiki\Interwiki\ClassicInterwikiLookup

tests/phpunit/includes/jobqueue/JobQueueTest.php

@@ -3,6 +3,7 @@
 use MediaWiki\MediaWikiServices;
 use MediaWiki\WikiMap\WikiMap;
 use Wikimedia\ObjectCache\HashBagOStuff;
+use Wikimedia\ObjectCache\WANObjectCache;
 
 /**
  * @group JobQueue

tests/phpunit/includes/page/ParserOutputAccessTest.php

@@ -27,6 +27,7 @@ use MediaWiki\Utils\MWTimestamp;
 use Psr\Log\NullLogger;
 use Wikimedia\ObjectCache\EmptyBagOStuff;
 use Wikimedia\ObjectCache\HashBagOStuff;
+use Wikimedia\ObjectCache\WANObjectCache;
 use Wikimedia\Rdbms\ChronologyProtector;
 use Wikimedia\Rdbms\ILBFactory;
 use Wikimedia\Stats\StatsFactory;

tests/phpunit/includes/parser/ParserTest.php

@@ -30,7 +30,7 @@ use MediaWikiIntegrationTestCase;
 use ParserFactory;
 use Psr\Log\NullLogger;
 use ReflectionObject;
-use WANObjectCache;
+use Wikimedia\ObjectCache\WANObjectCache;
 
 /**
  * @covers \MediaWiki\Parser\Parser::__construct

tests/phpunit/includes/parser/PreprocessorTest.php

@@ -8,8 +8,8 @@ use MediaWikiIntegrationTestCase;
 use ParserOptions;
 use Preprocessor;
 use Preprocessor_Hash;
-use WANObjectCache;
 use Wikimedia\ObjectCache\HashBagOStuff;
+use Wikimedia\ObjectCache\WANObjectCache;
 
 /**
  * @covers \Preprocessor

tests/phpunit/includes/parser/RevisionOutputCacheTest.php

@@ -19,9 +19,9 @@ use Psr\Log\LoggerInterface;
 use Psr\Log\LogLevel;
 use Psr\Log\NullLogger;
 use TestLogger;
-use WANObjectCache;
 use Wikimedia\ObjectCache\BagOStuff;
 use Wikimedia\ObjectCache\HashBagOStuff;
+use Wikimedia\ObjectCache\WANObjectCache;
 use Wikimedia\Stats\StatsFactory;
 use Wikimedia\TestingAccessWrapper;
 use Wikimedia\UUID\GlobalIdGenerator;

tests/phpunit/includes/poolcounter/PoolWorkArticleViewOldTest.php

@@ -8,6 +8,7 @@ use MediaWiki\Status\Status;
 use Psr\Log\NullLogger;
 use Wikimedia\ObjectCache\BagOStuff;
 use Wikimedia\ObjectCache\HashBagOStuff;
+use Wikimedia\ObjectCache\WANObjectCache;
 use Wikimedia\Stats\StatsFactory;
 use Wikimedia\UUID\GlobalIdGenerator;
 

tests/phpunit/integration/includes/Permissions/RestrictionStoreTest.php

@@ -15,7 +15,7 @@ use MediaWiki\Permissions\RestrictionStore;
 use MediaWiki\SpecialPage\SpecialPage;
 use MediaWiki\Title\Title;
 use MediaWikiIntegrationTestCase;
-use WANObjectCache;
+use Wikimedia\ObjectCache\WANObjectCache;
 use Wikimedia\Rdbms\IDBAccessObject;
 use Wikimedia\Rdbms\ILoadBalancer;
 use Wikimedia\TestingAccessWrapper;

tests/phpunit/integration/includes/filerepo/LocalAndForeignDBRepoTest.php

@@ -2,6 +2,7 @@
 
 use MediaWiki\WikiMap\WikiMap;
 use Wikimedia\ObjectCache\HashBagOStuff;
+use Wikimedia\ObjectCache\WANObjectCache;
 
 class LocalAndForeignDBRepoTest extends MediaWikiIntegrationTestCase {
 	/**

tests/phpunit/mocks/MockDatabase.php

@@ -4,6 +4,7 @@ namespace MediaWiki\Tests;
 
 use MediaWiki\Logger\LoggerFactory;
 use Wikimedia\ObjectCache\HashBagOStuff;
+use Wikimedia\ObjectCache\WANObjectCache;
 use Wikimedia\Rdbms\Database;
 use Wikimedia\Rdbms\FakeResultWrapper;
 use Wikimedia\Rdbms\IDatabase;
@@ -53,7 +54,7 @@ class MockDatabase extends Database {
 		$this->replicationReporter = new ReplicationReporter(
 			$options['topologyRole'] ?? IDatabase::ROLE_STREAMING_MASTER,
 			$logger,
-			$options['srvCache'] ?? new \WANObjectCache( [
+			$options['srvCache'] ?? new WANObjectCache( [
 				'cache' => new HashBagOStuff(),
 				'logger' => $logger,
 			] )

tests/phpunit/unit/includes/Permissions/RestrictionStoreTest.php

@@ -23,8 +23,8 @@ use ReflectionClass;
 use ReflectionMethod;
 use RuntimeException;
 use UnexpectedValueException;
-use WANObjectCache;
 use Wikimedia\Assert\PreconditionException;
+use Wikimedia\ObjectCache\WANObjectCache;
 use Wikimedia\Rdbms\DeleteQueryBuilder;
 use Wikimedia\Rdbms\FakeResultWrapper;
 use Wikimedia\Rdbms\IDatabase;

tests/phpunit/unit/includes/Rest/Handler/PageHandlerTestTrait.php

@@ -25,7 +25,7 @@ use MediaWiki\Rest\ResponseFactory;
 use MediaWiki\Rest\Router;
 use PHPUnit\Framework\MockObject\MockObject;
 use RepoGroup;
-use WANObjectCache;
+use Wikimedia\ObjectCache\WANObjectCache;
 use Wikimedia\Parsoid\Parsoid;
 
 /**

tests/phpunit/unit/includes/Revision/RevisionStoreFactoryTest.php

@@ -22,8 +22,8 @@ use MediaWikiUnitTestCase;
 use PHPUnit\Framework\MockObject\MockObject;
 use Psr\Log\LoggerInterface;
 use Psr\Log\NullLogger;
-use WANObjectCache;
 use Wikimedia\ObjectCache\HashBagOStuff;
+use Wikimedia\ObjectCache\WANObjectCache;
 use Wikimedia\Rdbms\ILBFactory;
 use Wikimedia\Rdbms\ILoadBalancer;
 use Wikimedia\TestingAccessWrapper;

tests/phpunit/unit/includes/Storage/BlobStoreFactoryTest.php

@@ -9,7 +9,7 @@ use MediaWiki\Storage\BlobStore;
 use MediaWiki\Storage\BlobStoreFactory;
 use MediaWiki\Storage\SqlBlobStore;
 use MediaWikiUnitTestCase;
-use WANObjectCache;
+use Wikimedia\ObjectCache\WANObjectCache;
 use Wikimedia\Rdbms\ILBFactory;
 use Wikimedia\Rdbms\ILoadBalancer;
 use Wikimedia\TestingAccessWrapper;

tests/phpunit/unit/includes/cache/BacklinkCacheFactoryTest.php

@@ -6,6 +6,7 @@ use MediaWiki\Linker\LinksMigration;
 use MediaWiki\Logger\LoggerFactory;
 use MediaWiki\Page\PageReferenceValue;
 use Wikimedia\ObjectCache\EmptyBagOStuff;
+use Wikimedia\ObjectCache\WANObjectCache;
 use Wikimedia\Rdbms\IConnectionProvider;
 
 /**

tests/phpunit/unit/includes/db/MWLBFactoryTest.php

@@ -20,6 +20,7 @@
 
 use MediaWiki\Config\ServiceOptions;
 use Wikimedia\ObjectCache\EmptyBagOStuff;
+use Wikimedia\ObjectCache\WANObjectCache;
 use Wikimedia\Rdbms\ChronologyProtector;
 use Wikimedia\Rdbms\ConfiguredReadOnlyMode;
 use Wikimedia\Rdbms\DatabaseDomain;

tests/phpunit/unit/includes/filebackend/FileBackendGroupTest.php

@@ -7,6 +7,7 @@ use MediaWiki\FileBackend\LockManager\LockManagerGroupFactory;
 use MediaWiki\Tests\Unit\DummyServicesTrait;
 use Wikimedia\ObjectCache\BagOStuff;
 use Wikimedia\ObjectCache\EmptyBagOStuff;
+use Wikimedia\ObjectCache\WANObjectCache;
 
 /**
  * @coversDefaultClass \MediaWiki\FileBackend\FileBackendGroup

tests/phpunit/unit/includes/filebackend/FileBackendGroupTestTrait.php

@@ -9,6 +9,7 @@ use MediaWiki\Output\StreamFile;
 use MediaWiki\Status\Status;
 use Wikimedia\ObjectCache\BagOStuff;
 use Wikimedia\ObjectCache\HashBagOStuff;
+use Wikimedia\ObjectCache\WANObjectCache;
 use Wikimedia\TestingAccessWrapper;
 
 /**

tests/phpunit/unit/includes/jobqueue/JobQueueGroupFactoryTest.php

@@ -4,6 +4,7 @@ use MediaWiki\Config\HashConfig;
 use MediaWiki\Config\ServiceOptions;
 use MediaWiki\JobQueue\JobQueueGroupFactory;
 use MediaWiki\MainConfigNames;
+use Wikimedia\ObjectCache\WANObjectCache;
 use Wikimedia\Rdbms\ReadOnlyMode;
 use Wikimedia\UUID\GlobalIdGenerator;
 

tests/phpunit/unit/includes/libs/objectcache/WANObjectCacheTest.php

@@ -8,14 +8,14 @@ use ArrayIterator;
 use MediaWikiUnitTestCase;
 use Psr\Log\NullLogger;
 use UnexpectedValueException;
-use WANObjectCache;
 use Wikimedia\ObjectCache\BagOStuff;
 use Wikimedia\ObjectCache\EmptyBagOStuff;
 use Wikimedia\ObjectCache\HashBagOStuff;
+use Wikimedia\ObjectCache\WANObjectCache;
 use Wikimedia\TestingAccessWrapper;
 
 /**
- * @covers \WANObjectCache
+ * @covers \Wikimedia\ObjectCache\WANObjectCache
  */
 class WANObjectCacheTest extends MediaWikiUnitTestCase {
 

tests/phpunit/unit/includes/libs/rdbms/LoadMonitorTest.php

@@ -19,6 +19,7 @@
  */
 
 use Wikimedia\ObjectCache\HashBagOStuff;
+use Wikimedia\ObjectCache\WANObjectCache;
 use Wikimedia\Rdbms\DBUnexpectedError;
 use Wikimedia\Rdbms\FakeResultWrapper;
 use Wikimedia\Rdbms\IDatabase;

tests/phpunit/unit/includes/parser/ParserCacheFactoryTest.php

@@ -13,8 +13,8 @@ use MediaWiki\Title\TitleFactory;
 use MediaWikiUnitTestCase;
 use ParserCache;
 use Psr\Log\NullLogger;
-use WANObjectCache;
 use Wikimedia\ObjectCache\HashBagOStuff;
+use Wikimedia\ObjectCache\WANObjectCache;
 use Wikimedia\Stats\StatsFactory;
 use Wikimedia\UUID\GlobalIdGenerator;
 

tests/phpunit/unit/includes/parser/ParserFactoryTest.php

@@ -25,7 +25,7 @@ use MediaWiki\Utils\UrlUtils;
 use MediaWikiUnitTestCase;
 use ParserFactory;
 use TestLogger;
-use WANObjectCache;
+use Wikimedia\ObjectCache\WANObjectCache;
 use Wikimedia\TestingAccessWrapper;
 
 /**