adulau/cakephp2-php8
1
0
Fork 0
mirror of https://github.com/kamilwylegala/cakephp2-php8.git synced 2025-01-19 02:56:15 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Moving filter() into Set2.

Browse source
This commit is contained in:
mark_story 2012-01-21 22:03:25 -05:00
parent 885d5dfd80
commit 1315e0f1a1
2 changed files with 55 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -512,4 +512,33 @@ class Set2Test extends CakeTestCase {
$this->assertFalse(Set2::contains($a, $b));
}
/**
* testFilter method
*
* @return void
*/
public function testFilter() {
$result = Set2::filter(array('0', false, true, 0, array('one thing', 'I can tell you', 'is you got to be', false)));
$expected = array('0', 2 => true, 3 => 0, 4 => array('one thing', 'I can tell you', 'is you got to be'));
$this->assertSame($expected, $result);
$result = Set2::filter(array(1, array(false)));
$expected = array(1);
$this->assertEquals($expected, $result);
$result = Set2::filter(array(1, array(false, false)));
$expected = array(1);
$this->assertEquals($expected, $result);
$result = Set2::filter(array(1, array('empty', false)));
$expected = array(1, array('empty'));
$this->assertEquals($expected, $result);
$result = Set2::filter(array(1, array('2', false, array(3, null))));
$expected = array(1, array('2', 2 => array(3)));
$this->assertEquals($expected, $result);
$this->assertSame(array(), Set2::filter(array()));
}
}

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

@ -112,8 +112,33 @@ class Set2 {
}
/**
* Recursively filters empty elements out of a route array, excluding '0'.
*
* @param array $data Either an array to filter, or value when in callback
* @return array Filtered array
* @link http://book.cakephp.org/2.0/en/core-utility-libraries/set.html#Set::filter
*/
public static function filter(array $data) {
foreach ($data as $k => $v) {
if (is_array($v)) {
$data[$k] = Set2::filter($v);
}
}
return array_filter($data, array('Set2', '_filter'));
}
/**
* Callback function for filtering.
*
* @param array $var Array to filter.
* @return boolean
*/
protected static function _filter($var) {
if ($var === 0 || $var === '0' || !empty($var)) {
return true;
}
return false;
}
/**