From: Kunal Mehta <legoktm@member.fsf.org>
Date: Tue, 22 Aug 2017 04:50:31 +0000 (-0700)
Subject: Remove MemcachedClient compat class names
X-Git-Tag: 1.31.0-rc.0~2336^2
X-Git-Url: https://git.heureux-cyclage.org/?p=lhc%2Fweb%2Fwiklou.git;a=commitdiff_plain;h=434ea4f421ef89fdff1d939b6a5d7aaf32a8654b

Remove MemcachedClient compat class names

Deprecated since 1.27, and unused in Wikimedia Git.

Change-Id: I1d73efac2fddb771124bcd31b3d40769e751410c
---

diff --git a/RELEASE-NOTES-1.30 b/RELEASE-NOTES-1.30
index 61bce210e2..de4f760428 100644
--- a/RELEASE-NOTES-1.30
+++ b/RELEASE-NOTES-1.30
@@ -177,6 +177,8 @@ changes to languages because of Phabricator reports.
   should be used instead.
 * RunningStat class (deprecated in 1.27) was removed. The namespaced
   RunningStat\RunningStat should be used instead.
+* MWMemcached and MemCachedClientforWiki classes (deprecated in 1.27) were removed.
+  The MemcachedClient class should be used instead.
 
 == Compatibility ==
 MediaWiki 1.30 requires PHP 5.5.9 or later. There is experimental support for
diff --git a/autoload.php b/autoload.php
index 250d262ef8..ac45cc026f 100644
--- a/autoload.php
+++ b/autoload.php
@@ -799,7 +799,6 @@ $wgAutoloadLocalClasses = [
 	'MWGrants' => __DIR__ . '/includes/MWGrants.php',
 	'MWHttpRequest' => __DIR__ . '/includes/http/MWHttpRequest.php',
 	'MWLBFactory' => __DIR__ . '/includes/db/MWLBFactory.php',
-	'MWMemcached' => __DIR__ . '/includes/compat/MemcachedClientCompat.php',
 	'MWMessagePack' => __DIR__ . '/includes/libs/MWMessagePack.php',
 	'MWNamespace' => __DIR__ . '/includes/MWNamespace.php',
 	'MWOldPassword' => __DIR__ . '/includes/password/MWOldPassword.php',
@@ -964,7 +963,6 @@ $wgAutoloadLocalClasses = [
 	'MediaWiki\\Widget\\TitleInputWidget' => __DIR__ . '/includes/widget/TitleInputWidget.php',
 	'MediaWiki\\Widget\\UserInputWidget' => __DIR__ . '/includes/widget/UserInputWidget.php',
 	'MediaWiki\\Widget\\UsersMultiselectWidget' => __DIR__ . '/includes/widget/UsersMultiselectWidget.php',
-	'MemCachedClientforWiki' => __DIR__ . '/includes/compat/MemcachedClientCompat.php',
 	'MemcLockManager' => __DIR__ . '/includes/libs/lockmanager/MemcLockManager.php',
 	'MemcachedBagOStuff' => __DIR__ . '/includes/libs/objectcache/MemcachedBagOStuff.php',
 	'MemcachedClient' => __DIR__ . '/includes/libs/objectcache/MemcachedClient.php',
diff --git a/includes/compat/MemcachedClientCompat.php b/includes/compat/MemcachedClientCompat.php
deleted file mode 100644
index 23047339cc..0000000000
--- a/includes/compat/MemcachedClientCompat.php
+++ /dev/null
@@ -1,34 +0,0 @@
-<?php
-/**
- * Backward-compatibility alias for MemcachedClient
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License along
- * with this program; if not, write to the Free Software Foundation, Inc.,
- * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- * http://www.gnu.org/copyleft/gpl.html
- *
- * @since 1.27
- * @file
- */
-
-/**
- * @deprecated since 1.27
- */
-class MWMemcached extends MemcachedClient {
-}
-
-/**
- * @deprecated since 1.27
- */
-class MemCachedClientforWiki extends MWMemcached {
-}