symfony
diff --git a/‎src/Symfony/Component/Form/Extension/Core/DataMapper/PropertyPathMapper.php
Copy file name to clipboardExpand all lines: src/Symfony/Component/Form/Extension/Core/DataMapper/PropertyPathMapper.php
+7-7Lines changed: 7 additions & 7 deletions b/‎src/Symfony/Component/Form/Extension/Core/DataMapper/PropertyPathMapper.php
Copy file name to clipboardExpand all lines: src/Symfony/Component/Form/Extension/Core/DataMapper/PropertyPathMapper.php
+7-7Lines changed: 7 additions & 7 deletions
diff --git a/‎src/Symfony/Component/Form/Tests/Extension/Core/DataMapper/PropertyPathMapperTest.php
Copy file name to clipboardExpand all lines: src/Symfony/Component/Form/Tests/Extension/Core/DataMapper/PropertyPathMapperTest.php
+36-3Lines changed: 36 additions & 3 deletions b/‎src/Symfony/Component/Form/Tests/Extension/Core/DataMapper/PropertyPathMapperTest.php
Copy file name to clipboardExpand all lines: src/Symfony/Component/Form/Tests/Extension/Core/DataMapper/PropertyPathMapperTest.php
+36-3Lines changed: 36 additions & 3 deletions
@@ -44,24 +44,24 @@ public function __construct(PropertyAccessorInterface $propertyAccessor = null)
      */
     public function mapDataToForms($data, array $forms)
     {
-        if (null === $data || array() === $data) {
-            return;
-        }
+        $empty = null === $data || array() === $data;
 
-        if (!is_array($data) && !is_object($data)) {
+        if (!$empty && !is_array($data) && !is_object($data)) {
             throw new UnexpectedTypeException($data, 'object, array or empty');
         }
 
         $iterator = new VirtualFormAwareIterator($forms);
         $iterator = new \RecursiveIteratorIterator($iterator);
 
         foreach ($iterator as $form) {
-            /* @var FormInterface $form */
+            /* @var \Symfony\Component\Form\FormInterface $form */
             $propertyPath = $form->getPropertyPath();
             $config = $form->getConfig();
 
-            if (null !== $propertyPath && $config->getMapped()) {
+            if (!$empty && null !== $propertyPath && $config->getMapped()) {
                 $form->setData($this->propertyAccessor->getValue($data, $propertyPath));
+            } else {
+                $form->setData($form->getConfig()->getData());
             }
         }
     }
@@ -83,7 +83,7 @@ public function mapFormsToData(array $forms, &$data)
         $iterator = new \RecursiveIteratorIterator($iterator);
 
         foreach ($iterator as $form) {
-            /* @var FormInterface $form */
+            /* @var \Symfony\Component\Form\FormInterface $form */
             $propertyPath = $form->getPropertyPath();
             $config = $form->getConfig();
 
 
@@ -165,8 +165,9 @@ public function testMapDataToFormsIgnoresUnmapped()
         $this->assertNull($form->getData());
     }
 
-    public function testMapDataToFormsIgnoresEmptyData()
+    public function testMapDataToFormsSetsDefaultDataIfPassedDataIsNull()
     {
+        $default = new \stdClass();
         $propertyPath = $this->getPropertyPath('engine');
 
         $this->propertyAccessor->expects($this->never())
@@ -175,11 +176,43 @@ public function testMapDataToFormsIgnoresEmptyData()
         $config = new FormConfigBuilder('name', '\stdClass', $this->dispatcher);
         $config->setByReference(true);
         $config->setPropertyPath($propertyPath);
-        $form = $this->getForm($config);
+        $config->setData($default);
+
+        $form = $this->getMockBuilder('Symfony\Component\Form\Form')
+            ->setConstructorArgs(array($config))
+            ->setMethods(array('setData'))
+            ->getMock();
+
+        $form->expects($this->once())
+            ->method('setData')
+            ->with($default);
 
         $this->mapper->mapDataToForms(null, array($form));
+    }
 
-        $this->assertNull($form->getData());
+    public function testMapDataToFormsSetsDefaultDataIfPassedDataIsEmptyArray()
+    {
+        $default = new \stdClass();
+        $propertyPath = $this->getPropertyPath('engine');
+
+        $this->propertyAccessor->expects($this->never())
+            ->method('getValue');
+
+        $config = new FormConfigBuilder('name', '\stdClass', $this->dispatcher);
+        $config->setByReference(true);
+        $config->setPropertyPath($propertyPath);
+        $config->setData($default);
+
+        $form = $this->getMockBuilder('Symfony\Component\Form\Form')
+            ->setConstructorArgs(array($config))
+            ->setMethods(array('setData'))
+            ->getMock();
+
+        $form->expects($this->once())
+            ->method('setData')
+            ->with($default);
+
+        $this->mapper->mapDataToForms(array(), array($form));
     }
 
     public function testMapDataToFormsSkipsVirtualForms()