Remove IPSet compat classes

Deprecated in 1.26, unused in Wikimedia Git.

Change-Id: I7719a204160ddd0ba71a1a5d8f7088f7d552acbd

diff --git a/RELEASE-NOTES-1.30 b/RELEASE-NOTES-1.30
index 2d50abb..ce190fd 100644 (file)
--- a/RELEASE-NOTES-1.30
+++ b/RELEASE-NOTES-1.30
@@ -173,6 +173,8 @@ changes to languages because of Phabricator reports.
   any more.
 * CdbReader, CdbWriter, CdbException classes (deprecated in 1.25) were removed.
   The namespaced classes in the Cdb namespace should be used instead.
   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
 
 == 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 759a501..092dbd2 100644 (file)
--- a/autoload.php
+++ b/autoload.php
@@ -614,7 +614,6 @@ $wgAutoloadLocalClasses = [
        'ILocalizedException' => __DIR__ . '/includes/exception/LocalizedException.php',
        'IMaintainableDatabase' => __DIR__ . '/includes/libs/rdbms/database/IMaintainableDatabase.php',
        'IP' => __DIR__ . '/includes/libs/IP.php',
        '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',
        'IPTC' => __DIR__ . '/includes/media/IPTC.php',
        'IRCColourfulRCFeedFormatter' => __DIR__ . '/includes/rcfeed/IRCColourfulRCFeedFormatter.php',
        'IcuCollation' => __DIR__ . '/includes/collation/IcuCollation.php',

diff --git a/includes/compat/IPSetCompat.php b/includes/compat/IPSetCompat.php
deleted file mode 100644 (file)
index 79c6000..0000000
--- a/includes/compat/IPSetCompat.php
+++ /dev/null
@@ -1,28 +0,0 @@
-<?php
-/**
- * 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
- *
- * @file
- */
-
-/**
- * Backward-compatibility alias for IPSet, which was moved out
- * into an external library and namespaced.
- *
- * @deprecated since 1.26 use IPSet\IPSet directly
- */
-class IPSet extends IPSet\IPSet {
-}