bug #24606 [HttpFoundation] Fix FileBag issue with associative arrays (enumag)

fabpot · fabpot · commit d74402735714 · 2017-10-25T18:19:06.000-07:00
This PR was squashed before being merged into the 2.7 branch (closes #24606). Discussion ---------- [HttpFoundation] Fix FileBag issue with associative arrays | Q | A | ------------- | --- | Branch? | 2.7 | Bug fix? | yes | New feature? | no | BC breaks? | no | Deprecations? | no | Tests pass? | yes | Fixed tickets | #24546 | License | MIT | Doc PR | Commits ------- 8ea2860 [HttpFoundation] Fix FileBag issue with associative arrays
diff --git a/src/Symfony/Component/HttpFoundation/FileBag.php b/src/Symfony/Component/HttpFoundation/FileBag.php
@@ -87,7 +87,10 @@ protected function convertFileInformation($file)
                     $file = new UploadedFile($file['tmp_name'], $file['name'], $file['type'], $file['size'], $file['error']);
                 }
             } else {
-                $file = array_filter(array_map(array($this, 'convertFileInformation'), $file));
+                $file = array_map(array($this, 'convertFileInformation'), $file);
+                if (array_keys($keys) === $keys) {
+                    $file = array_filter($file);
+                }
             }
         }
 
diff --git a/src/Symfony/Component/HttpFoundation/Tests/FileBagTest.php b/src/Symfony/Component/HttpFoundation/Tests/FileBagTest.php
@@ -62,15 +62,28 @@ public function testShouldSetEmptyUploadedFilesToNull()
 
     public function testShouldRemoveEmptyUploadedFilesForMultiUpload()
     {
-        $bag = new FileBag(array('file' => array(
+        $bag = new FileBag(array('files' => array(
             'name' => array(''),
             'type' => array(''),
             'tmp_name' => array(''),
             'error' => array(UPLOAD_ERR_NO_FILE),
             'size' => array(0),
         )));
 
-        $this->assertSame(array(), $bag->get('file'));
+        $this->assertSame(array(), $bag->get('files'));
+    }
+
+    public function testShouldNotRemoveEmptyUploadedFilesForAssociativeArray()
+    {
+        $bag = new FileBag(array('files' => array(
+            'name' => array('file1' => ''),
+            'type' => array('file1' => ''),
+            'tmp_name' => array('file1' => ''),
+            'error' => array('file1' => UPLOAD_ERR_NO_FILE),
+            'size' => array('file1' => 0),
+        )));
+
+        $this->assertSame(array('file1' => null), $bag->get('files'));
     }
 
     public function testShouldConvertUploadedFilesWithPhpBug()

Original file line number	Diff line number	Diff line change
`@@ -87,7 +87,10 @@ 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_filter(array_map(array($this, 'convertFileInformation'), $file));`
	`90`	`+ $file = array_map(array($this, 'convertFileInformation'), $file);`
	`91`	`+ if (array_keys($keys) === $keys) {`
	`92`	`+ $file = array_filter($file);`
	`93`	`+ }`
`91`	`94`	`}`
`92`	`95`	`}`
`93`	`96`