From 35091b1837d20bad770f7f7c5559e802b393053e Mon Sep 17 00:00:00 2001
From: Fabien Potencier <fabien.potencier@gmail.com>
Date: Thu, 29 Sep 2016 16:48:55 -0700
Subject: [PATCH] Revert "bug #20080 [Form] compound forms without children
 should be considered rendered implicitly (backbone87)"

This reverts commit eae5a9ba0b4350bd046be635364ab51e320e921b, reversing
changes made to fd763ad5a315e4559fd3e964a9bfb619474e79d8.
---
 src/Symfony/Component/Form/FormView.php       |  8 +--
 .../Extension/Core/Type/FormTypeTest.php      | 61 ++-----------------
 2 files changed, 7 insertions(+), 62 deletions(-)

diff --git a/src/Symfony/Component/Form/FormView.php b/src/Symfony/Component/Form/FormView.php
index 73e38d358e..401288cf83 100644
--- a/src/Symfony/Component/Form/FormView.php
+++ b/src/Symfony/Component/Form/FormView.php
@@ -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) {
diff --git a/src/Symfony/Component/Form/Tests/Extension/Core/Type/FormTypeTest.php b/src/Symfony/Component/Form/Tests/Extension/Core/Type/FormTypeTest.php
index d7c5cb4050..2b4b255b0d 100644
--- a/src/Symfony/Component/Form/Tests/Extension/Core/Type/FormTypeTest.php
+++ b/src/Symfony/Component/Form/Tests/Extension/Core/Type/FormTypeTest.php
@@ -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(