From 38692a6e5f7d423b15e842ef3203f703c37fb27d Mon Sep 17 00:00:00 2001
From: Yonel Ceruto <yonelceruto@gmail.com>
Date: Thu, 22 Nov 2018 12:30:46 -0500
Subject: [PATCH] [HttpKernel][WebProfilerBundle] Getting the cached client
 mime type instead of guessing it again

---
 .../views/Collector/request.html.twig         | 21 ++-----------------
 .../DataCollector/RequestDataCollector.php    | 21 ++-----------------
 2 files changed, 4 insertions(+), 38 deletions(-)

diff --git a/src/Symfony/Bundle/WebProfilerBundle/Resources/views/Collector/request.html.twig b/src/Symfony/Bundle/WebProfilerBundle/Resources/views/Collector/request.html.twig
index f6648b5b38..923049aebc 100644
--- a/src/Symfony/Bundle/WebProfilerBundle/Resources/views/Collector/request.html.twig
+++ b/src/Symfony/Bundle/WebProfilerBundle/Resources/views/Collector/request.html.twig
@@ -131,31 +131,14 @@
                     {{ include('@WebProfiler/Profiler/bag.html.twig', { bag: collector.requestrequest, maxDepth: 1 }, with_context = false) }}
                 {% endif %}
 
-                <h3>Uploaded files</h3>
+                <h4>Uploaded Files</h4>
 
                 {% if collector.requestfiles is empty %}
                     <div class="empty">
                         <p>No files were uploaded</p>
                     </div>
                 {% else %}
-                    <table>
-                        <thead>
-                            <tr>
-                                <th scope="col">File Name</th>
-                                <th scope="col">MIME Type</th>
-                                <th scope="col" class="text-right">Size (bytes)</th>
-                            </tr>
-                        </thead>
-                        <tbody>
-                        {% for file in collector.requestfiles %}
-                            <tr>
-                                <td>{{ file.name }}</td>
-                                <td>{{ file.mimetype }}</td>
-                                <td class="text-right">{{ file.size|number_format }}</td>
-                            </tr>
-                        {% endfor %}
-                        </tbody>
-                    </table>
+                    {{ include('@WebProfiler/Profiler/bag.html.twig', { bag: collector.requestfiles, maxDepth: 1 }, with_context = false) }}
                 {% endif %}
 
                 <h3>Request Attributes</h3>
diff --git a/src/Symfony/Component/HttpKernel/DataCollector/RequestDataCollector.php b/src/Symfony/Component/HttpKernel/DataCollector/RequestDataCollector.php
index 5afaf39299..ed75382618 100644
--- a/src/Symfony/Component/HttpKernel/DataCollector/RequestDataCollector.php
+++ b/src/Symfony/Component/HttpKernel/DataCollector/RequestDataCollector.php
@@ -13,7 +13,6 @@ namespace Symfony\Component\HttpKernel\DataCollector;
 
 use Symfony\Component\EventDispatcher\EventSubscriberInterface;
 use Symfony\Component\HttpFoundation\Cookie;
-use Symfony\Component\HttpFoundation\File\UploadedFile;
 use Symfony\Component\HttpFoundation\ParameterBag;
 use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\HttpFoundation\Response;
@@ -58,22 +57,6 @@ class RequestDataCollector extends DataCollector implements EventSubscriberInter
             $content = false;
         }
 
-        $requestFiles = array();
-        $extractFiles = function (array $files) use (&$extractFiles, &$requestFiles) {
-            foreach ($files as $file) {
-                if ($file instanceof UploadedFile) {
-                    $requestFiles[] = array(
-                        'name' => $file->getClientOriginalName(),
-                        'mimetype' => $file->getMimeType(),
-                        'size' => $file->getSize(),
-                    );
-                } elseif (\is_array($file)) {
-                    $extractFiles($file);
-                }
-            }
-        };
-        $extractFiles($request->files->all());
-
         $sessionMetadata = array();
         $sessionAttributes = array();
         $session = null;
@@ -112,7 +95,7 @@ class RequestDataCollector extends DataCollector implements EventSubscriberInter
             'status_code' => $statusCode,
             'request_query' => $request->query->all(),
             'request_request' => $request->request->all(),
-            'request_files' => $requestFiles,
+            'request_files' => $request->files->all(),
             'request_headers' => $request->headers->all(),
             'request_server' => $request->server->all(),
             'request_cookies' => $request->cookies->all(),
@@ -216,7 +199,7 @@ class RequestDataCollector extends DataCollector implements EventSubscriberInter
 
     public function getRequestFiles()
     {
-        return $this->data['request_files']->getValue(true);
+        return new ParameterBag($this->data['request_files']->getValue());
     }
 
     public function getRequestHeaders()