Merge branch 'hotfix/zendframework/zendframework#6261-string-trim-all…

…ows-0-in-charlist'

Close zendframework/zendframework#6261

src/StringTrim.php

@@ -46,10 +46,12 @@ public function __construct($charlistOrOptions = null)
      */
     public function setCharList($charList)
     {
-        if (empty($charList)) {
+        if (! strlen($charList)) {
             $charList = null;
         }
+
         $this->options['charlist'] = $charList;
+
         return $this;
     }
 

test/StringTrimTest.php

@@ -13,7 +13,7 @@
 use stdClass;
 
 /**
- * @group      Zend_Filter
+ * @covers \Zend\Filter\StringTrim
  */
 class StringTrimTest extends \PHPUnit_Framework_TestCase
 {
@@ -157,4 +157,19 @@ public function testShouldNotFilterNonStringValues($value)
         $filtered = $this->_filter->filter($value);
         $this->assertSame($value, $filtered);
     }
+
+    /**
+     * Ensures expected behavior with '0' as character list
+     *
+     * @group 6261
+     */
+    public function testEmptyCharList()
+    {
+        $filter = $this->_filter;
+        $filter->setCharList('0');
+        $this->assertEquals('a0b', $filter('00a0b00'));
+
+        $filter->setCharList('');
+        $this->assertEquals('str', $filter(' str '));
+    }
 }