Merge pull request #8308 from kenjis/fix-ArrayHelper-sortValuesByNatural

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

Author: kenjis

system/Helpers/Array/ArrayHelper.php

@@ -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);
         });
     }
 }

tests/system/Helpers/Array/ArrayHelperSortValuesByNaturalTest.php

@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 /**
  * This file is part of CodeIgniter 4 framework.
  *