From: Derick Alangi <alangiderick@gmail.com>
Date: Wed, 15 May 2019 14:15:03 +0000 (+0100)
Subject: IP: Remove unused deprecated ::isValidBlock() method
X-Git-Tag: 1.34.0-rc.0~1671^2
X-Git-Url: http://git.cyclocoop.org/data/%24self?a=commitdiff_plain;h=0bffecb8ff58f095bbb9f1375628c3fa6871b8c7;p=lhc%2Fweb%2Fwiklou.git

IP: Remove unused deprecated ::isValidBlock() method

This method was deprecated in 1.30 and no longer used in our code
bases.

Usage
=====

https://codesearch.wmflabs.org/search/?q=%5CbisValidBlock%5Cb&i=nope&files=&repos=

Change-Id: I26e11c0d88fe7c82c052c1cf8e0bbc33bd99de70
---

diff --git a/RELEASE-NOTES-1.34 b/RELEASE-NOTES-1.34
index 7e10de1f9c..917609bb3f 100644
--- a/RELEASE-NOTES-1.34
+++ b/RELEASE-NOTES-1.34
@@ -168,6 +168,7 @@ because of Phabricator reports.
 * FileRepoStatus, deprecated in 1.25, has been removed.
 * The LegacyHookPreAuthenticationProvider class, deprecated since its creation
   in 1.27, has been removed.
+* IP::isValidBlock(), deprecated in 1.30, has been removed.
 * …
 
 === Deprecations in 1.34 ===
diff --git a/includes/libs/IP.php b/includes/libs/IP.php
index 37e0076651..e9f0258fe6 100644
--- a/includes/libs/IP.php
+++ b/includes/libs/IP.php
@@ -115,20 +115,6 @@ class IP {
 			|| preg_match( '/^' . RE_IPV6_ADD . '$/', $ip ) );
 	}
 
-	/**
-	 * Validate an IP range (valid address with a valid CIDR prefix).
-	 * SIIT IPv4-translated addresses are rejected.
-	 * @note canonicalize() tries to convert translated addresses to IPv4.
-	 *
-	 * @deprecated since 1.30. Use the equivalent IP::isValidRange().
-	 * @param string $ipRange
-	 * @return bool True if it is valid
-	 */
-	public static function isValidBlock( $ipRange ) {
-		wfDeprecated( __METHOD__, '1.30' );
-		return self::isValidRange( $ipRange );
-	}
-
 	/**
 	 * Validate an IP range (valid address with a valid CIDR prefix).
 	 * SIIT IPv4-translated addresses are rejected.