summaryrefslogtreecommitdiff
path: root/vendor/symfony/http-foundation/FileBag.php
diff options
context:
space:
mode:
authorGreg Roach <fisharebest@gmail.com>2017-10-16 14:56:14 +0100
committerGreg Roach <fisharebest@gmail.com>2017-10-16 14:56:14 +0100
commit542cb0023a05d14b3bf09a1c6c99f99b4256eaa2 (patch)
treef56893fcd67f4f1c8c7da08f9344702d3b471852 /vendor/symfony/http-foundation/FileBag.php
parent14b849be814811cd4d8ef5390813857fac9669da (diff)
downloadwebtrees-542cb0023a05d14b3bf09a1c6c99f99b4256eaa2.tar.gz
webtrees-542cb0023a05d14b3bf09a1c6c99f99b4256eaa2.tar.bz2
webtrees-542cb0023a05d14b3bf09a1c6c99f99b4256eaa2.zip
Update vendor code
Diffstat (limited to 'vendor/symfony/http-foundation/FileBag.php')
-rw-r--r--vendor/symfony/http-foundation/FileBag.php6
1 files changed, 2 insertions, 4 deletions
diff --git a/vendor/symfony/http-foundation/FileBag.php b/vendor/symfony/http-foundation/FileBag.php
index e17a9057b7..722ec2a9c4 100644
--- a/vendor/symfony/http-foundation/FileBag.php
+++ b/vendor/symfony/http-foundation/FileBag.php
@@ -24,8 +24,6 @@ class FileBag extends ParameterBag
private static $fileKeys = array('error', 'name', 'size', 'tmp_name', 'type');
/**
- * Constructor.
- *
* @param array $parameters An array of HTTP files
*/
public function __construct(array $parameters = array())
@@ -69,7 +67,7 @@ class FileBag extends ParameterBag
*
* @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)
{
@@ -89,7 +87,7 @@ class FileBag extends ParameterBag
$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));
}
}