From d964a4cf75fad7d99ed92b2369127dbdf2707ee3 Mon Sep 17 00:00:00 2001 From: Liangent Date: Sat, 25 Jan 2014 05:25:43 +0000 Subject: [PATCH] Fix various docs and version numbers from 84a2f570 Change-Id: I03f7778bc93a255475aa132a09c6da15decd1549 --- includes/Collation.php | 4 ++-- includes/utils/ArrayUtils.php | 18 ++++++++++++------ 2 files changed, 14 insertions(+), 8 deletions(-) diff --git a/includes/Collation.php b/includes/Collation.php index b51256b281..d2a5797f9f 100644 --- a/includes/Collation.php +++ b/includes/Collation.php @@ -514,7 +514,7 @@ class IcuCollation extends Collation { * Do a binary search, and return the index of the largest item that sorts * less than or equal to the target value. * - * @deprecated in 1.22; use ArrayUtils::findLowerBound() instead + * @deprecated in 1.23; use ArrayUtils::findLowerBound() instead * * @param array $valueCallback A function to call to get the value with * a given array index. @@ -528,7 +528,7 @@ class IcuCollation extends Collation { * sorts before all items. */ function findLowerBound( $valueCallback, $valueCount, $comparisonCallback, $target ) { - wfDeprecated( __METHOD__, '1.22' ); + wfDeprecated( __METHOD__, '1.23' ); return ArrayUtils::findLowerBound( $valueCallback, $valueCount, $comparisonCallback, $target ); } diff --git a/includes/utils/ArrayUtils.php b/includes/utils/ArrayUtils.php index 802cdbcf8d..037663c292 100644 --- a/includes/utils/ArrayUtils.php +++ b/includes/utils/ArrayUtils.php @@ -22,6 +22,8 @@ /** * A collection of static methods to play with arrays. + * + * @since 1.21 */ class ArrayUtils { /** @@ -94,13 +96,15 @@ class ArrayUtils { * Do a binary search, and return the index of the largest item that sorts * less than or equal to the target value. * + * @since 1.23 + * * @param array $valueCallback A function to call to get the value with * a given array index. - * @param $valueCount int The number of items accessible via $valueCallback, + * @param int $valueCount The number of items accessible via $valueCallback, * indexed from 0 to $valueCount - 1 - * @param $comparisonCallback array A callback to compare two values, returning + * @param array $comparisonCallback A callback to compare two values, returning * -1, 0 or 1 in the style of strcmp(). - * @param $target string The target value to find. + * @param string $target The target value to find. * * @return int|bool The item index of the lower bound, or false if the target value * sorts before all items. @@ -142,9 +146,11 @@ class ArrayUtils { * * Note: empty arrays are removed. * - * @param $array1 array The array to compare from - * @param $array2 array An array to compare against - * @param ... array More arrays to compare against + * @since 1.23 + * + * @param array $array1 The array to compare from + * @param array $array2 An array to compare against + * @param array ... More arrays to compare against * @return array An array containing all the values from array1 * that are not present in any of the other arrays. */ -- 2.20.1