X-Git-Url: https://git.heureux-cyclage.org/?a=blobdiff_plain;f=includes%2Flibs%2FIP.php;h=e9f0258fe65fe25ca5510bd0910595eb1699234d;hb=eb06fb858e8492453ddb66f9b813ef4724decced;hp=8efcd1589b4ff48872e3e1dbb20f78841c11b308;hpb=15f6eff90c305d405fe4331c8a8dc8caa842e5b3;p=lhc%2Fweb%2Fwiklou.git

diff --git a/includes/libs/IP.php b/includes/libs/IP.php
index 8efcd1589b..e9f0258fe6 100644
--- a/includes/libs/IP.php
+++ b/includes/libs/IP.php
@@ -115,19 +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 ) {
-		return self::isValidRange( $ipRange );
-	}
-
 	/**
 	 * Validate an IP range (valid address with a valid CIDR prefix).
 	 * SIIT IPv4-translated addresses are rejected.
@@ -467,7 +454,7 @@ class IP {
 	 * to an integer network and a number of bits
 	 *
 	 * @param string $range IP with CIDR prefix
-	 * @return array(int or string, int)
+	 * @return array [int or string, int]
 	 */
 	public static function parseCIDR( $range ) {
 		if ( self::isIPv6( $range ) ) {
@@ -557,7 +544,7 @@ class IP {
 	 *
 	 * @param string $range
 	 *
-	 * @return array(string, int)
+	 * @return array [string, int]
 	 */
 	private static function parseCIDR6( $range ) {
 		# Explode into <expanded IP,range>
@@ -598,7 +585,7 @@ class IP {
 	 *
 	 * @param string $range
 	 *
-	 * @return array(string, string)
+	 * @return array [string, string]
 	 */
 	private static function parseRange6( $range ) {
 		# Expand any IPv6 IP