Merge "Add another Bengali synonym for HIDDENCAT in MessagesBn.php"

[lhc/web/wiklou.git] / includes / libs / IP.php

diff --git a/includes/libs/IP.php b/includes/libs/IP.php
index 8efcd15..37e0076 100644 (file)
--- a/includes/libs/IP.php
+++ b/includes/libs/IP.php
@@ -125,6 +125,7 @@ class IP {
         * @return bool True if it is valid
         */
        public static function isValidBlock( $ipRange ) {
+               wfDeprecated( __METHOD__, '1.30' );
                return self::isValidRange( $ipRange );
        }
 
@@ -467,7 +468,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 +558,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 +599,7 @@ class IP {
         *
         * @param string $range
         *
-        * @return array(string, string)
+        * @return array [string, string]
         */
        private static function parseRange6( $range ) {
                # Expand any IPv6 IP