feature #16424 [DI] Deprecate ContainerAware in favor of ContainerAwareTrait (nicolas-grekas)

fabpot · fabpot · commit a594b9fc1824 · 2015-11-04T01:36:48.000+01:00
This PR was merged into the 2.8 branch. Discussion ---------- [DI] Deprecate ContainerAware in favor of ContainerAwareTrait | Q | A | ------------- | --- | Bug fix? | no | New feature? | no | BC breaks? | no | Deprecations? | yes | Tests pass? | yes | Fixed tickets | n/a | License | MIT | Doc PR | - To be merged before #16411 (that then should be rebased) if we agree that this is the right approach (which I believe personally). The deprecation notice will be triggered by the existing mechanism in the DebugClassLoader (it can't be added inline because that would make symfony itself trigger it). PHP 5.3 users migrating to 3.0 must already move to 2.8+5.5 beforehand so this is really on the CUP (Continuous Upgrade Path). Commits ------- 807ebac [DI] Deprecate ContainerAware in favor of ContainerAwareTrait
diff --git a/src/Symfony/Component/DependencyInjection/CHANGELOG.md b/src/Symfony/Component/DependencyInjection/CHANGELOG.md
@@ -4,6 +4,7 @@ CHANGELOG
 2.8.0
 -----
 
+ * deprecated the abstract ContainerAware class in favor of ContainerAwareTrait
  * deprecated IntrospectableContainerInterface, to be merged with ContainerInterface in 3.0
  * allowed specifying a directory to recursively load all configuration files it contains
  * deprecated the concept of scopes
diff --git a/src/Symfony/Component/DependencyInjection/ContainerAware.php b/src/Symfony/Component/DependencyInjection/ContainerAware.php
@@ -15,6 +15,8 @@
  * A simple implementation of ContainerAwareInterface.
  *
  * @author Fabien Potencier <fabien@symfony.com>
+ *
+ * @deprecated since version 2.8, to be removed in 3.0. Use the ContainerAwareTrait instead.
  */
 abstract class ContainerAware implements ContainerAwareInterface
 {

Original file line number	Diff line number	Diff line change
`@@ -15,6 +15,8 @@`
`15`	`15`	`* A simple implementation of ContainerAwareInterface.`
`16`	`16`	`*`
`17`	`17`	`* @author Fabien Potencier <[email protected]>`
	`18`	`+ *`
	`19`	`+ * @deprecated since version 2.8, to be removed in 3.0. Use the ContainerAwareTrait instead.`
`18`	`20`	`*/`
`19`	`21`	`abstract class ContainerAware implements ContainerAwareInterface`
`20`	`22`	`{`