From 6ce20a36c6551e6dcf1c7d3211907e4cc86b39c7 Mon Sep 17 00:00:00 2001
From: Michiel Roos <michiel@maxserv.nl>
Date: Tue, 11 Feb 2014 22:07:13 +0100
Subject: [PATCH] [TASK] Cleanup ArrayUtility::sortArraysByKey()
Replace strtolower and ternary operations with strcasecmp.
Change-Id: Ia962ef879c6ba1d91081db78f74fc577fa67c467
Resolves: #55899
Releases: 6.2
Reviewed-on: https://review.typo3.org/27559
Reviewed-by: Oliver Klee
Reviewed-by: Christian Kuhn
Tested-by: Christian Kuhn
Reviewed-by: Wouter Wolters
Tested-by: Wouter Wolters
---
.../core/Classes/Utility/ArrayUtility.php | 21 +++++--------------
1 file changed, 5 insertions(+), 16 deletions(-)
diff --git a/typo3/sysext/core/Classes/Utility/ArrayUtility.php b/typo3/sysext/core/Classes/Utility/ArrayUtility.php
index 0793768bc6a6..9edc1f6994cb 100644
--- a/typo3/sysext/core/Classes/Utility/ArrayUtility.php
+++ b/typo3/sysext/core/Classes/Utility/ArrayUtility.php
@@ -276,34 +276,23 @@ class ArrayUtility {
*
* @param array $arrays Array of arrays to sort
* @param string $key Key to sort after
- * @param integer $ascending Set to TRUE for ascending order, FALSE for descending order
+ * @param bool $ascending Set to TRUE for ascending order, FALSE for descending order
* @return array Array of sorted arrays
* @throws \RuntimeException
*/
static public function sortArraysByKey(array $arrays, $key, $ascending = TRUE) {
- if (!count($arrays))
+ if (empty($arrays)) {
return $arrays;
-
- $sortResult = uasort($arrays, function($a, $b) use ($key, $ascending) {
+ }
+ $sortResult = uasort($arrays, function (array $a, array $b) use ($key, $ascending) {
if (!isset($a[$key]) || !isset($b[$key])) {
throw new \RuntimeException('The specified sorting key "' . $key . '" is not available in the given array.', 1373727309);
}
- $valueA = strtolower($a[$key]);
- $valueB = strtolower($b[$key]);
- if ($valueA === $valueB) {
- return 0;
- } else {
- if ($ascending) {
- return $valueA > $valueB ? 1 : -1;
- } else {
- return $valueA < $valueB ? 1 : -1;
- }
- }
+ return ($ascending) ? strcasecmp($a[$key], $b[$key]) : strcasecmp($b[$key], $a[$key]);
});
if (!$sortResult) {
throw new \RuntimeException('The function uasort() failed for unknown reasons.', 1373727329);
}
-
return $arrays;
}
--
GitLab