[Form] fix "prototype" not required when parent form is not required

HeahDude · HeahDude · commit 041c804e2cf4 · 2016-03-26T14:49:05.000+01:00
diff --git a/src/Symfony/Component/Form/Extension/Core/Type/CollectionType.php b/src/Symfony/Component/Form/Extension/Core/Type/CollectionType.php
@@ -56,6 +56,10 @@ public function buildView(FormView $view, FormInterface $form, array $options)
 
         if ($form->getConfig()->hasAttribute('prototype')) {
             $view->vars['prototype'] = $form->getConfig()->getAttribute('prototype')->createView($view);
+
+            if ($view->parent && !$view->parent->vars['required']) {
+                $view->vars['prototype']->vars['required'] = false;
+            }
         }
     }
 
diff --git a/src/Symfony/Component/Form/Tests/Extension/Core/Type/CollectionTypeTest.php b/src/Symfony/Component/Form/Tests/Extension/Core/Type/CollectionTypeTest.php
@@ -221,4 +221,46 @@ public function testPrototypeSetNotRequired()
         $this->assertFalse($form->createView()->vars['required'], 'collection is not required');
         $this->assertFalse($form->createView()->vars['prototype']->vars['required'], '"prototype" should not be required');
     }
+
+    public function testPrototypeSetNotRequiredIfParentNotRequired()
+    {
+        $child = $this->factory->create('collection', array(), array(
+            'type' => 'file',
+            'allow_add' => true,
+            'prototype' => true,
+            'prototype_name' => '__test__',
+        ));
+
+        $parent = $this->factory->create('form', array(), array(
+            'required' => false,
+        ));
+
+        $child->setParent($parent);
+        $this->assertFalse($parent->createView()->vars['required'], 'Parent is not required');
+        $this->assertFalse($child->createView()->vars['required'], 'Child is not required');
+        $this->assertFalse($child->createView()->vars['prototype']->vars['required'], '"Prototype" should not be required');
+    }
+
+    public function testPrototypeNotOverrideRequiredByEntryOptionsInFavorOfParent()
+    {
+        $child = $this->factory->create('collection', array(), array(
+            'type' => 'file',
+            'allow_add' => true,
+            'prototype' => true,
+            'prototype_name' => '__test__',
+            'options' => array(
+                'required' => true,
+            ),
+        ));
+
+        $parent = $this->factory->create('form', array(), array(
+            'required' => false,
+        ));
+
+        $child->setParent($parent);
+
+        $this->assertFalse($parent->createView()->vars['required'], 'Parent is not required');
+        $this->assertFalse($child->createView()->vars['required'], 'Child is not required');
+        $this->assertFalse($child->createView()->vars['prototype']->vars['required'], '"Prototype" should not be required');
+    }
 }

Original file line number	Diff line number	Diff line change
`@@ -56,6 +56,10 @@ public function buildView(FormView $view, FormInterface $form, array $options)`
`56`	`56`
`57`	`57`	`if ($form->getConfig()->hasAttribute('prototype')) {`
`58`	`58`	`$view->vars['prototype'] = $form->getConfig()->getAttribute('prototype')->createView($view);`
	`59`	`+`
	`60`	`+ if ($view->parent && !$view->parent->vars['required']) {`
	`61`	`+ $view->vars['prototype']->vars['required'] = false;`
	`62`	`+ }`
`59`	`63`	`}`
`60`	`64`	`}`
`61`	`65`