Merge "Addition of a parser test for page= parameter of image inclusion"

[lhc/web/wiklou.git] / includes / Collation.php

diff --git a/includes/Collation.php b/includes/Collation.php
index 88e15b3..071a278 100644 (file)
--- 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.23; use ArrayUtils::findLowerBound() instead
+        * @deprecated since 1.23; use ArrayUtils::findLowerBound() instead
         *
         * @param array $valueCallback A function to call to get the value with
         *     a given array index.
@@ -551,7 +551,7 @@ class IcuCollation extends Collation {
         * This function will return false on older PHPs.
         *
         * @since 1.21
-        * @return string|false
+        * @return string|bool
         */
        static function getICUVersion() {
                return defined( 'INTL_ICU_VERSION' ) ? INTL_ICU_VERSION : false;
@@ -562,7 +562,7 @@ class IcuCollation extends Collation {
         * currently in use, or false when it can't be determined.
         *
         * @since 1.21
-        * @return string|false
+        * @return string|bool
         */
        static function getUnicodeVersionForICU() {
                $icuVersion = IcuCollation::getICUVersion();