Hash::filter() should not exclude 0.0

Refs #10385
cakephp · Mar 10, 2017 · e698891 · e698891
1 parent 8d0e1fa
commit e698891
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 3 deletions.
diff --git a/lib/Cake/Test/Case/Utility/HashTest.php b/lib/Cake/Test/Case/Utility/HashTest.php
@@ -655,8 +655,21 @@ public function testContains() {
  * @return void
  */
 	public function testFilter() {
-		$result = Hash::filter(array('0', false, true, 0, array('one thing', 'I can tell you', 'is you got to be', false)));
+		$result = Hash::filter(array(
-		$expected = array('0', 2 => true, 3 => 0, 4 => array('one thing', 'I can tell you', 'is you got to be'));
+			'0',
+			false,
+			true,
+			0,
+			0.0,
+			array('one thing', 'I can tell you', 'is you got to be', false)
+		));
+		$expected = array(
+			'0',
+			2 => true,
+			3 => 0,
+			4 => 0.0,
+			5 => array('one thing', 'I can tell you', 'is you got to be')
+		);
 		$this->assertSame($expected, $result);
 
 		$result = Hash::filter(array(1, array(false)));

diff --git a/lib/Cake/Utility/Hash.php b/lib/Cake/Utility/Hash.php
@@ -573,7 +573,7 @@ public static function filter(array $data, $callback = array('self', '_filter'))
  * @return bool
  */
 	protected static function _filter($var) {
-		if ($var === 0 || $var === '0' || !empty($var)) {
+		if ($var === 0 || $var === 0.0 || $var === '0' || !empty($var)) {
 			return true;
 		}
 		return false;