Add namespace to Wikimedia\Redis libs

Bug: T353458
Change-Id: I7a874e1ee1d41a75e34b8a6b6f4d065b5b812c43

10 files changed, 33 insertions, 6 deletions

diff --git a/RELEASE-NOTES-1.43 b/RELEASE-NOTES-1.43
index e0ca1c92b5ec..254cf861bd5a 100644
--- a/RELEASE-NOTES-1.43
+++ b/RELEASE-NOTES-1.43
@@ -690,6 +690,9 @@ because of Phabricator reports.
   - Wikimedia\Rdbms:
     - DBAccessObjectUtils
     - IDBAccessObject
+  - Wikimedia\Redis:
+    - RedisConnectionPool
+    - RedisConnRef
 * MessageCache::get() with $language other than Language or null is
   deprecated and emits deprecation warnings. For high-level access,
   use wfMessage() or RequestContext::msg() instead.
diff --git a/autoload.php b/autoload.php
index 013e97dc35cb..114aef740846 100644
--- a/autoload.php
+++ b/autoload.php
@@ -3557,6 +3557,8 @@ $wgAutoloadLocalClasses = [
 	'Wikimedia\\Rdbms\\TransactionProfiler' => __DIR__ . '/includes/libs/rdbms/TransactionProfiler.php',
 	'Wikimedia\\Rdbms\\UnionQueryBuilder' => __DIR__ . '/includes/libs/rdbms/querybuilder/UnionQueryBuilder.php',
 	'Wikimedia\\Rdbms\\UpdateQueryBuilder' => __DIR__ . '/includes/libs/rdbms/querybuilder/UpdateQueryBuilder.php',
+	'Wikimedia\\Redis\\RedisConnRef' => __DIR__ . '/includes/libs/redis/RedisConnRef.php',
+	'Wikimedia\\Redis\\RedisConnectionPool' => __DIR__ . '/includes/libs/redis/RedisConnectionPool.php',
 	'Wikimedia\\Reflection\\GhostFieldAccessTrait' => __DIR__ . '/includes/libs/GhostFieldAccessTrait.php',
 	'Wikimedia\\StaticArrayWriter' => __DIR__ . '/includes/libs/StaticArrayWriter.php',
 	'Wikimedia\\Stats\\Emitters\\EmitterInterface' => __DIR__ . '/includes/libs/Stats/Emitters/EmitterInterface.php',
diff --git a/includes/jobqueue/JobQueueRedis.php b/includes/jobqueue/JobQueueRedis.php
index b95d03ed21f4..22237da0f0ae 100644
--- a/includes/jobqueue/JobQueueRedis.php
+++ b/includes/jobqueue/JobQueueRedis.php
@@ -21,6 +21,8 @@
 use MediaWiki\Logger\LoggerFactory;
 use MediaWiki\WikiMap\WikiMap;
 use Psr\Log\LoggerInterface;
+use Wikimedia\Redis\RedisConnectionPool;
+use Wikimedia\Redis\RedisConnRef;
 
 /**
  * Redis-backed job queue storage.
diff --git a/includes/libs/lockmanager/RedisLockManager.php b/includes/libs/lockmanager/RedisLockManager.php
index e8a2593664ff..43a73cfeb869 100644
--- a/includes/libs/lockmanager/RedisLockManager.php
+++ b/includes/libs/lockmanager/RedisLockManager.php
@@ -18,6 +18,8 @@
  * @file
  */
 
+use Wikimedia\Redis\RedisConnectionPool;
+
 /**
  * Manage locks using redis servers.
  *
diff --git a/includes/libs/objectcache/RedisBagOStuff.php b/includes/libs/objectcache/RedisBagOStuff.php
index c2cd85bfe1f3..83772bb35acf 100644
--- a/includes/libs/objectcache/RedisBagOStuff.php
+++ b/includes/libs/objectcache/RedisBagOStuff.php
@@ -22,9 +22,9 @@ namespace Wikimedia\ObjectCache;
 use ArrayUtils;
 use Exception;
 use Redis;
-use RedisConnectionPool;
-use RedisConnRef;
 use RedisException;
+use Wikimedia\Redis\RedisConnectionPool;
+use Wikimedia\Redis\RedisConnRef;
 
 /**
  * Store data in Redis.
diff --git a/includes/libs/redis/RedisConnRef.php b/includes/libs/redis/RedisConnRef.php
index e606ce9c2883..dead44b0e936 100644
--- a/includes/libs/redis/RedisConnRef.php
+++ b/includes/libs/redis/RedisConnRef.php
@@ -17,8 +17,13 @@
  *
  * @file
  */
+
+namespace Wikimedia\Redis;
+
 use Psr\Log\LoggerAwareInterface;
 use Psr\Log\LoggerInterface;
+use Redis;
+use RedisException;
 
 /**
  * Helper class to handle automatically marking connections as reusable (via RAII pattern)
@@ -301,3 +306,6 @@ class RedisConnRef implements LoggerAwareInterface {
 		$this->pool->freeConnection( $this->server, $this->conn );
 	}
 }
+
+/** @deprecated class alias since 1.43 */
+class_alias( RedisConnRef::class, 'RedisConnRef' );
diff --git a/includes/libs/redis/RedisConnectionPool.php b/includes/libs/redis/RedisConnectionPool.php
index 4563534ac8d9..495a4e366149 100644
--- a/includes/libs/redis/RedisConnectionPool.php
+++ b/includes/libs/redis/RedisConnectionPool.php
@@ -21,9 +21,16 @@
  * @defgroup Redis Redis
  */
 
+namespace Wikimedia\Redis;
+
+use Exception;
+use InvalidArgumentException;
 use Psr\Log\LoggerAwareInterface;
 use Psr\Log\LoggerInterface;
 use Psr\Log\NullLogger;
+use Redis;
+use RedisException;
+use RuntimeException;
 
 /**
  * Helper class to manage Redis connections.
@@ -416,3 +423,6 @@ class RedisConnectionPool implements LoggerAwareInterface {
 		}
 	}
 }
+
+/** @deprecated class alias since 1.43 */
+class_alias( RedisConnectionPool::class, 'RedisConnectionPool' );
diff --git a/includes/poolcounter/PoolCounterRedis.php b/includes/poolcounter/PoolCounterRedis.php
index c9139caeb332..a27bc0901d1c 100644
--- a/includes/poolcounter/PoolCounterRedis.php
+++ b/includes/poolcounter/PoolCounterRedis.php
@@ -24,9 +24,9 @@ use ArrayUtils;
 use Exception;
 use HashRing;
 use MediaWiki\Status\Status;
-use RedisConnectionPool;
-use RedisConnRef;
 use RedisException;
+use Wikimedia\Redis\RedisConnectionPool;
+use Wikimedia\Redis\RedisConnRef;
 
 /**
  * Version of PoolCounter that uses Redis
diff --git a/includes/recentchanges/RCFeed/RedisPubSubFeedEngine.php b/includes/recentchanges/RCFeed/RedisPubSubFeedEngine.php
index 0074e1437582..fcff676bc162 100644
--- a/includes/recentchanges/RCFeed/RedisPubSubFeedEngine.php
+++ b/includes/recentchanges/RCFeed/RedisPubSubFeedEngine.php
@@ -20,7 +20,7 @@
 
 namespace MediaWiki\RCFeed;
 
-use RedisConnectionPool;
+use Wikimedia\Redis\RedisConnectionPool;
 
 /**
  * Send recent change to a Redis Pub/Sub channel.
diff --git a/maintenance/includes/ForkController.php b/maintenance/includes/ForkController.php
index 0ac402190b71..fb29090114d5 100644
--- a/maintenance/includes/ForkController.php
+++ b/maintenance/includes/ForkController.php
@@ -21,8 +21,8 @@
 namespace MediaWiki\Maintenance;
 
 use MediaWiki\MediaWikiServices;
-use RedisConnectionPool;
 use RuntimeException;
+use Wikimedia\Redis\RedisConnectionPool;
 
 /**
  * Manage forking inside CLI maintenance scripts.