[DependencyInjection] Deprecate ContainerAwareInterface and ContainerAwareTrait

alexandre-daubois · alexandre-daubois · commit e7e734defb0f · 2023-06-09T14:33:37.000+02:00
diff --git a/UPGRADE-6.4.md b/UPGRADE-6.4.md
@@ -1,6 +1,42 @@
 UPGRADE FROM 6.3 to 6.4
 =======================
 
+DependencyInjection
+-------------------
+
+ * Deprecate `ContainerAwareInterface` and `ContainerAwareTrait`, use dependency injection instead
+
+   Before:
+   ```php
+   class MyService implements ContainerAwareInterface
+   {
+       use ContainerAwareTrait;
+
+       // ...
+   }
+   ```
+
+   After:
+   ```php
+   class MyService
+   {
+       private ContainerInterface $container;
+
+       // Inject the container through the constructor...
+       public function __construct(ContainerInterface $container)
+       {
+           $this->container = $container;
+       }
+
+       // ... or by using the #[Required] attribute
+       #[Required]
+       public function setContainer(ContainerInterface $container): void
+       {
+            $this->container = $container;
+       }
+   }
+   ```
+
 DoctrineBridge
 --------------
 
diff --git a/src/Symfony/Component/DependencyInjection/CHANGELOG.md b/src/Symfony/Component/DependencyInjection/CHANGELOG.md
@@ -1,6 +1,11 @@
 CHANGELOG
 =========
 
+6.4
+---
+
+ * Deprecate `ContainerAwareInterface` and `ContainerAwareTrait`, use dependency injection instead
+
 6.3
 ---
 
diff --git a/src/Symfony/Component/DependencyInjection/ContainerAwareInterface.php b/src/Symfony/Component/DependencyInjection/ContainerAwareInterface.php
@@ -15,6 +15,8 @@
  * ContainerAwareInterface should be implemented by classes that depends on a Container.
  *
  * @author Fabien Potencier <fabien@symfony.com>
+ *
+ * @deprecated since Symfony 6.4, use dependency injection instead
  */
 interface ContainerAwareInterface
 {
diff --git a/src/Symfony/Component/DependencyInjection/ContainerAwareTrait.php b/src/Symfony/Component/DependencyInjection/ContainerAwareTrait.php
@@ -15,6 +15,8 @@
  * ContainerAware trait.
  *
  * @author Fabien Potencier <fabien@symfony.com>
+ *
+ * @deprecated since Symfony 6.4, use dependency injection instead
  */
 trait ContainerAwareTrait
 {

Original file line number	Diff line number	Diff line change
`@@ -15,6 +15,8 @@`
`15`	`15`	`* ContainerAwareInterface should be implemented by classes that depends on a Container.`
`16`	`16`	`*`
`17`	`17`	`* @author Fabien Potencier <fabien@symfony.com>`
	`18`	`+ *`
	`19`	`+ * @deprecated since Symfony 6.4, use dependency injection instead`
`18`	`20`	`*/`
`19`	`21`	`interface ContainerAwareInterface`
`20`	`22`	`{`