feature #26650 [Messenger] Clone messages to show in profiler (Nyholm)

fabpot · fabpot · commit 5b27c2f61f27 · 2018-03-27T09:46:52.000+02:00
This PR was squashed before being merged into the 4.1-dev branch (closes #26650). Discussion ---------- [Messenger] Clone messages to show in profiler | Q | A | ------------- | --- | Branch? | master | Bug fix? | no | New feature? | yes | BC breaks? | no | Deprecations? | no | Tests pass? | yes | Fixed tickets | na | License | MIT | Doc PR | na We should make the profiler page more pretty by using the cloner. ![screen shot 2018-03-23 at 11 08 02](https://user-images.githubusercontent.com/1275206/37823687-816a373a-2e8a-11e8-824e-ac7f96a51e3b.png) Commits ------- 4d1be87 [Messenger] Clone messages to show in profiler
diff --git a/src/Symfony/Bundle/FrameworkBundle/DataCollector/MessengerDataCollector.php b/src/Symfony/Bundle/FrameworkBundle/DataCollector/MessengerDataCollector.php
@@ -53,6 +53,7 @@ public function handle($message, callable $next)
         $debugRepresentation = array(
             'message' => array(
                 'type' => get_class($message),
+                'object' => $this->cloneVar($message),
             ),
         );
 
@@ -63,6 +64,12 @@ public function handle($message, callable $next)
             if (is_object($result)) {
                 $debugRepresentation['result'] = array(
                     '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(
@@ -77,7 +84,7 @@ public function handle($message, callable $next)
             );
         }
 
-        $this->data[] = $debugRepresentation;
+        $this->data['messages'][] = $debugRepresentation;
 
         if (null !== $exception) {
             throw $exception;
@@ -88,6 +95,6 @@ public function handle($message, callable $next)
 
     public function getMessages(): array
     {
-        return $this->data;
+        return $this->data['messages'] ?? array();
     }
 }
diff --git a/src/Symfony/Bundle/WebProfilerBundle/Resources/views/Collector/messenger.html.twig b/src/Symfony/Bundle/WebProfilerBundle/Resources/views/Collector/messenger.html.twig
@@ -41,18 +41,28 @@
             </thead>
             <tbody>
             {% for message in collector.messages %}
-            <tr>
-                <td>{{ message.message.type }}</td>
-                <td>
-                    {% if message.result.type is defined %}
-                        {{ message.result.type }}
-                    {% endif %}
-
-                    {% if message.exception.type is defined %}
-                        {{ message.exception.type }}
-                    {% endif %}
-                </td>
-            </tr>
+                <tr>
+                    <td>
+                        {% if message.result.object is defined %}
+                            {{ profiler_dump(message.message.object, maxDepth=2) }}
+                        {% else %}
+                            {{ message.message.type }}
+                        {% endif %}
+                    </td>
+                    <td>
+                        {% if message.result.object is defined %}
+                            {{ 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 %}
+                    </td>
+                </tr>
             {% endfor %}
             </tbody>
         </table>
