Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

Revert "Fixing Set::filter() not predictably filtering in a recursive

fashion.  While a minor change in behavior, more predictable and uniform
behavior is worth it." Refs #1431

This reverts commit 6e2ffaf.
  • Loading branch information...
commit 4f94b715ecf893e2ce415ba312f4448a05c19a94 1 parent 8754d11
@markstory markstory authored
Showing with 3 additions and 27 deletions.
  1. +2 −14 cake/libs/set.php
  2. +1 −13 cake/tests/cases/libs/set.test.php
View
16 cake/libs/set.php
@@ -68,22 +68,10 @@ function merge($arr1, $arr2 = null) {
* @static
*/
function filter($var, $isArray = false) {
- foreach ((array)$var as $k => $v) {
- if (!empty($v) && is_array($v)) {
- $var[$k] = array_filter($v, array('Set', '_filter'));
- }
+ if (is_array($var) && (!empty($var) || $isArray)) {
+ return array_filter($var, 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
@@ -88,20 +88,8 @@ 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'));
+ $expected = array('0', 2 => true, 3 => 0, 4 => array('one thing', 'I can tell you', 'is you got to be', false));
$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);
}
/**
Please sign in to comment.
Something went wrong with that request. Please try again.