[FrameworkBundle] Deprecate ContainerAwareCommand

Robin Chalas · Robin Chalas · commit d962935d03c5 · 2018-09-09T19:07:56.000+02:00
diff --git a/UPGRADE-4.2.md b/UPGRADE-4.2.md
@@ -85,6 +85,8 @@ FrameworkBundle
    and will allow dumping optimized routers and using Unicode classes in requirements.
  * Added support for the SameSite attribute for session cookies. It is highly recommended to set this setting (`framework.session.cookie_samesite`) to `lax` for increased security against CSRF attacks.
  * The `Controller` class has been deprecated, use `AbstractController` instead.
+ * The `ContainerAwareCommand` class has been deprecated, use `Symfony\Component\Console\Command\Command`
+   with dependency injection instead.
 
 Messenger
 ---------
diff --git a/UPGRADE-5.0.md b/UPGRADE-5.0.md
@@ -93,6 +93,8 @@ FrameworkBundle
  * The `RequestDataCollector` class has been removed. Use the `Symfony\Component\HttpKernel\DataCollector\RequestDataCollector` class instead.
  * Removed `Symfony\Bundle\FrameworkBundle\Controller\Controller`. Use `Symfony\Bundle\FrameworkBundle\Controller\AbstractController` instead.
  * Added support for the SameSite attribute for session cookies. It is highly recommended to set this setting (`framework.session.cookie_samesite`) to `lax` for increased security against CSRF attacks.
+ * The `ContainerAwareCommand` class has been removed, use `Symfony\Component\Console\Command\Command`
+   with dependency injection instead.
 
 HttpFoundation
 --------------
diff --git a/src/Symfony/Bundle/FrameworkBundle/CHANGELOG.md b/src/Symfony/Bundle/FrameworkBundle/CHANGELOG.md
@@ -11,6 +11,7 @@ CHANGELOG
  * Deprecated the `Symfony\Bundle\FrameworkBundle\Controller\Controller` class in favor of `Symfony\Bundle\FrameworkBundle\Controller\AbstractController`.
  * Enabled autoconfiguration for `Psr\Log\LoggerAwareInterface`
  * Added new "auto" mode for `framework.session.cookie_secure` to turn it on when HTTPS is used
+ * Deprecated the `ContainerAwareCommand` class in favor of `Symfony\Component\Console\Command\Command`
 
 4.1.0
 -----
diff --git a/src/Symfony/Bundle/FrameworkBundle/Command/ContainerAwareCommand.php b/src/Symfony/Bundle/FrameworkBundle/Command/ContainerAwareCommand.php
@@ -15,10 +15,14 @@
 use Symfony\Component\DependencyInjection\ContainerAwareInterface;
 use Symfony\Component\DependencyInjection\ContainerInterface;
 
+@trigger_error(sprintf('The "%s" class is deprecated since Symfony 4.2, use "%s" with dependency injection instead.', ContainerAwareCommand::class, Command::class), E_USER_DEPRECATED);
+
 /**
  * Command.
  *
  * @author Fabien Potencier <fabien@symfony.com>
+ *
+ * @deprecated since Symfony 4.2, use {@see Command} instead.
  */
 abstract class ContainerAwareCommand extends Command implements ContainerAwareInterface
 {
diff --git a/src/Symfony/Bundle/FrameworkBundle/Tests/Console/ApplicationTest.php b/src/Symfony/Bundle/FrameworkBundle/Tests/Console/ApplicationTest.php
@@ -101,6 +101,10 @@ public function testBundleCommandCanBeFoundByAlias()
         $this->assertSame($command, $application->find('alias'));
     }
 
+    /**
+     * @group legacy
+     * @expectedDeprecation The "Symfony\Bundle\FrameworkBundle\Command\ContainerAwareCommand" class is deprecated since Symfony 4.2, use "Symfony\Component\Console\Command\Command" with dependency injection instead.
+     */
     public function testBundleCommandsHaveRightContainer()
     {
         $command = $this->getMockForAbstractClass('Symfony\Bundle\FrameworkBundle\Command\ContainerAwareCommand', array('foo'), '', true, true, true, array('setContainer'));

Original file line number	Diff line number	Diff line change
`@@ -15,10 +15,14 @@`
`15`	`15`	`use Symfony\Component\DependencyInjection\ContainerAwareInterface;`
`16`	`16`	`use Symfony\Component\DependencyInjection\ContainerInterface;`
`17`	`17`
	`18`	`+@trigger_error(sprintf('The "%s" class is deprecated since Symfony 4.2, use "%s" with dependency injection instead.', ContainerAwareCommand::class, Command::class), E_USER_DEPRECATED);`
	`19`	`+`
`18`	`20`	`/**`
`19`	`21`	`* Command.`
`20`	`22`	`*`
`21`	`23`	`* @author Fabien Potencier <fabien@symfony.com>`
	`24`	`+ *`
	`25`	`+ * @deprecated since Symfony 4.2, use {@see Command} instead.`
`22`	`26`	`*/`
`23`	`27`	`abstract class ContainerAwareCommand extends Command implements ContainerAwareInterface`
`24`	`28`	`{`
Original file line number	Diff line number	Diff line change
`@@ -101,6 +101,10 @@ public function testBundleCommandCanBeFoundByAlias()`
`101`	`101`	`$this->assertSame($command, $application->find('alias'));`
`102`	`102`	`}`
`103`	`103`
	`104`	`+ /**`
	`105`	`+ * @group legacy`
	`106`	`+ * @expectedDeprecation The "Symfony\Bundle\FrameworkBundle\Command\ContainerAwareCommand" class is deprecated since Symfony 4.2, use "Symfony\Component\Console\Command\Command" with dependency injection instead.`
	`107`	`+ */`
`104`	`108`	`public function testBundleCommandsHaveRightContainer()`
`105`	`109`	`{`
`106`	`110`	`$command = $this->getMockForAbstractClass('Symfony\Bundle\FrameworkBundle\Command\ContainerAwareCommand', array('foo'), '', true, true, true, array('setContainer'));`