merged branch drak/kernel_dicb (PR symfony#3909)

fabpot · fabpot · commit d87a197d8082 · 2012-04-13T07:50:57.000+02:00
Commits ------- 82bbf3b [HttpKernel] Allow override of ContainerBuilder instance used to build container Discussion ---------- [HttpKernel] Allow override of ContainerBuilder class in Kernel Bug fix: no Feature addition: yes Backwards compatibility break: no Symfony2 tests pass: yes Fixes the following tickets: - Todo: - The ContainerBuilder class is hard coded into the `buildContainer()` method and is therefor not extensible. --------------------------------------------------------------------------- by fabpot at 2012-04-13T04:54:28Z I would definitely prefer a `getContainerBuilder()` that returns a container builder. But why would you want to do that? --------------------------------------------------------------------------- by drak at 2012-04-13T05:12:13Z @fabpot - The use case is to override the behaviour of the compilation that is performed by the kernel on the container. There is no way to override the compile() method called on the builder because the class is created hard in `Kernel::buildContainer()`. This was the simplest way to change it without other cascading changes. If we had a method which returned a container builder instance, would it just be something that creates a container builder, or acts as a getter on a property? The reason I ask is there is no real need to have a container builder persisting in a property, so a method that just returns a `new ContainerBuilder()` would also work but then we have to deal with the constructor as there is no way to set a ParameterBag on a container and `Kernel::buildContainer()` needs that. Basically, my reasoning is that since this particular container is just a throwaway, it seems ok to control the class name that was used to create the throwaway builder. So are you suggesting doing this instead? protected function getContainerBuilder() { return new ContainerBuilder(new ParameterBag($this->getKernelParameters())); } --------------------------------------------------------------------------- by fabpot at 2012-04-13T05:22:20Z Yes this was my suggestion. But are you sure you cannot solve your problems with compiler passes? --------------------------------------------------------------------------- by drak at 2012-04-13T05:38:29Z @fabpot, yes, this particular issue can't be solved by compiler passes. I'll adapt the PR. --------------------------------------------------------------------------- by drak at 2012-04-13T05:46:03Z @fabpot, amended as per your suggestion.
diff --git a/src/Symfony/Component/HttpKernel/Kernel.php b/src/Symfony/Component/HttpKernel/Kernel.php
@@ -640,7 +640,7 @@ protected function buildContainer()
             }
         }
 
-        $container = new ContainerBuilder(new ParameterBag($this->getKernelParameters()));
+        $container = $this->getContainerBuilder();
         $extensions = array();
         foreach ($this->bundles as $bundle) {
             if ($extension = $bundle->getContainerExtension()) {
@@ -671,6 +671,16 @@ protected function buildContainer()
         return $container;
     }
 
+    /**
+     * Gets a new ContainerBuilder instance used to build the service container.
+     *
+     * @return ContainerBuilder
+     */
+    protected function getContainerBuilder()
+    {
+        return new ContainerBuilder(new ParameterBag($this->getKernelParameters()));
+    }
+
     /**
      * Dumps the service container to PHP code in the cache.
      *

Original file line number	Diff line number	Diff line change
`@@ -640,7 +640,7 @@ protected function buildContainer()`
`640`	`640`	`}`
`641`	`641`	`}`
`642`	`642`
`643`		`- $container = new ContainerBuilder(new ParameterBag($this->getKernelParameters()));`
	`643`	`+ $container = $this->getContainerBuilder();`
`644`	`644`	`$extensions = array();`
`645`	`645`	`foreach ($this->bundles as $bundle) {`
`646`	`646`	`if ($extension = $bundle->getContainerExtension()) {`
`@@ -671,6 +671,16 @@ protected function buildContainer()`
`671`	`671`	`return $container;`
`672`	`672`	`}`
`673`	`673`
	`674`	`+ /**`
	`675`	`+ * Gets a new ContainerBuilder instance used to build the service container.`
	`676`	`+ *`
	`677`	`+ * @return ContainerBuilder`
	`678`	`+ */`
	`679`	`+ protected function getContainerBuilder()`
	`680`	`+ {`
	`681`	`+ return new ContainerBuilder(new ParameterBag($this 51C4 ->getKernelParameters()));`
	`682`	`+ }`
	`683`	`+`
`674`	`684`	`/**`
`675`	`685`	`* Dumps the service container to PHP code in the cache.`
`676`	`686`	`*`