symfony · ogizanagi · Aug 17, 2016 · Aug 19, 2016 · Aug 17, 2016 · theofidry
diff --git a/src/Symfony/Component/DependencyInjection/Compiler/MergeExtensionConfigurationPass.php b/src/Symfony/Component/DependencyInjection/Compiler/MergeExtensionConfigurationPass.php
@@ -44,7 +44,7 @@ public function process(ContainerBuilder $container)
             }
             $config = $container->getParameterBag()->resolveValue($config);
 
-            $tmpContainer = new ContainerBuilder($container->getParameterBag());
+            $tmpContainer = new ContainerBuilder($container->getParameterBag(), $container->getContext());
             $tmpContainer->setResourceTracking($container->isTrackingResources());
             $tmpContainer->addObjectResource($extension);
 

diff --git a/src/Symfony/Component/DependencyInjection/ContainerBuilder.php b/src/Symfony/Component/DependencyInjection/ContainerBuilder.php
@@ -25,6 +25,7 @@
 use Symfony\Component\Config\Resource\ResourceInterface;
 use Symfony\Component\DependencyInjection\LazyProxy\Instantiator\InstantiatorInterface;
 use Symfony\Component\DependencyInjection\LazyProxy\Instantiator\RealServiceInstantiator;
+use Symfony\Component\DependencyInjection\ParameterBag\ParameterBagInterface;
 use Symfony\Component\ExpressionLanguage\Expression;
 use Symfony\Component\ExpressionLanguage\ExpressionFunctionProviderInterface;
 
@@ -33,7 +34,7 @@
  *
  * @author Fabien Potencier <fabien@symfony.com>
  */
-class ContainerBuilder extends Container implements TaggedContainerInterface
+class ContainerBuilder extends Container implements TaggedContainerInterface, ContextualizedContainerBuilderInterface
 {
     /**
      * @var ExtensionInterface[]
@@ -89,8 +90,21 @@ class ContainerBuilder extends Container implements TaggedContainerInterface
      */
     private $usedTags = array();
 
+    private $context;
+
     private $compiled = false;
 
+    /**
+     * @param ParameterBagInterface|null $parameterBag A ParameterBagInterface instance
+     * @param Context|null               $context      A Context instance, or null
+     */
+    public function __construct(ParameterBagInterface $parameterBag = null, Context $context = null)
+    {
+        parent::__construct($parameterBag);
+
+        $this->context = $context ?: Context::create();
+    }
+
     /**
      * Sets the track resources flag.
      *
@@ -1017,6 +1031,14 @@ public static function getServiceConditionals($value)
         return $services;
     }
 
+    /**
+     * {@inheritdoc}
+     */
+    public function getContext()
+    {
+        return $this->context;
+    }
+
     /**
      * Retrieves the currently set proxy instantiator or instantiates one.
      *

diff --git a/src/Symfony/Component/DependencyInjection/Context.php b/src/Symfony/Component/DependencyInjection/Context.php
@@ -0,0 +1,76 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\DependencyInjection;
+
+use Symfony\Component\DependencyInjection\Exception\ContextElementNotFoundException;
+
+/**
+ * @author Maxime Steinhausser <maxime.steinhausser@gmail.com>
+ */
+final class Context
+{
+    private $elements;
+
+    private function __construct(array $elements = array())
+    {
+        $this->elements = $elements;
+    }
+
+    /**
+     * Creates a new context allowing to share elements during the container building phase.
+     *
+     * Context elements is an array where the values are the elements to share
+     * and the keys are strings allowing to retrieve an element.
+     *
+     * For instance:
+     *
+     * Context::create(array('kernel' => new BootingKernel($kernel)));
+     *
+     * You can optionally pass an existing Context instance. Thus, original elements are reused,
+     * but new context elements replace any existing key.
+     *
+     * @param array        $elements An array of elements indexed by a string.
+     * @param Context|null $previous An optional Context instance used as base.
+     *
+     * @return Context
+     */
+    public static function create(array $elements = array(), Context $previous = null)
+    {
+        return new self($previous ? array_replace($previous->elements, $elements) : $elements);
+    }
+
+    /**
+     * @param string $key
+     *
+     * @return bool
+     */
+    public function has($key)
+    {
+        return isset($this->elements[$key]);
+    }
+
+    /**
+     * @param string $key
+     *
+     * @return mixed
+     *
+     * @throws ContextElementNotFoundException When no element exists for this key.
+     */
+    public function get($key)
+    {
+        if (!$this->has($key)) {
+            throw new ContextElementNotFoundException($key);
+        }
+
+        return $this->elements[$key];
+    }
+}
diff --git a/src/Symfony/Component/DependencyInjection/ContextualizedContainerBuilderInterface.php b/src/Symfony/Component/DependencyInjection/ContextualizedContainerBuilderInterface.php
@@ -0,0 +1,25 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\DependencyInjection;
+
+/**
+ * Implemented by a ContainerBuilder sharing a context during build time.
+ *
+ * @author Maxime Steinhausser <maxime.steinhausser@gmail.com>
+ */
+interface ContextualizedContainerBuilderInterface extends ContainerInterface
+{
+    /**
+     * @return Context
+     */
+    public function getContext();
+}
diff --git a/src/Symfony/Component/DependencyInjection/Exception/ContextElementNotFoundException.php b/src/Symfony/Component/DependencyInjection/Exception/ContextElementNotFoundException.php
@@ -0,0 +1,40 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\DependencyInjection\Exception;
+
+/**
+ * This exception is thrown when a non-existent context element is used.
+ *
+ * @author Maxime Steinhausser <maxime.steinhausser@gmail.com>
+ */
+class ContextElementNotFoundException extends InvalidArgumentException
+{
+    private $key;
+
+    /**
+     * @param string $key
+     */
+    public function __construct($key)
+    {
+        $this->key = $key;
+
+        parent::__construct(sprintf('Context element not found for "%s" key', $key));
+    }
+
+    /**
+     * @return string
+     */
+    public function getKey()
+    {
+        return $this->key;
+    }
+}
diff --git a/src/Symfony/Component/HttpKernel/BootingKernel.php b/src/Symfony/Component/HttpKernel/BootingKernel.php
@@ -0,0 +1,191 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\HttpKernel;
+
+use Symfony\Component\Config\Loader\LoaderInterface;
+use Symfony\Component\DependencyInjection\Exception\BadMethodCallException;
+use Symfony\Component\HttpFoundation\Request;
+use Symfony\Component\HttpKernel\Bundle\BootingBundle;
+use Symfony\Component\HttpKernel\Bundle\BundleInterface;
+
+/**
+ * @author Maxime Steinhausser <maxime.steinhausser@gmail.com>
+ */
+class BootingKernel implements KernelInterface
+{
+    private $innerKernel;
+
+    public function __construct(KernelInterface $innerKernel)
+    {
+        $this->innerKernel = $innerKernel;
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function serialize()
+    {
+        return $this->innerKernel->serialize();
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function unserialize($serialized)
+    {
+        $this->innerKernel->unserialize($serialized);
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function handle(Request $request, $type = self::MASTER_REQUEST, $catch = true)
+    {
+        throw new BadMethodCallException(sprintf('Calling "%s()" is not allowed.', __METHOD__));
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function registerBundles()
+    {
+        throw new BadMethodCallException(sprintf('Calling "%s()" is not allowed.', __METHOD__));
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function registerContainerConfiguration(LoaderInterface $loader)
+    {
+        throw new BadMethodCallException(sprintf('Calling "%s()" is not allowed.', __METHOD__));
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function boot()
+    {
+        throw new BadMethodCallException(sprintf('Calling "%s()" is not allowed.', __METHOD__));
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function shutdown()
+    {
+        throw new BadMethodCallException(sprintf('Calling "%s()" is not allowed.', __METHOD__));
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function getBundles()
+    {
+        return array_map(function (BundleInterface $bundle) {
+            return new BootingBundle($bundle);
+        }, $this->innerKernel->getBundles());
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function getBundle($name, $first = true)
+    {
+        if (is_array($bundle = $this->innerKernel->getBundle($name, $first))) {
+            return array_map(function (BundleInterface $bundle) {
+                return new BootingBundle($bundle);
+            }, $bundle);
+        }
+
+        return new BootingBundle($bundle);
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function locateResource($name, $dir = null, $first = true)
+    {
+        return $this->innerKernel->locateResource($name, $dir, $first);
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function getName()
+    {
+        return $this->innerKernel->getName();
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function getEnvironment()
+    {
+        return $this->innerKernel->getEnvironment();
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function isDebug()
+    {
+        return $this->innerKernel->isDebug();
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function getRootDir()
+    {
+        return $this->innerKernel->getRootDir();
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function getContainer()
+    {
+        throw new BadMethodCallException(sprintf('Calling "%s()" is not allowed.', __METHOD__));
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function getStartTime()
+    {
+        return $this->innerKernel->getStartTime();
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function getCacheDir()
+    {
+        return $this->innerKernel->getCacheDir();
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function getLogDir()
+    {
+        return $this->innerKernel->getLogDir();
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function getCharset()
+    {
+        return $this->innerKernel->getCharset();
+    }
+}