Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

Fixing Set::filter() not predictably filtering in a recursive fashion…

…. While a minor change in behavior, more predictable and uniform behavior is worth it.

Fixes #1431
  • Loading branch information...
commit b7b18584f79b953dbb2475470b57bede15f814db 1 parent 5c481f1
@markstory markstory authored
Showing with 27 additions and 3 deletions.
  1. +14 −2 cake/libs/set.php
  2. +13 −1 cake/tests/cases/libs/set.test.php
View
16 cake/libs/set.php
@@ -75,10 +75,22 @@ function merge($arr1, $arr2 = null) {
* @static
*/
function filter($var, $isArray = false) {
- if (is_array($var) && (!empty($var) || $isArray)) {
- return array_filter($var, array('Set', 'filter'));
+ foreach ((array)$var as $k => $v) {
+ if (!empty($v) && is_array($v)) {
+ $var[$k] = array_filter($v, array('Set', '_filter'));
+ }
}
+ return array_filter($var, array('Set', '_filter'));
+ }
+/**
+ * Set::filter callback function
+ *
+ * @param array $var Array to filter.
+ * @return boolean
+ * @access protected
+ */
+ function _filter($var) {
if ($var === 0 || $var === '0' || !empty($var)) {
return true;
}
View
14 cake/tests/cases/libs/set.test.php
@@ -90,8 +90,20 @@ function testEnum() {
*/
function testFilter() {
$result = Set::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', false));
+ $expected = array('0', 2 => true, 3 => 0, 4 => array('one thing', 'I can tell you', 'is you got to be'));
$this->assertIdentical($result, $expected);
+
+ $result = Set::filter(array(1, array(false)));
+ $expected = array(1);
+ $this->assertEqual($expected, $result);
+
+ $result = Set::filter(array(1, array(false, false)));
+ $expected = array(1);
+ $this->assertEqual($expected, $result);
+
+ $result = Set::filter(array(1, array('empty', false)));
+ $expected = array(1, array('empty'));
+ $this->assertEqual($expected, $result);
}
/**
* testNumericArrayCheck method
Please sign in to comment.
Something went wrong with that request. Please try again.