From: Aaron Schulz <aschulz@wikimedia.org>
Date: Tue, 26 Mar 2019 22:56:43 +0000 (-0700)
Subject: objectcache: remove redundant merge() definitions
X-Git-Tag: 1.34.0-rc.0~2311^2
X-Git-Url: https://git.cyclocoop.org/%27.WWW_URL.%27admin/?a=commitdiff_plain;h=f00df01316637f44fbb2fefddc8564868af13de6;p=lhc%2Fweb%2Fwiklou.git

objectcache: remove redundant merge() definitions

Change-Id: Ide24dd395b300f8d747b2be307dbbad08f6b221d
---

diff --git a/includes/libs/objectcache/APCBagOStuff.php b/includes/libs/objectcache/APCBagOStuff.php
index 74dcddff02..0d4ca11ed9 100644
--- a/includes/libs/objectcache/APCBagOStuff.php
+++ b/includes/libs/objectcache/APCBagOStuff.php
@@ -120,10 +120,6 @@ class APCBagOStuff extends BagOStuff {
 		return apc_dec( $key . self::KEY_SUFFIX, $value );
 	}
 
-	public function merge( $key, callable $callback, $exptime = 0, $attempts = 10, $flags = 0 ) {
-		return $this->mergeViaCas( $key, $callback, $exptime, $attempts, $flags );
-	}
-
 	protected function serialize( $value ) {
 		if ( !$this->nativeSerialize && !$this->isInteger( $value ) ) {
 			$value = serialize( $value );
diff --git a/includes/libs/objectcache/APCUBagOStuff.php b/includes/libs/objectcache/APCUBagOStuff.php
index 55e940503d..c36a1dc894 100644
--- a/includes/libs/objectcache/APCUBagOStuff.php
+++ b/includes/libs/objectcache/APCUBagOStuff.php
@@ -104,8 +104,4 @@ class APCUBagOStuff extends APCBagOStuff {
 			return false;
 		}
 	}
-
-	public function merge( $key, callable $callback, $exptime = 0, $attempts = 10, $flags = 0 ) {
-		return $this->mergeViaCas( $key, $callback, $exptime, $attempts, $flags );
-	}
 }
diff --git a/includes/libs/objectcache/HashBagOStuff.php b/includes/libs/objectcache/HashBagOStuff.php
index eaea2d15b7..d1f312a6ce 100644
--- a/includes/libs/objectcache/HashBagOStuff.php
+++ b/includes/libs/objectcache/HashBagOStuff.php
@@ -130,10 +130,6 @@ class HashBagOStuff extends BagOStuff {
 		return false;
 	}
 
-	public function merge( $key, callable $callback, $exptime = 0, $attempts = 10, $flags = 0 ) {
-		return $this->mergeViaCas( $key, $callback, $exptime, $attempts, $flags );
-	}
-
 	/**
 	 * Clear all values in cache
 	 */
diff --git a/includes/libs/objectcache/MemcachedBagOStuff.php b/includes/libs/objectcache/MemcachedBagOStuff.php
index 5453862cf2..b0fbecef97 100644
--- a/includes/libs/objectcache/MemcachedBagOStuff.php
+++ b/includes/libs/objectcache/MemcachedBagOStuff.php
@@ -91,10 +91,6 @@ class MemcachedBagOStuff extends BagOStuff {
 		return ( $n !== false && $n !== null ) ? $n : false;
 	}
 
-	public function merge( $key, callable $callback, $exptime = 0, $attempts = 10, $flags = 0 ) {
-		return $this->mergeViaCas( $key, $callback, $exptime, $attempts );
-	}
-
 	public function changeTTL( $key, $exptime = 0, $flags = 0 ) {
 		return $this->client->touch( $this->validateKeyEncoding( $key ),
 			$this->fixExpiry( $exptime ) );
diff --git a/includes/libs/objectcache/RESTBagOStuff.php b/includes/libs/objectcache/RESTBagOStuff.php
index 7e578f96d9..3303692adc 100644
--- a/includes/libs/objectcache/RESTBagOStuff.php
+++ b/includes/libs/objectcache/RESTBagOStuff.php
@@ -164,10 +164,6 @@ class RESTBagOStuff extends BagOStuff {
 		return false;
 	}
 
-	public function merge( $key, callable $callback, $exptime = 0, $attempts = 10, $flags = 0 ) {
-		return $this->mergeViaCas( $key, $callback, $exptime, $attempts, $flags );
-	}
-
 	/**
 	 * Handle storage error
 	 * @param string $msg Error message
diff --git a/includes/libs/objectcache/RedisBagOStuff.php b/includes/libs/objectcache/RedisBagOStuff.php
index f64fe7e780..af90c5c742 100644
--- a/includes/libs/objectcache/RedisBagOStuff.php
+++ b/includes/libs/objectcache/RedisBagOStuff.php
@@ -297,10 +297,6 @@ class RedisBagOStuff extends BagOStuff {
 		return $result;
 	}
 
-	public function merge( $key, callable $callback, $exptime = 0, $attempts = 10, $flags = 0 ) {
-		return $this->mergeViaCas( $key, $callback, $exptime, $attempts );
-	}
-
 	/**
 	 * Non-atomic implementation of incr().
 	 *
diff --git a/includes/libs/objectcache/WinCacheBagOStuff.php b/includes/libs/objectcache/WinCacheBagOStuff.php
index 0ca3e4a5f9..fb64d77f66 100644
--- a/includes/libs/objectcache/WinCacheBagOStuff.php
+++ b/includes/libs/objectcache/WinCacheBagOStuff.php
@@ -93,10 +93,6 @@ class WinCacheBagOStuff extends BagOStuff {
 		return true;
 	}
 
-	public function merge( $key, callable $callback, $exptime = 0, $attempts = 10, $flags = 0 ) {
-		return $this->mergeViaCas( $key, $callback, $exptime, $attempts, $flags );
-	}
-
 	/**
 	 * Construct a cache key.
 	 *