bug #20080 [Form] compound forms without children should be considered

backbone87 · backbone87 · commit 46e880598a5f · 2016-10-02T22:28:00.000+02:00
rendered
diff --git a/src/Symfony/Component/Form/FormView.php b/src/Symfony/Component/Form/FormView.php
@@ -65,8 +65,12 @@ public function __construct(FormView $parent = null)
      */
     public function isRendered()
     {
-        if (true === $this->rendered || 0 === count($this->children)) {
-            return $this->rendered;
+        if ($this->rendered) {
+            return true;
+        }
+
+        if (isset($this->vars['compound']) ? !$this->vars['compound'] : 0 === count($this->children)) {
+            return false;
         }
 
         foreach ($this->children as $child) {
diff --git a/src/Symfony/Component/Form/Tests/AbstractDivLayoutTest.php b/src/Symfony/Component/Form/Tests/AbstractDivLayoutTest.php
@@ -453,7 +453,7 @@ public function testNestedFormError()
         $form = $this->factory->createNamedBuilder('name', 'form')
             ->add($this->factory
                 ->createNamedBuilder('child', 'form', null, array('error_bubbling' => false))
-                ->add('grandChild', 'form')
+                ->add('grandChild', 'text')
             )
             ->getForm();
 
diff --git a/src/Symfony/Component/Form/Tests/AbstractTableLayoutTest.php b/src/Symfony/Component/Form/Tests/AbstractTableLayoutTest.php
@@ -318,7 +318,7 @@ public function testNestedFormError()
         $form = $this->factory->createNamedBuilder('name', 'form')
             ->add($this->factory
                 ->createNamedBuilder('child', 'form', null, array('error_bubbling' => false))
-                ->add('grandChild', 'form')
+                ->add('grandChild', 'text')
             )
             ->getForm();
 
diff --git a/src/Symfony/Component/Form/Tests/Extension/Core/Type/FormTypeTest.php b/src/Symfony/Component/Form/Tests/Extension/Core/Type/FormTypeTest.php
@@ -488,16 +488,67 @@ public function testPassMultipartTrueIfAnyChildIsMultipartToView()
         $this->assertTrue($view->vars['multipart']);
     }
 
-    public function testViewIsNotRenderedByDefault()
+    public function testViewIsConsideredRenderedForRenderedNonCompoundForms()
+    {
+        $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();
+
+        $this->assertFalse($view->isRendered());
+    }
+
+    public function testViewIsNotConsideredRenderedImplicitlyForCompoundFormsWithNonCompoundChildren()
     {
         $view = $this->factory->createBuilder('form')
-                ->add('foo', 'form')
-                ->getForm()
-                ->createView();
+            ->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(

Original file line number	Diff line number	Diff line change
`@@ -65,8 +65,12 @@ public function __construct(FormView $parent = null)`
`65`	`65`	`*/`
`66`	`66`	`public function isRendered()`
`67`	`67`	`{`
`68`		`- if (true === $this->rendered \|\| 0 === count($this->children)) {`
`69`		`- return $this->rendered;`
	`68`	`+ if ($this->rendered) {`
	`69`	`+ return true;`
	`70`	`+ }`
	`71`	`+`
	`72`	`+ if (isset($this->vars['compound']) ? !$this->vars['compound'] : 0 === count($this->children)) {`
	`73`	`+ return false;`
`70`	`74`	`}`
`71`	`75`
`72`	`76`	`foreach ($this->children as $child) {`
Original file line number	Diff line number	Diff line change
`@@ -453,7 +453,7 @@ public function testNestedFormError()`
`453`	`453`	`$form = $this->factory->createNamedBuilder('name', 'form')`
`454`	`454`	`->add($this->factory`
`455`	`455`	`->createNamedBuilder('child', 'form', null, array('error_bubbling' => false))`
`456`		`- ->add('grandChild', 'form')`
	`456`	`+ ->add('grandChild', 'text')`
`457`	`457`	`)`
`458`	`458`	`->getForm();`
`459`	`459`
Original file line number	Diff line number	Diff line change
`@@ -318,7 +318,7 @@ public function testNestedFormError()`
`318`	`318`	`$form = $this->factory->createNamedBuilder('name', 'form')`
`319`	`319`	`->add($this->factory`
`320`	`320`	`->createNamedBuilder('child', 'form', null, array('error_bubbling' => false))`
`321`		`- ->add('grandChild', 'form')`
	`321`	`+ ->add('grandChild', 'text')`
`322`	`322`	`)`
`323`	`323`	`->getForm();`
`324`	`324`