[5.3] Deal with null $files in request (#15558)

* Deal with null files in request * fix style
laravel · Sep 22, 2016 · 4532598 · 4532598
1 parent da531cd
commit 4532598
Showing 1 changed file with 5 additions and 1 deletion.
diff --git a/src/Illuminate/Http/Request.php b/src/Illuminate/Http/Request.php
@@ -870,11 +870,15 @@ public function duplicate(array $query = null, array $request = null, array $att
     /**
      * Filter the given array of files, removing any empty values.
      *
-     * @param  array  $files
+     * @param  mixed  $files
      * @return mixed
      */
     protected function filterFiles($files)
     {
+        if (! $files) {
+            return;
+        }
+
         foreach ($files as $key => $file) {
             if (is_array($file)) {
                 $files[$key] = $this->filterFiles($files[$key]);