[php8-compat] Fix issue with returning bool from uasort by using the …

…spaceship operator
civicrm · Jun 4, 2021 · 11d593e · 11d593e
1 parent 94ef389
commit 11d593e
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/CRM/Core/BAO/Dashboard.php b/CRM/Core/BAO/Dashboard.php
@@ -96,7 +96,7 @@ public static function getContactDashlets(): array {
         if (!isset($a['dashboard_contact.weight'])) {
           return 1;
         }
-        return $a['dashboard_contact.weight'] > $b['dashboard_contact.weight'];
+        return $a['dashboard_contact.weight'] <=> $b['dashboard_contact.weight'];
       });
     }
     return Civi::$statics[__CLASS__][__FUNCTION__][$cid] ?? [];

diff --git a/CRM/Utils/Check.php b/CRM/Utils/Check.php
@@ -114,7 +114,7 @@ public static function severitySort($a, $b) {
       return strcmp($a->getName(), $b->getName());
     }
     // The Message constructor guarantees that these will always be integers.
-    return ($aSeverity < $bSeverity);
+    return ($aSeverity <=> $bSeverity);
   }
 
   /**

diff --git a/api/v3/Profile.php b/api/v3/Profile.php
@@ -615,7 +615,7 @@ function _civicrm_api3_buildprofile_submitfields($profileID, $optionsBehaviour,
  * @return bool
  */
 function _civicrm_api3_order_by_weight($a, $b) {
-  return ($b['weight'] ?? 0) < ($a['weight'] ?? 0);
+  return ($b['weight'] ?? 0) < ($a['weight'] ?? 0) ? 1 : -1;
 }
 
 /**