Merge "Remove IPSet compat classes"

diff --combined RELEASE-NOTES-1.30
index 8638c44,ce190fd..ca771ed
--- 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
@@@ -177,6 -173,8 +177,8 @@@ changes to languages because of Phabric
    any more.
  * CdbReader, CdbWriter, CdbException classes (deprecated in 1.25) were removed.
    The namespaced classes in the Cdb namespace should be used instead.
+ * IPSet class (deprecated in 1.26) was removed. The namespaced IPSet\IPSet
+   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 c17838e,092dbd2..382d988
--- 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',
@@@ -613,7 -614,6 +613,6 @@@
        'ILocalizedException' => __DIR__ . '/includes/exception/LocalizedException.php',
        'IMaintainableDatabase' => __DIR__ . '/includes/libs/rdbms/database/IMaintainableDatabase.php',
        'IP' => __DIR__ . '/includes/libs/IP.php',
-       'IPSet' => __DIR__ . '/includes/compat/IPSetCompat.php',
        'IPTC' => __DIR__ . '/includes/media/IPTC.php',
        'IRCColourfulRCFeedFormatter' => __DIR__ . '/includes/rcfeed/IRCColourfulRCFeedFormatter.php',
        'IcuCollation' => __DIR__ . '/includes/collation/IcuCollation.php',