[Form] fixed radio and checkbox when data is not bool

symfony · Nov 16, 2011 · 79ae3fc · 79ae3fc
1 parent b55a438
commit 79ae3fc
Show file tree

Hide file tree

Showing 3 changed files with 39 additions and 2 deletions.
diff --git a/src/Symfony/Component/Form/Extension/Core/Type/CheckboxType.php b/src/Symfony/Component/Form/Extension/Core/Type/CheckboxType.php
@@ -37,7 +37,7 @@ public function buildView(FormView $view, FormInterface $form)
     {
         $view
             ->set('value', $form->getAttribute('value'))
-            ->set('checked', (Boolean) $form->getData())
+            ->set('checked', (Boolean) $form->getClientData())
         ;
     }
 

diff --git a/src/Symfony/Component/Form/Extension/Core/Type/RadioType.php b/src/Symfony/Component/Form/Extension/Core/Type/RadioType.php
@@ -37,7 +37,7 @@ public function buildView(FormView $view, FormInterface $form)
     {
         $view
             ->set('value', $form->getAttribute('value'))
-            ->set('checked', (Boolean) $form->getData())
+            ->set('checked', (Boolean) $form->getClientData())
         ;
 
         if ($view->hasParent()) {

diff --git a/tests/Symfony/Tests/Component/Form/Extension/Core/Type/CheckboxTypeTest.php b/tests/Symfony/Tests/Component/Form/Extension/Core/Type/CheckboxTypeTest.php
@@ -11,6 +11,8 @@
 
 namespace Symfony\Tests\Component\Form\Extension\Core\Type;
 
+use Symfony\Component\Form\CallbackTransformer;
+
 class CheckboxTypeTest extends TypeTestCase
 {
     public function testPassValueToView()
@@ -38,4 +40,39 @@ public function testNotCheckedIfDataFalse()
 
         $this->assertFalse($view->get('checked'));
     }
+
+    /**
+     * @dataProvider proviceTransformedData
+     */
+    public function testTransformedData($data, $expected)
+    {
+        // present a binary status field as a checkbox
+        $transformer = new CallbackTransformer(
+            function ($value)
+            {
+                return 'expedited' == $value;
+            },
+            function ($value)
+            {
+                return $value ? 'expedited' : 'standard';
+            }
+        );
+
+        $form = $this->builder
+            ->create('expedited_shipping', 'checkbox')
+            ->prependClientTransformer($transformer)
+            ->getForm();
+        $form->setData($data);
+        $view = $form->createView();
+
+        $this->assertEquals($expected, $view->get('checked'));
+    }
+
+    public function proviceTransformedData()
+    {
+        return array(
+            array('expedited', true),
+            array('standard', false),
+        );
+    }
 }