Fix conflict between Bundle and ExtensionInterface

GuilhemN · GuilhemN · commit a1d3431f29bf · 2016-10-20T20:10:08.000+02:00
diff --git a/src/Symfony/Component/HttpKernel/Bundle/SimpleBundle.php b/src/Symfony/Component/HttpKernel/Bundle/SimpleBundle.php
@@ -14,92 +14,81 @@
 use Symfony\Component\Config\Definition\Builder\NodeParentInterface;
 use Symfony\Component\Config\Definition\Builder\TreeBuilder;
 use Symfony\Component\Config\Definition\ConfigurationInterface;
-use Symfony\Component\Config\Definition\Processor;
-use Symfony\Component\DependencyInjection\Container;
 use Symfony\Component\DependencyInjection\ContainerBuilder;
-use Symfony\Component\DependencyInjection\Extension\ConfigurationExtensionInterface;
-use Symfony\Component\DependencyInjection\Extension\ExtensionInterface;
+use Symfony\Component\HttpKernel\DependencyInjection\Extension;
 
 /**
  * A all-in-one implementation of {@link BundleInterface},
  * {@link ExtensionInterface} and {@link ConfigurationInterface}.
  *
  * @author Guilhem N. <egetick@gmail.com>
  */
-abstract class MicroBundle extends Bundle implements ExtensionInterface, ConfigurationExtensionInterface, ConfigurationInterface
+abstract class SimpleBundle extends Bundle implements ConfigurationInterface
 {
     /**
      * {@inheritdoc}
      */
     final public function getContainerExtension()
     {
-        return $this;
+        return new SimpleExtension($this, function (array $config, ContainerBuilder $container) {
+            $this->buildContainer($config, $container);
+        });
     }
 
     /**
      * {@inheritdoc}
      */
-    public function getXsdValidationBasePath()
+    final public function getConfigTreeBuilder()
     {
-        return false;
+        $treeBuilder = new TreeBuilder();
+        $rootNode = $treeBuilder->root($this->getAlias());
+
+        $this->buildConfiguration($rootNode);
+
+        return $treeBuilder;
     }
 
-    /**
-     * {@inheritdoc}
-     */
-    public function getNamespace()
+    protected function buildConfiguration(NodeParentInterface $rootNode)
     {
-        return 'http://example.org/schema/dic/'.$this->getAlias();
     }
 
-    /**
-     * {@inheritdoc}
-     */
-    public function getAlias()
+    protected function buildContainer(array $config, ContainerBuilder $container)
     {
-        // check naming convention
-        $basename = preg_replace('/Bundle$/', '', $this->getName());
-
-        return Container::underscore($basename);
     }
+}
 
-    /**
-     * {@inheritdoc}
-     */
-    final public function load(array $configs, ContainerBuilder $container)
-    {
-        $processor = new Processor();
-        $config = $processor->processConfiguration($this, $configs);
+/**
+ * Simple {@link ExtensionInterface} supporting {@link MicroBundle}.
+ *
+ * @internal
+ */
+final class SimpleExtension extends Extension
+{
+    private $bundle;
+    private $buildContainer;
 
-        $this->buildContainer($config, $container);
+    public function __construct(SimpleBundle $bundle, Closure $buildContainer)
+    {
+        $this->bundle = $bundle;
+        $this->buildContainer = $buildContainer;
     }
 
     /**
      * {@inheritdoc}
      */
-    final public function getConfiguration(array $config, ContainerBuilder $container)
+    public function load(array $configs, ContainerBuilder $container)
     {
-        return $this;
+        $config = $this->processConfiguration($this->bundle, $configs);
+
+        $f = $this->buildContainer;
+        $f($config, $container);
     }
 
     /**
      * {@inheritdoc}
      */
-    final public function getConfigTreeBuilder()
-    {
-        $treeBuilder = new TreeBuilder();
-        $rootNode = $treeBuilder->root($this->getAlias());
-
-        $this->buildConfiguration($rootNode);
-
-        return $treeBuilder;
-    }
-
-    protected function buildConfiguration(NodeParentInterface $rootNode)
-    {
-    }
-
-    protected function buildContainer(array $config, ContainerBuilder $container)
+    public function getConfiguration(array $config, ContainerBuilder $container)
     {
+        return $this->bundle;
     }
 }
