[Form] Fixed FormFactory not to set "data" option if not explicitely given

Author: webmozart

src/Symfony/Component/Form/Extension/Core/Type/FormType.php

@@ -149,7 +149,7 @@ public function setDefaultOptions(OptionsResolverInterface $resolver)
  {
  // Derive "data_class" option from passed "data" object
  $dataClass = function (Options $options) {
- return is_object($options['data']) ? get_class($options['data']) : null;
+ return isset($options['data']) && is_object($options['data']) ? get_class($options['data']) : null;
  };
 
  // Derive "empty_data" closure from "data_class" option

src/Symfony/Component/Form/FormFactory.php

@@ -145,7 +145,7 @@ public function createBuilder($type, $data = null, array $options = array(), For
  */
  public function createNamedBuilder($name, $type, $data = null, array $options = array(), FormBuilderInterface $parent = null)
  {
- if (!array_key_exists('data', $options)) {
+ if (null !== $data && !array_key_exists('data', $options)) {
  $options['data'] = $data;
  }
 

src/Symfony/Component/Form/Tests/Fixtures/FooType.php

@@ -16,13 +16,19 @@
 use Symfony\Component\Form\FormBuilderInterface;
 use Symfony\Component\Form\FormFactoryInterface;
 use Symfony\Component\EventDispatcher\EventDispatcher;
+use Symfony\Component\OptionsResolver\OptionsResolverInterface;
 
 class FooType extends AbstractType
 {
  public function buildForm(FormBuilderInterface $builder, array $options)
  {
  $builder->setAttribute('foo', 'x');
- $builder->setAttribute('data_option', $options['data']);
+ $builder->setAttribute('data_option', isset($options['data']) ? $options['data'] : null);
+ // Important: array_key_exists(), not isset()
+ // -> The "data" option is optional in FormType
+ // If it is given, the form's data will be locked to the value of the option
+ // Thus "data" must not be set in the array unless explicitely specified
+ $builder->setAttribute('data_option_set', array_key_exists('data', $options));
  }
 
  public function getName()
@@ -35,21 +41,21 @@ public function createBuilder($name, FormFactoryInterface $factory, array $optio
  return new FormBuilder($name, null, new EventDispatcher(), $factory);
  }
 
- public function getDefaultOptions()
+ public function setDefaultOptions(OptionsResolverInterface $resolver)
  {
- return array(
- 'data' => null,
+ $resolver->setDefaults(array(
  'required' => false,
  'max_length' => null,
  'a_or_b' => 'a',
- );
- }
+ ));
 
- public function getAllowedOptionValues()
- {
- return array(
+ $resolver->setOptional(array(
+ 'data',
+ ));
+
+ $resolver->setAllowedValues(array(
  'a_or_b' => array('a', 'b'),
- );
+ ));
  }
 
  public function getParent()

src/Symfony/Component/Form/Tests/FormFactoryTest.php

@@ -150,9 +150,21 @@ public function testCreateNamedBuilderFillsDataOption()
  $builder = $this->factory->createNamedBuilder('bar', 'foo', 'xyz');
 
  // see FooType::buildForm()
+ $this->assertTrue($builder->getAttribute('data_option_set'));
  $this->assertEquals('xyz', $builder->getAttribute('data_option'));
  }
 
+ public function testCreateNamedBuilderDoesNotSetDataOptionIfNull()
+ {
+ $type = new FooType();
+ $this->extension1->addType($type);
+
+ $builder = $this->factory->createNamedBuilder('bar', 'foo', null);
+
+ // see FooType::buildForm()
+ $this->assertFalse($builder->getAttribute('data_option_set'));
+ }
+
  public function testCreateNamedBuilderDoesNotOverrideExistingDataOption()
  {
  $type = new FooType();
@@ -163,6 +175,7 @@ public function testCreateNamedBuilderDoesNotOverrideExistingDataOption()
  ));
 
  // see FooType::buildForm()
+ $this->assertTrue($builder->getAttribute('data_option_set'));
  $this->assertEquals('abc', $builder->getAttribute('data_option'));
  }