Merge branch 'hotfix/fix-filter-bool'

Author: Jens Schulze

src/Model/Product/Filter.php

@@ -43,9 +43,12 @@ public function getFields()
 
     protected function valueToString($value)
     {
-        if (is_numeric($value)) {
+        if (is_int($value) || is_float($value)) {
             return $value;
         }
+        if (is_bool($value)) {
+            return $value ? 'true': 'false';
+        }
         if (is_string($value)) {
             return '"' . $value . '"';
         }
@@ -61,7 +64,7 @@ public function __toString()
         $facet = $this->getName();
         $value = $this->getValue();
         $alias = $this->getAlias();
-        if ($value) {
+        if (!is_null($value)) {
             $facet .= ':' . $this->valueToString($value);
         }
         if ($alias) {

tests/unit/Model/Product/FilterTest.php

@@ -17,6 +17,27 @@ public function testNumeric()
         $this->assertSame('test:10', (string)$filter);
     }
 
+    public function testIntString()
+    {
+        $filter = new Filter();
+        $filter->setName('test')->setValue('10');
+        $this->assertSame('test:"10"', (string)$filter);
+    }
+
+    public function testIntStringArray()
+    {
+        $filter = new Filter('array');
+        $filter->setName('test')->setValue(['1', '2', '3']);
+        $this->assertSame('test:"1","2","3"', (string)$filter);
+    }
+
+    public function testFloatStringArray()
+    {
+        $filter = new Filter('array');
+        $filter->setName('test')->setValue(['1.1', '2.2', '3.3']);
+        $this->assertSame('test:"1.1","2.2","3.3"', (string)$filter);
+    }
+
     public function testDefaultType()
     {
         $filter = new Filter();
@@ -38,13 +59,20 @@ public function testString()
         $this->assertSame('test:"key" as foo', (string)$filter);
     }
 
-    public function testArray()
+    public function testIntArray()
     {
         $filter = new Filter('array');
-        $filter->setName('test')->setValue([1,2,3])->setAlias('foo');
+        $filter->setName('test')->setValue([1, 2, 3])->setAlias('foo');
         $this->assertSame('test:1,2,3 as foo', (string)$filter);
     }
 
+    public function testFloatArray()
+    {
+        $filter = new Filter('array');
+        $filter->setName('test')->setValue([1.1, 2.2, 3.3])->setAlias('foo');
+        $this->assertSame('test:1.1,2.2,3.3 as foo', (string)$filter);
+    }
+
     public function testSingleStringInArray()
     {
         $filter = new Filter('array');
@@ -63,4 +91,18 @@ public function testRange()
         $filter->setName('test')->setValue($filterRangeCollection)->setAlias('foo');
         $this->assertSame('test:range(1 to 10),(11 to 20) as foo', (string)$filter);
     }
+
+    public function testBoolTrue()
+    {
+        $filter = new Filter('bool');
+        $filter->setName('test')->setValue(true);
+        $this->assertSame('test:true', (string)$filter);
+    }
+
+    public function testBoolFalse()
+    {
+        $filter = new Filter('bool');
+        $filter->setName('test')->setValue(false);
+        $this->assertSame('test:false', (string)$filter);
+    }
 }