[HttpKernel] Keep 3.0 compat by not using ContainerAware

nicolas-grekas · nicolas-grekas · commit ed29c03a5f52 · 2015-11-04T18:45:49.000+01:00
diff --git a/src/Symfony/Component/DependencyInjection/ContainerAwareTrait.php b/src/Symfony/Component/DependencyInjection/ContainerAwareTrait.php
@@ -24,9 +24,9 @@ trait ContainerAwareTrait
     protected $container;
 
     /**
-     * Sets the Container associated with this Controller.
+     * Sets the Container.
      *
-     * @param ContainerInterface $container A ContainerInterface instance
+     * @param ContainerInterface|null $container A ContainerInterface instance or null
      */
     public function setContainer(ContainerInterface $container = null)
     {
diff --git a/src/Symfony/Component/HttpKernel/Bundle/Bundle.php b/src/Symfony/Component/HttpKernel/Bundle/Bundle.php
@@ -11,7 +11,7 @@
 
 namespace Symfony\Component\HttpKernel\Bundle;
 
-use Symfony\Component\DependencyInjection\ContainerAware;
+use Symfony\Component\DependencyInjection\ContainerInterface;
 use Symfony\Component\DependencyInjection\ContainerBuilder;
 use Symfony\Component\DependencyInjection\Container;
 use Symfony\Component\Console\Application;
@@ -24,8 +24,12 @@
  *
  * @author Fabien Potencier <fabien@symfony.com>
  */
-abstract class Bundle extends ContainerAware implements BundleInterface
+abstract class Bundle implements BundleInterface
 {
+    /**
+     * @var ContainerInterface
+     */
+    protected $container;
     protected $name;
     protected $extension;
     protected $path;
@@ -58,6 +62,16 @@ public function build(ContainerBuilder $container)
     {
     }
 
+    /**
+     * Sets the Container.
+     *
+     * @param ContainerInterface|null $container A ContainerInterface instance or null
+     */
+    public function setContainer(ContainerInterface $container = null)
+    {
+        $this->container = $container;
+    }
+
     /**
      * Returns the bundle's container extension.
      *

Original file line number	Diff line number	Diff line change
`@@ -24,9 +24,9 @@ trait ContainerAwareTrait`
`24`	`24`	`protected $container;`
`25`	`25`
`26`	`26`	`/**`
`27`		`- * Sets the Container associated with this Controller.`
	`27`	`+ * Sets the Container.`
`28`	`28`	`*`
`29`		`- * @param ContainerInterface $container A ContainerInterface instance`
	`29`	`+ * @param ContainerInterface\|null $container A ContainerInterface instance or null`
`30`	`30`	`*/`
`31`	`31`	`public function setContainer(ContainerInterface $container = null)`
`32`	`32`	`{`