Skip to content

Commit

Permalink
[Form] Filter arrays out of scalar form types
Browse files Browse the repository at this point in the history
  • Loading branch information
nicolas-grekas committed Nov 26, 2018
1 parent f747ea9 commit c377561
Show file tree
Hide file tree
Showing 4 changed files with 20 additions and 9 deletions.
3 changes: 3 additions & 0 deletions src/Symfony/Component/Form/Form.php
Expand Up @@ -532,6 +532,9 @@ public function submit($submittedData, $clearMissing = true)
$submittedData = null;
} elseif (is_scalar($submittedData)) {
$submittedData = (string) $submittedData;
} elseif (\is_array($submittedData) && !$this->config->getCompound() && !$this->config->hasOption('multiple')) {
$submittedData = null;
$this->transformationFailure = new TransformationFailedException('Submitted data was expected to be text or number, array given.');
}

$dispatcher = $this->config->getEventDispatcher();
Expand Down
16 changes: 16 additions & 0 deletions src/Symfony/Component/Form/Tests/CompoundFormTest.php
Expand Up @@ -1036,6 +1036,22 @@ public function testDisabledButtonIsNotSubmitted()
$this->assertFalse($submit->isSubmitted());
}

public function testArrayTransformationFailureOnSubmit()
{
$this->form->add($this->getBuilder('foo')->setCompound(false)->getForm());
$this->form->add($this->getBuilder('bar', null, null, array('multiple' => false))->setCompound(false)->getForm());

$this->form->submit(array(
'foo' => array('foo'),
'bar' => array('bar'),
));

$this->assertNull($this->form->get('foo')->getData());
$this->assertSame('Submitted data was expected to be text or number, array given.', $this->form->get('foo')->getTransformationFailure()->getMessage());

$this->assertSame(array('bar'), $this->form->get('bar')->getData());
}

protected function createForm()
{
return $this->getBuilder()
Expand Down
Expand Up @@ -83,14 +83,6 @@ public function testThrowExceptionIfDefaultProtocolIsInvalid()
));
}

public function testSubmitWithNonStringDataDoesNotBreakTheFixUrlProtocolListener()
{
$form = $this->factory->create(static::TESTED_TYPE);
$form->submit(array('domain.com', 'www.domain.com'));

$this->assertSame(array('domain.com', 'www.domain.com'), $form->getData());
}

public function testSubmitNullUsesDefaultEmptyData($emptyData = 'empty', $expectedData = 'http://empty')
{
$form = $this->factory->create(static::TESTED_TYPE, null, array(
Expand Down
Expand Up @@ -220,7 +220,7 @@ public function testDontValidateConstraintsIfNoValidationGroups()
->getForm();

// Launch transformer
$form->submit(array());
$form->submit('foo');

$this->expectNoValidate();

Expand Down

0 comments on commit c377561

Please sign in to comment.