From e4618b6c592844682afba3b52ac372c51ee01d79 Mon Sep 17 00:00:00 2001
From: Fabien Bourigault <bourigaultfabien@gmail.com>
Date: Wed, 19 Apr 2017 13:58:02 +0200
Subject: [PATCH] fix broken profiling.formatter option

---
 DependencyInjection/HttplugExtension.php           |  2 +-
 Resources/config/data-collector.xml                |  5 -----
 .../DependencyInjection/HttplugExtensionTest.php   | 14 ++++++++++++++
 3 files changed, 15 insertions(+), 6 deletions(-)

diff --git a/DependencyInjection/HttplugExtension.php b/DependencyInjection/HttplugExtension.php
index fd7fa1e3..69bbb4a2 100644
--- a/DependencyInjection/HttplugExtension.php
+++ b/DependencyInjection/HttplugExtension.php
@@ -63,7 +63,7 @@ public function load(array $configs, ContainerBuilder $container)
             if (!empty($config['profiling']['formatter'])) {
                 // Add custom formatter
                 $container
-                    ->getDefinition('httplug.collector.debug_collector')
+                    ->getDefinition('httplug.collector.formatter')
                     ->replaceArgument(0, new Reference($config['profiling']['formatter']))
                 ;
             }
diff --git a/Resources/config/data-collector.xml b/Resources/config/data-collector.xml
index dd673066..348dce41 100644
--- a/Resources/config/data-collector.xml
+++ b/Resources/config/data-collector.xml
@@ -12,11 +12,6 @@
             <argument type="service" id="httplug.formatter.full_http_message"/>
         </service>
 
-        <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"/>
-        </service>
-
         <service id="httplug.collector.collector" class="Http\HttplugBundle\Collector\Collector" public="false">
             <tag name="data_collector" template="HttplugBundle::webprofiler.html.twig" priority="200" id="httplug"/>
         </service>
diff --git a/Tests/Unit/DependencyInjection/HttplugExtensionTest.php b/Tests/Unit/DependencyInjection/HttplugExtensionTest.php
index b6910358..e8b49aa5 100644
--- a/Tests/Unit/DependencyInjection/HttplugExtensionTest.php
+++ b/Tests/Unit/DependencyInjection/HttplugExtensionTest.php
@@ -197,6 +197,20 @@ public function testProfilingWhenToolbarIsSpecificallyOn()
         $this->assertTrue(isset($arguments[3]));
     }
 
+    public function testOverrideProfillingFormatter()
+    {
+        $this->load(
+            [
+                'profiling' => [
+                    'formatter' => 'acme.formatter',
+                ],
+            ]
+        );
+
+        $def = $this->container->findDefinition('httplug.collector.formatter');
+        $this->assertEquals('acme.formatter', (string) $def->getArgument(0));
+    }
+
     private function verifyProfilingDisabled()
     {
         $def = $this->container->findDefinition('httplug.client');