Deprecate Symfony\Bundle\FrameworkBundle\Controller\Controller

sroze · sroze · commit f74d509865a7 · 2018-08-24T10:42:24.000+01:00
diff --git a/UPGRADE-5.0.md b/UPGRADE-5.0.md
@@ -91,6 +91,7 @@ FrameworkBundle
  * Removed `Symfony\Bundle\FrameworkBundle\Controller\ControllerNameParser`.
  * Warming up a router in `RouterCacheWarmer` that does not implement the `WarmableInterface` is not supported anymore.
  * 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.
 
 HttpFoundation
 --------------
diff --git a/src/Symfony/Bundle/FrameworkBundle/CHANGELOG.md b/src/Symfony/Bundle/FrameworkBundle/CHANGELOG.md
@@ -8,6 +8,7 @@ CHANGELOG
  * Allowed configuring PDO-based cache pools via a new `cache.adapter.pdo` abstract service
  * Deprecated auto-injection of the container in AbstractController instances, register them as service subscribers instead
  * Deprecated processing of services tagged `security.expression_language_provider` in favor of a new `AddExpressionLanguageProvidersPass` in SecurityBundle.
+ * Deprecated the `Symfony\Bundle\FrameworkBundle\Controller\Controller` class in favor of `Symfony\Bundle\FrameworkBundle\Controller\AbstractController`.
  * Enabled autoconfiguration for `Psr\Log\LoggerAwareInterface`
 
 4.1.0
diff --git a/src/Symfony/Bundle/FrameworkBundle/Controller/Controller.php b/src/Symfony/Bundle/FrameworkBundle/Controller/Controller.php
@@ -14,11 +14,15 @@
 use Symfony\Component\DependencyInjection\ContainerAwareInterface;
 use Symfony\Component\DependencyInjection\ContainerAwareTrait;
 
+@trigger_error(sprintf('The "%s" class is deprecated since Symfony 4.2. Use %s instead.', Controller::class, AbstractController::class), E_USER_DEPRECATED);
+
 /**
  * Controller is a simple implementation of a Controller.
  *
  * It provides methods to common features needed in controllers.
  *
+ * @deprecated since Symfony 4.2. Use {@see AbstractController} instead.
+ *
  * @author Fabien Potencier <fabien@symfony.com>
  */
 abstract class Controller implements ContainerAwareInterface
diff --git a/src/Symfony/Bundle/FrameworkBundle/Tests/Controller/ControllerTest.php b/src/Symfony/Bundle/FrameworkBundle/Tests/Controller/ControllerTest.php
@@ -13,6 +13,9 @@
 
 use Symfony\Bundle\FrameworkBundle\Controller\Controller;
 
+/**
+ * @group legacy
+ */
 class ControllerTest extends ControllerTraitTest
 {
     protected function createController()

Original file line number	Diff line number	Diff line change
`@@ -13,6 +13,9 @@`
`13`	`13`
`14`	`14`	`use Symfony\Bundle\FrameworkBundle\Controller\Controller;`
`15`	`15`
	`16`	`+/**`
	`17`	`+ * @group legacy`
	`18`	`+ */`
`16`	`19`	`class ControllerTest extends ControllerTraitTest`
`17`	`20`	`{`
`18`	`21`	`protected function createController()`