Skip to content

Commit e1b0da9

Browse files
committed
Fixed PHP 8.5 deprecation notice about $array[null].
1 parent e9cb757 commit e1b0da9

1 file changed

Lines changed: 4 additions & 2 deletions

File tree

YaLinqo/Utils.php

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ class Utils
2424
private static $lambdaCache;
2525
/** Map from comparison functions names to sort flags. Used in lambdaToSortFlagsAndOrder. @var array */
2626
private static $compareFunctionToSortFlags = [
27-
null => SORT_REGULAR,
27+
'' => SORT_REGULAR,
2828
'strcmp' => SORT_STRING,
2929
'strcasecmp' => SORT_STRING | SORT_FLAG_CASE,
3030
'strcoll' => SORT_LOCALE_STRING,
@@ -116,11 +116,13 @@ public static function createComparer($closure, $sortOrder, &$isReversed)
116116
*/
117117
public static function lambdaToSortFlagsAndOrder($closure, &$sortOrder)
118118
{
119+
if ($closure === null)
120+
$closure = '';
119121
if ($sortOrder !== SORT_ASC && $sortOrder !== SORT_DESC)
120122
$sortOrder = $sortOrder ? SORT_DESC : SORT_ASC;
121123
if (is_int($closure))
122124
return $closure;
123-
elseif (($closure === null || is_string($closure)) && isset(self::$compareFunctionToSortFlags[$closure]))
125+
elseif (is_string($closure) && isset(self::$compareFunctionToSortFlags[$closure]))
124126
return self::$compareFunctionToSortFlags[$closure];
125127
else
126128
return null;

0 commit comments

Comments
 (0)