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

[Form] Fixed: "data_constructor" option is used even if "data_class" option is not set

Browse Source
This commit is contained in:
Bernhard Schussek 2011-02-07 19:01:11 +01:00 committed by Fabien Potencier
parent 5b95805340
commit f51dafca3f
2 changed files with 9 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/Symfony/Component/Form/Form.php
View File

@ -112,10 +112,6 @@ class Form extends Field implements \IteratorAggregate, FormInterface
if (isset($options['data_constructor'])) { if (isset($options['data_constructor'])) {
$this->dataConstructor = $options['data_constructor']; $this->dataConstructor = $options['data_constructor'];
} else {
$this->dataConstructor = function ($class) {
return new $class();
};
} }
parent::__construct($name, $options); parent::__construct($name, $options);
@ -356,9 +352,14 @@ class Form extends Field implements \IteratorAggregate, FormInterface
*/ */
public function setData($data) public function setData($data)
{ {
if (empty($data) && $this->dataClass) { if (empty($data)) {
$constructor = $this->dataConstructor; if ($this->dataConstructor) {
$data = $constructor($this->dataClass); $constructor = $this->dataConstructor;
$data = $constructor();
} else if ($this->dataClass) {
$class = $this->dataClass;
$data = new $class();
}
} }
parent::setData($data); parent::setData($data);

6
tests/Symfony/Tests/Component/Form/FormTest.php
View File

@ -1011,13 +1011,9 @@ class FormTest extends \PHPUnit_Framework_TestCase
public function testSetDataToNullUsesDataConstructorOption() public function testSetDataToNullUsesDataConstructorOption()
{ {
$test = $this;
$author = new Author(); $author = new Author();
$form = new Form('author', array( $form = new Form('author', array(
'data_class' => 'Symfony\Tests\Component\Form\Fixtures\Author', 'data_constructor' => function () use ($author) {
'data_constructor' => function ($class) use ($test, $author) {
$test->assertEquals('Symfony\Tests\Component\Form\Fixtures\Author', $class);
return $author; return $author;
} }
)); ));