bug #24198 [HttpFoundation] Fix file upload multiple with no files (enumag)

fabpot · fabpot · commit 166f64efb1ee · 2017-09-30T07:18:14.000-07:00
This PR was merged into the 2.7 branch. Discussion ---------- [HttpFoundation] Fix file upload multiple with no files | Q | A | ------------- | --- | Branch? | 2.7 | Bug fix? | yes | New feature? | no | BC breaks? | no | Deprecations? | no | Tests pass? | yes | Fixed tickets | | License | MIT | Doc PR | ```php <form method="post" enctype="multipart/form-data"> <input type="file" multiple name="img[]"> <input type="submit"> </form> <?php $loader = require __DIR__ . '/../app/autoload.php'; if ($_SERVER['REQUEST_METHOD'] === 'POST') { $request = \Symfony\Component\HttpFoundation\Request::createFromGlobals(); var_export($request->files->all()['img']); } ``` Expected result when I send the form without any files: ``` array () ``` Actual result: ``` array ( 0 => NULL, ) ``` This causes a problem later when using FileType with multiple option - if no files are sent the form data are `[0 => '']` instead of `[]`. Of course I need to add a test for this. Commits ------- d4f6039 [HttpFoundation] Fix file upload multiple with no files
diff --git a/src/Symfony/Component/HttpFoundation/FileBag.php b/src/Symfony/Component/HttpFoundation/FileBag.php
@@ -67,7 +67,7 @@ public function add(array $files = array())
      *
      * @param array|UploadedFile $file A (multi-dimensional) array of uploaded file information
      *
-     * @return UploadedFile|UploadedFile[] A (multi-dimensional) array of UploadedFile instances
+     * @return UploadedFile[]|UploadedFile|null A (multi-dimensional) array of UploadedFile instances
      */
     protected function convertFileInformation($file)
     {
@@ -87,7 +87,7 @@ protected function convertFileInformation($file)
                     $file = new UploadedFile($file['tmp_name'], $file['name'], $file['type'], $file['size'], $file['error']);
                 }
             } else {
-                $file = array_map(array($this, 'convertFileInformation'), $file);
+                $file = array_filter(array_map(array($this, 'convertFileInformation'), $file));
             }
         }
 
diff --git a/src/Symfony/Component/HttpFoundation/Tests/FileBagTest.php b/src/Symfony/Component/HttpFoundation/Tests/FileBagTest.php
@@ -60,6 +60,19 @@ public function testShouldSetEmptyUploadedFilesToNull()
         $this->assertNull($bag->get('file'));
     }
 
+    public function testShouldRemoveEmptyUploadedFilesForMultiUpload()
+    {
+        $bag = new FileBag(array('file' => array(
+            'name' => array(''),
+            'type' => array(''),
+            'tmp_name' => array(''),
+            'error' => array(UPLOAD_ERR_NO_FILE),
+            'size' => array(0),
+        )));
+
+        $this->assertSame(array(), $bag->get('file'));
+    }
+
     public function testShouldConvertUploadedFilesWithPhpBug()
     {
         $tmpFile = $this->createTempFile();

Original file line number	Diff line number	Diff line change
`@@ -67,7 +67,7 @@ public function add(array $files = array())`
`67`	`67`	`*`
`68`	`68`	`* @param array\|UploadedFile $file A (multi-dimensional) array of uploaded file information`
`69`	`69`	`*`
`70`		`- * @return UploadedFile\|UploadedFile[] A (multi-dimensional) array of UploadedFile instances`
	`70`	`+ * @return UploadedFile[]\|UploadedFile\|null A (multi-dimensional) array of UploadedFile instances`
`71`	`71`	`*/`
`72`	`72`	`protected function convertFileInformation($file)`
`73`	`73`	`{`
`@@ -87,7 +87,7 @@ protected function convertFileInformation($file)`
`87`	`87`	`$file = new UploadedFile($file['tmp_name'], $file['name'], $file['type'], $file['size'], $file['error']);`
`88`	`88`	`}`
`89`	`89`	`} else {`
`90`		`- $file = array_map(array($this, 'convertFileInformation'), $file);`
	`90`	`+ $file = array_filter(array_map(array($this, 'convertFileInformation'), $file));`
`91`	`91`	`}`
`92`	`92`	`}`
`93`	`93`