Resolving issue sonata-project/sandbox#89

BacLuc · Dec 14, 2013 · 7f66428 · 7f66428
1 parent adfcd06
commit 7f66428
Show file tree

Hide file tree

Showing 2 changed files with 28 additions and 1 deletion.
diff --git a/Filter/Filter.php b/Filter/Filter.php
@@ -199,7 +199,9 @@ public function isActive()
     {
         $values = $this->getValue();
 
-        return !empty($values['value']);
+        return isset($values['value'])
+            && false !== $values['value']
+            && "" !== $values['value'];
     }
 
     /**

diff --git a/Tests/Filter/FilterTest.php b/Tests/Filter/FilterTest.php
@@ -102,4 +102,29 @@ public function testExceptionOnNonDefinedFieldName()
 
         $filter->getFieldName();
     }
+
+    /**
+     * @dataProvider isActiveData
+     *
+     * @param $expected
+     * @param $value
+     */
+    public function testIsActive($expected, $value)
+    {
+        $filter = new FilterTest_Filter;
+        $filter->setValue($value);
+
+        $this->assertEquals($expected, $filter->isActive());
+    }
+
+    public function isActiveData()
+    {
+        return array(
+            array(false, array()),
+            array(false, array('value' => null)),
+            array(false, array('value' => "")),
+            array(false, array('value' => false)),
+            array(true, array('value' => "active")),
+        );
+    }
 }