Fix issue BookStackApp#5542 Sorting by name

diff --git a/app/Sorting/SortSetOperationComparisons.php b/app/Sorting/SortSetOperationComparisons.php
index e3465231573244b4784cd39fe7401943403f8cde..e506e9a139df5798ab578599c66cbfe74d241022 100644 (file)
--- a/app/Sorting/SortSetOperationComparisons.php
+++ b/app/Sorting/SortSetOperationComparisons.php
@@ -2,6 +2,7 @@
 
 namespace BookStack\Sorting;
 
 
 namespace BookStack\Sorting;
 

+use voku\helper\ASCII;

 use BookStack\Entities\Models\Chapter;
 use BookStack\Entities\Models\Entity;
 
 use BookStack\Entities\Models\Chapter;
 use BookStack\Entities\Models\Entity;
 


@@ -13,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($a->name) <=> strtolower($b->name);
+        return strtolower(ASCII::to_transliterate($a->name)) <=>  strtolower(ASCII::to_transliterate($b->name));

     }
 
     public static function nameDesc(Entity $a, Entity $b): int
     {
     }
 
     public static function nameDesc(Entity $a, Entity $b): int
     {

-        return strtolower($b->name) <=> strtolower($a->name);
+        return strtolower(ASCII::to_transliterate($b->name)) <=>  strtolower(ASCII::to_transliterate($a->name));

     }
 
     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 e956f49df4bde7f20d1b5fa18de9952364406b43..b0f20cba5aee9b13012de796eb549c45717df278 100644 (file)
--- a/tests/Sorting/SortRuleTest.php
+++ b/tests/Sorting/SortRuleTest.php
@@ -198,6 +198,8 @@ class SortRuleTest extends TestCase
         $namesToAdd = [
             "Beans",
             "bread",
         $namesToAdd = [
             "Beans",
             "bread",

+            "Éclaire",
+            "egg",

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