NOW MANAGED ON CODEBERG
Sort Rules: Updated name comparison to not ignore non-ascii chars
Dan Brown1ba0d26fdd1e
diff --git a/app/Sorting/SortSetOperationComparisons.php b/app/Sorting/SortSetOperationComparisons.phpindex e506e9a13..cb20e1860 100644--- a/app/Sorting/SortSetOperationComparisons.php+++ b/app/Sorting/SortSetOperationComparisons.php@@ -14,12 +14,12 @@ class SortSetOperationComparisons{public static function nameAsc(Entity $a, Entity $b): int{- return strtolower(ASCII::to_transliterate($a->name)) <=> strtolower(ASCII::to_transliterate($b->name));+ return strtolower(ASCII::to_transliterate($a->name, null)) <=> strtolower(ASCII::to_transliterate($b->name, null));}public static function nameDesc(Entity $a, Entity $b): int{- return strtolower(ASCII::to_transliterate($b->name)) <=> strtolower(ASCII::to_transliterate($a->name));+ return strtolower(ASCII::to_transliterate($b->name, null)) <=> strtolower(ASCII::to_transliterate($a->name, null));}public static function nameNumericAsc(Entity $a, Entity $b): intdiff --git a/tests/Sorting/SortRuleTest.php b/tests/Sorting/SortRuleTest.phpindex b0f20cba5..4a9d3a7b3 100644--- a/tests/Sorting/SortRuleTest.php+++ b/tests/Sorting/SortRuleTest.php@@ -200,6 +200,8 @@ class SortRuleTest extends TestCase"bread","Éclaire","egg",+ "É😀ire",+ "É🫠ire","Milk","pizza","Tomato",