[Form] Fixed regression on Collection type

symfony · Dec 29, 2015 · bd686cd · bd686cd · kralos · Jan 8, 2016
1 parent a7e5b49
commit bd686cd
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 1 deletion.
diff --git a/src/Symfony/Component/Form/Extension/Core/Type/CollectionType.php b/src/Symfony/Component/Form/Extension/Core/Type/CollectionType.php
@@ -30,7 +30,7 @@ public function buildForm(FormBuilderInterface $builder, array $options)
             $prototypeOptions = array_replace(array(
                 'required' => $options['required'],
                 'label' => $options['prototype_name'].'label__',
-            ), $options['options']);
+            ), $options['entry_options']);
 
             if (null !== $options['prototype_data']) {
                 $prototypeOptions['data'] = $options['prototype_data'];

diff --git a/src/Symfony/Component/Form/Tests/Extension/Core/Type/CollectionTypeTest.php b/src/Symfony/Component/Form/Tests/Extension/Core/Type/CollectionTypeTest.php
@@ -311,10 +311,12 @@ public function testPrototypeData()
             'entry_type' => 'Symfony\Component\Form\Extension\Core\Type\TextType',
             'entry_options' => array(
                 'data' => 'bar',
+                'label' => false,
             ),
         ));
 
         $this->assertSame('foo', $form->createView()->vars['prototype']->vars['value']);
+        $this->assertFalse($form->createView()->vars['prototype']->vars['label']);
     }
 
     /**
@@ -328,9 +330,11 @@ public function testLegacyPrototypeData()
             'type' => 'Symfony\Component\Form\Extension\Core\Type\TextType',
             'options' => array(
                 'data' => 'bar',
+                'label' => false,
             ),
         ));
         $this->assertSame('bar', $form->createView()->vars['prototype']->vars['value']);
+        $this->assertFalse($form->createView()->vars['prototype']->vars['label']);
     }
 
     public function testPrototypeDefaultRequired()