symfony
diff --git a/‎src/Symfony/Component/Form/NativeRequestHandler.php
Lines changed: 2 additions & 2 deletions b/‎src/Symfony/Component/Form/NativeRequestHandler.php
Lines changed: 2 additions & 2 deletions
diff --git a/‎src/Symfony/Component/Form/Tests/AbstractRequestHandlerTest.php
Lines changed: 45 additions & 1 deletion b/‎src/Symfony/Component/Form/Tests/AbstractRequestHandlerTest.php
Lines changed: 45 additions & 1 deletion
diff --git a/‎src/Symfony/Component/Form/Tests/Extension/HttpFoundation/HttpFoundationRequestHandlerTest.php
Lines changed: 2 additions & 2 deletions b/‎src/Symfony/Component/Form/Tests/Extension/HttpFoundation/HttpFoundationRequestHandlerTest.php
Lines changed: 2 additions & 2 deletions
diff --git a/‎src/Symfony/Component/Form/Tests/Fixtures/foo2 b/‎src/Symfony/Component/Form/Tests/Fixtures/foo2
diff --git a/‎src/Symfony/Component/Form/Tests/Fixtures/foo3 b/‎src/Symfony/Component/Form/Tests/Fixtures/foo3
diff --git a/‎src/Symfony/Component/Form/Tests/NativeRequestHandlerTest.php
Lines changed: 3 additions & 3 deletions b/‎src/Symfony/Component/Form/Tests/NativeRequestHandlerTest.php
Lines changed: 3 additions & 3 deletions
@@ -98,8 +98,8 @@ public function handleRequest(FormInterface $form, $request = null)
             }
 
             $fixedFiles = array();
-            foreach ($_FILES as $name => $file) {
-                $fixedFiles[$name] = self::stripEmptyFiles(self::fixPhpFilesArray($file));
+            foreach ($_FILES as $fileKey => $file) {
+                $fixedFiles[$fileKey] = self::stripEmptyFiles(self::fixPhpFilesArray($file));
             }
 
             if ('' === $name) {
 
@@ -266,6 +266,50 @@ public function testSubmitFileIfNoParam($method)
         $this->requestHandler->handleRequest($form, $this->request);
     }
 
+    /**
+     * @dataProvider methodExceptGetProvider
+     */
+    public function testSubmitMultipleFiles($method)
+    {
+        $form = $this->getMockForm('param1', $method);
+        $file = $this->getMockFile();
+
+        $this->setRequestData($method, array(
+            'param1' => null,
+        ), array(
+            'param2' => $this->getMockFile('2'),
+            'param1' => $file,
+            'param3' => $this->getMockFile('3'),
+        ));
+
+        $form->expects($this->once())
+             ->method('submit')
+             ->with($file, 'PATCH' !== $method);
+
+        $this->requestHandler->handleRequest($form, $this->request);
+    }
+
+    /**
+     * @dataProvider methodExceptGetProvider
+     */
+    public function testSubmitFileWithNamelessForm($method)
+    {
+        $form = $this->getMockForm(null, $method);
+        $file = $this->getMockFile();
+
+        $this->setRequestData($method, array(
+            '' => null,
+        ), array(
+            '' => $file,
+        ));
+
+        $form->expects($this->once())
+             ->method('submit')
+             ->with($file, 'PATCH' !== $method);
+
+        $this->requestHandler->handleRequest($form, $this->request);
+    }
+
     /**
      * @dataProvider getPostMaxSizeFixtures
      */
@@ -314,7 +358,7 @@ abstract protected function setRequestData($method, $data, $files = array());
 
     abstract protected function getRequestHandler();
 
-    abstract protected function getMockFile();
+    abstract protected function getMockFile($suffix = '');
 
     protected function getMockForm($name, $method = null, $compound = true)
     {
 
@@ -46,8 +46,8 @@ protected function getRequestHandler()
         return new HttpFoundationRequestHandler($this->serverParams);
     }
 
-    protected function getMockFile()
+    protected function getMockFile($suffix = '')
     {
-        return new UploadedFile(__DIR__.'/../../Fixtures/foo', 'foo');
+        return new UploadedFile(__DIR__.'/../../Fixtures/foo'.$suffix, 'foo'.$suffix);
     }
 }
@@ -206,12 +206,12 @@ protected function getRequestHandler()
         return new NativeRequestHandler($this->serverParams);
     }
 
-    protected function getMockFile()
+    protected function getMockFile($suffix = '')
     {
         return array(
-            'name' => 'upload.txt',
+            'name' => 'upload'.$suffix.'.txt',
             'type' => 'text/plain',
-            'tmp_name' => 'owfdskjasdfsa',
+            'tmp_name' => 'owfdskjasdfsa'.$suffix,
             'error' => UPLOAD_ERR_OK,
             'size' => 100,
         );
Original file line number	Diff line number	Diff line change
`@@ -98,8 +98,8 @@ public function handleRequest(FormInterface $form, $request = null)`
`98`	`98`	`}`
`99`	`99`
`100`	`100`	`$fixedFiles = array();`
`101`		`- foreach ($_FILES as $name => $file) {`
`102`		`- $fixedFiles[$name] = self::stripEmptyFiles(self::fixPhpFilesArray($file));`
	`101`	`+ foreach ($_FILES as $fileKey => $file) {`
	`102`	`+ $fixedFiles[$fileKey] = self::stripEmptyFiles(self::fixPhpFilesArray($file));`
`103`	`103`	`}`
`104`	`104`
`105`	`105`	`if ('' === $name) {`
Original file line number	Diff line number	Diff line change
`@@ -46,8 +46,8 @@ protected function getRequestHandler()`
`46`	`46`	`return new HttpFoundationRequestHandler($this->serverParams);`
`47`	`47`	`}`
`48`	`48`
`49`		`- protected function getMockFile()`
	`49`	`+ protected function getMockFile($suffix = '')`
`50`	`50`	`{`
`51`		`- return new UploadedFile(__DIR__.'/../../Fixtures/foo', 'foo');`
	`51`	`+ return new UploadedFile(__DIR__.'/../../Fixtures/foo'.$suffix, 'foo'.$suffix);`
`52`	`52`	`}`
`53`	`53`	`}`