From: Aaron Schulz <aschulz@wikimedia.org>
Date: Sun, 25 Oct 2015 18:24:16 +0000 (-0700)
Subject: Update CACHE_MEMCACHED to not used newMemcached
X-Git-Tag: 1.31.0-rc.0~9252^2
X-Git-Url: http://git.cyclocoop.org/%24action?a=commitdiff_plain;h=6344e0b18560309575d606b7e041aa55855a6ed9;p=lhc%2Fweb%2Fwiklou.git

Update CACHE_MEMCACHED to not used newMemcached

* Follow up to 0dd27b1da9e45
* Also removed that method, which is not used by callers

Bug: T116541
Change-Id: Ic6e4e25089de112cfd263fb042d654ee06970859
---

diff --git a/includes/DefaultSettings.php b/includes/DefaultSettings.php
index 04f3f31789..910c121a21 100644
--- a/includes/DefaultSettings.php
+++ b/includes/DefaultSettings.php
@@ -2212,7 +2212,7 @@ $wgObjectCaches = array(
 
 	CACHE_ANYTHING => array( 'factory' => 'ObjectCache::newAnything' ),
 	CACHE_ACCEL => array( 'factory' => 'ObjectCache::newAccelerator' ),
-	CACHE_MEMCACHED => array( 'factory' => 'ObjectCache::newMemcached', 'loggroup' => 'memcached' ),
+	CACHE_MEMCACHED => array( 'class' => 'MemcachedPhpBagOStuff', 'loggroup' => 'memcached' ),
 
 	'db-replicated' => array(
 		'class'       => 'ReplicatedBagOStuff',
diff --git a/includes/objectcache/ObjectCache.php b/includes/objectcache/ObjectCache.php
index f21b797a13..cb783a7efd 100644
--- a/includes/objectcache/ObjectCache.php
+++ b/includes/objectcache/ObjectCache.php
@@ -274,20 +274,6 @@ class ObjectCache {
 		return self::newFromId( $id );
 	}
 
-	/**
-	 * Factory function that creates a memcached client object.
-	 *
-	 * This always uses the PHP client, since the PECL client has a different
-	 * hashing scheme and a different interpretation of the flags bitfield, so
-	 * switching between the two clients randomly would be disastrous.
-	 *
-	 * @param array $params
-	 * @return MemcachedPhpBagOStuff
-	 */
-	public static function newMemcached( $params ) {
-		return new MemcachedPhpBagOStuff( $params );
-	}
-
 	/**
 	 * Create a new cache object of the specified type.
 	 *