From: jenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Date: Tue, 22 Aug 2017 15:07:22 +0000 (+0000)
Subject: Merge "Remove IPSet compat classes"
X-Git-Tag: 1.31.0-rc.0~2338
X-Git-Url: https://git.heureux-cyclage.org/?p=lhc%2Fweb%2Fwiklou.git;a=commitdiff_plain;h=5918cef6fe4b1d56f11726e1d2f70046636a3ccc;hp=05fa5fa13aa26ae1ddfa3fd156860f8f8098c423

Merge "Remove IPSet compat classes"
---

diff --git a/RELEASE-NOTES-1.30 b/RELEASE-NOTES-1.30
index 8638c4465d..ca771edfd4 100644
--- a/RELEASE-NOTES-1.30
+++ b/RELEASE-NOTES-1.30
@@ -177,6 +177,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.
+* 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 --git a/autoload.php b/autoload.php
index c17838ecbd..382d98848e 100644
--- a/autoload.php
+++ b/autoload.php
@@ -613,7 +613,6 @@ $wgAutoloadLocalClasses = [
 	'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',
diff --git a/includes/compat/IPSetCompat.php b/includes/compat/IPSetCompat.php
deleted file mode 100644
index 79c600046f..0000000000
--- 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 {
-}