diff --git a/src/Symfony/Component/Form/Extension/Core/Type/ChoiceType.php b/src/Symfony/Component/Form/Extension/Core/Type/ChoiceType.php
index 46a57190cf5a5..601583b7839f8 100644
--- a/src/Symfony/Component/Form/Extension/Core/Type/ChoiceType.php
+++ b/src/Symfony/Component/Form/Extension/Core/Type/ChoiceType.php
@@ -33,7 +33,6 @@
use Symfony\Component\Form\Extension\Core\EventListener\MergeCollectionListener;
use Symfony\Component\Form\Extension\Core\DataTransformer\ChoiceToValueTransformer;
use Symfony\Component\Form\Extension\Core\DataTransformer\ChoicesToValuesTransformer;
-use Symfony\Component\Form\Util\FormUtil;
use Symfony\Component\OptionsResolver\Options;
use Symfony\Component\OptionsResolver\OptionsResolver;
@@ -91,12 +90,12 @@ public function buildForm(FormBuilderInterface $builder, array $options)
$form = $event->getForm();
$data = $event->getData();
+ // Since the type always use mapper an empty array will not be
+ // considered as empty in Form::submit(), we need to evaluate
+ // empty data here so its value is submitted to sub forms
if (null === $data) {
$emptyData = $form->getConfig()->getEmptyData();
-
- if (false === FormUtil::isEmpty($emptyData) && array() !== $emptyData) {
- $data = is_callable($emptyData) ? call_user_func($emptyData, $form, $data) : $emptyData;
- }
+ $data = $emptyData instanceof \Closure ? $emptyData($form, $data) : $emptyData;
}
// Convert the submitted data to a string, if scalar, before
diff --git a/src/Symfony/Component/Form/Extension/Core/Type/FileType.php b/src/Symfony/Component/Form/Extension/Core/Type/FileType.php
index 7d84512d9b3c7..321cbc03690e5 100644
--- a/src/Symfony/Component/Form/Extension/Core/Type/FileType.php
+++ b/src/Symfony/Component/Form/Extension/Core/Type/FileType.php
@@ -27,10 +27,10 @@ class FileType extends AbstractType
*/
public function buildForm(FormBuilderInterface $builder, array $options)
{
+ // Ensure that submitted data is always an uploaded file or an array of some
$builder->addEventListener(FormEvents::PRE_SUBMIT, function (FormEvent $event) use ($options) {
$form = $event->getForm();
$requestHandler = $form->getConfig()->getRequestHandler();
- $data = null;
if ($options['multiple']) {
$data = array();
@@ -46,19 +46,16 @@ public function buildForm(FormBuilderInterface $builder, array $options)
}
}
- // submitted data for an input file (not required) without choosing any file
- if (array(null) === $data || array() === $data) {
+ // Since the array is never considered empty in the view data format
+ // on submission, we need to evaluate the configured empty data here
+ if (array() === $data) {
$emptyData = $form->getConfig()->getEmptyData();
-
- $data = is_callable($emptyData) ? call_user_func($emptyData, $form, $data) : $emptyData;
+ $data = $emptyData instanceof \Closure ? $emptyData($form, $data) : $emptyData;
}
$event->setData($data);
} elseif (!$requestHandler->isFileUpload($event->getData())) {
- $emptyData = $form->getConfig()->getEmptyData();
-
- $data = is_callable($emptyData) ? call_user_func($emptyData, $form, $data) : $emptyData;
- $event->setData($data);
+ $event->setData(null);
}
});
}
diff --git a/src/Symfony/Component/Form/Tests/Extension/Core/Type/ChoiceTypeTest.php b/src/Symfony/Component/Form/Tests/Extension/Core/Type/ChoiceTypeTest.php
index 9b0983eac5937..842136e14c677 100644
--- a/src/Symfony/Component/Form/Tests/Extension/Core/Type/ChoiceTypeTest.php
+++ b/src/Symfony/Component/Form/Tests/Extension/Core/Type/ChoiceTypeTest.php
@@ -690,6 +690,21 @@ public function testSubmitSingleChoiceWithEmptyData()
$this->assertSame('test', $form->getData());
}
+ public function testSubmitSingleChoiceWithEmptyDataAndInitialData()
+ {
+ $form = $this->factory->create(static::TESTED_TYPE, 'initial', array(
+ 'multiple' => false,
+ 'expanded' => false,
+ 'choices' => array('initial', 'test'),
+ 'choices_as_values' => true,
+ 'empty_data' => 'test',
+ ));
+
+ $form->submit(null);
+
+ $this->assertSame('test', $form->getData());
+ }
+
public function testSubmitMultipleChoiceWithEmptyData()
{
$form = $this->factory->create(static::TESTED_TYPE, null, array(
@@ -705,6 +720,36 @@ public function testSubmitMultipleChoiceWithEmptyData()
$this->assertSame(array('test'), $form->getData());
}
+ public function testSubmitMultipleChoiceWithEmptyDataAndInitialEmptyArray()
+ {
+ $form = $this->factory->create(static::TESTED_TYPE, array(), array(
+ 'multiple' => true,
+ 'expanded' => false,
+ 'choices' => array('test'),
+ 'choices_as_values' => true,
+ 'empty_data' => array('test'),
+ ));
+
+ $form->submit(null);
+
+ $this->assertSame(array('test'), $form->getData());
+ }
+
+ public function testSubmitMultipleChoiceWithEmptyDataAndInitialData()
+ {
+ $form = $this->factory->create(static::TESTED_TYPE, array('initial'), array(
+ 'multiple' => true,
+ 'expanded' => false,
+ 'choices' => array('initial', 'test'),
+ 'choices_as_values' => true,
+ 'empty_data' => array('test'),
+ ));
+
+ $form->submit(null);
+
+ $this->assertSame(array('test'), $form->getData());
+ }
+
public function testSubmitSingleChoiceExpandedWithEmptyData()
{
$form = $this->factory->create(static::TESTED_TYPE, null, array(
@@ -720,6 +765,21 @@ public function testSubmitSingleChoiceExpandedWithEmptyData()
$this->assertSame('test', $form->getData());
}
+ public function testSubmitSingleChoiceExpandedWithEmptyDataAndInitialData()
+ {
+ $form = $this->factory->create(static::TESTED_TYPE, 'initial', array(
+ 'multiple' => false,
+ 'expanded' => true,
+ 'choices' => array('initial', 'test'),
+ 'choices_as_values' => true,
+ 'empty_data' => 'test',
+ ));
+
+ $form->submit(null);
+
+ $this->assertSame('test', $form->getData());
+ }
+
public function testSubmitMultipleChoiceExpandedWithEmptyData()
{
$form = $this->factory->create(static::TESTED_TYPE, null, array(
@@ -735,6 +795,36 @@ public function testSubmitMultipleChoiceExpandedWithEmptyData()
$this->assertSame(array('test'), $form->getData());
}
+ public function testSubmitMultipleChoiceExpandedWithEmptyDataAndInitialEmptyArray()
+ {
+ $form = $this->factory->create(static::TESTED_TYPE, array(), array(
+ 'multiple' => true,
+ 'expanded' => true,
+ 'choices' => array('test'),
+ 'choices_as_values' => true,
+ 'empty_data' => array('test'),
+ ));
+
+ $form->submit(null);
+
+ $this->assertSame(array('test'), $form->getData());
+ }
+
+ public function testSubmitMultipleChoiceExpandedWithEmptyDataAndInitialData()
+ {
+ $form = $this->factory->create(static::TESTED_TYPE, array('init'), array(
+ 'multiple' => true,
+ 'expanded' => true,
+ 'choices' => array('init', 'test'),
+ 'choices_as_values' => true,
+ 'empty_data' => array('test'),
+ ));
+
+ $form->submit(null);
+
+ $this->assertSame(array('test'), $form->getData());
+ }
+
/**
* @group legacy
*/
pFad - Phonifier reborn
Pfad - The Proxy pFad of © 2024 Garber Painting. All rights reserved.
Note: This service is not intended for secure transactions such as banking, social media, email, or purchasing. Use at your own risk. We assume no liability whatsoever for broken pages.
Alternative Proxies:
Alternative Proxy
pFad Proxy
pFad v3 Proxy
pFad v4 Proxy