[Form] Fixed regression: bind(null) was not converted to an empty string anymore

webmozart · webmozart · commit 6e4ed9e177fc · 2012-04-17T17:29:15.000+02:00
diff --git a/src/Symfony/Component/Form/Extension/Core/Type/FormType.php b/src/Symfony/Component/Form/Extension/Core/Type/FormType.php
@@ -179,9 +179,9 @@ public function getDefaultOptions()
                 if ($form->hasChildren()) {
                     return array();
                 }
-            };
 
-            return '';
+                return '';
+            };
         };
 
         return array(
diff --git a/src/Symfony/Component/Form/Tests/Extension/Core/Type/FormTypeTest.php b/src/Symfony/Component/Form/Tests/Extension/Core/Type/FormTypeTest.php
@@ -344,6 +344,22 @@ public function testBindWithEmptyDataStoresArrayIfNoClassAvailable()
         $this->assertSame(array('firstName' => 'Bernhard'), $form->getData());
     }
 
+    public function testBindWithEmptyDataPassesEmptyStringToTransformerIfNoChildren()
+    {
+        $form = $this->factory->createBuilder('form')
+            ->appendClientTransformer(new FixedDataTransformer(array(
+                // required for the initial, internal setData(null)
+                null => 'null',
+                // required to test that bind(null) is converted to ''
+                'empty' => '',
+            )))
+            ->getForm();
+
+        $form->bind(null);
+
+        $this->assertSame('empty', $form->getData());
+    }
+
     public function testBindWithEmptyDataUsesEmptyDataOption()
     {
         $author = new Author();
