colin
/
bookstack
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'bernardo-campos/development' into development

This commit is contained in:
Dan Brown 2025-04-02 15:18:31 +01:00
parent 802f69cf35 1ba0d26fdd
commit 1256320c72
No known key found for this signature in database
GPG Key ID: 46D9F943C24A2EF9
2 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
app/Sorting/SortSetOperationComparisons.php
View File

@ -2,6 +2,7 @@
namespace BookStack\Sorting;
use voku\helper\ASCII;
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
{
return strtolower($a->name) <=> strtolower($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($b->name) <=> strtolower($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

4
tests/Sorting/SortRuleTest.php
View File

@ -198,6 +198,10 @@ class SortRuleTest extends TestCase
$namesToAdd = [
"Beans",
"bread",
"Éclaire",
"egg",
"É😀ire",
"É🫠ire",
"Milk",
"pizza",
"Tomato",