[Form] Fixed FixRadioInputListener to not ignore 0.

fivestar · fivestar · commit 790284f2a8ce · 2011-06-02T19:19:43.000+09:00
diff --git a/src/Symfony/Component/Form/Extension/Core/EventListener/FixRadioInputListener.php b/src/Symfony/Component/Form/Extension/Core/EventListener/FixRadioInputListener.php
@@ -27,11 +27,11 @@ public function onBindClientData(FilterDataEvent $event)
     {
         $data = $event->getData();
 
-        $event->setData(empty($data) ? array() : array($data => true));
+        $event->setData(strlen($data) < 1 ? array() : array($data => true));
     }
 
     public static function getSubscribedEvents()
     {
         return array(FormEvents::BIND_CLIENT_DATA => 'onBindClientData');
     }
-}
+}
diff --git a/tests/Symfony/Tests/Component/Form/Extension/Core/EventListener/FixRadioInputListenerTest.php b/tests/Symfony/Tests/Component/Form/Extension/Core/EventListener/FixRadioInputListenerTest.php
@@ -0,0 +1,54 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Tests\Component\Form\Extension\Core\EventListener;
+
+use Symfony\Component\Form\Event\FilterDataEvent;
+use Symfony\Component\Form\Extension\Core\EventListener\FixRadioInputListener;
+
+class FixRadioInputListenerTest extends \PHPUnit_Framework_TestCase
+{
+    public function testFixRadio()
+    {
+        $data = '1';
+        $form = $this->getMock('Symfony\Tests\Component\Form\FormInterface');
+        $event = new FilterDataEvent($form, $data);
+
+        $filter = new FixRadioInputListener();
+        $filter->onBindClientData($event);
+
+        $this->assertEquals(array('1' => true), $event->getData());
+    }
+
+    public function testFixZero()
+    {
+        $data = '0';
+        $form = $this->getMock('Symfony\Tests\Component\Form\FormInterface');
+        $event = new FilterDataEvent($form, $data);
+
+        $filter = new FixRadioInputListener();
+        $filter->onBindClientData($event);
+
+        $this->assertEquals(array('0' => true), $event->getData());
+    }
+
+    public function testIgnoreEmptyString()
+    {
+        $data = '';
+        $form = $this->getMock('Symfony\Tests\Component\Form\FormInterface');
+        $event = new FilterDataEvent($form, $data);
+
+        $filter = new FixRadioInputListener();
+        $filter->onBindClientData($event);
+
+        $this->assertEquals(array(), $event->getData());
+    }
+}

Original file line number	Diff line number	Diff line change
`@@ -27,11 +27,11 @@ public function onBindClientData(FilterDataEvent $event)`
`27`	`27`	`{`
`28`	`28`	`$data = $event->getData();`
`29`	`29`
`30`		`- $event->setData(empty($data) ? array() : array($data => true));`
	`30`	`+ $event->setData(strlen($data) < 1 ? array() : array($data => true));`
`31`	`31`	`}`
`32`	`32`
`33`	`33`	`public static function getSubscribedEvents()`
`34`	`34`	`{`
`35`	`35`	`return array(FormEvents::BIND_CLIENT_DATA => 'onBindClientData');`
`36`	`36`	`}`
`37`		`-}`
	`37`	`+}`