diff --git a/core/lib/Drupal/Core/Controller/ControllerInterface.php b/core/lib/Drupal/Core/Controller/ContainerFactoryControllerInterface.php similarity index 76% rename from core/lib/Drupal/Core/Controller/ControllerInterface.php rename to core/lib/Drupal/Core/Controller/ContainerFactoryControllerInterface.php index 5cdab2e..b4c4bc5 100644 --- a/core/lib/Drupal/Core/Controller/ControllerInterface.php +++ b/core/lib/Drupal/Core/Controller/ContainerFactoryControllerInterface.php @@ -2,7 +2,7 @@ /** * @file - * Contains \Drupal\Core\Controller\ControllerInterface. + * Contains \Drupal\Core\Controller\ContainerFactoryControllerInterface. */ namespace Drupal\Core\Controller; @@ -16,11 +16,11 @@ * rather than relying on a services.yml entry. However, it may result in * a lot of boilerplate code in the class. As an alternative, controllers that * contain only limited glue code ("thin" controllers) should instead extend - * ControllerBase as that allows direct access to the container. That renders - * the controller very difficult to unit test so should only be used for - * controllers that are trivial in complexity. + * \Drupal\Core\Controller\ControllerBase as that allows direct access to the + * container. That renders the controller very difficult to unit test so should + * only be used for controllers that are trivial in complexity. */ -interface ControllerInterface { +interface ContainerFactoryControllerInterface { /** * Instantiates a new instance of this controller. diff --git a/core/lib/Drupal/Core/Controller/ControllerBase.php b/core/lib/Drupal/Core/Controller/ControllerBase.php index 389279a..49d2062 100644 --- a/core/lib/Drupal/Core/Controller/ControllerBase.php +++ b/core/lib/Drupal/Core/Controller/ControllerBase.php @@ -19,15 +19,15 @@ * 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 - * refactored to be trivial glue code. + * this base class but use ContainerFactoryControllerInterface 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 * controller to leverage. A controller that needs other other services may * need to be refactored into a thin controller and a dependent unit-testable * service. * - * @see \Drupal\Core\Controller\ControllerInterface + * @see \Drupal\Core\Controller\ContainerControllerInterface */ abstract class ControllerBase extends ContainerAware { diff --git a/core/lib/Drupal/Core/Controller/ControllerResolver.php b/core/lib/Drupal/Core/Controller/ControllerResolver.php index 2fd4ee2..b62e722 100644 --- a/core/lib/Drupal/Core/Controller/ControllerResolver.php +++ b/core/lib/Drupal/Core/Controller/ControllerResolver.php @@ -81,7 +81,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\Controller\ContainerControllerInterface', 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..52ad53b 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\Controller\ContainerControllerInterface', class_implements($form_arg))) { return $form_arg::create($this->container); } diff --git a/core/lib/Drupal/Core/Entity/Controller/EntityViewController.php b/core/lib/Drupal/Core/Entity/Controller/EntityViewController.php index b9667d2..edcf847 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\Controller\ContainerFactoryControllerInterface; 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 ContainerFactoryControllerInterface { /** * The entity manager diff --git a/core/modules/action/lib/Drupal/action/Form/ActionAdminManageForm.php b/core/modules/action/lib/Drupal/action/Form/ActionAdminManageForm.php index d825415..f382396 100644 --- a/core/modules/action/lib/Drupal/action/Form/ActionAdminManageForm.php +++ b/core/modules/action/lib/Drupal/action/Form/ActionAdminManageForm.php @@ -7,7 +7,7 @@ namespace Drupal\action\Form; -use Drupal\Core\Controller\ControllerInterface; +use Drupal\Core\Controller\ContainerFactoryControllerInterface; use Drupal\Core\Form\FormInterface; use Drupal\Component\Utility\Crypt; use Drupal\Core\Action\ActionManager; @@ -16,7 +16,7 @@ /** * Provides a configuration form for configurable actions. */ -class ActionAdminManageForm implements FormInterface, ControllerInterface { +class ActionAdminManageForm implements FormInterface, ContainerFactoryControllerInterface { /** * The action plugin manager. diff --git a/core/modules/aggregator/lib/Drupal/aggregator/Controller/AggregatorController.php b/core/modules/aggregator/lib/Drupal/aggregator/Controller/AggregatorController.php index a8b1d80..793745d 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\Controller\ContainerFactoryControllerInterface; 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 ContainerFactoryControllerInterface { /** * Stores the Entity manager. diff --git a/core/modules/aggregator/lib/Drupal/aggregator/Form/OpmlFeedAdd.php b/core/modules/aggregator/lib/Drupal/aggregator/Form/OpmlFeedAdd.php index 0959fb0..a6d13f7 100644 --- a/core/modules/aggregator/lib/Drupal/aggregator/Form/OpmlFeedAdd.php +++ b/core/modules/aggregator/lib/Drupal/aggregator/Form/OpmlFeedAdd.php @@ -7,7 +7,7 @@ namespace Drupal\aggregator\Form; -use Drupal\Core\Controller\ControllerInterface; +use Drupal\Core\Controller\ContainerFactoryControllerInterface; use Drupal\Core\Database\Connection; use Drupal\Core\Entity\EntityManager; use Drupal\Core\Entity\Query\QueryFactory; @@ -20,7 +20,7 @@ /** * Imports feeds from OPML. */ -class OpmlFeedAdd implements ControllerInterface, FormInterface { +class OpmlFeedAdd implements ContainerFactoryControllerInterface, FormInterface { /** * The database connection object. diff --git a/core/modules/ban/lib/Drupal/ban/Form/BanAdmin.php b/core/modules/ban/lib/Drupal/ban/Form/BanAdmin.php index 9e31af2..88f3432 100644 --- a/core/modules/ban/lib/Drupal/ban/Form/BanAdmin.php +++ b/core/modules/ban/lib/Drupal/ban/Form/BanAdmin.php @@ -7,7 +7,7 @@ namespace Drupal\ban\Form; -use Drupal\Core\Controller\ControllerInterface; +use Drupal\Core\Controller\ContainerFactoryControllerInterface; use Drupal\Core\Form\FormInterface; use Drupal\ban\BanIpManager; use Symfony\Component\HttpFoundation\Request; @@ -16,7 +16,7 @@ /** * Displays banned IP addresses. */ -class BanAdmin implements FormInterface, ControllerInterface { +class BanAdmin implements FormInterface, ContainerFactoryControllerInterface { /** * @var \Drupal\ban\BanIpManager diff --git a/core/modules/ban/lib/Drupal/ban/Form/BanDelete.php b/core/modules/ban/lib/Drupal/ban/Form/BanDelete.php index ac1aa91..9c8e2c4 100644 --- a/core/modules/ban/lib/Drupal/ban/Form/BanDelete.php +++ b/core/modules/ban/lib/Drupal/ban/Form/BanDelete.php @@ -7,7 +7,7 @@ namespace Drupal\ban\Form; -use Drupal\Core\Controller\ControllerInterface; +use Drupal\Core\Controller\ContainerFactoryControllerInterface; use Drupal\Core\Form\ConfirmFormBase; use Drupal\ban\BanIpManager; use Symfony\Component\DependencyInjection\ContainerInterface; @@ -17,7 +17,7 @@ /** * Provides a form to unban IP addresses. */ -class BanDelete extends ConfirmFormBase implements ControllerInterface { +class BanDelete extends ConfirmFormBase implements ContainerFactoryControllerInterface { /** * The banned IP address. 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..c38deb4 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\Controller\ContainerFactoryControllerInterface; 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 ContainerFactoryControllerInterface { /** * 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..be0014f 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\Controller\ContainerFactoryControllerInterface; 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 ContainerFactoryControllerInterface { /** * 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 84ef0c1..2112035 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\Plugin\Core\Entity\Comment; -use Drupal\Core\Controller\ControllerInterface; +use Drupal\Core\Controller\ContainerFactoryControllerInterface; use Drupal\Core\Routing\PathBasedGeneratorInterface; use Symfony\Component\DependencyInjection\ContainerInterface; use Symfony\Component\HttpFoundation\RedirectResponse; @@ -23,7 +23,7 @@ * * @see \Drupal\comment\Plugin\Core\Entity\Comment. */ -class CommentController implements ControllerInterface { +class CommentController implements ContainerFactoryControllerInterface { /** * 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..e96cc3f 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\Controller\ContainerFactoryControllerInterface; 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 ContainerFactoryControllerInterface { /** * The target storage. @@ -37,7 +37,7 @@ class ConfigController implements ControllerInterface { /** * The file download controller. * - * @var \Drupal\Core\Controller\ControllerInterface + * @var \Drupal\Core\Controller\ContainerFactoryControllerInterface */ 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\Controller\ContainerFactoryControllerInterface $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, ContainerFactoryControllerInterface $file_download_controller) { $this->targetStorage = $target_storage; $this->sourceStorage = $source_storage; $this->fileDownloadController = $file_download_controller; diff --git a/core/modules/config/lib/Drupal/config/Form/ConfigSync.php b/core/modules/config/lib/Drupal/config/Form/ConfigSync.php index 8c5cb96..f5460ba 100644 --- a/core/modules/config/lib/Drupal/config/Form/ConfigSync.php +++ b/core/modules/config/lib/Drupal/config/Form/ConfigSync.php @@ -10,7 +10,7 @@ use Symfony\Component\EventDispatcher\EventDispatcherInterface; use Symfony\Component\DependencyInjection\ContainerInterface; -use Drupal\Core\Controller\ControllerInterface; +use Drupal\Core\Controller\ContainerFactoryControllerInterface; use Drupal\Core\Form\FormInterface; use Drupal\Core\Config\StorageInterface; use Drupal\Core\Lock\LockBackendInterface; @@ -25,7 +25,7 @@ /** * Construct the storage changes in a configuration synchronization form. */ -class ConfigSync implements ControllerInterface, FormInterface { +class ConfigSync implements ContainerFactoryControllerInterface, FormInterface { /** * The database lock object. diff --git a/core/modules/dblog/lib/Drupal/dblog/Controller/DbLogController.php b/core/modules/dblog/lib/Drupal/dblog/Controller/DbLogController.php index 3119a1b..129210f 100644 --- a/core/modules/dblog/lib/Drupal/dblog/Controller/DbLogController.php +++ b/core/modules/dblog/lib/Drupal/dblog/Controller/DbLogController.php @@ -9,14 +9,14 @@ use Drupal\Component\Utility\Unicode; use Drupal\Core\Database\Connection; -use Drupal\Core\Controller\ControllerInterface; +use Drupal\Core\Controller\ContainerFactoryControllerInterface; use Drupal\Core\Extension\ModuleHandlerInterface; use Symfony\Component\DependencyInjection\ContainerInterface; /** * Returns responses for dblog routes. */ -class DbLogController implements ControllerInterface { +class DbLogController implements ContainerFactoryControllerInterface { /** * 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..4613615 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\Controller\ContainerFactoryControllerInterface; 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 ContainerFactoryControllerInterface { /** * 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..f678456 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\Controller\ContainerFactoryControllerInterface; use Symfony\Component\DependencyInjection\ContainerInterface; /** * Provides methods for entity display mode routes. */ -class EntityDisplayModeController implements ControllerInterface { +class EntityDisplayModeController implements ContainerFactoryControllerInterface { /** * 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..7161dca 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\Controller\ContainerFactoryControllerInterface; /** * Defines route controller for entity reference. */ -class EntityReferenceController implements ControllerInterface { +class EntityReferenceController implements ContainerFactoryControllerInterface { /** * The autocomplete helper for entity references. diff --git a/core/modules/field_ui/lib/Drupal/field_ui/DisplayOverview.php b/core/modules/field_ui/lib/Drupal/field_ui/DisplayOverview.php index 841c056..aab02d6 100644 --- a/core/modules/field_ui/lib/Drupal/field_ui/DisplayOverview.php +++ b/core/modules/field_ui/lib/Drupal/field_ui/DisplayOverview.php @@ -8,7 +8,7 @@ namespace Drupal\field_ui; use Drupal\Component\Utility\NestedArray; -use Drupal\Core\Controller\ControllerInterface; +use Drupal\Core\Controller\ContainerFactoryControllerInterface; use Drupal\entity\EntityDisplayBaseInterface; use Drupal\field\FieldInstanceInterface; use Symfony\Component\DependencyInjection\ContainerInterface; @@ -16,7 +16,7 @@ /** * Field UI display overview form. */ -class DisplayOverview extends DisplayOverviewBase implements ControllerInterface { +class DisplayOverview extends DisplayOverviewBase implements ContainerFactoryControllerInterface { /** * {@inheritdoc} diff --git a/core/modules/field_ui/lib/Drupal/field_ui/Form/FieldEditForm.php b/core/modules/field_ui/lib/Drupal/field_ui/Form/FieldEditForm.php index 305596f..77f7812 100644 --- a/core/modules/field_ui/lib/Drupal/field_ui/Form/FieldEditForm.php +++ b/core/modules/field_ui/lib/Drupal/field_ui/Form/FieldEditForm.php @@ -7,7 +7,7 @@ namespace Drupal\field_ui\Form; -use Drupal\Core\Controller\ControllerInterface; +use Drupal\Core\Controller\ContainerFactoryControllerInterface; use Drupal\Core\Entity\EntityManager; use Drupal\Core\Entity\EntityInterface; use Drupal\Core\Form\FormInterface; @@ -19,7 +19,7 @@ /** * Provides a form for the field settings edit page. */ -class FieldEditForm implements FormInterface, ControllerInterface { +class FieldEditForm implements FormInterface, ContainerFactoryControllerInterface { /** * The field instance being edited. diff --git a/core/modules/field_ui/lib/Drupal/field_ui/Form/FieldInstanceEditForm.php b/core/modules/field_ui/lib/Drupal/field_ui/Form/FieldInstanceEditForm.php index 046e012..68d1cf0 100644 --- a/core/modules/field_ui/lib/Drupal/field_ui/Form/FieldInstanceEditForm.php +++ b/core/modules/field_ui/lib/Drupal/field_ui/Form/FieldInstanceEditForm.php @@ -7,7 +7,7 @@ namespace Drupal\field_ui\Form; -use Drupal\Core\Controller\ControllerInterface; +use Drupal\Core\Controller\ContainerFactoryControllerInterface; use Drupal\Core\Entity\EntityInterface; use Drupal\Core\Entity\EntityManager; use Drupal\Core\Entity\EntityNG; @@ -22,7 +22,7 @@ /** * Provides a form for the field instance settings form. */ -class FieldInstanceEditForm implements FormInterface, ControllerInterface { +class FieldInstanceEditForm implements FormInterface, ContainerFactoryControllerInterface { /** * The field instance being edited. diff --git a/core/modules/field_ui/lib/Drupal/field_ui/FormDisplayOverview.php b/core/modules/field_ui/lib/Drupal/field_ui/FormDisplayOverview.php index d2ab86a..fa50731 100644 --- a/core/modules/field_ui/lib/Drupal/field_ui/FormDisplayOverview.php +++ b/core/modules/field_ui/lib/Drupal/field_ui/FormDisplayOverview.php @@ -8,7 +8,7 @@ namespace Drupal\field_ui; use Drupal\Component\Utility\NestedArray; -use Drupal\Core\Controller\ControllerInterface; +use Drupal\Core\Controller\ContainerFactoryControllerInterface; use Drupal\entity\EntityDisplayBaseInterface; use Drupal\field\FieldInstanceInterface; use Symfony\Component\DependencyInjection\ContainerInterface; @@ -16,7 +16,7 @@ /** * Field UI form display overview form. */ -class FormDisplayOverview extends DisplayOverviewBase implements ControllerInterface { +class FormDisplayOverview extends DisplayOverviewBase implements ContainerFactoryControllerInterface { /** * {@inheritdoc} diff --git a/core/modules/field_ui/lib/Drupal/field_ui/OverviewBase.php b/core/modules/field_ui/lib/Drupal/field_ui/OverviewBase.php index 39ffb8d..5e9c90c 100644 --- a/core/modules/field_ui/lib/Drupal/field_ui/OverviewBase.php +++ b/core/modules/field_ui/lib/Drupal/field_ui/OverviewBase.php @@ -8,14 +8,14 @@ namespace Drupal\field_ui; use Symfony\Component\DependencyInjection\ContainerInterface; -use Drupal\Core\Controller\ControllerInterface; +use Drupal\Core\Controller\ContainerFactoryControllerInterface; use Drupal\Core\Entity\EntityManager; use Drupal\Core\Form\FormInterface; /** * Abstract base class for Field UI overview forms. */ -abstract class OverviewBase implements FormInterface, ControllerInterface { +abstract class OverviewBase implements FormInterface, ContainerFactoryControllerInterface { /** * The name of the entity type. diff --git a/core/modules/forum/lib/Drupal/forum/Controller/ForumController.php b/core/modules/forum/lib/Drupal/forum/Controller/ForumController.php index 51747fd..acd9d58 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\Controller\ContainerFactoryControllerInterface; 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 ContainerFactoryControllerInterface { /** * 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 8bea58c..6efaa9c 100644 --- a/core/modules/help/lib/Drupal/help/Controller/HelpController.php +++ b/core/modules/help/lib/Drupal/help/Controller/HelpController.php @@ -6,14 +6,14 @@ namespace Drupal\help\Controller; -use Drupal\Core\Controller\ControllerInterface; +use Drupal\Core\Controller\ContainerFactoryControllerInterface; use Drupal\Core\Extension\ModuleHandlerInterface; use Symfony\Component\DependencyInjection\ContainerInterface; /** * Controller routines for help routes. */ -class HelpController implements ControllerInterface { +class HelpController implements ContainerFactoryControllerInterface { /** * 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..8d1bcb6 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\Controller\ContainerFactoryControllerInterface; 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 ContainerFactoryControllerInterface { /** * 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 1d644e6..04458d0 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\Controller\ContainerFactoryControllerInterface; use Drupal\image\ImageEffectManager; use Drupal\image\ImageStyleInterface; use Symfony\Component\DependencyInjection\ContainerInterface; @@ -16,7 +16,7 @@ /** * Provides an add form for image effects. */ -class ImageEffectAddForm extends ImageEffectFormBase implements ControllerInterface { +class ImageEffectAddForm extends ImageEffectFormBase implements ContainerFactoryControllerInterface { /** * 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..d6b76c6 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\Controller\ContainerFactoryControllerInterface; 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 ContainerFactoryControllerInterface { /** * 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 b9ad7f9..fe76cbe 100644 --- a/core/modules/layout/lib/Drupal/layout/Controller/LayoutController.php +++ b/core/modules/layout/lib/Drupal/layout/Controller/LayoutController.php @@ -6,14 +6,14 @@ namespace Drupal\layout\Controller; -use Drupal\Core\Controller\ControllerInterface; +use Drupal\Core\Controller\ContainerFactoryControllerInterface; use Drupal\layout\Plugin\Type\LayoutManager; use Symfony\Component\DependencyInjection\ContainerInterface; /** * Controller routines for layout routes. */ -class LayoutController implements ControllerInterface { +class LayoutController implements ContainerFactoryControllerInterface { /** * 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..da1b0aa 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\Controller\ContainerFactoryControllerInterface; use Drupal\Core\Entity\EntityStorageControllerInterface; use Symfony\Component\DependencyInjection\ContainerInterface; /** * Controller routines for layout_test routes. */ -class LayoutTestController implements ControllerInterface{ +class LayoutTestController implements ContainerFactoryControllerInterface{ /** * 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 7d95e3a..9326a6d 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\Controller\ContainerFactoryControllerInterface; use Drupal\Core\Routing\PathBasedGeneratorInterface; 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 ContainerFactoryControllerInterface { /** * 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..cd11765 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\Controller\ContainerFactoryControllerInterface; 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 ContainerFactoryControllerInterface { /** * 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 381ae80..52b97b4 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\Controller\ContainerFactoryControllerInterface; use Drupal\Core\Entity\EntityManager; use Drupal\Component\Utility\String; use Drupal\user\TempStoreFactory; @@ -19,7 +19,7 @@ /** * Provides a node deletion confirmation form. */ -class DeleteMultiple extends ConfirmFormBase implements ControllerInterface { +class DeleteMultiple extends ConfirmFormBase implements ContainerFactoryControllerInterface { /** * 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 8c06d49..23ea1b4 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\Controller\ContainerFactoryControllerInterface; use Drupal\Core\Database\Connection; use Drupal\Core\Entity\EntityStorageControllerInterface; use Drupal\Core\Form\ConfirmFormBase; @@ -18,7 +18,7 @@ /** * Provides a form for reverting a node revision. */ -class NodeRevisionDeleteForm extends ConfirmFormBase implements ControllerInterface { +class NodeRevisionDeleteForm extends ConfirmFormBase implements ContainerFactoryControllerInterface { /** * 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 d4c69ec..5830979 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\Controller\ContainerFactoryControllerInterface; use Drupal\Core\Entity\EntityStorageControllerInterface; use Drupal\Core\Form\ConfirmFormBase; use Drupal\node\NodeInterface; @@ -17,7 +17,7 @@ /** * Provides a form for reverting a node revision. */ -class NodeRevisionRevertForm extends ConfirmFormBase implements ControllerInterface { +class NodeRevisionRevertForm extends ConfirmFormBase implements ContainerFactoryControllerInterface { /** * The node revision. diff --git a/core/modules/path/lib/Drupal/path/Form/DeleteForm.php b/core/modules/path/lib/Drupal/path/Form/DeleteForm.php index 2d4bcff..bca2f49 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\Controller\ContainerFactoryControllerInterface; use Drupal\Core\Form\ConfirmFormBase; use Drupal\Core\Path\Path; use Symfony\Component\DependencyInjection\ContainerInterface; @@ -16,7 +16,7 @@ /** * Builds the form to delete a path alias. */ -class DeleteForm extends ConfirmFormBase implements ControllerInterface { +class DeleteForm extends ConfirmFormBase implements ContainerFactoryControllerInterface { /** * The path crud service. diff --git a/core/modules/simpletest/lib/Drupal/simpletest/Form/SimpletestResultsForm.php b/core/modules/simpletest/lib/Drupal/simpletest/Form/SimpletestResultsForm.php index 3eb42ce..70e0fe4 100644 --- a/core/modules/simpletest/lib/Drupal/simpletest/Form/SimpletestResultsForm.php +++ b/core/modules/simpletest/lib/Drupal/simpletest/Form/SimpletestResultsForm.php @@ -7,7 +7,7 @@ namespace Drupal\simpletest\Form; -use Drupal\Core\Controller\ControllerInterface; +use Drupal\Core\Controller\ContainerFactoryControllerInterface; use Drupal\Core\Database\Connection; use Drupal\Core\Form\FormInterface; use Symfony\Component\DependencyInjection\ContainerInterface; @@ -16,7 +16,7 @@ /** * Test results form for $test_id. */ -class SimpletestResultsForm implements FormInterface, ControllerInterface { +class SimpletestResultsForm implements FormInterface, ContainerFactoryControllerInterface { /** * Associative array of themed result images keyed by status. diff --git a/core/modules/system/lib/Drupal/system/Controller/AdminController.php b/core/modules/system/lib/Drupal/system/Controller/AdminController.php index 6bda138..0d0a291 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\Controller\ContainerFactoryControllerInterface; use Drupal\Core\Extension\ModuleHandlerInterface; use Symfony\Component\DependencyInjection\ContainerInterface; /** * Controller for admin section. */ -class AdminController implements ControllerInterface { +class AdminController implements ContainerFactoryControllerInterface { /** * Module handler service. diff --git a/core/modules/system/lib/Drupal/system/Controller/SystemInfoController.php b/core/modules/system/lib/Drupal/system/Controller/SystemInfoController.php index c34efad..94055f3 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\Controller\ContainerFactoryControllerInterface; use Drupal\Core\Database\Connection; use Drupal\system\SystemManager; /** * Returns responses for System Info routes. */ -class SystemInfoController implements ControllerInterface { +class SystemInfoController implements ContainerFactoryControllerInterface { /** * 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..f850bd5 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\Controller\ContainerFactoryControllerInterface; 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 ContainerFactoryControllerInterface { /** * 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..e0a7e33 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\Controller\ContainerFactoryControllerInterface; 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 ContainerFactoryControllerInterface { /** * The module handler. diff --git a/core/modules/system/lib/Drupal/system/Form/DateFormatDeleteForm.php b/core/modules/system/lib/Drupal/system/Form/DateFormatDeleteForm.php index 3d3dfc7..e0fca4c 100644 --- a/core/modules/system/lib/Drupal/system/Form/DateFormatDeleteForm.php +++ b/core/modules/system/lib/Drupal/system/Form/DateFormatDeleteForm.php @@ -7,7 +7,6 @@ namespace Drupal\system\Form; -use Drupal\Core\Controller\ControllerInterface; use Drupal\Core\Datetime\Date; use Drupal\Core\Entity\EntityConfirmFormBase; use Drupal\Core\Entity\EntityControllerInterface; diff --git a/core/modules/system/lib/Drupal/system/Form/DateFormatLocalizeResetForm.php b/core/modules/system/lib/Drupal/system/Form/DateFormatLocalizeResetForm.php index d3de481..78f1ef6 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\Controller\ContainerFactoryControllerInterface; use Drupal\Core\Form\ConfirmFormBase; use Drupal\Core\Config\ConfigFactory; use Symfony\Component\DependencyInjection\ContainerInterface; @@ -16,7 +16,7 @@ /** * Builds a form for enabling a module. */ -class DateFormatLocalizeResetForm extends ConfirmFormBase implements ControllerInterface { +class DateFormatLocalizeResetForm extends ConfirmFormBase implements ContainerFactoryControllerInterface { /** * 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 8296ba6..cd913c3 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\Controller\ContainerFactoryControllerInterface; use Drupal\Core\Extension\ModuleHandlerInterface; use Drupal\Core\Form\ConfirmFormBase; use Drupal\Core\KeyValueStore\KeyValueStoreExpirableInterface; @@ -19,7 +19,7 @@ /** * Builds a confirmation form for enabling modules with dependencies. */ -class ModulesListConfirmForm extends ConfirmFormBase implements ControllerInterface { +class ModulesListConfirmForm extends ConfirmFormBase implements ContainerFactoryControllerInterface { /** * The module handler service. diff --git a/core/modules/system/lib/Drupal/system/Form/ModulesListForm.php b/core/modules/system/lib/Drupal/system/Form/ModulesListForm.php index c699c09..ba51e79 100644 --- a/core/modules/system/lib/Drupal/system/Form/ModulesListForm.php +++ b/core/modules/system/lib/Drupal/system/Form/ModulesListForm.php @@ -7,7 +7,7 @@ namespace Drupal\system\Form; -use Drupal\Core\Controller\ControllerInterface; +use Drupal\Core\Controller\ContainerFactoryControllerInterface; use Drupal\Core\Extension\ModuleHandlerInterface; use Drupal\Core\Form\FormInterface; use Drupal\Core\KeyValueStore\KeyValueExpirableFactory; @@ -25,7 +25,7 @@ * requires. See drupal_parse_info_file() for info on module.info.yml * descriptors. */ -class ModulesListForm implements FormInterface, ControllerInterface { +class ModulesListForm implements FormInterface, ContainerFactoryControllerInterface { /** * 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 463eb5a..3429a93 100644 --- a/core/modules/system/lib/Drupal/system/Form/ModulesUninstallConfirmForm.php +++ b/core/modules/system/lib/Drupal/system/Form/ModulesUninstallConfirmForm.php @@ -12,7 +12,7 @@ use Symfony\Component\HttpFoundation\Request; use Symfony\Component\HttpFoundation\RedirectResponse; use Symfony\Component\DependencyInjection\ContainerInterface; -use Drupal\Core\Controller\ControllerInterface; +use Drupal\Core\Controller\ContainerFactoryControllerInterface; use Drupal\Core\KeyValueStore\KeyValueExpirableFactory; use Drupal\Core\KeyValueStore\KeyValueStoreExpirableInterface; use Drupal\Core\Extension\ModuleHandlerInterface; @@ -20,7 +20,7 @@ /** * Builds a confirmation form to uninstall selected modules. */ -class ModulesUninstallConfirmForm extends ConfirmFormBase implements ControllerInterface { +class ModulesUninstallConfirmForm extends ConfirmFormBase implements ContainerFactoryControllerInterface { /** * The module handler service. diff --git a/core/modules/system/lib/Drupal/system/Form/ModulesUninstallForm.php b/core/modules/system/lib/Drupal/system/Form/ModulesUninstallForm.php index a6b3dea..b9ddf59 100644 --- a/core/modules/system/lib/Drupal/system/Form/ModulesUninstallForm.php +++ b/core/modules/system/lib/Drupal/system/Form/ModulesUninstallForm.php @@ -10,7 +10,7 @@ use Drupal\Core\Form\FormInterface; use Drupal\Core\StringTranslation\TranslationManager; use Symfony\Component\DependencyInjection\ContainerInterface; -use Drupal\Core\Controller\ControllerInterface; +use Drupal\Core\Controller\ContainerFactoryControllerInterface; use Drupal\Core\KeyValueStore\KeyValueExpirableFactory; use Drupal\Core\KeyValueStore\KeyValueStoreExpirableInterface; use Drupal\Core\Extension\ModuleHandlerInterface; @@ -19,7 +19,7 @@ /** * Provides a form for uninstalling modules. */ -class ModulesUninstallForm implements FormInterface, ControllerInterface { +class ModulesUninstallForm implements FormInterface, ContainerFactoryControllerInterface { /** * 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..9271a9b 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\Controller\ContainerFactoryControllerInterface; 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 ContainerFactoryControllerInterface { /** * The transliteration helper. diff --git a/core/modules/system/lib/Drupal/system/SystemConfigFormBase.php b/core/modules/system/lib/Drupal/system/SystemConfigFormBase.php index eb82bdc..7ebd904 100644 --- a/core/modules/system/lib/Drupal/system/SystemConfigFormBase.php +++ b/core/modules/system/lib/Drupal/system/SystemConfigFormBase.php @@ -8,7 +8,7 @@ namespace Drupal\system; use Drupal\Core\Form\FormInterface; -use Drupal\Core\Controller\ControllerInterface; +use Drupal\Core\Controller\ContainerFactoryControllerInterface; use Drupal\Core\Config\ConfigFactory; use Drupal\Core\Config\Context\ContextInterface; use Symfony\Component\DependencyInjection\ContainerInterface; @@ -16,7 +16,7 @@ /** * Base class for implementing system configuration forms. */ -abstract class SystemConfigFormBase implements FormInterface, ControllerInterface { +abstract class SystemConfigFormBase implements FormInterface, ContainerFactoryControllerInterface { /** * Stores the configuration factory. 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..97e8de3 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\Controller\ContainerFactoryControllerInterface; use Symfony\Component\DependencyInjection\ContainerInterface; /** * Controller routines for common_test routes. */ -class CommonTestController implements ControllerInterface { +class CommonTestController implements ContainerFactoryControllerInterface { /** * {@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..e54e1c5 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,25 +6,10 @@ namespace Drupal\design_test\Controller; -use Drupal\Core\Controller\ControllerInterface; - /** * Controller routines for design_test routes. */ -class DesignTestController implements ControllerInterface { - - /** - * {@inheritdoc} - */ - public static function create() { - return new static(); - } - - /** - * Constructs a DesignTestController object. - */ - public function __construct() { - } +class DesignTestController { /** * Menu for a category listing page. diff --git a/core/modules/system/tests/modules/form_test/lib/Drupal/form_test/FormTestControllerObject.php b/core/modules/system/tests/modules/form_test/lib/Drupal/form_test/FormTestControllerObject.php index b342128..723b1f8 100644 --- a/core/modules/system/tests/modules/form_test/lib/Drupal/form_test/FormTestControllerObject.php +++ b/core/modules/system/tests/modules/form_test/lib/Drupal/form_test/FormTestControllerObject.php @@ -8,14 +8,14 @@ namespace Drupal\form_test; use Drupal\Core\Form\FormInterface; -use Drupal\Core\Controller\ControllerInterface; +use Drupal\Core\Controller\ContainerFactoryControllerInterface; use Symfony\Component\DependencyInjection\ContainerInterface; use Symfony\Component\HttpFoundation\Request; /** * Provides a test form object. */ -class FormTestControllerObject implements FormInterface, ControllerInterface { +class FormTestControllerObject implements FormInterface, ContainerFactoryControllerInterface { /** * Implements \Drupal\Core\Form\FormInterface::getFormID(). 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..511db2b 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\Controller\ContainerFactoryControllerInterface; use Symfony\Component\DependencyInjection\ContainerInterface; /** * Controller routines for theme test routes. */ -class ThemeTestController implements ControllerInterface { +class ThemeTestController implements ContainerFactoryControllerInterface { /** * {@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..b80773f 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\Controller\ContainerFactoryControllerInterface; use Symfony\Component\DependencyInjection\ContainerInterface; /** * Controller routines for Twig extension test routes. */ -class TwigExtensionTestController implements ControllerInterface { +class TwigExtensionTestController implements ContainerFactoryControllerInterface { /** * {@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..e59804f 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\Controller\ContainerFactoryControllerInterface; use Symfony\Component\DependencyInjection\ContainerInterface; /** * Controller routines for Twig theme test routes. */ -class TwigThemeTestController implements ControllerInterface { +class TwigThemeTestController implements ContainerFactoryControllerInterface { /** * Creates the controller. 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 73b7cde..d7629f4 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\Controller\ContainerFactoryControllerInterface; use Symfony\Component\DependencyInjection\ContainerInterface; /** * Controller routines for tour_test routes. */ -class TourTestController implements ControllerInterface { +class TourTestController implements ContainerFactoryControllerInterface { /** * {@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..94ce990 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\Controller\ContainerFactoryControllerInterface; use Drupal\Core\Extension\ModuleHandlerInterface; use Symfony\Component\DependencyInjection\ContainerInterface; /** * Controller routines for update routes. */ -class UpdateController implements ControllerInterface { +class UpdateController implements ContainerFactoryControllerInterface { /** * 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..051078a 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\Controller\ContainerFactoryControllerInterface; use Drupal\user\UserAutocomplete; /** * Controller routines for taxonomy user routes. */ -class UserAutocompleteController implements ControllerInterface { +class UserAutocompleteController implements ContainerFactoryControllerInterface { /** * The user autocomplete helper class to find matching user names. diff --git a/core/modules/user/lib/Drupal/user/Form/UserLoginForm.php b/core/modules/user/lib/Drupal/user/Form/UserLoginForm.php index ebe5b96..dc73802 100644 --- a/core/modules/user/lib/Drupal/user/Form/UserLoginForm.php +++ b/core/modules/user/lib/Drupal/user/Form/UserLoginForm.php @@ -8,7 +8,7 @@ namespace Drupal\user\Form; use Drupal\Core\Config\ConfigFactory; -use Drupal\Core\Controller\ControllerInterface; +use Drupal\Core\Controller\ContainerFactoryControllerInterface; use Drupal\Core\Database\Connection; use Drupal\Core\Flood\FloodInterface; use Drupal\Core\Form\FormInterface; @@ -19,7 +19,7 @@ /** * Provides a user login form. */ -class UserLoginForm implements FormInterface, ControllerInterface { +class UserLoginForm implements FormInterface, ContainerFactoryControllerInterface { /** * The config factory. diff --git a/core/modules/user/lib/Drupal/user/Form/UserPasswordForm.php b/core/modules/user/lib/Drupal/user/Form/UserPasswordForm.php index 27f40bf..1fc2448 100644 --- a/core/modules/user/lib/Drupal/user/Form/UserPasswordForm.php +++ b/core/modules/user/lib/Drupal/user/Form/UserPasswordForm.php @@ -7,7 +7,7 @@ namespace Drupal\user\Form; -use Drupal\Core\Controller\ControllerInterface; +use Drupal\Core\Controller\ContainerFactoryControllerInterface; use Drupal\Core\Form\FormInterface; use Drupal\Core\Language\Language; use Drupal\Core\Language\LanguageManager; @@ -18,7 +18,7 @@ /** * Provides a user password reset form. */ -class UserPasswordForm implements FormInterface, ControllerInterface { +class UserPasswordForm implements FormInterface, ContainerFactoryControllerInterface { /** * The user storage controller. diff --git a/core/modules/user/lib/Drupal/user/Form/UserPermissionsForm.php b/core/modules/user/lib/Drupal/user/Form/UserPermissionsForm.php index a78eedf..9a74e8a 100644 --- a/core/modules/user/lib/Drupal/user/Form/UserPermissionsForm.php +++ b/core/modules/user/lib/Drupal/user/Form/UserPermissionsForm.php @@ -9,7 +9,7 @@ use Drupal\Component\Utility\String; use Drupal\Core\Cache\Cache; -use Drupal\Core\Controller\ControllerInterface; +use Drupal\Core\Controller\ContainerFactoryControllerInterface; use Drupal\Core\Extension\ModuleHandlerInterface; use Drupal\Core\Form\FormInterface; use Drupal\user\RoleStorageControllerInterface; @@ -18,7 +18,7 @@ /** * Provides the user permissions administration form. */ -class UserPermissionsForm implements FormInterface, ControllerInterface { +class UserPermissionsForm implements FormInterface, ContainerFactoryControllerInterface { /** * The module handler. diff --git a/core/modules/views/lib/Drupal/views/Controller/ViewAjaxController.php b/core/modules/views/lib/Drupal/views/Controller/ViewAjaxController.php index b0eea3c..0236a32 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\Controller\ContainerFactoryControllerInterface; 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 ContainerFactoryControllerInterface { /** * 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..ba7cd72 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\Controller\ContainerFactoryControllerInterface; 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 ContainerFactoryControllerInterface { /** * 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..9a377c9 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\Controller\ContainerFactoryControllerInterface; 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 ContainerFactoryControllerInterface { /** * Stores the Entity manager.