Refactor the HttplugExtension (#97)

* Refactor the HttplugExtension

* minor refactor

* style fix

* typo

* Minor fixes

* Merge Profiling back to main extension

Separating profiling into a separate class does not make the code
cleaner or more readable.

In this commit:

- Profiling moved back to main extension
- Toolbar (profiling) defaults to kernel.debug

* added note about plugin client

Author: Nyholm

CHANGELOG.md

@@ -1,6 +1,16 @@
 # Change Log
 
 
+## UNRELEASED
+
+### Changed
+
+- All clients are registered with the PluginClient. (even in production)
+
+### Deprecated
+
+- `auto` value in `toolbar.enabled` config
+
 ## 1.2.2 - 2016-07-19
 
 ### Fixed

ClientFactory/PluginClientFactory.php

@@ -13,15 +13,23 @@
 final class PluginClientFactory
 {
     /**
-     * @param Plugin[]      $plugins
-     * @param ClientFactory $factory
-     * @param array         $config              config to the client factory
-     * @param array         $pluginClientOptions config forwarded to the PluginClient
+     * @param Plugin[]               $plugins
+     * @param ClientFactory|callable $factory
+     * @param array                  $config              config to the client factory
+     * @param array                  $pluginClientOptions config forwarded to the PluginClient
      *
      * @return PluginClient
      */
-    public static function createPluginClient(array $plugins, ClientFactory $factory, array $config, array $pluginClientOptions = [])
+    public static function createPluginClient(array $plugins, $factory, array $config, array $pluginClientOptions = [])
     {
-        return new PluginClient($factory->createClient($config), $plugins, $pluginClientOptions);
+        if ($factory instanceof ClientFactory) {
+            $client = $factory->createClient($config);
+        } elseif (is_callable($factory)) {
+            $client = $factory($config);
+        } else {
+            throw new \RuntimeException(sprintf('Second argument to PluginClientFactory::createPluginClient must be a "%s" or a callable.', ClientFactory::class));
+        }
+
+        return new PluginClient($client, $plugins, $pluginClientOptions);
     }
 }

DependencyInjection/Configuration.php

@@ -19,6 +19,23 @@
  */
 class Configuration implements ConfigurationInterface
 {
+    /**
+     * Whether to use the debug mode.
+     *
+     * @see https://github.com/doctrine/DoctrineBundle/blob/v1.5.2/DependencyInjection/Configuration.php#L31-L41
+     *
+     * @var bool
+     */
+    private $debug;
+
+    /**
+     * @param bool $debug
+     */
+    public function __construct($debug)
+    {
+        $this->debug = (bool) $debug;
+    }
+
     /**
      * {@inheritdoc}
      */
@@ -75,12 +92,17 @@ public function getConfigTreeBuilder()
                 ->end()
                 ->arrayNode('toolbar')
                     ->addDefaultsIfNotSet()
-                    ->info('Extend the debug profiler with inforation about requests.')
+                    ->info('Extend the debug profiler with information about requests.')
                     ->children()
-                        ->enumNode('enabled')
-                            ->info('If "auto" (default), the toolbar is activated when kernel.debug is true. You can force the toolbar on and off by changing this option.')
-                            ->values([true, false, 'auto'])
-                            ->defaultValue('auto')
+                        ->booleanNode('enabled') // @deprecated value auto in 1.3.0
+                            ->beforeNormalization()
+                                ->ifString()
+                                ->then(function ($v) {
+                                    return 'auto' === $v ? $this->debug : $v;
+                                })
+                            ->end()
+                            ->info('Turn the toolbar on or off. Defaults to kernel debug mode.')
+                            ->defaultValue($this->debug)
                         ->end()
                         ->scalarNode('formatter')->defaultNull()->end()
                         ->scalarNode('captured_body_length')