diff --git a/core/lib/Drupal/Core/Controller/ControllerBase.php b/core/lib/Drupal/Core/Controller/ControllerBase.php index d0718ff..19ceac3 100644 --- a/core/lib/Drupal/Core/Controller/ControllerBase.php +++ b/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 { diff --git a/core/lib/Drupal/Core/Controller/ControllerResolver.php b/core/lib/Drupal/Core/Controller/ControllerResolver.php index f363d65..7999f0e 100644 --- a/core/lib/Drupal/Core/Controller/ControllerResolver.php +++ b/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 { diff --git a/core/lib/Drupal/Core/Controller/HtmlFormController.php b/core/lib/Drupal/Core/Controller/HtmlFormController.php index 8e88b53..8b3e70a 100644 --- a/core/lib/Drupal/Core/Controller/HtmlFormController.php +++ b/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); } diff --git a/core/lib/Drupal/Core/Controller/ControllerInterface.php b/core/lib/Drupal/Core/DependencyInjection/ContainerInjectionInterface.php similarity index 89% rename from core/lib/Drupal/Core/Controller/ControllerInterface.php rename to core/lib/Drupal/Core/DependencyInjection/ContainerInjectionInterface.php index 5cdab2e..cc16a95 100644 --- a/core/lib/Drupal/Core/Controller/ControllerInterface.php +++ b/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. diff --git a/core/lib/Drupal/Core/Entity/Controller/EntityViewController.php b/core/lib/Drupal/Core/Entity/Controller/EntityViewController.php index b9667d2..5738052 100644 --- a/core/lib/Drupal/Core/Entity/Controller/EntityViewController.php +++ b/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 \Drupal\Core\DependencyInjection\ContainerInjectionInterface { /** * The entity manager diff --git a/core/lib/Drupal/Core/Entity/EntityManager.php b/core/lib/Drupal/Core/Entity/EntityManager.php index f41facf..15832e0 100644 --- a/core/lib/Drupal/Core/Entity/EntityManager.php +++ b/core/lib/Drupal/Core/Entity/EntityManager.php @@ -240,7 +240,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 { diff --git a/core/lib/Drupal/Core/Form/FormBase.php b/core/lib/Drupal/Core/Form/FormBase.php index bdb0004..059484e 100644 --- a/core/lib/Drupal/Core/Form/FormBase.php +++ b/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. diff --git a/core/modules/aggregator/lib/Drupal/aggregator/Controller/AggregatorController.php b/core/modules/aggregator/lib/Drupal/aggregator/Controller/AggregatorController.php index b6a2d84..b7e93e2 100644 --- a/core/modules/aggregator/lib/Drupal/aggregator/Controller/AggregatorController.php +++ b/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 \Drupal\Core\DependencyInjection\ContainerInjectionInterface { /** * Stores the Entity manager. diff --git a/core/modules/aggregator/lib/Drupal/aggregator/Form/CategoryDeleteForm.php b/core/modules/aggregator/lib/Drupal/aggregator/Form/CategoryDeleteForm.php index ecf98e7..2571c32 100644 --- a/core/modules/aggregator/lib/Drupal/aggregator/Form/CategoryDeleteForm.php +++ b/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. diff --git a/core/modules/block/custom_block/lib/Drupal/custom_block/Controller/CustomBlockController.php b/core/modules/block/custom_block/lib/Drupal/custom_block/Controller/CustomBlockController.php index 03edb7f..f8300cd 100644 --- a/core/modules/block/custom_block/lib/Drupal/custom_block/Controller/CustomBlockController.php +++ b/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 \Drupal\Core\DependencyInjection\ContainerInjectionInterface { /** * The entity manager. diff --git a/core/modules/book/lib/Drupal/book/Controller/BookController.php b/core/modules/book/lib/Drupal/book/Controller/BookController.php index 7b10eaf..9dabd45 100644 --- a/core/modules/book/lib/Drupal/book/Controller/BookController.php +++ b/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 \Drupal\Core\DependencyInjection\ContainerInjectionInterface { /** * Book Manager Service. diff --git a/core/modules/comment/lib/Drupal/comment/Controller/CommentController.php b/core/modules/comment/lib/Drupal/comment/Controller/CommentController.php index a75dbca..be3be99 100644 --- a/core/modules/comment/lib/Drupal/comment/Controller/CommentController.php +++ b/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 \Drupal\Core\DependencyInjection\ContainerInjectionInterface { /** * The url generator service. diff --git a/core/modules/config/lib/Drupal/config/Controller/ConfigController.php b/core/modules/config/lib/Drupal/config/Controller/ConfigController.php index 13917c0..4e5c53f 100644 --- a/core/modules/config/lib/Drupal/config/Controller/ConfigController.php +++ b/core/modules/config/lib/Drupal/config/Controller/ConfigController.php @@ -7,7 +7,7 @@ namespace Drupal\config\Controller; -use Drupal\Core\Controller\ControllerInterface; +use Drupal\Core\DependencyInjection\ContainerInjectionInterface; use Drupal\Core\Config\StorageInterface; use Drupal\Component\Archiver\ArchiveTar; use Drupal\Core\Extension\ModuleHandlerInterface; @@ -18,7 +18,7 @@ /** * Returns responses for config module routes. */ -class ConfigController implements ControllerInterface { +class ConfigController implements \Drupal\Core\DependencyInjection\ContainerInjectionInterface { /** * The target storage. @@ -37,7 +37,7 @@ class ConfigController implements ControllerInterface { /** * The file download controller. * - * @var \Drupal\Core\Controller\ControllerInterface + * @var \Drupal\Core\DependencyInjection\ContainerInjectionInterface */ protected $fileDownloadController; @@ -59,10 +59,10 @@ public static function create(ContainerInterface $container) { * The target storage. * @param \Drupal\Core\Config\StorageInterface $source_storage * The source storage - * @param \Drupal\Core\Controller\ControllerInterface $file_download_controller + * @param \Drupal\Core\DependencyInjection\ContainerInjectionInterface $file_download_controller * The file download controller. */ - public function __construct(StorageInterface $target_storage, StorageInterface $source_storage, ControllerInterface $file_download_controller) { + public function __construct(StorageInterface $target_storage, StorageInterface $source_storage, \Drupal\Core\DependencyInjection\ContainerInjectionInterface $file_download_controller) { $this->targetStorage = $target_storage; $this->sourceStorage = $source_storage; $this->fileDownloadController = $file_download_controller; diff --git a/core/modules/dblog/lib/Drupal/dblog/Controller/DbLogController.php b/core/modules/dblog/lib/Drupal/dblog/Controller/DbLogController.php index a010363..44aec88 100644 --- a/core/modules/dblog/lib/Drupal/dblog/Controller/DbLogController.php +++ b/core/modules/dblog/lib/Drupal/dblog/Controller/DbLogController.php @@ -11,7 +11,7 @@ use Drupal\Component\Utility\String; use Drupal\Component\Utility\Xss; use Drupal\Core\Database\Connection; -use Drupal\Core\Controller\ControllerInterface; +use Drupal\Core\DependencyInjection\ContainerInjectionInterface; use Drupal\Core\Datetime\Date; use Drupal\Core\Extension\ModuleHandlerInterface; use Drupal\user\UserStorageControllerInterface; @@ -20,7 +20,7 @@ /** * Returns responses for dblog routes. */ -class DbLogController implements ControllerInterface { +class DbLogController implements \Drupal\Core\DependencyInjection\ContainerInjectionInterface { /** * The database service. diff --git a/core/modules/edit/lib/Drupal/edit/EditController.php b/core/modules/edit/lib/Drupal/edit/EditController.php index 2979e89..ffe2108 100644 --- a/core/modules/edit/lib/Drupal/edit/EditController.php +++ b/core/modules/edit/lib/Drupal/edit/EditController.php @@ -13,7 +13,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; @@ -29,7 +29,7 @@ /** * Returns responses for Edit module routes. */ -class EditController implements ControllerInterface { +class EditController implements ContainerInjectionInterface { /** * The TempStore factory. diff --git a/core/modules/entity/lib/Drupal/entity/Controller/EntityDisplayModeController.php b/core/modules/entity/lib/Drupal/entity/Controller/EntityDisplayModeController.php index 81a684f..8ca3cba 100644 --- a/core/modules/entity/lib/Drupal/entity/Controller/EntityDisplayModeController.php +++ b/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. diff --git a/core/modules/entity_reference/lib/Drupal/entity_reference/EntityReferenceController.php b/core/modules/entity_reference/lib/Drupal/entity_reference/EntityReferenceController.php index b6099f1..3836392 100644 --- a/core/modules/entity_reference/lib/Drupal/entity_reference/EntityReferenceController.php +++ b/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. diff --git a/core/modules/forum/lib/Drupal/forum/Controller/ForumController.php b/core/modules/forum/lib/Drupal/forum/Controller/ForumController.php index 51747fd..1627932 100644 --- a/core/modules/forum/lib/Drupal/forum/Controller/ForumController.php +++ b/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 \Drupal\Core\DependencyInjection\ContainerInjectionInterface { /** * Entity Manager Service. diff --git a/core/modules/help/lib/Drupal/help/Controller/HelpController.php b/core/modules/help/lib/Drupal/help/Controller/HelpController.php index 9fb23a9..a88070e 100644 --- a/core/modules/help/lib/Drupal/help/Controller/HelpController.php +++ b/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 \Drupal\Core\DependencyInjection\ContainerInjectionInterface { /** * Stores the module handler. diff --git a/core/modules/image/lib/Drupal/image/Controller/ImageStyleDownloadController.php b/core/modules/image/lib/Drupal/image/Controller/ImageStyleDownloadController.php index 8013962..4a30501 100644 --- a/core/modules/image/lib/Drupal/image/Controller/ImageStyleDownloadController.php +++ b/core/modules/image/lib/Drupal/image/Controller/ImageStyleDownloadController.php @@ -9,7 +9,7 @@ use Drupal\Component\Utility\Crypt; use Drupal\Core\Config\ConfigFactory; -use Drupal\Core\Controller\ControllerInterface; +use Drupal\Core\DependencyInjection\ContainerInjectionInterface; use Drupal\Core\Extension\ModuleHandlerInterface; use Drupal\Core\Image\ImageFactory; use Drupal\Core\Lock\LockBackendInterface; @@ -26,7 +26,7 @@ /** * Defines a controller to serve image styles. */ -class ImageStyleDownloadController extends FileDownloadController implements ControllerInterface { +class ImageStyleDownloadController extends FileDownloadController implements ContainerInjectionInterface { /** * The config factory. diff --git a/core/modules/image/lib/Drupal/image/Form/ImageEffectAddForm.php b/core/modules/image/lib/Drupal/image/Form/ImageEffectAddForm.php index 7696b23..32a72af 100644 --- a/core/modules/image/lib/Drupal/image/Form/ImageEffectAddForm.php +++ b/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. diff --git a/core/modules/language/tests/language_test/lib/Drupal/language_test/Controller/LanguageTestController.php b/core/modules/language/tests/language_test/lib/Drupal/language_test/Controller/LanguageTestController.php index 5670d8f..001fe39 100644 --- a/core/modules/language/tests/language_test/lib/Drupal/language_test/Controller/LanguageTestController.php +++ b/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. diff --git a/core/modules/layout/lib/Drupal/layout/Controller/LayoutController.php b/core/modules/layout/lib/Drupal/layout/Controller/LayoutController.php index 246b628..e9379f1 100644 --- a/core/modules/layout/lib/Drupal/layout/Controller/LayoutController.php +++ b/core/modules/layout/lib/Drupal/layout/Controller/LayoutController.php @@ -8,14 +8,14 @@ namespace Drupal\layout\Controller; use Drupal\Component\Utility\String; -use Drupal\Core\Controller\ControllerInterface; +use Drupal\Core\DependencyInjection\ContainerInjectionInterface; use Drupal\layout\Plugin\Type\LayoutManager; use Symfony\Component\DependencyInjection\ContainerInterface; /** * Controller routines for layout routes. */ -class LayoutController implements ControllerInterface { +class LayoutController implements ContainerInjectionInterface { /** * Stores the Layout manager. diff --git a/core/modules/layout/tests/layout_test/lib/Drupal/layout_test/Controller/LayoutTestController.php b/core/modules/layout/tests/layout_test/lib/Drupal/layout_test/Controller/LayoutTestController.php index a1ca946..a5bdd28 100644 --- a/core/modules/layout/tests/layout_test/lib/Drupal/layout_test/Controller/LayoutTestController.php +++ b/core/modules/layout/tests/layout_test/lib/Drupal/layout_test/Controller/LayoutTestController.php @@ -6,14 +6,14 @@ namespace Drupal\layout_test\Controller; -use Drupal\Core\Controller\ControllerInterface; +use Drupal\Core\DependencyInjection\ContainerInjectionInterface; use Drupal\Core\Entity\EntityStorageControllerInterface; use Symfony\Component\DependencyInjection\ContainerInterface; /** * Controller routines for layout_test routes. */ -class LayoutTestController implements ControllerInterface{ +class LayoutTestController implements ContainerInjectionInterface{ /** * Stores the entity storage controller. diff --git a/core/modules/locale/lib/Drupal/locale/Controller/LocaleController.php b/core/modules/locale/lib/Drupal/locale/Controller/LocaleController.php index 71bbd6c..ca1d672 100644 --- a/core/modules/locale/lib/Drupal/locale/Controller/LocaleController.php +++ b/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 \Drupal\Core\DependencyInjection\ContainerInjectionInterface { /** * The module handler. diff --git a/core/modules/menu/lib/Drupal/menu/Controller/MenuController.php b/core/modules/menu/lib/Drupal/menu/Controller/MenuController.php index f707dfb..8ad2de5 100644 --- a/core/modules/menu/lib/Drupal/menu/Controller/MenuController.php +++ b/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 \Drupal\Core\DependencyInjection\ContainerInjectionInterface { /** * The menu link storage. diff --git a/core/modules/node/lib/Drupal/node/Form/DeleteMultiple.php b/core/modules/node/lib/Drupal/node/Form/DeleteMultiple.php index 8395fcb..48afe7b 100644 --- a/core/modules/node/lib/Drupal/node/Form/DeleteMultiple.php +++ b/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. diff --git a/core/modules/node/lib/Drupal/node/Form/NodeRevisionDeleteForm.php b/core/modules/node/lib/Drupal/node/Form/NodeRevisionDeleteForm.php index b84f151..e0d7fae 100644 --- a/core/modules/node/lib/Drupal/node/Form/NodeRevisionDeleteForm.php +++ b/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. diff --git a/core/modules/node/lib/Drupal/node/Form/NodeRevisionRevertForm.php b/core/modules/node/lib/Drupal/node/Form/NodeRevisionRevertForm.php index dfa8abf..79c19c5 100644 --- a/core/modules/node/lib/Drupal/node/Form/NodeRevisionRevertForm.php +++ b/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. diff --git a/core/modules/overlay/lib/Drupal/overlay/Controller/OverlayController.php b/core/modules/overlay/lib/Drupal/overlay/Controller/OverlayController.php index cdb14e4..38e5181 100644 --- a/core/modules/overlay/lib/Drupal/overlay/Controller/OverlayController.php +++ b/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 \Drupal\Core\DependencyInjection\ContainerInjectionInterface { /** * {@inheritdoc} diff --git a/core/modules/path/lib/Drupal/path/Form/DeleteForm.php b/core/modules/path/lib/Drupal/path/Form/DeleteForm.php index caebcc3..3f16e0e 100644 --- a/core/modules/path/lib/Drupal/path/Form/DeleteForm.php +++ b/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. diff --git a/core/modules/system/lib/Drupal/system/Controller/AdminController.php b/core/modules/system/lib/Drupal/system/Controller/AdminController.php index 6bda138..032eab0 100644 --- a/core/modules/system/lib/Drupal/system/Controller/AdminController.php +++ b/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. diff --git a/core/modules/system/lib/Drupal/system/Controller/SystemController.php b/core/modules/system/lib/Drupal/system/Controller/SystemController.php index f736353..8403cc4 100644 --- a/core/modules/system/lib/Drupal/system/Controller/SystemController.php +++ b/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. diff --git a/core/modules/system/lib/Drupal/system/Controller/SystemInfoController.php b/core/modules/system/lib/Drupal/system/Controller/SystemInfoController.php index c34efad..3bfad98 100644 --- a/core/modules/system/lib/Drupal/system/Controller/SystemInfoController.php +++ b/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. diff --git a/core/modules/system/lib/Drupal/system/Controller/ThemeController.php b/core/modules/system/lib/Drupal/system/Controller/ThemeController.php index 0c163b8..d46e4cf 100644 --- a/core/modules/system/lib/Drupal/system/Controller/ThemeController.php +++ b/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. diff --git a/core/modules/system/lib/Drupal/system/FileDownloadController.php b/core/modules/system/lib/Drupal/system/FileDownloadController.php index 8bff1bb..9e76396 100644 --- a/core/modules/system/lib/Drupal/system/FileDownloadController.php +++ b/core/modules/system/lib/Drupal/system/FileDownloadController.php @@ -7,7 +7,7 @@ namespace Drupal\system; -use Drupal\Core\Controller\ControllerInterface; +use Drupal\Core\DependencyInjection\ContainerInjectionInterface; use Drupal\Core\Extension\ModuleHandlerInterface; use Symfony\Component\DependencyInjection\ContainerInterface; use Symfony\Component\HttpFoundation\Request; @@ -18,7 +18,7 @@ /** * System file controller. */ -class FileDownloadController implements ControllerInterface { +class FileDownloadController implements ContainerInjectionInterface { /** * The module handler. diff --git a/core/modules/system/lib/Drupal/system/Form/DateFormatLocalizeResetForm.php b/core/modules/system/lib/Drupal/system/Form/DateFormatLocalizeResetForm.php index 53ce314..8bfa07e 100644 --- a/core/modules/system/lib/Drupal/system/Form/DateFormatLocalizeResetForm.php +++ b/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 @@ /** * Builds a form for enabling a module. */ -class DateFormatLocalizeResetForm extends ConfirmFormBase implements ControllerInterface { +class DateFormatLocalizeResetForm extends ConfirmFormBase implements ContainerInjectionInterface { /** * The language to be reset. diff --git a/core/modules/system/lib/Drupal/system/Form/ModulesListConfirmForm.php b/core/modules/system/lib/Drupal/system/Form/ModulesListConfirmForm.php index 986b4d6..d674b18 100644 --- a/core/modules/system/lib/Drupal/system/Form/ModulesListConfirmForm.php +++ b/core/modules/system/lib/Drupal/system/Form/ModulesListConfirmForm.php @@ -7,7 +7,7 @@ namespace Drupal\system\Form; -use Drupal\Core\Controller\ControllerInterface; +use Drupal\Core\DependencyInjection\ContainerInjectionInterface; use Drupal\Core\Extension\ModuleHandlerInterface; use Drupal\Core\Form\ConfirmFormBase; use Drupal\Core\KeyValueStore\KeyValueStoreExpirableInterface; @@ -17,7 +17,7 @@ /** * Builds a confirmation form for enabling modules with dependencies. */ -class ModulesListConfirmForm extends ConfirmFormBase implements ControllerInterface { +class ModulesListConfirmForm extends ConfirmFormBase implements ContainerInjectionInterface { /** * The module handler service. diff --git a/core/modules/system/lib/Drupal/system/Form/ModulesUninstallConfirmForm.php b/core/modules/system/lib/Drupal/system/Form/ModulesUninstallConfirmForm.php index e8ebd46..be3d19f 100644 --- a/core/modules/system/lib/Drupal/system/Form/ModulesUninstallConfirmForm.php +++ b/core/modules/system/lib/Drupal/system/Form/ModulesUninstallConfirmForm.php @@ -10,14 +10,14 @@ use Drupal\Core\Form\ConfirmFormBase; use Symfony\Component\HttpFoundation\RedirectResponse; use Symfony\Component\DependencyInjection\ContainerInterface; -use Drupal\Core\Controller\ControllerInterface; +use Drupal\Core\DependencyInjection\ContainerInjectionInterface; use Drupal\Core\KeyValueStore\KeyValueStoreExpirableInterface; use Drupal\Core\Extension\ModuleHandlerInterface; /** * Builds a confirmation form to uninstall selected modules. */ -class ModulesUninstallConfirmForm extends ConfirmFormBase implements ControllerInterface { +class ModulesUninstallConfirmForm extends ConfirmFormBase implements ContainerInjectionInterface { /** * The module handler service. diff --git a/core/modules/system/lib/Drupal/system/MachineNameController.php b/core/modules/system/lib/Drupal/system/MachineNameController.php index 23cbc22..51085cd 100644 --- a/core/modules/system/lib/Drupal/system/MachineNameController.php +++ b/core/modules/system/lib/Drupal/system/MachineNameController.php @@ -9,7 +9,7 @@ use Drupal\Component\Transliteration\TransliterationInterface; use Drupal\Component\Utility\Unicode; -use Drupal\Core\Controller\ControllerInterface; +use Drupal\Core\DependencyInjection\ContainerInjectionInterface; use Symfony\Component\HttpFoundation\JsonResponse; use Symfony\Component\HttpFoundation\Request; use Symfony\Component\DependencyInjection\ContainerInterface; @@ -17,7 +17,7 @@ /** * Controller routines for machine name transliteration routes. */ -class MachineNameController implements ControllerInterface { +class MachineNameController implements ContainerInjectionInterface { /** * The transliteration helper. diff --git a/core/modules/system/tests/modules/common_test/lib/Drupal/common_test/Controller/CommonTestController.php b/core/modules/system/tests/modules/common_test/lib/Drupal/common_test/Controller/CommonTestController.php index 77b8606..2692060 100644 --- a/core/modules/system/tests/modules/common_test/lib/Drupal/common_test/Controller/CommonTestController.php +++ b/core/modules/system/tests/modules/common_test/lib/Drupal/common_test/Controller/CommonTestController.php @@ -7,13 +7,13 @@ namespace Drupal\common_test\Controller; -use Drupal\Core\Controller\ControllerInterface; +use Drupal\Core\DependencyInjection\ContainerInjectionInterface; use Symfony\Component\DependencyInjection\ContainerInterface; /** * Controller routines for common_test routes. */ -class CommonTestController implements ControllerInterface { +class CommonTestController implements \Drupal\Core\DependencyInjection\ContainerInjectionInterface { /** * {@inheritdoc} diff --git a/core/modules/system/tests/modules/design_test/lib/Drupal/design_test/Controller/DesignTestController.php b/core/modules/system/tests/modules/design_test/lib/Drupal/design_test/Controller/DesignTestController.php index 2800994..5b28f01 100644 --- a/core/modules/system/tests/modules/design_test/lib/Drupal/design_test/Controller/DesignTestController.php +++ b/core/modules/system/tests/modules/design_test/lib/Drupal/design_test/Controller/DesignTestController.php @@ -6,12 +6,12 @@ namespace Drupal\design_test\Controller; -use Drupal\Core\Controller\ControllerInterface; +use Drupal\Core\DependencyInjection\ContainerInjectionInterface; /** * Controller routines for design_test routes. */ -class DesignTestController implements ControllerInterface { +class DesignTestController implements \Drupal\Core\DependencyInjection\ContainerInjectionInterface { /** * {@inheritdoc} diff --git a/core/modules/system/tests/modules/router_test/lib/Drupal/router_test/TestContent.php b/core/modules/system/tests/modules/router_test/lib/Drupal/router_test/TestContent.php index 8ad44e5..a4ed1ec 100644 --- a/core/modules/system/tests/modules/router_test/lib/Drupal/router_test/TestContent.php +++ b/core/modules/system/tests/modules/router_test/lib/Drupal/router_test/TestContent.php @@ -7,7 +7,7 @@ namespace Drupal\router_test; -use Drupal\Core\Controller\ControllerInterface; +use Drupal\Core\DependencyInjection\ContainerInjectionInterface; use Drupal\user\UserInterface; use Symfony\Component\DependencyInjection\ContainerAware; use Symfony\Component\DependencyInjection\ContainerAwareInterface; @@ -18,7 +18,7 @@ /** * Test controllers that are intended to be wrapped in a main controller. */ -class TestContent extends ContainerAware implements ControllerInterface { +class TestContent extends ContainerAware implements ContainerInjectionInterface { /** * The HTTP kernel. diff --git a/core/modules/system/tests/modules/theme_test/lib/Drupal/theme_test/ThemeTestController.php b/core/modules/system/tests/modules/theme_test/lib/Drupal/theme_test/ThemeTestController.php index c790a84..d9f0767 100644 --- a/core/modules/system/tests/modules/theme_test/lib/Drupal/theme_test/ThemeTestController.php +++ b/core/modules/system/tests/modules/theme_test/lib/Drupal/theme_test/ThemeTestController.php @@ -7,13 +7,13 @@ namespace Drupal\theme_test; -use Drupal\Core\Controller\ControllerInterface; +use Drupal\Core\DependencyInjection\ContainerInjectionInterface; use Symfony\Component\DependencyInjection\ContainerInterface; /** * Controller routines for theme test routes. */ -class ThemeTestController implements ControllerInterface { +class ThemeTestController implements ContainerInjectionInterface { /** * {@inheritdoc} diff --git a/core/modules/system/tests/modules/twig_extension_test/lib/Drupal/twig_extension_test/TwigExtensionTestController.php b/core/modules/system/tests/modules/twig_extension_test/lib/Drupal/twig_extension_test/TwigExtensionTestController.php index 79e3211..20c5d91 100644 --- a/core/modules/system/tests/modules/twig_extension_test/lib/Drupal/twig_extension_test/TwigExtensionTestController.php +++ b/core/modules/system/tests/modules/twig_extension_test/lib/Drupal/twig_extension_test/TwigExtensionTestController.php @@ -7,13 +7,13 @@ namespace Drupal\twig_extension_test; -use Drupal\Core\Controller\ControllerInterface; +use Drupal\Core\DependencyInjection\ContainerInjectionInterface; use Symfony\Component\DependencyInjection\ContainerInterface; /** * Controller routines for Twig extension test routes. */ -class TwigExtensionTestController implements ControllerInterface { +class TwigExtensionTestController implements ContainerInjectionInterface { /** * {@inheritdoc} diff --git a/core/modules/system/tests/modules/twig_theme_test/lib/Drupal/twig_theme_test/TwigThemeTestController.php b/core/modules/system/tests/modules/twig_theme_test/lib/Drupal/twig_theme_test/TwigThemeTestController.php index 6eb318a..9179de9 100644 --- a/core/modules/system/tests/modules/twig_theme_test/lib/Drupal/twig_theme_test/TwigThemeTestController.php +++ b/core/modules/system/tests/modules/twig_theme_test/lib/Drupal/twig_theme_test/TwigThemeTestController.php @@ -7,13 +7,13 @@ namespace Drupal\twig_theme_test; -use Drupal\Core\Controller\ControllerInterface; +use Drupal\Core\DependencyInjection\ContainerInjectionInterface; use Symfony\Component\DependencyInjection\ContainerInterface; /** * Controller routines for Twig theme test routes. */ -class TwigThemeTestController implements ControllerInterface { +class TwigThemeTestController implements ContainerInjectionInterface { /** * Creates the controller. diff --git a/core/modules/taxonomy/lib/Drupal/taxonomy/Controller/TermAutocompleteController.php b/core/modules/taxonomy/lib/Drupal/taxonomy/Controller/TermAutocompleteController.php index a26bdb4..31ed191 100644 --- a/core/modules/taxonomy/lib/Drupal/taxonomy/Controller/TermAutocompleteController.php +++ b/core/modules/taxonomy/lib/Drupal/taxonomy/Controller/TermAutocompleteController.php @@ -10,7 +10,7 @@ use Drupal\Component\Utility\Tags; use Drupal\Component\Utility\Unicode; use Drupal\Component\Utility\String; -use Drupal\Core\Controller\ControllerInterface; +use Drupal\Core\DependencyInjection\ContainerInjectionInterface; use Drupal\Core\Entity\Query\QueryInterface; use Drupal\field\FieldInfo; use Drupal\taxonomy\TermStorageControllerInterface; @@ -22,7 +22,7 @@ /** * Returns autocomplete responses for taxonomy terms. */ -class TermAutocompleteController implements ControllerInterface { +class TermAutocompleteController implements \Drupal\Core\DependencyInjection\ContainerInjectionInterface { /** * Taxonomy term entity query interface. diff --git a/core/modules/tour/tests/tour_test/lib/Drupal/tour_test/Controller/TourTestController.php b/core/modules/tour/tests/tour_test/lib/Drupal/tour_test/Controller/TourTestController.php index 02a38a8..aa97264 100644 --- a/core/modules/tour/tests/tour_test/lib/Drupal/tour_test/Controller/TourTestController.php +++ b/core/modules/tour/tests/tour_test/lib/Drupal/tour_test/Controller/TourTestController.php @@ -6,13 +6,13 @@ namespace Drupal\tour_test\Controller; -use Drupal\Core\Controller\ControllerInterface; +use Drupal\Core\DependencyInjection\ContainerInjectionInterface; use Symfony\Component\DependencyInjection\ContainerInterface; /** * Controller routines for tour_test routes. */ -class TourTestController implements ControllerInterface { +class TourTestController implements \Drupal\Core\DependencyInjection\ContainerInjectionInterface { /** * {@inheritdoc} diff --git a/core/modules/update/lib/Drupal/update/Controller/UpdateController.php b/core/modules/update/lib/Drupal/update/Controller/UpdateController.php index ba145c0..deef6d8 100644 --- a/core/modules/update/lib/Drupal/update/Controller/UpdateController.php +++ b/core/modules/update/lib/Drupal/update/Controller/UpdateController.php @@ -7,14 +7,14 @@ namespace Drupal\update\Controller; -use Drupal\Core\Controller\ControllerInterface; +use Drupal\Core\DependencyInjection\ContainerInjectionInterface; use Drupal\Core\Extension\ModuleHandlerInterface; use Symfony\Component\DependencyInjection\ContainerInterface; /** * Controller routines for update routes. */ -class UpdateController implements ControllerInterface { +class UpdateController implements ContainerInjectionInterface { /** * Module handler service. diff --git a/core/modules/user/lib/Drupal/user/Controller/UserAutocompleteController.php b/core/modules/user/lib/Drupal/user/Controller/UserAutocompleteController.php index 587c7f4..2ee4407 100644 --- a/core/modules/user/lib/Drupal/user/Controller/UserAutocompleteController.php +++ b/core/modules/user/lib/Drupal/user/Controller/UserAutocompleteController.php @@ -10,13 +10,13 @@ use Symfony\Component\HttpFoundation\Request; use Symfony\Component\DependencyInjection\ContainerInterface; -use Drupal\Core\Controller\ControllerInterface; +use Drupal\Core\DependencyInjection\ContainerInjectionInterface; use Drupal\user\UserAutocomplete; /** * Controller routines for taxonomy user routes. */ -class UserAutocompleteController implements ControllerInterface { +class UserAutocompleteController implements \Drupal\Core\DependencyInjection\ContainerInjectionInterface { /** * The user autocomplete helper class to find matching user names. diff --git a/core/modules/views/lib/Drupal/views/Controller/ViewAjaxController.php b/core/modules/views/lib/Drupal/views/Controller/ViewAjaxController.php index b0eea3c..4afe07f 100644 --- a/core/modules/views/lib/Drupal/views/Controller/ViewAjaxController.php +++ b/core/modules/views/lib/Drupal/views/Controller/ViewAjaxController.php @@ -9,7 +9,7 @@ use Drupal\Component\Utility\Url; use Drupal\Core\Ajax\ReplaceCommand; -use Drupal\Core\Controller\ControllerInterface; +use Drupal\Core\DependencyInjection\ContainerInjectionInterface; use Drupal\Core\Entity\EntityStorageControllerInterface; use Drupal\views\Ajax\ScrollTopCommand; use Drupal\views\Ajax\ViewAjaxResponse; @@ -21,7 +21,7 @@ /** * Defines a controller to load a view via AJAX. */ -class ViewAjaxController implements ControllerInterface { +class ViewAjaxController implements \Drupal\Core\DependencyInjection\ContainerInjectionInterface { /** * The entity storage controller for views. diff --git a/core/modules/views/lib/Drupal/views/Routing/ViewPageController.php b/core/modules/views/lib/Drupal/views/Routing/ViewPageController.php index 3c0b5d9..741aaa3 100644 --- a/core/modules/views/lib/Drupal/views/Routing/ViewPageController.php +++ b/core/modules/views/lib/Drupal/views/Routing/ViewPageController.php @@ -7,7 +7,7 @@ namespace Drupal\views\Routing; -use Drupal\Core\Controller\ControllerInterface; +use Drupal\Core\DependencyInjection\ContainerInjectionInterface; use Drupal\Core\Entity\EntityStorageControllerInterface; use Drupal\views\ViewExecutableFactory; use Symfony\Component\DependencyInjection\ContainerInterface; @@ -17,7 +17,7 @@ /** * Defines a page controller to execute and render a view. */ -class ViewPageController implements ControllerInterface { +class ViewPageController implements ContainerInjectionInterface { /** * The entity storage controller. diff --git a/core/modules/views_ui/lib/Drupal/views_ui/Controller/ViewsUIController.php b/core/modules/views_ui/lib/Drupal/views_ui/Controller/ViewsUIController.php index a78c757..a2be198 100644 --- a/core/modules/views_ui/lib/Drupal/views_ui/Controller/ViewsUIController.php +++ b/core/modules/views_ui/lib/Drupal/views_ui/Controller/ViewsUIController.php @@ -11,7 +11,7 @@ use Drupal\views\ViewStorageInterface; use Drupal\views_ui\ViewUI; use Drupal\views\ViewsData; -use Drupal\Core\Controller\ControllerInterface; +use Drupal\Core\DependencyInjection\ContainerInjectionInterface; use Drupal\Core\Entity\EntityManager; use Symfony\Component\DependencyInjection\ContainerInterface; use Symfony\Component\HttpFoundation\Request; @@ -25,7 +25,7 @@ /** * Returns responses for Views UI routes. */ -class ViewsUIController implements ControllerInterface { +class ViewsUIController implements \Drupal\Core\DependencyInjection\ContainerInjectionInterface { /** * Stores the Entity manager.