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

3 files changed, 4 insertions, 4 deletions

diff --git a/tests/phpunit/includes/auth/AuthManagerTest.php b/tests/phpunit/includes/auth/AuthManagerTest.php
index b71c99315cfc..f257ca977f22 100644
--- a/tests/phpunit/includes/auth/AuthManagerTest.php
+++ b/tests/phpunit/includes/auth/AuthManagerTest.php
@@ -7,7 +7,6 @@ use DomainException;
 use DummySessionProvider;
 use DynamicPropertyTestHelper;
 use Exception;
-use HashBagOStuff;
 use InvalidArgumentException;
 use Language;
 use LogicException;
@@ -75,6 +74,7 @@ use StatusValue;
 use TestLogger;
 use TestUser;
 use UnexpectedValueException;
+use Wikimedia\ObjectCache\HashBagOStuff;
 use Wikimedia\ObjectFactory\ObjectFactory;
 use Wikimedia\Rdbms\ILoadBalancer;
 use Wikimedia\Rdbms\ReadOnlyMode;
diff --git a/tests/phpunit/includes/auth/ThrottlePreAuthenticationProviderTest.php b/tests/phpunit/includes/auth/ThrottlePreAuthenticationProviderTest.php
index 79a98e6dd815..1ef33658f5cb 100644
--- a/tests/phpunit/includes/auth/ThrottlePreAuthenticationProviderTest.php
+++ b/tests/phpunit/includes/auth/ThrottlePreAuthenticationProviderTest.php
@@ -2,7 +2,6 @@
 
 namespace MediaWiki\Tests\Auth;
 
-use HashBagOStuff;
 use MediaWiki\Auth\AuthenticationResponse;
 use MediaWiki\Auth\ThrottlePreAuthenticationProvider;
 use MediaWiki\Auth\UsernameAuthenticationRequest;
@@ -15,6 +14,7 @@ use Psr\Log\LogLevel;
 use StatusValue;
 use stdClass;
 use TestLogger;
+use Wikimedia\ObjectCache\HashBagOStuff;
 use Wikimedia\TestingAccessWrapper;
 
 /**
diff --git a/tests/phpunit/includes/auth/ThrottlerTest.php b/tests/phpunit/includes/auth/ThrottlerTest.php
index 619551a04c7c..b687319fb60f 100644
--- a/tests/phpunit/includes/auth/ThrottlerTest.php
+++ b/tests/phpunit/includes/auth/ThrottlerTest.php
@@ -2,8 +2,6 @@
 
 namespace MediaWiki\Tests\Auth;
 
-use BagOStuff;
-use HashBagOStuff;
 use InvalidArgumentException;
 use MediaWiki\Auth\Throttler;
 use MediaWiki\MainConfigNames;
@@ -11,6 +9,8 @@ use MediaWikiIntegrationTestCase;
 use Psr\Log\AbstractLogger;
 use Psr\Log\LoggerInterface;
 use Psr\Log\NullLogger;
+use Wikimedia\ObjectCache\BagOStuff;
+use Wikimedia\ObjectCache\HashBagOStuff;
 use Wikimedia\TestingAccessWrapper;
 
 /**