Merge pull request #162 from php-http/Nyholm-patch-30

Minor fixes

Author: Nyholm

DependencyInjection/HttplugExtension.php

@@ -58,7 +58,8 @@ public function load(array $configs, ContainerBuilder $container)
         }
 
         // Configure toolbar
-        if ($this->isConfigEnabled($container, $config['profiling'])) {
+        $profilingEnabled = $this->isConfigEnabled($container, $config['profiling']);
+        if ($profilingEnabled) {
             $loader->load('data-collector.xml');
 
             if (!empty($config['profiling']['formatter'])) {
@@ -75,7 +76,7 @@ public function load(array $configs, ContainerBuilder $container)
             ;
         }
 
-        $this->configureClients($container, $config, $this->isConfigEnabled($container, $config['profiling']));
+        $this->configureClients($container, $config, $profilingEnabled);
         $this->configureSharedPlugins($container, $config['plugins']); // must be after clients, as clients.X.plugins might use plugins as templates that will be removed
         $this->configureAutoDiscoveryClients($container, $config);
     }

Resources/config/data-collector.xml

@@ -4,8 +4,6 @@
            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.formatter" class="Http\HttplugBundle\Collector\Formatter" public="false">