Fix merge

nicolas-grekas · nicolas-grekas · commit 182f90638d9b · 2016-12-06T15:06:08.000+01:00
diff --git a/src/Symfony/Component/Form/Tests/Extension/Core/Type/FileTypeTest.php b/src/Symfony/Component/Form/Tests/Extension/Core/Type/FileTypeTest.php
@@ -56,7 +56,7 @@ public function testSubmitEmpty()
 
     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,
         ))->getForm();
 
@@ -68,7 +68,7 @@ public function testSubmitEmptyMultiple()
 
     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,
         ))->getForm();
 

Original file line number	Diff line number	Diff line change
`@@ -56,7 +56,7 @@ public function testSubmitEmpty()`
`56`	`56`
`57`	`57`	`public function testSubmitEmptyMultiple()`
`58`	`58`	`{`
`59`		`- $form = $this->factory->createBuilder('file', null, array(`
	`59`	`+ $form = $this->factory->createBuilder('Symfony\Component\Form\Extension\Core\Type\FileType', null, array(`
`60`	`60`	`'multiple' => true,`
`61`	`61`	`))->getForm();`
`62`	`62`
`@@ -68,7 +68,7 @@ public function testSubmitEmptyMultiple()`
`68`	`68`
`69`	`69`	`public function testSetDataMultiple()`
`70`	`70`	`{`
`71`		`- $form = $this->factory->createBuilder('file', null, array(`
	`71`	`+ $form = $this->factory->createBuilder('Symfony\Component\Form\Extension\Core\Type\FileType', null, array(`
`72`	`72`	`'multiple' => true,`
`73`	`73`	`))->getForm();`
`74`	`74`