Skip to content

refactor: TypeError in strict mode by ArrayHelper::SortValuesByNatural() #8308

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Dec 8, 2023
Merged

refactor: TypeError in strict mode by ArrayHelper::SortValuesByNatural() #8308

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b47d919
fix: TypeError in strict mode
kenjis Dec 8, 2023
29e6f76
test: add `declare(strict_types=1)`
kenjis Dec 8, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 4 additions & 3 deletions system/Helpers/Array/ArrayHelper.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -306,16 +306,17 @@ public static function recursiveCount(array $array, int $counter = 0): int
* Sorts array values in natural order
* If the value is an array, you need to specify the $sortByIndex of the key to sort
*
* @param int|string|null $sortByIndex
* @param list<int|list<int|string>|string> $array
* @param int|string|null $sortByIndex
*/
public static function sortValuesByNatural(array &$array, $sortByIndex = null): bool
{
return usort($array, static function ($currentValue, $nextValue) use ($sortByIndex) {
if ($sortByIndex !== null) {
return strnatcmp($currentValue[$sortByIndex], $nextValue[$sortByIndex]);
return strnatcmp((string) $currentValue[$sortByIndex], (string) $nextValue[$sortByIndex]);
}

return strnatcmp($currentValue, $nextValue);
return strnatcmp((string) $currentValue, (string) $nextValue);
});
}
}
2 changes: 2 additions & 0 deletions tests/system/Helpers/Array/ArrayHelperSortValuesByNaturalTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
<?php

declare(strict_types=1);

/**
* This file is part of CodeIgniter 4 framework.
*
Expand Down