Issue #2057589 by smiletrl, tim.plunkett, alexpott, dawehner: Rename...

Issue #2057589 by smiletrl, tim.plunkett, alexpott, dawehner: Rename ControllerInterface to ContainerInjectionInterface.

core/lib/Drupal/Core/Controller/ControllerBase.php

@@ -19,7 +19,7 @@
  * difficult to unit test. Therefore this base class should only be used by
  * controller classes that contain only trivial glue code.  Controllers that
  * contain sufficiently complex logic that it's worth testing should not use
- * this base class but use ControllerInterface instead, or even better be
+ * this base class but use ContainerInjectionInterface instead, or even better be
  * refactored to be trivial glue code.
  *
  * The services exposed here are those that it is reasonable for a well-behaved
@@ -27,7 +27,7 @@
  * need to be refactored into a thin controller and a dependent unit-testable
  * service.
  *
- * @see \Drupal\Core\Controller\ControllerInterface
+ * @see \Drupal\Core\DependencyInjection\ContainerInjectionInterface
  */
 abstract class ControllerBase extends ContainerAware {
 

core/lib/Drupal/Core/Controller/ControllerResolver.php

@@ -129,7 +129,7 @@ protected function createController($controller) {
         throw new \InvalidArgumentException(sprintf('Class "%s" does not exist.', $class));
       }
       // @todo Remove the second in_array() once that interface has been removed.
-      if (in_array('Drupal\Core\Controller\ControllerInterface', class_implements($class))) {
+      if (in_array('Drupal\Core\DependencyInjection\ContainerInjectionInterface', class_implements($class))) {
         $controller = $class::create($this->container);
       }
       else {

core/lib/Drupal/Core/Controller/HtmlFormController.php

@@ -82,7 +82,7 @@ public function content(Request $request, $_form) {
   protected function getFormObject(Request $request, $form_arg) {
     // If this is a class, instantiate it.
     if (class_exists($form_arg)) {
-      if (in_array('Drupal\Core\Controller\ControllerInterface', class_implements($form_arg))) {
+      if (in_array('Drupal\Core\DependencyInjection\ContainerInjectionInterface', class_implements($form_arg))) {
         return $form_arg::create($this->container);
       }
 

core/lib/Drupal/Core/Controller/ControllerInterface.php → core/lib/Drupal/Core/DependencyInjection/ContainerInjectionInterface.php

@@ -2,10 +2,10 @@
 
 /**
  * @file
- * Contains \Drupal\Core\Controller\ControllerInterface.
+ * Contains \Drupal\Core\Controller\ContainerInjectionInterface.
  */
 
-namespace Drupal\Core\Controller;
+namespace Drupal\Core\DependencyInjection;
 
 use Symfony\Component\DependencyInjection\ContainerInterface;
 
@@ -20,7 +20,7 @@
  * the controller very difficult to unit test so should only be used for
  * controllers that are trivial in complexity.
  */
-interface ControllerInterface {
+interface ContainerInjectionInterface {
 
   /**
    * Instantiates a new instance of this controller.

core/lib/Drupal/Core/Entity/Controller/EntityViewController.php

@@ -7,7 +7,7 @@
 
 namespace Drupal\Core\Entity\Controller;
 
-use Drupal\Core\Controller\ControllerInterface;
+use Drupal\Core\DependencyInjection\ContainerInjectionInterface;
 use Drupal\Core\Entity\EntityManager;
 use Drupal\Core\Entity\EntityInterface;
 use Symfony\Component\DependencyInjection\ContainerInterface;
@@ -15,7 +15,7 @@
 /**
  * Defines a generic controller to render a single entity.
  */
-class EntityViewController implements ControllerInterface {
+class EntityViewController implements ContainerInjectionInterface {
 
   /**
    * The entity manager

core/lib/Drupal/Core/Entity/EntityManager.php

@@ -276,7 +276,7 @@ public function getListController($entity_type) {
   public function getFormController($entity_type, $operation) {
     if (!isset($this->controllers['form'][$operation][$entity_type])) {
       $class = $this->getControllerClass($entity_type, 'form', $operation);
-      if (in_array('Drupal\Core\Controller\ControllerInterface', class_implements($class))) {
+      if (in_array('Drupal\Core\DependencyInjection\ContainerInjectionInterface', class_implements($class))) {
         $controller = $class::create($this->container);
       }
       else {

core/lib/Drupal/Core/Form/FormBase.php

@@ -7,7 +7,7 @@
 
 namespace Drupal\Core\Form;
 
-use Drupal\Core\Controller\ControllerInterface;
+use Drupal\Core\DependencyInjection\ContainerInjectionInterface;
 use Drupal\Core\StringTranslation\TranslationInterface;
 use Symfony\Component\DependencyInjection\ContainerInterface;
 use Symfony\Component\HttpFoundation\Request;
@@ -15,7 +15,7 @@
 /**
  * Provides a base class for forms.
  */
-abstract class FormBase implements FormInterface, ControllerInterface {
+abstract class FormBase implements FormInterface, ContainerInjectionInterface {
 
   /**
    * The translation manager service.

core/modules/aggregator/lib/Drupal/aggregator/Controller/AggregatorController.php

@@ -9,7 +9,7 @@
 
 use Drupal\aggregator\FeedInterface;
 use Drupal\Core\Config\ConfigFactory;
-use Drupal\Core\Controller\ControllerInterface;
+use Drupal\Core\DependencyInjection\ContainerInjectionInterface;
 use Drupal\Core\Database\Connection;
 use Drupal\Core\Entity\EntityManager;
 use Drupal\Core\Extension\ModuleHandlerInterface;
@@ -22,7 +22,7 @@
 /**
  * Returns responses for aggregator module routes.
  */
-class AggregatorController implements ControllerInterface {
+class AggregatorController implements ContainerInjectionInterface {
 
   /**
    * Stores the Entity manager.

core/modules/aggregator/lib/Drupal/aggregator/Form/CategoryDeleteForm.php

@@ -8,7 +8,7 @@
 namespace Drupal\aggregator\Form;
 
 use Drupal\aggregator\CategoryStorageControllerInterface;
-use Drupal\Core\Controller\ControllerInterface;
+use Drupal\Core\DependencyInjection\ContainerInjectionInterface;
 use Drupal\Core\Entity\EntityManager;
 use Drupal\Core\Extension\ModuleHandlerInterface;
 use Drupal\Core\Form\ConfirmFormBase;
@@ -18,7 +18,7 @@
 /**
  * Provides a confirm delete form.
  */
-class CategoryDeleteForm extends ConfirmFormBase implements ControllerInterface {
+class CategoryDeleteForm extends ConfirmFormBase implements ContainerInjectionInterface {
 
   /**
    * The category to be deleted.

core/modules/block/custom_block/lib/Drupal/custom_block/Controller/CustomBlockController.php

@@ -8,13 +8,13 @@
 namespace Drupal\custom_block\Controller;
 
 use Drupal\Component\Plugin\PluginManagerInterface;
-use Drupal\Core\Controller\ControllerInterface;
+use Drupal\Core\DependencyInjection\ContainerInjectionInterface;
 use Drupal\Core\Entity\EntityStorageControllerInterface;
 use Drupal\custom_block\CustomBlockTypeInterface;
 use Symfony\Component\DependencyInjection\ContainerInterface;
 use Symfony\Component\HttpFoundation\Request;
 
-class CustomBlockController implements ControllerInterface {
+class CustomBlockController implements ContainerInjectionInterface {
 
   /**
    * The entity manager.

core/modules/book/lib/Drupal/book/Controller/BookController.php

@@ -6,7 +6,7 @@
 
 namespace Drupal\book\Controller;
 
-use Drupal\Core\Controller\ControllerInterface;
+use Drupal\Core\DependencyInjection\ContainerInjectionInterface;
 use Symfony\Component\DependencyInjection\ContainerInterface;
 
 use Drupal\book\BookManager;
@@ -14,7 +14,7 @@
 /**
  * Controller routines for book routes.
  */
-class BookController implements ControllerInterface {
+class BookController implements ContainerInjectionInterface {
 
   /**
    * Book Manager Service.

core/modules/comment/lib/Drupal/comment/Controller/CommentController.php

@@ -9,7 +9,7 @@
 
 use Drupal\comment\CommentInterface;
 use Drupal\comment\Entity\Comment;
-use Drupal\Core\Controller\ControllerInterface;
+use Drupal\Core\DependencyInjection\ContainerInjectionInterface;
 use Drupal\Core\Routing\UrlGeneratorInterface;
 use Symfony\Component\DependencyInjection\ContainerInterface;
 use Symfony\Component\HttpFoundation\RedirectResponse;
@@ -23,7 +23,7 @@
  *
  * @see \Drupal\comment\Entity\Comment.
  */
-class CommentController implements ControllerInterface {
+class CommentController implements ContainerInjectionInterface {
 
   /**
    * The url generator service.

core/modules/comment/lib/Drupal/comment/Form/ConfirmDeleteMultiple.php

@@ -10,7 +10,7 @@
 use Drupal\comment\CommentStorageControllerInterface;
 use Drupal\Component\Utility\String;
 use Drupal\Core\Cache\Cache;
-use Drupal\Core\Controller\ControllerInterface;
+use Drupal\Core\DependencyInjection\ContainerInjectionInterface;
 use Drupal\Core\Form\ConfirmFormBase;
 use Symfony\Component\DependencyInjection\ContainerInterface;
 use Symfony\Component\HttpFoundation\Request;
@@ -18,7 +18,7 @@
 /**
  * Provides the comment multiple delete confirmation form.
  */
-class ConfirmDeleteMultiple extends ConfirmFormBase implements ControllerInterface {
+class ConfirmDeleteMultiple extends ConfirmFormBase implements ContainerInjectionInterface {
 
   /**
    * The comment storage.

core/modules/config/lib/Drupal/config/Controller/ConfigController.php

@@ -7,9 +7,9 @@
 
 namespace Drupal\config\Controller;
 
-use Drupal\Core\Controller\ControllerInterface;
-use Drupal\Core\Config\StorageInterface;
 use Drupal\Component\Archiver\ArchiveTar;
+use Drupal\Core\Config\StorageInterface;
+use Drupal\Core\DependencyInjection\ContainerInjectionInterface;
 use Drupal\system\FileDownloadController;
 use Symfony\Component\DependencyInjection\ContainerInterface;
 use Symfony\Component\HttpFoundation\Request;
@@ -17,7 +17,7 @@
 /**
  * Returns responses for config module routes.
  */
-class ConfigController implements ControllerInterface {
+class ConfigController implements ContainerInjectionInterface {
 
   /**
    * The target storage.

core/modules/dblog/lib/Drupal/dblog/Controller/DbLogController.php

@@ -12,8 +12,8 @@
 use Drupal\Component\Utility\Xss;
 use Drupal\Core\Controller\ControllerBase;
 use Drupal\Core\Database\Connection;
-use Drupal\Core\Controller\ControllerInterface;
 use Drupal\Core\Datetime\Date;
+use Drupal\Core\DependencyInjection\ContainerInjectionInterface;
 use Drupal\Core\Extension\ModuleHandlerInterface;
 use Drupal\user\UserStorageControllerInterface;
 use Symfony\Component\DependencyInjection\ContainerInterface;
@@ -21,7 +21,7 @@
 /**
  * Returns responses for dblog routes.
  */
-class DbLogController extends ControllerBase implements ControllerInterface {
+class DbLogController extends ControllerBase implements ContainerInjectionInterface {
 
   /**
    * The database service.

core/modules/edit/lib/Drupal/edit/EditController.php

@@ -12,7 +12,7 @@
 use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\HttpKernel\Exception\NotFoundHttpException;
 use Drupal\Core\Ajax\AjaxResponse;
-use Drupal\Core\Controller\ControllerInterface;
+use Drupal\Core\DependencyInjection\ContainerInjectionInterface;
 use Drupal\Core\Entity\EntityInterface;
 use Drupal\Core\Entity\EntityManager;
 use Drupal\field\FieldInfo;
@@ -28,7 +28,7 @@
 /**
  * Returns responses for Edit module routes.
  */
-class EditController implements ControllerInterface {
+class EditController implements ContainerInjectionInterface {
 
   /**
    * The TempStore factory.

core/modules/entity/lib/Drupal/entity/Controller/EntityDisplayModeController.php

@@ -8,13 +8,13 @@
 namespace Drupal\entity\Controller;
 
 use Drupal\Component\Plugin\PluginManagerInterface;
-use Drupal\Core\Controller\ControllerInterface;
+use Drupal\Core\DependencyInjection\ContainerInjectionInterface;
 use Symfony\Component\DependencyInjection\ContainerInterface;
 
 /**
  * Provides methods for entity display mode routes.
  */
-class EntityDisplayModeController implements ControllerInterface {
+class EntityDisplayModeController implements ContainerInjectionInterface {
 
   /**
    * The entity manager.

core/modules/entity_reference/lib/Drupal/entity_reference/EntityReferenceController.php

@@ -11,12 +11,12 @@
 use Symfony\Component\HttpFoundation\JsonResponse;
 use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\HttpKernel\Exception\AccessDeniedHttpException;
-use Drupal\Core\Controller\ControllerInterface;
+use Drupal\Core\DependencyInjection\ContainerInjectionInterface;
 
 /**
  * Defines route controller for entity reference.
  */
-class EntityReferenceController implements ControllerInterface {
+class EntityReferenceController implements ContainerInjectionInterface {
 
   /**
    * The autocomplete helper for entity references.

core/modules/forum/lib/Drupal/forum/Controller/ForumController.php

@@ -8,7 +8,7 @@
 namespace Drupal\forum\Controller;
 
 use Drupal\Core\Config\ConfigFactory;
-use Drupal\Core\Controller\ControllerInterface;
+use Drupal\Core\DependencyInjection\ContainerInjectionInterface;
 use Drupal\Core\Entity\EntityManager;
 use Drupal\taxonomy\TermStorageControllerInterface;
 use Symfony\Component\DependencyInjection\ContainerInterface;
@@ -16,7 +16,7 @@
 /**
  * Controller routines for forum routes.
  */
-class ForumController implements ControllerInterface {
+class ForumController implements ContainerInjectionInterface {
 
   /**
    * Entity Manager Service.

core/modules/help/lib/Drupal/help/Controller/HelpController.php

@@ -6,7 +6,7 @@
 
 namespace Drupal\help\Controller;
 
-use Drupal\Core\Controller\ControllerInterface;
+use Drupal\Core\DependencyInjection\ContainerInjectionInterface;
 use Drupal\Core\Extension\ModuleHandlerInterface;
 use Symfony\Component\DependencyInjection\ContainerInterface;
 use Symfony\Component\HttpKernel\Exception\NotFoundHttpException;
@@ -14,7 +14,7 @@
 /**
  * Controller routines for help routes.
  */
-class HelpController implements ControllerInterface {
+class HelpController implements ContainerInjectionInterface {
 
   /**
    * Stores the module handler.

core/modules/image/lib/Drupal/image/Controller/ImageStyleDownloadController.php

@@ -8,7 +8,7 @@
 namespace Drupal\image\Controller;
 
 use Drupal\Component\Utility\Crypt;
-use Drupal\Core\Controller\ControllerInterface;
+use Drupal\Core\DependencyInjection\ContainerInjectionInterface;
 use Drupal\Core\Image\ImageFactory;
 use Drupal\Core\Lock\LockBackendInterface;
 use Drupal\image\ImageStyleInterface;
@@ -23,7 +23,7 @@
 /**
  * Defines a controller to serve image styles.
  */
-class ImageStyleDownloadController extends FileDownloadController implements ControllerInterface {
+class ImageStyleDownloadController extends FileDownloadController implements ContainerInjectionInterface {
 
   /**
    * The lock backend.

core/modules/image/lib/Drupal/image/Form/ImageEffectAddForm.php

@@ -7,7 +7,7 @@
 
 namespace Drupal\image\Form;
 
-use Drupal\Core\Controller\ControllerInterface;
+use Drupal\Core\DependencyInjection\ContainerInjectionInterface;
 use Drupal\image\ImageEffectManager;
 use Drupal\image\ImageStyleInterface;
 use Symfony\Component\DependencyInjection\ContainerInterface;
@@ -15,7 +15,7 @@
 /**
  * Provides an add form for image effects.
  */
-class ImageEffectAddForm extends ImageEffectFormBase implements ControllerInterface {
+class ImageEffectAddForm extends ImageEffectFormBase implements ContainerInjectionInterface {
 
   /**
    * The image effect manager.

core/modules/language/tests/language_test/lib/Drupal/language_test/Controller/LanguageTestController.php

@@ -7,7 +7,7 @@
 
 namespace Drupal\language_test\Controller;
 
-use Drupal\Core\Controller\ControllerInterface;
+use Drupal\Core\DependencyInjection\ContainerInjectionInterface;
 use Symfony\Component\DependencyInjection\ContainerInterface;
 use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\HttpKernel\HttpKernelInterface;
@@ -15,7 +15,7 @@
 /**
  * Controller routines for language_test routes.
  */
-class LanguageTestController implements ControllerInterface {
+class LanguageTestController implements ContainerInjectionInterface {
 
   /**
    * The HTTP kernel service.

core/modules/locale/lib/Drupal/locale/Controller/LocaleController.php

@@ -6,7 +6,7 @@
 
 namespace Drupal\locale\Controller;
 
-use Drupal\Core\Controller\ControllerInterface;
+use Drupal\Core\DependencyInjection\ContainerInjectionInterface;
 use Drupal\Core\Routing\UrlGeneratorInterface;
 use Drupal\Core\Extension\ModuleHandlerInterface;
 use Symfony\Component\DependencyInjection\ContainerInterface;
@@ -14,7 +14,7 @@
 /**
  * Return response for manual check translations.
  */
-class LocaleController implements ControllerInterface {
+class LocaleController implements ContainerInjectionInterface {
 
   /**
    * The module handler.

core/modules/menu/lib/Drupal/menu/Controller/MenuController.php

@@ -7,7 +7,7 @@
 
 namespace Drupal\menu\Controller;
 
-use Drupal\Core\Controller\ControllerInterface;
+use Drupal\Core\DependencyInjection\ContainerInjectionInterface;
 use Drupal\Core\Entity\EntityManager;
 use Drupal\menu_link\MenuLinkStorageControllerInterface;
 use Drupal\system\MenuInterface;
@@ -18,7 +18,7 @@
 /**
  * Returns responses for Menu routes.
  */
-class MenuController implements ControllerInterface {
+class MenuController implements ContainerInjectionInterface {
 
   /**
    * The menu link storage.

core/modules/node/lib/Drupal/node/Form/DeleteMultiple.php

@@ -8,7 +8,7 @@
 namespace Drupal\node\Form;
 
 use Drupal\Core\Form\ConfirmFormBase;
-use Drupal\Core\Controller\ControllerInterface;
+use Drupal\Core\DependencyInjection\ContainerInjectionInterface;
 use Drupal\Core\Entity\EntityManager;
 use Drupal\Component\Utility\String;
 use Drupal\user\TempStoreFactory;
@@ -18,7 +18,7 @@
 /**
  * Provides a node deletion confirmation form.
  */
-class DeleteMultiple extends ConfirmFormBase implements ControllerInterface {
+class DeleteMultiple extends ConfirmFormBase implements ContainerInjectionInterface {
 
   /**
    * The array of nodes to delete.

core/modules/node/lib/Drupal/node/Form/NodeRevisionDeleteForm.php

@@ -7,7 +7,7 @@
 
 namespace Drupal\node\Form;
 
-use Drupal\Core\Controller\ControllerInterface;
+use Drupal\Core\DependencyInjection\ContainerInjectionInterface;
 use Drupal\Core\Database\Connection;
 use Drupal\Core\Entity\EntityStorageControllerInterface;
 use Drupal\Core\Form\ConfirmFormBase;
@@ -17,7 +17,7 @@
 /**
  * Provides a form for reverting a node revision.
  */
-class NodeRevisionDeleteForm extends ConfirmFormBase implements ControllerInterface {
+class NodeRevisionDeleteForm extends ConfirmFormBase implements ContainerInjectionInterface {
 
   /**
    * The node revision.

core/modules/node/lib/Drupal/node/Form/NodeRevisionRevertForm.php

@@ -7,7 +7,7 @@
 
 namespace Drupal\node\Form;
 
-use Drupal\Core\Controller\ControllerInterface;
+use Drupal\Core\DependencyInjection\ContainerInjectionInterface;
 use Drupal\Core\Entity\EntityStorageControllerInterface;
 use Drupal\Core\Form\ConfirmFormBase;
 use Drupal\node\NodeInterface;
@@ -16,7 +16,7 @@
 /**
  * Provides a form for reverting a node revision.
  */
-class NodeRevisionRevertForm extends ConfirmFormBase implements ControllerInterface {
+class NodeRevisionRevertForm extends ConfirmFormBase implements ContainerInjectionInterface {
 
   /**
    * The node revision.

core/modules/overlay/lib/Drupal/overlay/Controller/OverlayController.php

@@ -7,7 +7,7 @@
 
 namespace Drupal\overlay\Controller;
 
-use Drupal\Core\Controller\ControllerInterface;
+use Drupal\Core\DependencyInjection\ContainerInjectionInterface;
 use Symfony\Component\DependencyInjection\ContainerInterface;
 use Symfony\Component\HttpFoundation\Response;
 use Symfony\Component\HttpFoundation\Request;
@@ -20,7 +20,7 @@
  * @todo keeping the controllerInterface since we should be injecting
  * something to take care of the overlay_render_region() call.
  */
-class OverlayController implements ControllerInterface {
+class OverlayController implements ContainerInjectionInterface {
 
   /**
    * {@inheritdoc}

core/modules/path/lib/Drupal/path/Form/DeleteForm.php

@@ -7,7 +7,7 @@
 
 namespace Drupal\path\Form;
 
-use Drupal\Core\Controller\ControllerInterface;
+use Drupal\Core\DependencyInjection\ContainerInjectionInterface;
 use Drupal\Core\Form\ConfirmFormBase;
 use Drupal\Core\Path\Path;
 use Symfony\Component\DependencyInjection\ContainerInterface;
@@ -15,7 +15,7 @@
 /**
  * Builds the form to delete a path alias.
  */
-class DeleteForm extends ConfirmFormBase implements ControllerInterface {
+class DeleteForm extends ConfirmFormBase implements ContainerInjectionInterface {
 
   /**
    * The path crud service.

core/modules/system/lib/Drupal/system/Controller/AdminController.php

@@ -7,14 +7,14 @@
 
 namespace Drupal\system\Controller;
 
-use Drupal\Core\Controller\ControllerInterface;
+use Drupal\Core\DependencyInjection\ContainerInjectionInterface;
 use Drupal\Core\Extension\ModuleHandlerInterface;
 use Symfony\Component\DependencyInjection\ContainerInterface;
 
 /**
  * Controller for admin section.
  */
-class AdminController implements ControllerInterface {
+class AdminController implements ContainerInjectionInterface {
 
   /**
    * Module handler service.

core/modules/system/lib/Drupal/system/Controller/SystemController.php

@@ -8,7 +8,7 @@
 namespace Drupal\system\Controller;
 
 use Drupal\Core\Controller\ControllerBase;
-use Drupal\Core\Controller\ControllerInterface;
+use Drupal\Core\DependencyInjection\ContainerInjectionInterface;
 use Drupal\Core\Entity\Query\QueryFactory;
 use Drupal\system\SystemManager;
 use Symfony\Component\DependencyInjection\ContainerInterface;
@@ -17,7 +17,7 @@
 /**
  * Returns responses for System routes.
  */
-class SystemController extends ControllerBase implements ControllerInterface {
+class SystemController extends ControllerBase implements ContainerInjectionInterface {
 
   /**
    * The entity query factory object.

core/modules/system/lib/Drupal/system/Controller/SystemInfoController.php

@@ -9,14 +9,14 @@
 
 use Symfony\Component\DependencyInjection\ContainerInterface;
 use Symfony\Component\HttpFoundation\Response;
-use Drupal\Core\Controller\ControllerInterface;
+use Drupal\Core\DependencyInjection\ContainerInjectionInterface;
 use Drupal\Core\Database\Connection;
 use Drupal\system\SystemManager;
 
 /**
  * Returns responses for System Info routes.
  */
-class SystemInfoController implements ControllerInterface {
+class SystemInfoController implements ContainerInjectionInterface {
 
   /**
    * System Manager Service.

core/modules/system/lib/Drupal/system/Controller/ThemeController.php

@@ -8,7 +8,7 @@
 namespace Drupal\system\Controller;
 
 use Drupal\Core\Config\Config;
-use Drupal\Core\Controller\ControllerInterface;
+use Drupal\Core\DependencyInjection\ContainerInjectionInterface;
 use Symfony\Component\DependencyInjection\ContainerInterface;
 use Symfony\Component\HttpFoundation\RedirectResponse;
 use Symfony\Component\HttpFoundation\Request;
@@ -17,7 +17,7 @@
 /**
  * Controller for theme handling.
  */
-class ThemeController implements ControllerInterface {
+class ThemeController implements ContainerInjectionInterface {
 
   /**
    * The system.theme config object.

core/modules/system/lib/Drupal/system/Form/DateFormatLocalizeResetForm.php

@@ -7,7 +7,7 @@
 
 namespace Drupal\system\Form;
 
-use Drupal\Core\Controller\ControllerInterface;
+use Drupal\Core\DependencyInjection\ContainerInjectionInterface;
 use Drupal\Core\Form\ConfirmFormBase;
 use Drupal\Core\Config\ConfigFactory;
 use Symfony\Component\DependencyInjection\ContainerInterface;
@@ -15,7 +15,7 @@
 /**