Merge "Remove MemcachedClient compat class names"

diff --combined RELEASE-NOTES-1.30
index 6023b13,de4f760..ae16779
--- 1/RELEASE-NOTES-1.30
--- 2/RELEASE-NOTES-1.30
+++ b/RELEASE-NOTES-1.30
@@@ -33,10 -33,6 +33,10 @@@ section)
    use $wgFragmentMode to migrate off it to a modern alternative.
  * $wgExternalInterwikiFragmentMode was introduced to control how fragments in
    sinterwikis going outside of current wiki farm are encoded.
 +* (T120333) Soft-deprecated the use of PHP extension 'mysql' in favor of 'mysqli'.
 +  This PHP extension was deprecated in PHP 5.5 and removed in PHP 7.0. MediaWiki
 +  auto-selects the 'mysqli' driver since MediaWiki 1.22, except if explicitly
 +  requested through the configuration parameter $wgDBservers.
  
  === New features in 1.30 ===
  * (T37247) Output from Parser::parse() will now be wrapped in a div with
@@@ -181,6 -177,8 +181,8 @@@ changes to languages because of Phabric
    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 --combined autoload.php
index 18b7740,ac45cc0..47b78fc
--- 1/autoload.php
--- 2/autoload.php
+++ b/autoload.php
@@@ -364,6 -364,7 +364,6 @@@ $wgAutoloadLocalClasses = 
        'DeleteLogFormatter' => __DIR__ . '/includes/logging/DeleteLogFormatter.php',
        'DeleteOldRevisions' => __DIR__ . '/maintenance/deleteOldRevisions.php',
        'DeleteOrphanedRevisions' => __DIR__ . '/maintenance/deleteOrphanedRevisions.php',
 -      'DeleteRevision' => __DIR__ . '/maintenance/deleteRevision.php',
        'DeleteSelfExternals' => __DIR__ . '/maintenance/deleteSelfExternals.php',
        'DeletedContribsPager' => __DIR__ . '/includes/specials/pagers/DeletedContribsPager.php',
        'DeletedContributionsPage' => __DIR__ . '/includes/specials/SpecialDeletedContributions.php',
@@@ -798,7 -799,6 +798,6 @@@
        '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',
@@@ -963,7 -963,6 +962,6 @@@
        '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',