tonyair/silverstripe-framework
1
0
Fork 0
mirror of https://github.com/silverstripe/silverstripe-framework synced 2024-10-22 14:05:37 +02:00
Code Issues Projects Releases Wiki Activity

Merge pull request #5903 from dhensby/pulls/3.2/fix-bad-arraylist-sort

Browse Source 
FIX ArrayList sorting now caseinsensitive
This commit is contained in:
Loz Calver 2016-08-22 14:27:10 +01:00 committed by GitHub
commit c8f49045dc
2 changed files with 87 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
model/ArrayList.php
View File

@ -430,6 +430,7 @@ class ArrayList extends ViewableData implements SS_List, SS_Filterable, SS_Sorta
// This the main sorting algorithm that supports infinite sorting params // This the main sorting algorithm that supports infinite sorting params
$multisortArgs = array(); $multisortArgs = array();
$values = array(); $values = array();
$firstRun = true;
foreach($columnsToSort as $column => $direction) { foreach($columnsToSort as $column => $direction) {
// The reason these are added to columns is of the references, otherwise when the foreach // The reason these are added to columns is of the references, otherwise when the foreach
// is done, all $values and $direction look the same // is done, all $values and $direction look the same
@ -437,7 +438,7 @@ class ArrayList extends ViewableData implements SS_List, SS_Filterable, SS_Sorta
$sortDirection[$column] = $direction; $sortDirection[$column] = $direction;
// We need to subtract every value into a temporary array for sorting // We need to subtract every value into a temporary array for sorting
foreach($this->items as $index => $item) { foreach($this->items as $index => $item) {
$values[$column][] = $this->extractValue($item, $column); $values[$column][] = strtolower($this->extractValue($item, $column));
} }
// PHP 5.3 requires below arguments to be reference when using array_multisort together // PHP 5.3 requires below arguments to be reference when using array_multisort together
// with call_user_func_array // with call_user_func_array
@ -445,6 +446,10 @@ class ArrayList extends ViewableData implements SS_List, SS_Filterable, SS_Sorta
$multisortArgs[] = &$values[$column]; $multisortArgs[] = &$values[$column];
// First argument is the direction to be sorted, // First argument is the direction to be sorted,
$multisortArgs[] = &$sortDirection[$column]; $multisortArgs[] = &$sortDirection[$column];
if ($firstRun) {
$multisortArgs[] = defined('SORT_NATURAL') ? SORT_NATURAL : SORT_STRING;
}
$firstRun = false;
} }
$multisortArgs[] = &$originalKeys; $multisortArgs[] = &$originalKeys;

93
tests/model/ArrayListTest.php
View File

@ -247,39 +247,108 @@ class ArrayListTest extends SapphireTest {
$list = new ArrayList(array( $list = new ArrayList(array(
array('Name' => 'Steve'), array('Name' => 'Steve'),
(object) array('Name' => 'Bob'), (object) array('Name' => 'Bob'),
array('Name' => 'John') array('Name' => 'John'),
array('Name' => 'bonny'),
)); ));
// Unquoted name // Unquoted name
$list1 = $list->sort('Name'); $list1 = $list->sort('Name');
$this->assertEquals($list1->toArray(), array( $this->assertEquals(array(
(object) array('Name' => 'Bob'), (object) array('Name' => 'Bob'),
array('Name' => 'bonny'),
array('Name' => 'John'), array('Name' => 'John'),
array('Name' => 'Steve') array('Name' => 'Steve'),
)); ), $list1->toArray());
// Quoted name name // Quoted name name
$list2 = $list->sort('"Name"'); $list2 = $list->sort('"Name"');
$this->assertEquals($list2->toArray(), array( $this->assertEquals(array(
(object) array('Name' => 'Bob'), (object) array('Name' => 'Bob'),
array('Name' => 'bonny'),
array('Name' => 'John'), array('Name' => 'John'),
array('Name' => 'Steve') array('Name' => 'Steve'),
)); ), $list2->toArray());
// Array (non-associative) // Array (non-associative)
$list3 = $list->sort(array('"Name"')); $list3 = $list->sort(array('"Name"'));
$this->assertEquals($list3->toArray(), array( $this->assertEquals(array(
(object) array('Name' => 'Bob'), (object) array('Name' => 'Bob'),
array('Name' => 'bonny'),
array('Name' => 'John'), array('Name' => 'John'),
array('Name' => 'Steve') array('Name' => 'Steve'),
)); ), $list3->toArray());
// Check original list isn't altered // Check original list isn't altered
$this->assertEquals($list->toArray(), array( $this->assertEquals(array(
array('Name' => 'Steve'), array('Name' => 'Steve'),
(object) array('Name' => 'Bob'), (object) array('Name' => 'Bob'),
array('Name' => 'John') array('Name' => 'John'),
array('Name' => 'bonny'),
), $list->toArray());
}
public function testNaturalSort() {
//natural sort is only available in 5.4+
if (version_compare(phpversion(), '5.4.0', '<')) {
$this->markTestSkipped();
}
$list = new ArrayList(array(
array('Name' => 'Steve'),
(object) array('Name' => 'Bob'),
array('Name' => 'John'),
array('Name' => 'bonny'),
array('Name' => 'bonny1'),
array('Name' => 'bonny10'),
array('Name' => 'bonny2'),
)); ));
// Unquoted name
$list1 = $list->sort('Name');
$this->assertEquals(array(
(object) array('Name' => 'Bob'),
array('Name' => 'bonny'),
array('Name' => 'bonny1'),
array('Name' => 'bonny2'),
array('Name' => 'bonny10'),
array('Name' => 'John'),
array('Name' => 'Steve'),
), $list1->toArray());
// Quoted name name
$list2 = $list->sort('"Name"');
$this->assertEquals(array(
(object) array('Name' => 'Bob'),
array('Name' => 'bonny'),
array('Name' => 'bonny1'),
array('Name' => 'bonny2'),
array('Name' => 'bonny10'),
array('Name' => 'John'),
array('Name' => 'Steve'),
), $list2->toArray());
// Array (non-associative)
$list3 = $list->sort(array('"Name"'));
$this->assertEquals(array(
(object) array('Name' => 'Bob'),
array('Name' => 'bonny'),
array('Name' => 'bonny1'),
array('Name' => 'bonny2'),
array('Name' => 'bonny10'),
array('Name' => 'John'),
array('Name' => 'Steve'),
), $list3->toArray());
// Check original list isn't altered
$this->assertEquals(array(
array('Name' => 'Steve'),
(object) array('Name' => 'Bob'),
array('Name' => 'John'),
array('Name' => 'bonny'),
array('Name' => 'bonny1'),
array('Name' => 'bonny10'),
array('Name' => 'bonny2'),
), $list->toArray());
} }
public function testSortSimpleASCOrder() { public function testSortSimpleASCOrder() {