Sort Rules: Updated name comparison to not ignore non-ascii chars

Related to #5550 and #5542

diff --git a/app/Sorting/SortSetOperationComparisons.php b/app/Sorting/SortSetOperationComparisons.php
index e506e9a139df5798ab578599c66cbfe74d241022..cb20e1860f76f1a337e7ccc884b1bfee8b068ed7 100644 (file)
--- 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
     {
 {
     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
     {
     }
 
     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): int
     }
 
     public static function nameNumericAsc(Entity $a, Entity $b): int

diff --git a/tests/Sorting/SortRuleTest.php b/tests/Sorting/SortRuleTest.php
index b0f20cba5aee9b13012de796eb549c45717df278..4a9d3a7b33f2365754380b24fd1be9d30189e2b4 100644 (file)
--- a/tests/Sorting/SortRuleTest.php
+++ b/tests/Sorting/SortRuleTest.php
@@ -200,6 +200,8 @@ class SortRuleTest extends TestCase
             "bread",
             "Éclaire",
             "egg",
             "bread",
             "Éclaire",
             "egg",

+            "É😀ire",
+            "É🫠ire",

             "Milk",
             "pizza",
             "Tomato",
             "Milk",
             "pizza",
             "Tomato",