Merge "IP: Remove unused deprecated ::isValidBlock() method"

diff --git a/RELEASE-NOTES-1.34 b/RELEASE-NOTES-1.34
index 7e10de1..917609b 100644 (file)
--- 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 37e0076..e9f0258 100644 (file)
--- 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.