refactor(Sharing): Simplify sorting

lib/unstable/Sharing/Permission/SharePermission.php

@@ -59,8 +59,12 @@ public function format(ISharingRegistry $registry, IFactory $l10nFactory): array
 	public static function formatMultiple(ISharingRegistry $registry, IFactory $l10nFactory, array $permissions): array {
 		$permissions = array_map(static fn (SharePermission $permission): array => $permission->format($registry, $l10nFactory), $permissions);
 
-		// First sort by priority and then sort by class name to get a stable order regardless of the DB order
-		usort($permissions, static fn (array $a, array $b): int => 2 * ($b['priority'] <=> $a['priority']) + ($a['class'] <=> $b['class']));
+		usort(
+			$permissions,
+			static fn (array $a, array $b): int
+				=> ($b['priority'] <=> $a['priority'])
+				?: ($a['class'] <=> $b['class']),
+		);
 
 		return $permissions;
 	}

lib/unstable/Sharing/Property/ShareProperty.php

@@ -64,7 +64,12 @@ public static function formatMultiple(ISharingRegistry $registry, IFactory $l10n
 		$properties = array_map(fn (ShareProperty $property): array => $property->format($registry, $l10nFactory, $share), $properties);
 
 		// First sort by priority and then sort by class name to get a stable order regardless of the DB order
-		usort($properties, static fn (array $a, array $b): int => 2 * ($b['priority'] <=> $a['priority']) + ($a['class'] <=> $b['class']));
+		usort(
+			$properties,
+			static fn (array $a, array $b): int
+				=> ($b['priority'] <=> $a['priority'])
+				?: ($a['class'] <=> $b['class']),
+		);
 
 		return $properties;
 	}

lib/unstable/Sharing/Recipient/ShareRecipient.php

@@ -126,8 +126,14 @@ public static function formatMultiple(ISharingRegistry $registry, IFactory $l10n
 			++$recipientDisplayNames[$displayName];
 		}
 
-		// First sort by least amount of disabled permissions, then by instance, then by class and finally by value to get a stable order regardless of the DB order
-		usort($recipients, static fn (ShareRecipient $a, ShareRecipient $b): int => 8 * (count($a->getDisabledPermissions()) <=> count($b->getDisabledPermissions())) + 4 * ($a->instance === null ? -1 : ($a->instance <=> $b->instance)) + 2 * ($a->class <=> $b->class) + ($a->value <=> $b->value));
+		usort(
+			$recipients,
+			static fn (ShareRecipient $a, ShareRecipient $b): int
+				=> (count($a->getDisabledPermissions()) <=> count($b->getDisabledPermissions()))
+				?: ($a->instance === null ? -1 : ($a->instance <=> $b->instance))
+				?: ($a->class <=> $b->class)
+				?: ($a->value <=> $b->value),
+		);
 
 		return array_map(static fn (ShareRecipient $recipient): array => $recipient->format($registry, $l10nFactory, $urlGenerator, $userManager, $recipientDisplayNames[$recipientTypes[$recipient->class]?->getRecipientDisplayName($recipient->value) ?? $recipient->value] === 1), $recipients);
 	}

lib/unstable/Sharing/Share.php

@@ -321,8 +321,13 @@ public function format(ISharingRegistry $registry, IFactory $l10nFactory, IURLGe
 	 * @experimental 35.0.0
 	 */
 	public static function formatMultiple(ISharingRegistry $registry, IFactory $l10nFactory, IURLGenerator $urlGenerator, IUserManager $userManager, ShareAccessContext $accessContext, array $shares): array {
-		// First sort by number of enabled permissions and then sort by share id to get a stable order regardless of the DB order
-		usort($shares, static fn (Share $a, Share $b): int => 2 * (count($b->getEffectiveEnabledPermissions($accessContext)) <=> count($a->getEffectiveEnabledPermissions($accessContext))) + ($a->id <=> $b->id));
+		usort(
+			$shares,
+			static fn (Share $a, Share $b): int
+				=> (count($b->getEffectiveEnabledPermissions($accessContext)) <=> count($a->getEffectiveEnabledPermissions($accessContext)))
+				?: ($a->id <=> $b->id),
+		);
+
 		return array_map(static fn (Share $share): array => $share->format($registry, $l10nFactory, $urlGenerator, $userManager, $accessContext), $shares);
 	}
 }

lib/unstable/Sharing/Source/ShareSource.php

@@ -81,8 +81,12 @@ public static function formatMultiple(ISharingRegistry $registry, IFactory $l10n
 			++$sourceDisplayNames[$displayName];
 		}
 
-		// First sort by class and then sort by value to get a stable order regardless of the DB order
-		usort($sources, static fn (ShareSource $a, ShareSource $b): int => 2 * ($a->class <=> $b->class) + ($a->value <=> $b->value));
+		usort(
+			$sources,
+			static fn (ShareSource $a, ShareSource $b): int
+				=> ($a->class <=> $b->class)
+				?: ($a->value <=> $b->value),
+		);
 
 		return array_map(static fn (ShareSource $source): array => $source->format($registry, $l10nFactory, $sourceDisplayNames[$source->getMetadata($registry)->getDisplayName()] === 1), $sources);
 	}