Bugfixing and improving documentation

Author: Nyholm

DependencyInjection/Configuration.php

@@ -74,8 +74,9 @@ public function getConfigTreeBuilder()
                 ->arrayNode('toolbar')
                     ->canBeDisabled()
                     ->addDefaultsIfNotSet()
+                    ->info('Extend the debug profiler with inforation about requests. This could only be active when the kernel is in debug mode.')
                     ->children()
-                        ->scalarNode('formatter')->defaultValue('httplug.collector.message_journal')->end()
+                        ->scalarNode('formatter')->defaultNull()->end()
                     ->end()
                 ->end()
             ->end();

DependencyInjection/HttplugExtension.php

@@ -27,11 +27,15 @@ public function load(array $configs, ContainerBuilder $container)
         $loader->load('services.xml');
         $loader->load('plugins.xml');
         $loader->load('discovery.xml');
-        if ($config['toolbar']['enabled'] && $container->hasParameter('kernel.debug') && $container->getParameter('kernel.debug')) {
+
+        if ($config['toolbar']['enabled'] && $s = $container->hasParameter('kernel.debug') && $container->getParameter('kernel.debug')) {
             $loader->load('data-collector.xml');
-            $container->getDefinition('httplug.collector.history_plugin')
-                ->replaceArgument(0, new Reference($config['toolbar']['formatter']));
-            $config['_inject_journal_plugin'] = true;
+            $config['_inject_collector_plugin'] = true;
+
+            if (!empty($config['toolbar']['formatter'])) {
+                $container->getDefinition('httplug.collector.message_journal')
+                    ->replaceArgument(0, new Reference($config['toolbar']['formatter']));
+            }
         }
 
         foreach ($config['classes'] as $service => $class) {
@@ -61,7 +65,7 @@ protected function configureClients(ContainerBuilder $container, array $config)
                 $first = $name;
             }
 
-            if (isset($config['_inject_journal_plugin'])) {
+            if (isset($config['_inject_collector_plugin'])) {
                 array_unshift($arguments['plugins'], 'httplug.collector.history_plugin');
             }
 

Resources/config/data-collector.xml

@@ -7,10 +7,11 @@
         <service id="httplug.collector.message_journal" class="Http\HttplugBundle\Collector\MessageJournal" public="false">
             <tag name="data_collector" template="HttplugBundle::webprofiler.html.twig" priority="200"
                  id="httplug"/>
+            <argument>null</argument>
         </service>
 
         <service id="httplug.collector.history_plugin" class="Http\Client\Plugin\HistoryPlugin" public="false">
-            <argument />
+            <argument type="service" id="httplug.collector.message_journal"/>
         </service>
     </services>
 </container>