Updated according to feedback

Nyholm · Nyholm · commit 5700de0e3e14 · 2018-03-23T12:26:36.000+01:00
diff --git a/src/Symfony/Bundle/FrameworkBundle/DataCollector/MessengerDataCollector.php b/src/Symfony/Bundle/FrameworkBundle/DataCollector/MessengerDataCollector.php
@@ -66,6 +66,11 @@ public function handle($message, callable $next)
                     'type' => get_class($result),
                     'object' => $this->cloneVar($result),
                 );
+            } elseif (is_array($result)) {
+                $debugRepresentation['result'] = array(
+                    'type' => 'array',
+                    'object' => $this->cloneVar($result),
+                );
             } else {
                 $debugRepresentation['result'] = array(
                     'type' => gettype($result),
@@ -79,7 +84,7 @@ public function handle($message, callable $next)
             );
         }
 
-        $this->data[] = $debugRepresentation;
+        $this->data['messages'][] = $debugRepresentation;
 
         if (null !== $exception) {
             throw $exception;
@@ -90,6 +95,6 @@ public function handle($message, callable $next)
 
     public function getMessages(): array
     {
-        return $this->data;
+        return $this->data['messages'];
     }
 }
diff --git a/src/Symfony/Bundle/WebProfilerBundle/Resources/views/Collector/messages.html.twig b/src/Symfony/Bundle/WebProfilerBundle/Resources/views/Collector/messages.html.twig
@@ -43,8 +43,10 @@
                     {{ profiler_dump(message.result.object, maxDepth=2) }}
                 {% elseif message.result.type is defined %}
                     {{ message.result.type }}
+                    {% if message.result.value is defined %}
+                        {{ message.result.value }}
+                    {% endif %}
                 {% endif %}
-
                 {% if message.exception.type is defined %}
                     {{ message.exception.type }}
                 {% endif %}

Original file line number	Diff line number	Diff line change
`@@ -66,6 +66,11 @@ public function handle($message, callable $next)`
`66`	`66`	`'type' => get_class($result),`
`67`	`67`	`'object' => $this->cloneVar($result),`
`68`	`68`	`);`
	`69`	`+ } elseif (is_array($result)) {`
	`70`	`+ $debugRepresentation['result'] = array(`
	`71`	`+ 'type' => 'array',`
	`72`	`+ 'object' => $this->cloneVar($result),`
	`73`	`+ );`
`69`	`74`	`} else {`
`70`	`75`	`$debugRepresentation['result'] = array(`
`71`	`76`	`'type' => gettype($result),`
`@@ -79,7 +84,7 @@ public function handle($message, callable $next)`
`79`	`84`	`);`
`80`	`85`	`}`
`81`	`86`
`82`		`- $this->data[] = $debugRepresentation;`
	`87`	`+ $this->data['messages'][] = $debugRepresentation;`
`83`	`88`
`84`	`89`	`if (null !== $exception) {`
`85`	`90`	`throw $exception;`
`@@ -90,6 +95,6 @@ public function handle($message, callable $next)`
`90`	`95`
`91`	`96`	`public function getMessages(): array`
`92`	`97`	`{`
`93`		`- return $this->data;`
	`98`	`+ return $this->data['messages'];`
`94`	`99`	`}`
`95`	`100`	`}`