Updated to Drupal 8.5. Core Media not yet in use.

[yaffs-website] / vendor / symfony / http-foundation / FileBag.php

diff --git a/vendor/symfony/http-foundation/FileBag.php b/vendor/symfony/http-foundation/FileBag.php
index e17a9057b71579fc5b159aec0e489bffbd776975..5edd0e6210c52551e2500591514e8e703fa74c66 100644 (file)
--- 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)
     {
@@ -90,6 +88,9 @@ class FileBag extends ParameterBag
                 }
             } else {
                 $file = array_map(array($this, 'convertFileInformation'), $file);
+                if (array_keys($keys) === $keys) {
+                    $file = array_filter($file);
+                }
             }
         }
 
@@ -108,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)