Merge remote branch 'vicb/form-rendered'

* vicb/form-rendered:
  [Form] Fix for nested forms getting erroneously set as rendered
This commit is contained in:
Fabien Potencier 2011-05-22 08:16:24 +02:00
commit 2c85a59599
2 changed files with 10 additions and 1 deletions

View File

@ -29,7 +29,7 @@ class FormType extends AbstractType
{
$multipart = false;
foreach ($view as $child) {
foreach ($view->getChildren() as $child) {
if ($child->get('multipart')) {
$multipart = true;
break;

View File

@ -193,4 +193,13 @@ class FormTypeTest extends TypeTestCase
$this->assertTrue($view->get('multipart'));
}
public function testCreateViewDoNoMarkItAsRendered()
{
$form = $this->factory->create('form');
$form->add($this->factory->create('form'));
$view = $form->createView();
$this->assertFalse($view->isRendered());
}
}