[2.2] [Form] Trim listener, unicode whitespace characters.

symfony · Oct 25, 2012 · 878dd91 · 878dd91
1 parent e1c65fa
commit 878dd91
Show file tree

Hide file tree

Showing 2 changed files with 39 additions and 1 deletion.
diff --git a/src/Symfony/Component/Form/Extension/Core/EventListener/TrimListener.php b/src/Symfony/Component/Form/Extension/Core/EventListener/TrimListener.php
@@ -26,7 +26,13 @@ public function preBind(FormEvent $event)
     {
         $data = $event->getData();
 
-        if (is_string($data)) {
+        if (!is_string($data)) {
+            return;
+        }
+
+        if (null !== $result = @preg_replace('/^[\pZ\p{Cc}]+|[\pZ\p{Cc}]+$/u', '', $data)) {
+            $event->setData($result);
+        } else {
             $event->setData(trim($data));
         }
     }

diff --git a/src/Symfony/Component/Form/Tests/Extension/Core/EventListener/TrimListenerTest.php b/src/Symfony/Component/Form/Tests/Extension/Core/EventListener/TrimListenerTest.php
@@ -46,4 +46,36 @@ public function testTrimSkipNonStrings()
 
         $this->assertSame(1234, $event->getData());
     }
+
+    /**
+     * @dataProvider codePointProvider
+     */
+    public function testTrimUtf8($description, $chars)
+    {
+        if (!function_exists('mb_check_encoding')) {
+            $this->markTestSkipped('The "mb_check_encoding" function is not available');
+        }
+
+        $data = mb_convert_encoding(pack('H*', implode('', (array)$chars)), 'UTF-8', 'UCS-2BE');
+        $data = $data."ab\ncd".$data;
+
+        $form  = $this->getMock('Symfony\Component\Form\Tests\FormInterface');
+        $event = new FormEvent($form, $data);
+
+        $filter = new TrimListener();
+        $filter->preBind($event);
+
+        $this->assertSame("ab\ncd", $event->getData(), 'TrimListener should trim character(s): '.$description.': '.implode(', ', $chars));
+    }
+
+    public function codePointProvider()
+    {
+        return array(
+            array('General category: Separator',
+                array('0020', '00A0', '1680', '180E', '2000', '2001', '2002', '2003', '2004', '2005',
+                    '2006', '2007', '2008', '2009', '200A', '2028', '2029', '202F', '205F', '3000')),
+            array('General category: Other, control', array('0009', '000A', '000B', '000C', '000D', '0085')),
+//            array('General category: Other, format. ZERO WIDTH SPACE', '200B')
+        );
+    }
 }