summaryrefslogtreecommitdiff
path: root/vendor/symfony/http-foundation/FileBag.php
diff options
context:
space:
mode:
authorGreg Roach <fisharebest@gmail.com>2017-11-12 16:08:46 +0000
committerGreg Roach <fisharebest@gmail.com>2017-11-13 11:24:00 +0000
commit025f16b9ad2e4c24f5dbfe8cc421b96807c3df25 (patch)
tree31c8fd1b04fb15ab1c9d8f6085a3ec04aa0475ca /vendor/symfony/http-foundation/FileBag.php
parentb6f3e912ccefb7cbf9669cb885d33550d9423374 (diff)
downloadwebtrees-025f16b9ad2e4c24f5dbfe8cc421b96807c3df25.tar.gz
webtrees-025f16b9ad2e4c24f5dbfe8cc421b96807c3df25.tar.bz2
webtrees-025f16b9ad2e4c24f5dbfe8cc421b96807c3df25.zip
Update dependencies
Diffstat (limited to 'vendor/symfony/http-foundation/FileBag.php')
-rw-r--r--vendor/symfony/http-foundation/FileBag.php7
1 files changed, 4 insertions, 3 deletions
diff --git a/vendor/symfony/http-foundation/FileBag.php b/vendor/symfony/http-foundation/FileBag.php
index 722ec2a9c4..5edd0e6210 100644
--- a/vendor/symfony/http-foundation/FileBag.php
+++ b/vendor/symfony/http-foundation/FileBag.php
@@ -87,7 +87,10 @@ class FileBag extends ParameterBag
$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);
+ }
}
}
@@ -106,8 +109,6 @@ class FileBag extends ParameterBag
* It's safe to pass an already converted array, in which case this method
* just returns the original array unmodified.
*
- * @param array $data
- *
* @return array
*/
protected function fixPhpFilesArray($data)