Commitb4b5d63

authored and

committed

[Form]fix#15544 when a collection type attribute "required" is false, "prototype" should too

1 parent423f83f commitb4b5d63Copy full SHA for b4b5d63

File tree

+27

-0

lines changed

src/Symfony/Component/Form
- Extension/Core/Type
  - CollectionType.php
- Tests/Extension/Core/Type
  - CollectionTypeTest.php

+27

-0

lines changed

Lines changed: 1 addition & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -28,6 +28,7 @@ public function buildForm(FormBuilderInterface $builder, array $options)`
`28`	`28`	`{`
`29`	`29`	`if ($options['allow_add'] &&$options['prototype']) {`
`30`	`30`	`$prototype =$builder->create($options['prototype_name'],$options['type'],array_replace(array(`
	`31`	`+'required' =>$options['required'],`
`31`	`32`	`'label' =>$options['prototype_name'].'label__',`
`32`	`33`	`),$options['options']));`
`33`	`34`	`$builder->setAttribute('prototype',$prototype->getForm());`

Lines changed: 26 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -195,4 +195,30 @@ public function testPrototypeDefaultLabel()`
`195`	`195`
`196`	`196`	`$this->assertSame('__test__label__',$form->createView()->vars['prototype']->vars['label']);`
`197`	`197`	`}`
	`198`	`+`
	`199`	`+publicfunctiontestPrototypeDefaultRequired()`
	`200`	`+ {`
	`201`	`+$form =$this->factory->create('collection',array(),array(`
	`202`	`+'type' =>'file',`
	`203`	`+'allow_add' =>true,`
	`204`	`+'prototype' =>true,`
	`205`	`+'prototype_name' =>'__test__',`
	`206`	`+ ));`
	`207`	`+`
	`208`	`+$this->assertTrue($form->createView()->vars['prototype']->vars['required']);`
	`209`	`+ }`
	`210`	`+`
	`211`	`+publicfunctiontestPrototypeSetNotRequired()`
	`212`	`+ {`
	`213`	`+$form =$this->factory->create('collection',array(),array(`
	`214`	`+'type' =>'file',`
	`215`	`+'allow_add' =>true,`
	`216`	`+'prototype' =>true,`
	`217`	`+'prototype_name' =>'__test__',`
	`218`	`+'required' =>false,`
	`219`	`+ ));`
	`220`	`+`
	`221`	`+$this->assertFalse($form->createView()->vars['required'],'collection is not required');`
	`222`	`+$this->assertFalse($form->createView()->vars['prototype']->vars['required'],'"prototype" should not be required');`
	`223`	`+ }`
`198`	`224`	`}`

Comments

(0)