diogo
/
symfony
Archived
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Tests and fix for issue in array model data in EntityType field with multiple=true

This commit is contained in:
stoccc 2017-08-25 09:11:28 +02:00 committed by Fabien Potencier
parent 2e286f8854
commit aaba6b4c2b
3 changed files with 36 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
src/Symfony/Bridge/Doctrine/Tests/Form/Type/EntityTypeTest.php
View File

@ -1482,4 +1482,38 @@ class EntityTypeTest extends BaseTypeTest
$this->assertEquals($collection, $form->getNormData());
$this->assertSame(array(), $form->getViewData(), 'View data is always an array');
}
public function testSetDataEmptyArraySubmitNullMultiple()
{
$emptyArray = array();
$form = $this->factory->create(static::TESTED_TYPE, null, array(
'em' => 'default',
'class' => self::SINGLE_IDENT_CLASS,
'multiple' => true,
));
$form->setData($emptyArray);
$form->submit(null);
$this->assertInternalType('array', $form->getData());
$this->assertEquals(array(), $form->getData());
$this->assertEquals(array(), $form->getNormData());
$this->assertSame(array(), $form->getViewData(), 'View data is always an array');
}
public function testSetDataNonEmptyArraySubmitNullMultiple()
{
$entity1 = new SingleIntIdEntity(1, 'Foo');
$this->persist(array($entity1));
$form = $this->factory->create(static::TESTED_TYPE, null, array(
'em' => 'default',
'class' => self::SINGLE_IDENT_CLASS,
'multiple' => true,
));
$existing = array(0 => $entity1);
$form->setData($existing);
$form->submit(null);
$this->assertInternalType('array', $form->getData());
$this->assertEquals(array(), $form->getData());
$this->assertEquals(array(), $form->getNormData());
$this->assertSame(array(), $form->getViewData(), 'View data is always an array');
}
}

2
src/Symfony/Bridge/Doctrine/composer.json
View File

@ -22,7 +22,7 @@
"require-dev": {
"symfony/stopwatch": "~2.2",
"symfony/dependency-injection": "~2.2",
"symfony/form": "~2.7.25|^2.8.18",
"symfony/form": "~2.7.34|^2.8.27",
"symfony/http-kernel": "~2.2",
"symfony/property-access": "~2.3",
"symfony/security": "~2.2",

2
src/Symfony/Component/Form/Extension/Core/EventListener/MergeCollectionListener.php
View File

@ -80,7 +80,7 @@ class MergeCollectionListener implements EventSubscriberInterface
return;
}
if (!$dataToMergeInto) {
if (null === $dataToMergeInto) {
// No original data was set. Set it if allowed
if ($this->allowAdd) {
$dataToMergeInto = $data;