Tweak RequestCollector, use HTML + VarDumper

barryvdh · web-flow · commit 4c2e35ece1e4 · 2018-10-23T22:22:52.000+02:00
diff --git a/src/DataCollector/RequestCollector.php b/src/DataCollector/RequestCollector.php
@@ -51,7 +51,7 @@ public function getWidgets()
         return [
             "request" => [
                 "icon" => "tags",
-                "widget" => "PhpDebugBar.Widgets.VariableListWidget",
+                "widget" => "PhpDebugBar.Widgets.HtmlVariableListWidget",
                 "map" => "request",
                 "default" => "{}"
             ]
@@ -86,19 +86,20 @@ public function collect()
         $statusCode = $response->getStatusCode();
 
         $data = [
+            'path_info' => $request->getPathInfo(),
+            'status_code' => $statusCode,
+            'status_text' => isset(Response::$statusTexts[$statusCode]) ? Response::$statusTexts[$statusCode] : '',
             'format' => $request->getRequestFormat(),
             'content_type' => $response->headers->get('Content-Type') ? $response->headers->get(
                 'Content-Type'
             ) : 'text/html',
-            'status_text' => isset(Response::$statusTexts[$statusCode]) ? Response::$statusTexts[$statusCode] : '',
-            'status_code' => $statusCode,
             'request_query' => $request->query->all(),
             'request_request' => $request->request->all(),
             'request_headers' => $request->headers->all(),
             'request_server' => $request->server->all(),
             'request_cookies' => $request->cookies->all(),
             'response_headers' => $responseHeaders,
-            'path_info' => $request->getPathInfo(),
+
         ];
 
         if ($this->session) {
@@ -123,11 +124,15 @@ public function collect()
         if (isset($data['request_server']['PHP_AUTH_PW'])) {
             $data['request_server']['PHP_AUTH_PW'] = '******';
         }
+       ;
 
         foreach ($data as $key => $var) {
             if (!is_string($data[$key])) {
-                $data[$key] = $this->formatVar($var);
+                $data[$key] = DataCollector::getDefaultVarDumper()->renderVar($var);
+            } else {
+                $data[$key] = e($data[$key]);
             }
+
         }
 
         return $data;
