From dc73c916fc4a864ac6c9f15b521931fb884360f2 Mon Sep 17 00:00:00 2001 From: Taufan Aditya Date: Sun, 5 May 2013 09:39:43 +0700 Subject: [PATCH 1/2] Fix unsupported flag in php 5.3.x environment [ArrayHelper::multisort] --- framework/helpers/base/ArrayHelper.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/framework/helpers/base/ArrayHelper.php b/framework/helpers/base/ArrayHelper.php index 8a9a38c..5c94887 100644 --- a/framework/helpers/base/ArrayHelper.php +++ b/framework/helpers/base/ArrayHelper.php @@ -272,7 +272,7 @@ class ArrayHelper foreach ($keys as $i => $key) { $flag = $sortFlag[$i]; $cs = $caseSensitive[$i]; - if (!$cs && ($flag === SORT_STRING || $flag === SORT_NATURAL)) { + if (!$cs && ($flag === SORT_STRING)) { if (defined('SORT_FLAG_CASE')) { $flag = $flag | SORT_FLAG_CASE; $args[] = static::getColumn($array, $key); From cfc958201fb32f089cc5bbec2f5ccdf75f44f7c1 Mon Sep 17 00:00:00 2001 From: Taufan Aditya Date: Sun, 5 May 2013 10:00:59 +0700 Subject: [PATCH 2/2] Remove reference to php 5.4-only constants in arrayhelper --- framework/helpers/base/ArrayHelper.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/framework/helpers/base/ArrayHelper.php b/framework/helpers/base/ArrayHelper.php index 5c94887..5f72fe4 100644 --- a/framework/helpers/base/ArrayHelper.php +++ b/framework/helpers/base/ArrayHelper.php @@ -237,11 +237,11 @@ class ArrayHelper * @param boolean|array $ascending whether to sort in ascending or descending order. When * sorting by multiple keys with different ascending orders, use an array of ascending flags. * @param integer|array $sortFlag the PHP sort flag. Valid values include - * `SORT_REGULAR`, `SORT_NUMERIC`, `SORT_STRING`, `SORT_LOCALE_STRING` and `SORT_NATURAL`. - * and `SORT_STRING | SORT_FLAG_CASE`. Please refer to [PHP manual](http://php.net/manual/en/function.sort.php) + * `SORT_REGULAR`, `SORT_NUMERIC`, `SORT_STRING` and `SORT_LOCALE_STRING`. + * Please refer to [PHP manual](http://php.net/manual/en/function.sort.php) * for more details. When sorting by multiple keys with different sort flags, use an array of sort flags. * @param boolean|array $caseSensitive whether to sort string in case-sensitive manner. This parameter - * is used only when `$sortFlag` is either `SORT_STRING` or `SORT_NATURAL`. + * is used only when `$sortFlag` is `SORT_STRING`. * When sorting by multiple keys with different case sensitivities, use an array of boolean values. * @throws InvalidParamException if the $ascending or $sortFlag parameters do not have * correct number of elements as that of $key.