Add namespace to the root classes of ObjectCache

And deprecated aliases for the the no namespaced classes.

ReplicatedBagOStuff that already is deprecated isn't moved.

Bug: T353458
Change-Id: Ie01962517e5b53e59b9721e9996d4f1ea95abb51

31 files changed, 49 insertions, 26 deletions

diff --git a/tests/phpunit/unit/includes/Rest/RestTestTrait.php b/tests/phpunit/unit/includes/Rest/RestTestTrait.php
index 893c75ff53f2..e137221c3061 100644
--- a/tests/phpunit/unit/includes/Rest/RestTestTrait.php
+++ b/tests/phpunit/unit/includes/Rest/RestTestTrait.php
@@ -2,7 +2,6 @@
 
 namespace MediaWiki\Tests\Rest;
 
-use EmptyBagOStuff;
 use MediaWiki\Config\ServiceOptions;
 use MediaWiki\MainConfigNames;
 use MediaWiki\Rest\BasicAccess\StaticBasicAuthorizer;
@@ -15,6 +14,7 @@ use MediaWiki\Rest\Validator\Validator;
 use MediaWiki\Tests\Rest\Handler\SessionHelperTestTrait;
 use MediaWiki\Tests\Unit\Permissions\MockAuthorityTrait;
 use Psr\Container\ContainerInterface;
+use Wikimedia\ObjectCache\EmptyBagOStuff;
 use Wikimedia\ObjectFactory\ObjectFactory;
 
 /**
diff --git a/tests/phpunit/unit/includes/Rest/RouterTest.php b/tests/phpunit/unit/includes/Rest/RouterTest.php
index 683a61e15ba6..e2a4de70b42d 100644
--- a/tests/phpunit/unit/includes/Rest/RouterTest.php
+++ b/tests/phpunit/unit/includes/Rest/RouterTest.php
@@ -3,7 +3,6 @@
 namespace MediaWiki\Tests\Rest;
 
 use GuzzleHttp\Psr7\Uri;
-use HashBagOStuff;
 use MediaWiki\Config\ServiceOptions;
 use MediaWiki\MainConfigNames;
 use MediaWiki\Rest\BasicAccess\StaticBasicAuthorizer;
@@ -28,6 +27,7 @@ use Psr\Log\NullLogger;
 use RuntimeException;
 use Throwable;
 use UDPTransport;
+use Wikimedia\ObjectCache\HashBagOStuff;
 use Wikimedia\ParamValidator\ParamValidator;
 use Wikimedia\Stats\OutputFormats;
 use Wikimedia\Stats\StatsCache;
diff --git a/tests/phpunit/unit/includes/Revision/RevisionStoreFactoryTest.php b/tests/phpunit/unit/includes/Revision/RevisionStoreFactoryTest.php
index fd865aec1326..04136ef54ca1 100644
--- a/tests/phpunit/unit/includes/Revision/RevisionStoreFactoryTest.php
+++ b/tests/phpunit/unit/includes/Revision/RevisionStoreFactoryTest.php
@@ -2,7 +2,6 @@
 
 namespace MediaWiki\Tests\Unit\Revision;
 
-use HashBagOStuff;
 use MediaWiki\CommentStore\CommentStore;
 use MediaWiki\Content\IContentHandlerFactory;
 use MediaWiki\Page\PageStore;
@@ -24,6 +23,7 @@ use PHPUnit\Framework\MockObject\MockObject;
 use Psr\Log\LoggerInterface;
 use Psr\Log\NullLogger;
 use WANObjectCache;
+use Wikimedia\ObjectCache\HashBagOStuff;
 use Wikimedia\Rdbms\ILBFactory;
 use Wikimedia\Rdbms\ILoadBalancer;
 use Wikimedia\TestingAccessWrapper;
diff --git a/tests/phpunit/unit/includes/Settings/Cache/CachedSourceTest.php b/tests/phpunit/unit/includes/Settings/Cache/CachedSourceTest.php
index fdc262ece100..aff3d636547c 100644
--- a/tests/phpunit/unit/includes/Settings/Cache/CachedSourceTest.php
+++ b/tests/phpunit/unit/includes/Settings/Cache/CachedSourceTest.php
@@ -2,11 +2,11 @@
 
 namespace MediaWiki\Tests\Unit\Settings\Cache;
 
-use HashBagOStuff;
 use MediaWiki\Settings\Cache\CacheableSource;
 use MediaWiki\Settings\Cache\CachedSource;
 use MediaWiki\Settings\SettingsBuilderException;
 use PHPUnit\Framework\TestCase;
+use Wikimedia\ObjectCache\HashBagOStuff;
 
 /**
  * @covers \MediaWiki\Settings\Cache\CachedSource
diff --git a/tests/phpunit/unit/includes/Settings/SettingsBuilderTest.php b/tests/phpunit/unit/includes/Settings/SettingsBuilderTest.php
index d5d92e5265e8..25cf4a01336e 100644
--- a/tests/phpunit/unit/includes/Settings/SettingsBuilderTest.php
+++ b/tests/phpunit/unit/includes/Settings/SettingsBuilderTest.php
@@ -2,7 +2,6 @@
 
 namespace MediaWiki\Tests\Unit\Settings;
 
-use BagOStuff;
 use ExtensionRegistry;
 use InvalidArgumentException;
 use MediaWiki\MainConfigNames;
@@ -15,6 +14,7 @@ use MediaWiki\Settings\Config\PhpIniSink;
 use MediaWiki\Settings\SettingsBuilder;
 use MediaWiki\Settings\SettingsBuilderException;
 use PHPUnit\Framework\TestCase;
+use Wikimedia\ObjectCache\BagOStuff;
 
 /**
  * @covers \MediaWiki\Settings\SettingsBuilder
diff --git a/tests/phpunit/unit/includes/Storage/EditResultCacheTest.php b/tests/phpunit/unit/includes/Storage/EditResultCacheTest.php
index bb1ef51fd1f5..e915bb8e7a61 100644
--- a/tests/phpunit/unit/includes/Storage/EditResultCacheTest.php
+++ b/tests/phpunit/unit/includes/Storage/EditResultCacheTest.php
@@ -2,13 +2,13 @@
 
 namespace MediaWiki\Tests\Storage;
 
-use BagOStuff;
 use MediaWiki\Config\ServiceOptions;
 use MediaWiki\Json\FormatJson;
 use MediaWiki\MainConfigNames;
 use MediaWiki\Storage\EditResult;
 use MediaWiki\Storage\EditResultCache;
 use MediaWikiUnitTestCase;
+use Wikimedia\ObjectCache\BagOStuff;
 use Wikimedia\Rdbms\IConnectionProvider;
 use Wikimedia\Rdbms\IDatabase;
 use Wikimedia\Rdbms\SelectQueryBuilder;
diff --git a/tests/phpunit/unit/includes/StubObject/DeprecatedGlobalTest.php b/tests/phpunit/unit/includes/StubObject/DeprecatedGlobalTest.php
index 8b54cdc11f2d..dd6b925783ad 100644
--- a/tests/phpunit/unit/includes/StubObject/DeprecatedGlobalTest.php
+++ b/tests/phpunit/unit/includes/StubObject/DeprecatedGlobalTest.php
@@ -19,6 +19,7 @@
  */
 
 use MediaWiki\StubObject\DeprecatedGlobal;
+use Wikimedia\ObjectCache\HashBagOStuff;
 
 /**
  * @covers \MediaWiki\StubObject\DeprecatedGlobal
diff --git a/tests/phpunit/unit/includes/cache/BacklinkCacheFactoryTest.php b/tests/phpunit/unit/includes/cache/BacklinkCacheFactoryTest.php
index 69377d8ab123..2736a20556f6 100644
--- a/tests/phpunit/unit/includes/cache/BacklinkCacheFactoryTest.php
+++ b/tests/phpunit/unit/includes/cache/BacklinkCacheFactoryTest.php
@@ -4,6 +4,7 @@ use MediaWiki\Cache\BacklinkCacheFactory;
 use MediaWiki\Config\ServiceOptions;
 use MediaWiki\Linker\LinksMigration;
 use MediaWiki\Page\PageReferenceValue;
+use Wikimedia\ObjectCache\EmptyBagOStuff;
 use Wikimedia\Rdbms\IConnectionProvider;
 
 /**
diff --git a/tests/phpunit/unit/includes/config/EtcdConfigTest.php b/tests/phpunit/unit/includes/config/EtcdConfigTest.php
index 841d3f838c85..baf602506c5b 100644
--- a/tests/phpunit/unit/includes/config/EtcdConfigTest.php
+++ b/tests/phpunit/unit/includes/config/EtcdConfigTest.php
@@ -3,6 +3,7 @@
 use MediaWiki\Config\ConfigException;
 use MediaWiki\Config\EtcdConfig;
 use Wikimedia\Http\MultiHttpClient;
+use Wikimedia\ObjectCache\HashBagOStuff;
 use Wikimedia\TestingAccessWrapper;
 
 /**
diff --git a/tests/phpunit/unit/includes/db/MWLBFactoryTest.php b/tests/phpunit/unit/includes/db/MWLBFactoryTest.php
index 16a97d3ade82..8c07e647392d 100644
--- a/tests/phpunit/unit/includes/db/MWLBFactoryTest.php
+++ b/tests/phpunit/unit/includes/db/MWLBFactoryTest.php
@@ -19,6 +19,7 @@
  */
 
 use MediaWiki\Config\ServiceOptions;
+use Wikimedia\ObjectCache\EmptyBagOStuff;
 use Wikimedia\Rdbms\ChronologyProtector;
 use Wikimedia\Rdbms\ConfiguredReadOnlyMode;
 use Wikimedia\Rdbms\DatabaseDomain;
diff --git a/tests/phpunit/unit/includes/edit/SimpleParsoidOutputStashTest.php b/tests/phpunit/unit/includes/edit/SimpleParsoidOutputStashTest.php
index 3f9b510a8c7a..788418703286 100644
--- a/tests/phpunit/unit/includes/edit/SimpleParsoidOutputStashTest.php
+++ b/tests/phpunit/unit/includes/edit/SimpleParsoidOutputStashTest.php
@@ -2,12 +2,12 @@
 
 namespace MediaWiki\Tests\Unit\Edit;
 
-use HashBagOStuff;
 use MediaWiki\Content\TextContentHandler;
 use MediaWiki\Edit\ParsoidRenderID;
 use MediaWiki\Edit\SelserContext;
 use MediaWiki\Edit\SimpleParsoidOutputStash;
 use MediaWiki\Tests\Unit\DummyServicesTrait;
+use Wikimedia\ObjectCache\HashBagOStuff;
 use Wikimedia\Parsoid\Core\PageBundle;
 use WikitextContent;
 
diff --git a/tests/phpunit/unit/includes/filebackend/FileBackendGroupTest.php b/tests/phpunit/unit/includes/filebackend/FileBackendGroupTest.php
index 034f135dad8d..60a5ff976f6a 100644
--- a/tests/phpunit/unit/includes/filebackend/FileBackendGroupTest.php
+++ b/tests/phpunit/unit/includes/filebackend/FileBackendGroupTest.php
@@ -5,6 +5,8 @@ use MediaWiki\FileBackend\FileBackendGroup;
 use MediaWiki\FileBackend\FSFile\TempFSFileFactory;
 use MediaWiki\FileBackend\LockManager\LockManagerGroupFactory;
 use MediaWiki\Tests\Unit\DummyServicesTrait;
+use Wikimedia\ObjectCache\BagOStuff;
+use Wikimedia\ObjectCache\EmptyBagOStuff;
 
 /**
  * @coversDefaultClass \MediaWiki\FileBackend\FileBackendGroup
diff --git a/tests/phpunit/unit/includes/filebackend/FileBackendGroupTestTrait.php b/tests/phpunit/unit/includes/filebackend/FileBackendGroupTestTrait.php
index 651f372a99ce..ddb01c9c6cfd 100644
--- a/tests/phpunit/unit/includes/filebackend/FileBackendGroupTestTrait.php
+++ b/tests/phpunit/unit/includes/filebackend/FileBackendGroupTestTrait.php
@@ -7,6 +7,8 @@ use MediaWiki\Logger\LoggerFactory;
 use MediaWiki\MainConfigNames;
 use MediaWiki\Output\StreamFile;
 use MediaWiki\Status\Status;
+use Wikimedia\ObjectCache\BagOStuff;
+use Wikimedia\ObjectCache\HashBagOStuff;
 use Wikimedia\TestingAccessWrapper;
 
 /**
diff --git a/tests/phpunit/unit/includes/installer/PingbackTest.php b/tests/phpunit/unit/includes/installer/PingbackTest.php
index 404df12634ac..533cf3a59af0 100644
--- a/tests/phpunit/unit/includes/installer/PingbackTest.php
+++ b/tests/phpunit/unit/includes/installer/PingbackTest.php
@@ -6,6 +6,8 @@ use MediaWiki\Installer\Pingback;
 use MediaWiki\MainConfigNames;
 use MediaWiki\Status\Status;
 use Psr\Log\NullLogger;
+use Wikimedia\ObjectCache\BagOStuff;
+use Wikimedia\ObjectCache\HashBagOStuff;
 use Wikimedia\Rdbms\IConnectionProvider;
 use Wikimedia\Rdbms\IDatabase;
 use Wikimedia\Rdbms\InsertQueryBuilder;
diff --git a/tests/phpunit/unit/includes/libs/WRStats/BagOStuffStatsStoreTest.php b/tests/phpunit/unit/includes/libs/WRStats/BagOStuffStatsStoreTest.php
index eece0ed70de1..85e2db4b0e2f 100644
--- a/tests/phpunit/unit/includes/libs/WRStats/BagOStuffStatsStoreTest.php
+++ b/tests/phpunit/unit/includes/libs/WRStats/BagOStuffStatsStoreTest.php
@@ -2,8 +2,8 @@
 
 namespace Wikimedia\Tests\WRStats;
 
-use HashBagOStuff;
 use PHPUnit\Framework\TestCase;
+use Wikimedia\ObjectCache\HashBagOStuff;
 use Wikimedia\WRStats\BagOStuffStatsStore;
 use Wikimedia\WRStats\EntityKey;
 use Wikimedia\WRStats\GlobalEntityKey;
diff --git a/tests/phpunit/unit/includes/libs/objectcache/CachedBagOStuffTest.php b/tests/phpunit/unit/includes/libs/objectcache/CachedBagOStuffTest.php
index e511b2669ead..c1a8f152cccc 100644
--- a/tests/phpunit/unit/includes/libs/objectcache/CachedBagOStuffTest.php
+++ b/tests/phpunit/unit/includes/libs/objectcache/CachedBagOStuffTest.php
@@ -2,15 +2,15 @@
 
 namespace Wikimedia\Tests\ObjectCache;
 
-use CachedBagOStuff;
-use HashBagOStuff;
 use MediaWikiCoversValidator;
 use PHPUnit\Framework\TestCase;
 use Wikimedia\LightweightObjectStore\StorageAwareness;
+use Wikimedia\ObjectCache\CachedBagOStuff;
+use Wikimedia\ObjectCache\HashBagOStuff;
 use Wikimedia\TestingAccessWrapper;
 
 /**
- * @covers \CachedBagOStuff
+ * @covers \Wikimedia\ObjectCache\CachedBagOStuff
  * @group BagOStuff
  */
 class CachedBagOStuffTest extends TestCase {
diff --git a/tests/phpunit/unit/includes/libs/objectcache/HashBagOStuffTest.php b/tests/phpunit/unit/includes/libs/objectcache/HashBagOStuffTest.php
index f63d11a9010b..a1125d9a3a1f 100644
--- a/tests/phpunit/unit/includes/libs/objectcache/HashBagOStuffTest.php
+++ b/tests/phpunit/unit/includes/libs/objectcache/HashBagOStuffTest.php
@@ -2,14 +2,14 @@
 
 namespace Wikimedia\Tests\ObjectCache;
 
-use BagOStuff;
-use HashBagOStuff;
 use InvalidArgumentException;
 use MediaWikiCoversValidator;
 use NullStatsdDataFactory;
 use PHPUnit\Framework\TestCase;
 use Psr\Log\NullLogger;
 use UDPTransport;
+use Wikimedia\ObjectCache\BagOStuff;
+use Wikimedia\ObjectCache\HashBagOStuff;
 use Wikimedia\Stats\Metrics\MetricInterface;
 use Wikimedia\Stats\OutputFormats;
 use Wikimedia\Stats\StatsCache;
@@ -17,9 +17,9 @@ use Wikimedia\Stats\StatsFactory;
 use Wikimedia\TestingAccessWrapper;
 
 /**
- * @covers \HashBagOStuff
- * @covers \MediumSpecificBagOStuff
- * @covers \BagOStuff
+ * @covers \Wikimedia\ObjectCache\HashBagOStuff
+ * @covers \Wikimedia\ObjectCache\MediumSpecificBagOStuff
+ * @covers \Wikimedia\ObjectCache\BagOStuff
  * @group BagOStuff
  */
 class HashBagOStuffTest extends TestCase {
diff --git a/tests/phpunit/unit/includes/libs/objectcache/ReplicatedBagOStuffTest.php b/tests/phpunit/unit/includes/libs/objectcache/ReplicatedBagOStuffTest.php
index 0ed35f06700f..a353bf37caec 100644
--- a/tests/phpunit/unit/includes/libs/objectcache/ReplicatedBagOStuffTest.php
+++ b/tests/phpunit/unit/includes/libs/objectcache/ReplicatedBagOStuffTest.php
@@ -2,10 +2,10 @@
 
 namespace Wikimedia\Tests\ObjectCache;
 
-use HashBagOStuff;
 use MediaWikiUnitTestCase;
 use ReplicatedBagOStuff;
 use Wikimedia\LightweightObjectStore\StorageAwareness;
+use Wikimedia\ObjectCache\HashBagOStuff;
 use Wikimedia\TestingAccessWrapper;
 
 /**
diff --git a/tests/phpunit/unit/includes/libs/objectcache/WANObjectCacheTest.php b/tests/phpunit/unit/includes/libs/objectcache/WANObjectCacheTest.php
index e247c68b8443..7ea9b8f91014 100644
--- a/tests/phpunit/unit/includes/libs/objectcache/WANObjectCacheTest.php
+++ b/tests/phpunit/unit/includes/libs/objectcache/WANObjectCacheTest.php
@@ -5,13 +5,13 @@
 namespace Wikimedia\Tests\ObjectCache;
 
 use ArrayIterator;
-use BagOStuff;
-use EmptyBagOStuff;
-use HashBagOStuff;
 use MediaWikiUnitTestCase;
 use Psr\Log\NullLogger;
 use UnexpectedValueException;
 use WANObjectCache;
+use Wikimedia\ObjectCache\BagOStuff;
+use Wikimedia\ObjectCache\EmptyBagOStuff;
+use Wikimedia\ObjectCache\HashBagOStuff;
 use Wikimedia\TestingAccessWrapper;
 
 /**
diff --git a/tests/phpunit/unit/includes/libs/rdbms/ChronologyProtectorTest.php b/tests/phpunit/unit/includes/libs/rdbms/ChronologyProtectorTest.php
index cba38252ac50..3f3f13f90b1d 100644
--- a/tests/phpunit/unit/includes/libs/rdbms/ChronologyProtectorTest.php
+++ b/tests/phpunit/unit/includes/libs/rdbms/ChronologyProtectorTest.php
@@ -22,6 +22,7 @@
  */
 
 use PHPUnit\Framework\TestCase;
+use Wikimedia\ObjectCache\HashBagOStuff;
 use Wikimedia\Rdbms\ChronologyProtector;
 use Wikimedia\Rdbms\ILoadBalancer;
 use Wikimedia\Rdbms\MySQLPrimaryPos;
diff --git a/tests/phpunit/unit/includes/libs/rdbms/LoadMonitorTest.php b/tests/phpunit/unit/includes/libs/rdbms/LoadMonitorTest.php
index 44c15c51bf11..fcc1b12ff36a 100644
--- a/tests/phpunit/unit/includes/libs/rdbms/LoadMonitorTest.php
+++ b/tests/phpunit/unit/includes/libs/rdbms/LoadMonitorTest.php
@@ -18,6 +18,7 @@
  * @file
  */
 
+use Wikimedia\ObjectCache\HashBagOStuff;
 use Wikimedia\Rdbms\DBUnexpectedError;
 use Wikimedia\Rdbms\FakeResultWrapper;
 use Wikimedia\Rdbms\IDatabase;
diff --git a/tests/phpunit/unit/includes/libs/rdbms/database/DatabaseTest.php b/tests/phpunit/unit/includes/libs/rdbms/database/DatabaseTest.php
index 57eec2c1298a..0721bc5dd358 100644
--- a/tests/phpunit/unit/includes/libs/rdbms/database/DatabaseTest.php
+++ b/tests/phpunit/unit/includes/libs/rdbms/database/DatabaseTest.php
@@ -3,7 +3,6 @@
 namespace Wikimedia\Tests\Rdbms;
 
 use DatabaseTestHelper;
-use HashBagOStuff;
 use MediaWiki\Tests\MockDatabase;
 use MediaWiki\Tests\Unit\Libs\Rdbms\AddQuoterMock;
 use MediaWiki\Tests\Unit\Libs\Rdbms\SQLPlatformTestHelper;
@@ -12,6 +11,7 @@ use PHPUnit\Framework\TestCase;
 use Psr\Log\NullLogger;
 use RuntimeException;
 use Throwable;
+use Wikimedia\ObjectCache\HashBagOStuff;
 use Wikimedia\Rdbms\Database;
 use Wikimedia\Rdbms\Database\DatabaseFlags;
 use Wikimedia\Rdbms\DatabaseDomain;
diff --git a/tests/phpunit/unit/includes/objectcache/MemcachedBagOStuffTest.php b/tests/phpunit/unit/includes/objectcache/MemcachedBagOStuffTest.php
index 0dbb3980f634..fbcf9b8195a1 100644
--- a/tests/phpunit/unit/includes/objectcache/MemcachedBagOStuffTest.php
+++ b/tests/phpunit/unit/includes/objectcache/MemcachedBagOStuffTest.php
@@ -1,6 +1,10 @@
 <?php
+
+use Wikimedia\ObjectCache\MemcachedBagOStuff;
+use Wikimedia\ObjectCache\MemcachedPhpBagOStuff;
+
 /**
- * @covers \MemcachedBagOStuff
+ * @covers \Wikimedia\ObjectCache\MemcachedBagOStuff
  * @group BagOStuff
  */
 class MemcachedBagOStuffTest extends \MediaWikiUnitTestCase {
diff --git a/tests/phpunit/unit/includes/objectcache/ObjectCacheFactoryTest.php b/tests/phpunit/unit/includes/objectcache/ObjectCacheFactoryTest.php
index 0e0cc62fe28f..6dd3c34df7a5 100644
--- a/tests/phpunit/unit/includes/objectcache/ObjectCacheFactoryTest.php
+++ b/tests/phpunit/unit/includes/objectcache/ObjectCacheFactoryTest.php
@@ -2,6 +2,7 @@
 
 use MediaWiki\Config\ServiceOptions;
 use MediaWiki\Logger\Spi;
+use Wikimedia\ObjectCache\HashBagOStuff;
 use Wikimedia\Stats\StatsFactory;
 
 /**
diff --git a/tests/phpunit/unit/includes/objectcache/RESTBagOStuffTest.php b/tests/phpunit/unit/includes/objectcache/RESTBagOStuffTest.php
index a20ce3be0036..c4966fee7f42 100644
--- a/tests/phpunit/unit/includes/objectcache/RESTBagOStuffTest.php
+++ b/tests/phpunit/unit/includes/objectcache/RESTBagOStuffTest.php
@@ -1,11 +1,13 @@
 <?php
 
 use Wikimedia\Http\MultiHttpClient;
+use Wikimedia\ObjectCache\BagOStuff;
+use Wikimedia\ObjectCache\RESTBagOStuff;
 
 /**
  * @group BagOStuff
  *
- * @covers \RESTBagOStuff
+ * @covers \Wikimedia\ObjectCache\RESTBagOStuff
  */
 class RESTBagOStuffTest extends \MediaWikiUnitTestCase {
 
diff --git a/tests/phpunit/unit/includes/objectcache/RedisBagOStuffTest.php b/tests/phpunit/unit/includes/objectcache/RedisBagOStuffTest.php
index f5794fc07858..32950ba462b1 100644
--- a/tests/phpunit/unit/includes/objectcache/RedisBagOStuffTest.php
+++ b/tests/phpunit/unit/includes/objectcache/RedisBagOStuffTest.php
@@ -1,9 +1,10 @@
 <?php
 
+use Wikimedia\ObjectCache\RedisBagOStuff;
 use Wikimedia\TestingAccessWrapper;
 
 /**
- * @covers \RedisBagOStuff
+ * @covers \Wikimedia\ObjectCache\RedisBagOStuff
  * @group BagOStuff
  */
 class RedisBagOStuffTest extends MediaWikiUnitTestCase {
diff --git a/tests/phpunit/unit/includes/page/DeletePageTest.php b/tests/phpunit/unit/includes/page/DeletePageTest.php
index 03be5738a298..eeeb662afb3b 100644
--- a/tests/phpunit/unit/includes/page/DeletePageTest.php
+++ b/tests/phpunit/unit/includes/page/DeletePageTest.php
@@ -3,7 +3,6 @@
 namespace MediaWiki\Tests\Unit\Page;
 
 use BadMethodCallException;
-use BagOStuff;
 use Generator;
 use JobQueueGroup;
 use MediaWiki\Cache\BacklinkCacheFactory;
@@ -30,6 +29,7 @@ use MediaWiki\User\UserIdentityValue;
 use MediaWikiUnitTestCase;
 use PHPUnit\Framework\MockObject\MockObject;
 use Wikimedia\Message\ITextFormatter;
+use Wikimedia\ObjectCache\BagOStuff;
 use Wikimedia\Rdbms\IDatabase;
 use Wikimedia\Rdbms\IResultWrapper;
 use Wikimedia\Rdbms\LBFactory;
diff --git a/tests/phpunit/unit/includes/page/File/BadFileLookupTest.php b/tests/phpunit/unit/includes/page/File/BadFileLookupTest.php
index df90174f285c..487eac153ad6 100644
--- a/tests/phpunit/unit/includes/page/File/BadFileLookupTest.php
+++ b/tests/phpunit/unit/includes/page/File/BadFileLookupTest.php
@@ -4,6 +4,7 @@ use MediaWiki\HookContainer\HookContainer;
 use MediaWiki\Page\File\BadFileLookup;
 use MediaWiki\Tests\Unit\DummyServicesTrait;
 use MediaWiki\Title\TitleValue;
+use Wikimedia\ObjectCache\EmptyBagOStuff;
 
 /**
  * @coversDefaultClass \MediaWiki\Page\File\BadFileLookup
diff --git a/tests/phpunit/unit/includes/parser/ParserCacheFactoryTest.php b/tests/phpunit/unit/includes/parser/ParserCacheFactoryTest.php
index ce2ebbbc865e..6d71e93edfab 100644
--- a/tests/phpunit/unit/includes/parser/ParserCacheFactoryTest.php
+++ b/tests/phpunit/unit/includes/parser/ParserCacheFactoryTest.php
@@ -2,7 +2,6 @@
 
 namespace MediaWiki\Tests\Parser;
 
-use HashBagOStuff;
 use MediaWiki\Config\ServiceOptions;
 use MediaWiki\Json\JsonCodec;
 use MediaWiki\MainConfigNames;
@@ -15,6 +14,7 @@ use MediaWikiUnitTestCase;
 use ParserCache;
 use Psr\Log\NullLogger;
 use WANObjectCache;
+use Wikimedia\ObjectCache\HashBagOStuff;
 use Wikimedia\Stats\StatsFactory;
 use Wikimedia\UUID\GlobalIdGenerator;
 
diff --git a/tests/phpunit/unit/includes/watchlist/WatchedItemStoreUnitTest.php b/tests/phpunit/unit/includes/watchlist/WatchedItemStoreUnitTest.php
index f7ce37bb056a..334544632b1c 100644
--- a/tests/phpunit/unit/includes/watchlist/WatchedItemStoreUnitTest.php
+++ b/tests/phpunit/unit/includes/watchlist/WatchedItemStoreUnitTest.php
@@ -20,6 +20,7 @@ use MediaWiki\Watchlist\ActivityUpdateJob;
 use MediaWiki\Watchlist\WatchedItem;
 use MediaWiki\Watchlist\WatchedItemStore;
 use PHPUnit\Framework\MockObject\MockObject;
+use Wikimedia\ObjectCache\HashBagOStuff;
 use Wikimedia\Rdbms\DeleteQueryBuilder;
 use Wikimedia\Rdbms\FakeResultWrapper;
 use Wikimedia\Rdbms\IDatabase;
diff --git a/tests/phpunit/unit/tests/MediaWikiUnitTestCaseTest.php b/tests/phpunit/unit/tests/MediaWikiUnitTestCaseTest.php
index 21c31be0c5f1..4c67293fae01 100644
--- a/tests/phpunit/unit/tests/MediaWikiUnitTestCaseTest.php
+++ b/tests/phpunit/unit/tests/MediaWikiUnitTestCaseTest.php
@@ -1,6 +1,7 @@
 <?php
 
 use MediaWiki\Config\HashConfig;
+use Wikimedia\ObjectCache\HashBagOStuff;
 use Wikimedia\Services\NoSuchServiceException;
 
 /**