From: Aaron Schulz <aschulz@wikimedia.org>
Date: Thu, 1 Aug 2019 20:16:39 +0000 (-0400)
Subject: objectcache: avoid using deprecated phpredis::delete() alias
X-Git-Tag: 1.31.6~10
X-Git-Url: http://git.heureux-cyclage.org/?p=lhc%2Fweb%2Fwiklou.git;a=commitdiff_plain;h=4444ded27b455b51d99ae326e5033ba919e9d002

objectcache: avoid using deprecated phpredis::delete() alias

Bug: T227461
Change-Id: I3ca8bd9160eefff6590228082f030a32d0edb511
(cherry picked from commit f445700ccc6f7f48158ae27d2cd13004675fd431)
---

diff --git a/includes/libs/objectcache/RedisBagOStuff.php b/includes/libs/objectcache/RedisBagOStuff.php
index f720010f41..0276ed2476 100644
--- a/includes/libs/objectcache/RedisBagOStuff.php
+++ b/includes/libs/objectcache/RedisBagOStuff.php
@@ -21,8 +21,9 @@
  */
 
 /**
- * Redis-based caching module for redis server >= 2.6.12
+ * Redis-based caching module for redis server >= 2.6.12 and phpredis >= 2.2.4
  *
+ * @see https://github.com/phpredis/phpredis/blob/d310ed7c8/Changelog.md
  * @note Avoid use of Redis::MULTI transactions for twemproxy support
  *
  * @ingroup Cache
@@ -135,7 +136,7 @@ class RedisBagOStuff extends BagOStuff {
 			return false;
 		}
 		try {
-			$conn->delete( $key );
+			$conn->del( $key );
 			// Return true even if the key didn't exist
 			$result = true;
 		} catch ( RedisException $e ) {