Added plugin names

Author: Nyholm

Collector/DebugPluginCollector.php

@@ -21,12 +21,18 @@ class DebugPluginCollector extends DataCollector
      */
     private $formatter;
 
+    /**
+     * @var PluginJournal
+     */
+    private $journal;
+
     /**
      * @param Formatter $formatter
      */
-    public function __construct(Formatter $formatter = null)
+    public function __construct(Formatter $formatter, PluginJournal $journal)
     {
-        $this->formatter = $formatter ?: new SimpleFormatter();
+        $this->formatter = $formatter;
+        $this->journal = $journal;
     }
 
     /**
@@ -116,6 +122,14 @@ public function getClients()
         return ClientDataCollector::createFromCollectedData($this->data);
     }
 
+    /**
+     * @return PluginJournal
+     */
+    public function getJournal()
+    {
+        return $this->journal;
+    }
+
     /**
      * {@inheritdoc}
      */
@@ -131,4 +145,14 @@ public function getName()
     {
         return 'httplug';
     }
+
+    public function serialize()
+    {
+        return serialize([$this->data, $this->journal]);
+    }
+
+    public function unserialize($data)
+    {
+        list($this->data, $this->journal) = unserialize($data);
+    }
 }

Collector/PluginJournal.php

@@ -0,0 +1,50 @@
+<?php
+
+namespace Http\HttplugBundle\Collector;
+
+/**
+ * A object that remembers what plugins are configured for which clients.
+ *
+ * @author Tobias Nyholm <[email protected]>
+ */
+class PluginJournal
+{
+    /**
+     * @var array ['clientName'=>['index' => 'PluginName']
+     */
+    private $data;
+
+    /**
+     * @return array
+     */
+    public function getPlugins($clientName)
+    {
+        return $this->data[$clientName];
+    }
+
+    /**
+     * @return string|null
+     */
+    public function getPluginName($clientName, $idx)
+    {
+        if (isset($this->data[$clientName][$idx])) {
+            return $this->data[$clientName][$idx];
+        }
+
+        return;
+    }
+
+    /**
+     * @param string $clientName
+     * @param array $plugins
+     *
+     * @return $this
+     */
+    public function setPlugins($clientName, array $plugins)
+    {
+        $this->data[$clientName] = $plugins;
+
+        return $this;
+    }
+
+}

DependencyInjection/HttplugExtension.php

@@ -226,6 +226,10 @@ function ($id) {
                 ->addArgument(new Reference($arguments['factory']))
                 ->addArgument($arguments['config'])
                 ->addArgument(['debug_plugins'=>[new Reference($serviceIdDebugPlugin)]]);
+
+            // tell the plugin journal what plugins we used
+            $container->getDefinition('httplug.collector.plugin_journal')
+                ->addMethodCall('setPlugins', [$name, $arguments['plugins']]);
         }
 
 

Resources/config/data-collector.xml

@@ -4,10 +4,12 @@
            xsi:schemaLocation="http://symfony.com/schema/dic/services http://symfony.com/schema/dic/services/services-1.0.xsd">
 
     <services>
+        <service id="httplug.collector.plugin_journal" class="Http\HttplugBundle\Collector\PluginJournal" public="false" />
         <service id="httplug.formatter.full_http_message" class="Http\Message\Formatter\FullHttpMessageFormatter" public="false" />
 
         <service id="httplug.collector.debug_collector" class="Http\HttplugBundle\Collector\DebugPluginCollector" public="false">
             <argument type="service" id="httplug.formatter.full_http_message"/>
+            <argument type="service" id="httplug.collector.plugin_journal"/>
             <tag name="data_collector" template="HttplugBundle::webprofiler.html.twig" priority="200" id="httplug"/>
         </service>
     </services>

Resources/views/webprofiler.html.twig

@@ -53,7 +53,7 @@
     {% for name, client in collector.clients %}
         <h3>{{ name }}</h3>
         {% for stackIndex in client.stackIndexKeys %}
-            {{ macro.printMessages(client.requstStack(stackIndex), client.responseStack(stackIndex)) }}
+            {{ macro.printMessages(client.requstStack(stackIndex), client.responseStack(stackIndex), collector.journal.plugins(name)) }}
         {% endfor %}
     {% else %}
         <div class="empty">
@@ -63,7 +63,7 @@
 
 {% endblock %}
 
-{% macro printMessages(requestStack, responseStack) %}
+{% macro printMessages(requestStack, responseStack, pluginNames) %}
     <table>
         <tr>
             <th width="50%">Request</th>
@@ -79,10 +79,13 @@
                 <td colspan="2" style="text-align:center">See all</td>
             </tr>
             {% for idx in 1..requestStack|length-1 %}
-            <tr>
-                <td>{{ requestStack[idx]|nl2br }}</td>
-                <td>{{ responseStack[idx]|nl2br }}</td>
-            </tr>
+                <tr>
+                    <td colspan="2" style="">{{ pluginNames[idx-1] }}</td>
+                </tr>
+                <tr>
+                    <td>{{ requestStack[idx]|nl2br }}</td>
+                    <td>{{ responseStack[idx]|nl2br }}</td>
+                </tr>
             {% endfor %}
         {% endif %}
     </table>