merged branch hhamon/container_aware_abstract (PR symfony#4457)

fabpot · fabpot · commit f5355f60c54a · 2012-05-30T10:42:45.000+02:00
Commits ------- a551d9e [DependencyInjection] made ContainerAware class abstract. Discussion ---------- [DependencyInjection] made ContainerAware class abstract. Bug fix: no Feature addition: no Backwards compatibility break: no Symfony2 tests pass: yes --------------------------------------------------------------------------- by travisbot at 2012-05-30T07:09:10Z This pull request [passes](http://travis-ci.org/symfony/symfony/builds/1474925) (merged a551d9e into 0e98d33). --------------------------------------------------------------------------- by stof at 2012-05-30T08:01:57Z please add a note in the changelog of the component
diff --git a/src/Symfony/Component/DependencyInjection/ContainerAware.php b/src/Symfony/Component/DependencyInjection/ContainerAware.php
@@ -18,7 +18,7 @@
  *
  * @api
  */
-class ContainerAware implements ContainerAwareInterface
+abstract class ContainerAware implements ContainerAwareInterface
 {
     /**
      * @var ContainerInterface

Original file line number	Diff line number	Diff line change
`@@ -18,7 +18,7 @@`
`18`	`18`	`*`
`19`	`19`	`* @api`
`20`	`20`	`*/`
`21`		`-class ContainerAware implements ContainerAwareInterface`
	`21`	`+abstract class ContainerAware implements ContainerAwareInterface`
`22`	`22`	`{`
`23`	`23`	`/**`
`24`	`24`	`* @var ContainerInterface`