Making Set::filter() only operate on arrays.

Also making Set::filter() work properly in a recursive fashion. This matches behavior with other functions in Set. Fixes #1431
cakephp · Jan 10, 2011 · 166c776 · 166c776
1 parent f87ae54
commit 166c776
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 4 deletions.
diff --git a/cake/libs/set.php b/cake/libs/set.php
@@ -61,10 +61,10 @@ public static function merge($arr1, $arr2 = null) {
  * @param boolean $isArray Force to tell $var is an array when $var is empty
  * @return mixed Either filtered array, or true/false when in callback
  */
-	public 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'));
+	public static function filter(array $var) {
+		foreach ($var as $k => $v) {
+			if (is_array($v)) {
+				$var[$k] = Set::filter($v);
 			}
 		}
 		return array_filter($var, array('Set', '_filter'));

diff --git a/cake/tests/cases/libs/set.test.php b/cake/tests/cases/libs/set.test.php
@@ -100,8 +100,15 @@ function testFilter() {
 		$result = Set::filter(array(1, array('empty', false)));
 		$expected = array(1, array('empty'));
 		$this->assertEqual($expected, $result);
+
+		$result = Set::filter(array(1, array('2', false, array(3, null))));
+		$expected = array(1, array('2', 2 => array(3)));
+		$this->assertEqual($expected, $result);
+
+		$this->assertSame(array(), Set::filter(array()));
 	}
 
+
 /**
  * testNumericArrayCheck method
  *