adulau/cakephp2-php8
1
0
Fork 0
mirror of https://github.com/kamilwylegala/cakephp2-php8.git synced 2025-04-02 23:22:58 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix sort() not working.

Browse source
This commit is contained in:
mark_story 2012-02-19 23:05:38 -05:00
parent 57d50cd018
commit 771efd950e
2 changed files with 10 additions and 32 deletions
lib/Cake
Test/Case/Utility
Set2Test.php
Utility
Set2.php

31
lib/Cake/Test/Case/Utility/Set2Test.php
View file

@ -804,7 +804,6 @@ class Set2Test extends CakeTestCase {
* @return void * @return void
*/ */
public function testSort() { public function testSort() {
$this->markTestIncomplete('Not done, sort() is broken.');
$a = array( $a = array(
0 => array( 0 => array(
'Person' => array('name' => 'Jeff'), 'Person' => array('name' => 'Jeff'),
@ -882,36 +881,6 @@ class Set2Test extends CakeTestCase {
$a = Set2::sort($a, '{n}.Person.name', 'asc'); $a = Set2::sort($a, '{n}.Person.name', 'asc');
$this->assertEquals($a, $b); $this->assertEquals($a, $b);
$a = array(
array(7,6,4),
array(3,4,5),
array(3,2,1),
);
$b = array(
array(3,2,1),
array(3,4,5),
array(7,6,4),
);
$a = Set2::sort($a, '{n}.{n}', 'asc');
$this->assertEquals($a, $b);
$a = array(
array(7,6,4),
array(3,4,5),
array(3,2,array(1,1,1)),
);
$b = array(
array(3,2,array(1,1,1)),
array(3,4,5),
array(7,6,4),
);
$a = Set2::sort($a, '{n}', 'asc');
$this->assertEquals($a, $b);
$a = array( $a = array(
0 => array('Person' => array('name' => 'Jeff')), 0 => array('Person' => array('name' => 'Jeff')),
1 => array('Shirt' => array('color' => 'black')) 1 => array('Shirt' => array('color' => 'black'))

11
lib/Cake/Utility/Set2.php
View file

@ -538,7 +538,16 @@ class Set2 {
if (is_numeric(implode('', $originalKeys))) { if (is_numeric(implode('', $originalKeys))) {
$data = array_values($data); $data = array_values($data);
} }
$result = self::_squash(self::extract($data, $path)); $sortValues = self::extract($data, $path);
$sortCount = count($sortValues);
$dataCount = count($data);
// Make sortValues match the data length, as some keys could be missing
// the sorted value path.
if ($sortCount < $dataCount) {
$sortValues = array_pad($sortValues, $dataCount, null);
}
$result = self::_squash($sortValues);
$keys = self::extract($result, '{n}.id'); $keys = self::extract($result, '{n}.id');
$values = self::extract($result, '{n}.value'); $values = self::extract($result, '{n}.value');