Fix: PHP 8.3 deprecation error for strcmp with a null second argu…

…ment https://datatables.net/forums/discussion/79256
DataTables · Jun 24, 2024 · 00441ce · 00441ce
1 parent e3f951d
commit 00441ce
Show file tree

Hide file tree

Showing 2 changed files with 28 additions and 6 deletions.
diff --git a/Editor/Options.php b/Editor/Options.php
@@ -334,9 +334,20 @@ public function exec($db)
 		// Only sort if there was no SQL order field
 		if (!$this->_order) {
 			usort($out, static function ($a, $b) {
-				return is_numeric($a['label']) && is_numeric($b['label']) ?
-					($a['label'] * 1) - ($b['label'] * 1) :
-					strcmp($a['label'], $b['label']);
+				$aLabel = $a['label'];
+				$bLabel = $b['label'];
+
+				if ($aLabel === null) {
+					$aLabel = '';
+				}
+
+				if ($bLabel === null) {
+					$bLabel = '';
+				}
+
+				return is_numeric($aLabel) && is_numeric($bLabel) ?
+					($aLabel * 1) - ($bLabel * 1) :
+					strcmp($aLabel, $bLabel);
 			});
 		}
 

diff --git a/Editor/SearchBuilderOptions.php b/Editor/SearchBuilderOptions.php
@@ -323,9 +323,20 @@ public function exec($field, $editor, $http, $fields, $leftJoinIn)
 		// Only sort if there was no SQL order field
 		if (!$this->_order) {
 			usort($out, static function ($a, $b) {
-				return is_numeric($a['label']) && is_numeric($b['label']) ?
-					($a['label'] * 1) - ($b['label'] * 1) :
-					strcmp($a['label'], $b['label']);
+				$aLabel = $a['label'];
+				$bLabel = $b['label'];
+
+				if ($aLabel === null) {
+					$aLabel = '';
+				}
+
+				if ($bLabel === null) {
+					$bLabel = '';
+				}
+
+				return is_numeric($aLabel) && is_numeric($bLabel) ?
+					($aLabel * 1) - ($bLabel * 1) :
+					strcmp($aLabel, $bLabel);
 			});
 		}