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

Revert "bug #20080 [Form] compound forms without children should be considered rendered implicitly (backbone87)" 

This reverts commit eae5a9ba0b, reversing
changes made to fd763ad5a3.
This commit is contained in:
Fabien Potencier 2016-09-29 16:48:55 -07:00
parent eae5a9ba0b
commit 35091b1837
2 changed files with 7 additions and 62 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/Symfony/Component/Form/FormView.php
View File

@ -65,12 +65,8 @@ class FormView implements \ArrayAccess, \IteratorAggregate, \Countable
*/
public function isRendered()
{
if ($this->rendered) {
return true;
}
if (isset($this->vars['compound']) ? !$this->vars['compound'] : 0 === count($this->children)) {
return false;
if (true === $this->rendered || 0 === count($this->children)) {
return $this->rendered;
}
foreach ($this->children as $child) {

61
src/Symfony/Component/Form/Tests/Extension/Core/Type/FormTypeTest.php
View File

@ -488,67 +488,16 @@ class FormTypeTest extends BaseTypeTest
$this->assertTrue($view->vars['multipart']);
}
public function testViewIsConsideredRenderedForRenderedNonCompoundForms()
public function testViewIsNotRenderedByDefault()
{
$view = $this->factory->createBuilder('form', null, array(
'compound' => false,
))
->getForm()
->createView();
$view->setRendered();
$this->assertTrue($view->isRendered());
}
public function testViewIsNotConsideredRenderedImplicitlyForNonCompoundForms()
{
$view = $this->factory->createBuilder('form', null, array(
'compound' => false,
))
->getForm()
->createView();
$view = $this->factory->createBuilder('form')
->add('foo', 'form')
->getForm()
->createView();
$this->assertFalse($view->isRendered());
}
public function testViewIsNotConsideredRenderedImplicitlyForCompoundFormsWithNonCompoundChildren()
{
$view = $this->factory->createBuilder('form')
->add('foo', 'form', array(
'compound' => false,
))
->getForm()
->createView();
$this->assertFalse($view->isRendered());
}
public function testViewIsConsideredRenderedImplicitlyForCompoundFormsWithRenderedNonCompoundChildren()
{
$view = $this->factory->createBuilder('form')
->add('foo', 'form', array(
'compound' => false,
))
->getForm()
->createView();
foreach ($view as $child) {
$child->setRendered();
}
$this->assertTrue($view->isRendered());
}
public function testViewIsConsideredRenderedImplicitlyForCompoundFormsWithoutChildren()
{
$view = $this->factory->createBuilder('form')
->getForm()
->createView();
$this->assertTrue($view->isRendered());
}
public function testErrorBubblingIfCompound()
{
$form = $this->factory->create('form', null, array(