trigger deprecation notice for ContainerAware

Tobion · Tobion · commit 75c0b8acd180 · 2015-11-01T17:41:13.000+01:00
diff --git a/src/Symfony/Bridge/Doctrine/ManagerRegistry.php b/src/Symfony/Bridge/Doctrine/ManagerRegistry.php
@@ -13,7 +13,6 @@
 
 use Symfony\Component\DependencyInjection\ContainerAwareInterface;
 use Symfony\Component\DependencyInjection\ContainerAwareTrait;
-use Symfony\Component\DependencyInjection\ContainerInterface;
 use Doctrine\Common\Persistence\AbstractManagerRegistry;
 
 /**
diff --git a/src/Symfony/Component/DependencyInjection/CHANGELOG.md b/src/Symfony/Component/DependencyInjection/CHANGELOG.md
@@ -5,6 +5,7 @@ CHANGELOG
 -----
 
  * removed all deprecated codes from 2.x versions
+ * deprecated abstract ContainerAware class in favor of ContainerAwareTrait
 
 2.8.0
 -----
diff --git a/src/Symfony/Component/DependencyInjection/ContainerAware.php b/src/Symfony/Component/DependencyInjection/ContainerAware.php
@@ -11,6 +11,8 @@
 
 namespace Symfony\Component\DependencyInjection;
 
+@trigger_error('The '.__NAMESPACE__.'\ContainerAware class is deprecated since version 3.0 and will be removed in 4.0. Use ContainerAwareTrait with ContainerAwareInterface instead.', E_USER_DEPRECATED);
+
 /**
  * A simple implementation of ContainerAwareInterface.
  *
diff --git a/src/Symfony/Component/HttpKernel/Bundle/Bundle.php b/src/Symfony/Component/HttpKernel/Bundle/Bundle.php
@@ -11,7 +11,6 @@
 
 namespace Symfony\Component\HttpKernel\Bundle;
 
-use Symfony\Component\DependencyInjection\ContainerAwareInterface;
 use Symfony\Component\DependencyInjection\ContainerAwareTrait;
 use Symfony\Component\DependencyInjection\ContainerBuilder;
 use Symfony\Component\DependencyInjection\Container;

Original file line number	Diff line number	Diff line change
`@@ -11,6 +11,8 @@`
`11`	`11`
`12`	`12`	`namespace Symfony\Component\DependencyInjection;`
`13`	`13`
	`14`	`+@trigger_error('The '.__NAMESPACE__.'\ContainerAware class is deprecated since version 3.0 and will be removed in 4.0. Use ContainerAwareTrait with ContainerAwareInterface instead.', E_USER_DEPRECATED);`
	`15`	`+`
`14`	`16`	`/**`
`15`	`17`	`* A simple implementation of ContainerAwareInterface.`
`16`	`18`	`*`