fixing broken merge

zendframework · Aug 16, 2012 · bb991fd · bb991fd
2 parents 4d5f078 + 533570c
commit bb991fd
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 1 deletion.
diff --git a/src/StringTrim.php b/src/StringTrim.php
@@ -107,7 +107,7 @@ protected function unicodeTrim($value, $charlist = '\\\\s')
             $charlist
         );
 
-        $pattern = '/^[' . $chars . ']*|[' . $chars . ']*$/sSD';
+        $pattern = '/^[' . $chars . ']+|[' . $chars . ']+$/usSD';
 
         return preg_replace($pattern, '', $value);
     }

diff --git a/test/StringTrimTest.php b/test/StringTrimTest.php
@@ -54,6 +54,19 @@ public function testBasic()
         }
     }
 
+    /**
+     * Ensures that the filter follows expected behavior
+     *
+     * @return void
+     */
+    public function testUtf8()
+    {
+        if (version_compare(PHP_VERSION, '5.3.4', 'lt')) {
+            $this->markTestSkipped('PCRE update in 5.3.4 fixes unicode whitespace checking issues; in 5.3.3, this test fails due to outdated PCRE version');
+        }
+        $this->assertEquals('a', $this->_filter->filter(utf8_encode("\xa0a\xa0")));
+    }
+
     /**
      * Ensures that getCharList() returns expected default value
      *