Remove plugins if their dependencies are missing

Author: Nyholm

DependencyInjection/CompilerPass/PluginPass.php

@@ -0,0 +1,28 @@
+<?php
+
+namespace Http\HttplugBundle\DependencyInjection\CompilerPass;
+
+use Symfony\Component\DependencyInjection\Compiler\CompilerPassInterface;
+use Symfony\Component\DependencyInjection\ContainerBuilder;
+
+/**
+ * Remove plugins if their dependencies are missing.
+ *
+ * @author Tobias Nyholm <[email protected]>
+ */
+class PluginPass implements CompilerPassInterface
+{
+    /**
+     * {@inheritdoc}
+     */
+    public function process(ContainerBuilder $container)
+    {
+        if (!($container->hasDefinition('logger') || $container->hasAlias('logger'))) {
+            $container->removeDefinition('httplug.plugin.logger');
+        }
+
+        if (!$container->hasDefinition('debug.stopwatch')) {
+            $container->removeDefinition('httplug.plugin.stopwatch');
+        }
+    }
+}

DependencyInjection/Configuration.php

@@ -15,6 +15,7 @@
  * sections are normalized, and merged.
  *
  * @author David Buchmann <[email protected]>
+ * @author Tobias Nyholm <[email protected]>
  */
 class Configuration implements ConfigurationInterface
 {
@@ -165,9 +166,10 @@ protected function configurePlugins(ArrayNodeDefinition $root)
                     ->end() // End history plugin
 
                     ->arrayNode('logger')
-                    ->canBeEnabled()
+                    ->canBeDisabled()
+                    ->addDefaultsIfNotSet()
                         ->children()
-                            ->scalarNode('logger')->isRequired()->cannotBeEmpty()->end()
+                            ->scalarNode('logger')->defaultValue('logger')->cannotBeEmpty()->end()
                             ->scalarNode('formatter')->defaultNull()->end()
                         ->end()
                     ->end() // End logger plugin
@@ -190,9 +192,10 @@ protected function configurePlugins(ArrayNodeDefinition $root)
                     ->end() // End retry plugin
 
                     ->arrayNode('stopwatch')
-                    ->canBeEnabled()
+                    ->canBeDisabled()
+                    ->addDefaultsIfNotSet()
                         ->children()
-                            ->scalarNode('stopwatch')->isRequired()->cannotBeEmpty()->end()
+                            ->scalarNode('stopwatch')->defaultValue('debug.stopwatch')->cannotBeEmpty()->end()
                         ->end()
                     ->end() // End stopwatch plugin
 

DependencyInjection/HttplugExtension.php

@@ -13,6 +13,7 @@
 
 /**
  * @author David Buchmann <[email protected]>
+ * @author Tobias Nyholm <[email protected]>
  */
 class HttplugExtension extends Extension
 {
@@ -143,9 +144,10 @@ private function configurePluginByName($name, Definition $definition, array $con
                 $definition->replaceArgument(0, new Reference($config['journal']));
                 break;
             case 'logger':
-                $definition
-                    ->replaceArgument(0, new Reference($config['logger']))
-                    ->replaceArgument(1, new Reference($config['formatter']));
+                $definition->replaceArgument(0, new Reference($config['logger']));
+                if (!empty($config['formatter'])) {
+                    $definition->replaceArgument(1, new Reference($config['formatter']));
+                }
                 break;
             case 'redirect':
                 $definition

HttplugBundle.php

@@ -2,11 +2,23 @@
 
 namespace Http\HttplugBundle;
 
+use Http\HttplugBundle\DependencyInjection\CompilerPass\PluginPass;
+use Symfony\Component\DependencyInjection\ContainerBuilder;
 use Symfony\Component\HttpKernel\Bundle\Bundle;
 
 /**
  * @author David Buchmann <[email protected]>
+ * @author Tobias Nyholm <[email protected]>
  */
 class HttplugBundle extends Bundle
 {
+    /**
+     * {@inheritdoc}
+     */
+    public function build(ContainerBuilder $container)
+    {
+        parent::build($container);
+
+        $container->addCompilerPass(new PluginPass());
+    }
 }

Resources/config/plugins.xml

@@ -23,7 +23,7 @@
         </service>
         <service id="httplug.plugin.logger" class="Http\Client\Plugin\LoggerPlugin" public="false">
             <argument />
-            <argument />
+            <argument>null</argument>
         </service>
         <service id="httplug.plugin.redirect" class="Http\Client\Plugin\RedirectPlugin" public="false" />
         <service id="httplug.plugin.retry" class="Http\Client\Plugin\RetryPlugin" public="false" />