From ea5c76d583c2b6cea29c4a2b5c902ce3dbe3522f Mon Sep 17 00:00:00 2001
From: catch <catch@35733.no-reply.drupal.org>
Date: Wed, 15 Jul 2020 11:11:30 +0100
Subject: [PATCH] Issue #3156882 by alexpott, johnwebdev, adityasingh,
 pfrenssen:
 \Drupal\Core\Render\Element\StatusReport::preRenderGroupRequirements() and
 \Drupal\user\PermissionHandler::sortPermissions() sorts return bools

(cherry picked from commit edea78338bb9262e68a17427c406da823fdd432d)
---
 core/lib/Drupal/Core/Render/Element/StatusReport.php | 2 +-
 core/modules/user/src/PermissionHandler.php          | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/core/lib/Drupal/Core/Render/Element/StatusReport.php b/core/lib/Drupal/Core/Render/Element/StatusReport.php
index 85b12e25ff..3d9313af11 100644
--- a/core/lib/Drupal/Core/Render/Element/StatusReport.php
+++ b/core/lib/Drupal/Core/Render/Element/StatusReport.php
@@ -52,7 +52,7 @@ public static function preRenderGroupRequirements($element) {
     // Order the grouped requirements by a set order.
     $order = array_flip($element['#priorities']);
     uksort($grouped_requirements, function ($a, $b) use ($order) {
-      return $order[$a] > $order[$b];
+      return $order[$a] <=> $order[$b];
     });
 
     $element['#grouped_requirements'] = $grouped_requirements;
diff --git a/core/modules/user/src/PermissionHandler.php b/core/modules/user/src/PermissionHandler.php
index 056c435dff..dd04ab0118 100644
--- a/core/modules/user/src/PermissionHandler.php
+++ b/core/modules/user/src/PermissionHandler.php
@@ -205,10 +205,10 @@ protected function sortPermissions(array $all_permissions = []) {
 
     uasort($all_permissions, function (array $permission_a, array $permission_b) use ($modules) {
       if ($modules[$permission_a['provider']] == $modules[$permission_b['provider']]) {
-        return $permission_a['title'] > $permission_b['title'];
+        return $permission_a['title'] <=> $permission_b['title'];
       }
       else {
-        return $modules[$permission_a['provider']] > $modules[$permission_b['provider']];
+        return $modules[$permission_a['provider']] <=> $modules[$permission_b['provider']];
       }
     });
     return $all_permissions;
-- 
GitLab