Fix merge

This commit is contained in:
Nicolas Grekas 2016-12-06 15:06:08 +01:00
parent cffa826146
commit 182f90638d

View File

@ -56,7 +56,7 @@ class FileTypeTest extends \Symfony\Component\Form\Test\TypeTestCase
public function testSubmitEmptyMultiple() public function testSubmitEmptyMultiple()
{ {
$form = $this->factory->createBuilder('file', null, array( $form = $this->factory->createBuilder('Symfony\Component\Form\Extension\Core\Type\FileType', null, array(
'multiple' => true, 'multiple' => true,
))->getForm(); ))->getForm();
@ -68,7 +68,7 @@ class FileTypeTest extends \Symfony\Component\Form\Test\TypeTestCase
public function testSetDataMultiple() public function testSetDataMultiple()
{ {
$form = $this->factory->createBuilder('file', null, array( $form = $this->factory->createBuilder('Symfony\Component\Form\Extension\Core\Type\FileType', null, array(
'multiple' => true, 'multiple' => true,
))->getForm(); ))->getForm();