Typos and let the toolbar "canBeDisabled"

Author: Nyholm

DependencyInjection/Configuration.php

@@ -72,7 +72,13 @@ public function getConfigTreeBuilder()
                         ->scalarNode('stream_factory')->defaultNull()->end()
                     ->end()
                 ->end()
-                ->booleanNode('toolbar')->defaultTrue()->end()
+                ->arrayNode('toolbar')
+                    ->canBeDisabled()
+                    ->addDefaultsIfNotSet()
+                    ->children()
+                        ->scalarNode('formatter')->defaultValue('httplug.collector.message_journal')->end()
+                    ->end()
+                ->end()
             ->end()
         ;
 

DependencyInjection/HttplugExtension.php

@@ -27,8 +27,10 @@ public function load(array $configs, ContainerBuilder $container)
         $loader->load('services.xml');
         $loader->load('plugins.xml');
         $loader->load('discovery.xml');
-        if ($config['toolbar'] && $container->hasParameter('kernel.debug') && $container->getParameter('kernel.debug')) {
+        if ($config['toolbar']['enabled'] && $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;
         }
 
@@ -62,7 +64,7 @@ protected function configureClients(ContainerBuilder $container, array $config)
             }
 
             if (isset($config['_inject_journal_plugin'])) {
-                array_unshift($arguments['plugins'], 'httplug.plugin.history');
+                array_unshift($arguments['plugins'], 'httplug.collector.history_plugin');
             }
 
             $def = $container->register('httplug.client.'.$name, DummyClient::class);

README.md

@@ -51,7 +51,7 @@ For information how to write applications with the services provided by this bun
 | httplug.stream_factory | Service* that provides the `Http\Message\StreamFactory`
 | httplug.client.[name] | This is your Httpclient that you have configured. With the configuration below the name would be `acme_client`.
 | httplug.client | This is the first client configured or a client named `default`.
-| httplug.plugin.content_length <br> httplug.plugin.decoder<br> httplug.plugin.error<br> httplug.plugin.history<br> httplug.plugin.logger<br> httplug.plugin.redirect<br> httplug.plugin.retry | These are built in plugins that lives in the `php-http/plugins` package. These servcies are not public and may only be used when configure HttpClients or services.<br><br>*The History plugin is only available when the kernel runs on debug mode and `httplug.toolbar: true`. It gets automatically injected to all clients.* 
+| httplug.plugin.content_length <br> httplug.plugin.decoder<br> httplug.plugin.error<br> httplug.plugin.logger<br> httplug.plugin.redirect<br> httplug.plugin.retry | These are built in plugins that live in the `php-http/plugins` package. These servcies are not public and may only be used when configure HttpClients or services. 
 
 \* *These services are always an alias to another service. You can specify your own service or leave the default, which is the same name with `.default` appended. The default services in turn use the service discovery mechanism to provide the best available implementation. You can specify a class for each of the default services to use instead of discovery, as long as those classes can be instantiated without arguments.*
 

Resources/config/data-collector.xml

@@ -4,13 +4,13 @@
            xsi:schemaLocation="http://symfony.com/schema/dic/services http://symfony.com/schema/dic/services/services-1.0.xsd">
 
     <services>
-        <service id="httplug.message_journal" class="Http\HttplugBundle\Collector\MessageJournal" public="false">
+        <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"/>
         </service>
 
-        <service id="httplug.plugin.history" class="Http\Client\Plugin\HistoryPlugin" public="false">
-            <argument type="service" id="httplug.message_journal"/>
+        <service id="httplug.collector.history_plugin" class="Http\Client\Plugin\HistoryPlugin" public="false">
+            <argument />
         </service>
     </services>
 </container>