diff --git a/core/lib/Drupal/Core/Form/ConfigFormBase.php b/core/lib/Drupal/Core/Form/ConfigFormBase.php index 5c69835..b6c5446 100644 --- a/core/lib/Drupal/Core/Form/ConfigFormBase.php +++ b/core/lib/Drupal/Core/Form/ConfigFormBase.php @@ -9,13 +9,14 @@ use Drupal\Core\Config\ConfigFactory; use Drupal\Core\Config\Context\ContextInterface; +use Drupal\Core\DependencyInjection\ContainerInjectionInterface; use Drupal\Core\Form\FormBase; use Symfony\Component\DependencyInjection\ContainerInterface; /** * Base class for implementing system configuration forms. */ -abstract class ConfigFormBase extends FormBase { +abstract class ConfigFormBase extends FormBase implements ContainerInjectionInterface { /** * Stores the configuration factory. diff --git a/core/lib/Drupal/Core/Form/FormBase.php b/core/lib/Drupal/Core/Form/FormBase.php index 2fad298..0453eb7 100644 --- a/core/lib/Drupal/Core/Form/FormBase.php +++ b/core/lib/Drupal/Core/Form/FormBase.php @@ -8,7 +8,6 @@ namespace Drupal\Core\Form; use Drupal\Core\Config\ConfigFactory; -use Drupal\Core\DependencyInjection\ContainerInjectionInterface; use Drupal\Core\DependencyInjection\DependencySerialization; use Drupal\Core\Routing\UrlGeneratorInterface; use Drupal\Core\StringTranslation\TranslationInterface; @@ -18,7 +17,7 @@ /** * Provides a base class for forms. */ -abstract class FormBase extends DependencySerialization implements FormInterface, ContainerInjectionInterface { +abstract class FormBase extends DependencySerialization implements FormInterface { /** * The translation manager service. @@ -51,13 +50,6 @@ /** * {@inheritdoc} */ - public static function create(ContainerInterface $container) { - return new static(); - } - - /** - * {@inheritdoc} - */ public function validateForm(array &$form, array &$form_state) { // Validation is optional. } diff --git a/core/modules/action/lib/Drupal/action/ActionFormControllerBase.php b/core/modules/action/lib/Drupal/action/ActionFormControllerBase.php index 2bd8573..3a4534c 100644 --- a/core/modules/action/lib/Drupal/action/ActionFormControllerBase.php +++ b/core/modules/action/lib/Drupal/action/ActionFormControllerBase.php @@ -7,6 +7,7 @@ namespace Drupal\action; +use Drupal\Core\DependencyInjection\ContainerInjectionInterface; use Drupal\Core\Entity\EntityFormController; use Drupal\Core\Entity\EntityStorageControllerInterface; use Drupal\Core\Plugin\PluginFormInterface; @@ -15,7 +16,7 @@ /** * Provides a base form controller for action forms. */ -abstract class ActionFormControllerBase extends EntityFormController { +abstract class ActionFormControllerBase extends EntityFormController implements ContainerInjectionInterface { /** * The action plugin being configured. diff --git a/core/modules/action/lib/Drupal/action/Form/ActionAdminManageForm.php b/core/modules/action/lib/Drupal/action/Form/ActionAdminManageForm.php index 3b221db..f97bfc2 100644 --- a/core/modules/action/lib/Drupal/action/Form/ActionAdminManageForm.php +++ b/core/modules/action/lib/Drupal/action/Form/ActionAdminManageForm.php @@ -7,6 +7,7 @@ namespace Drupal\action\Form; +use Drupal\Core\DependencyInjection\ContainerInjectionInterface; use Drupal\Core\Form\FormBase; use Drupal\Component\Utility\Crypt; use Drupal\Core\Action\ActionManager; @@ -15,7 +16,7 @@ /** * Provides a configuration form for configurable actions. */ -class ActionAdminManageForm extends FormBase { +class ActionAdminManageForm extends FormBase implements ContainerInjectionInterface { /** * The action plugin manager. diff --git a/core/modules/aggregator/lib/Drupal/aggregator/Form/AggregatorCategorizeFormBase.php b/core/modules/aggregator/lib/Drupal/aggregator/Form/AggregatorCategorizeFormBase.php index 794dcce..55f3769 100644 --- a/core/modules/aggregator/lib/Drupal/aggregator/Form/AggregatorCategorizeFormBase.php +++ b/core/modules/aggregator/lib/Drupal/aggregator/Form/AggregatorCategorizeFormBase.php @@ -11,6 +11,7 @@ use Drupal\aggregator\ItemStorageControllerInterface; use Drupal\Component\Utility\String; use Drupal\Core\Database\Connection; +use Drupal\Core\DependencyInjection\ContainerInjectionInterface; use Drupal\Core\Entity\EntityRenderControllerInterface; use Drupal\Core\Form\FormBase; use Symfony\Component\DependencyInjection\ContainerInterface; @@ -18,7 +19,7 @@ /** * Provides a base form to allow items to be categorized. */ -abstract class AggregatorCategorizeFormBase extends FormBase { +abstract class AggregatorCategorizeFormBase extends FormBase implements ContainerInjectionInterface { /** * The aggregator item render controller. diff --git a/core/modules/aggregator/lib/Drupal/aggregator/Form/CategoryAdminForm.php b/core/modules/aggregator/lib/Drupal/aggregator/Form/CategoryAdminForm.php index 2aea172..2698575 100644 --- a/core/modules/aggregator/lib/Drupal/aggregator/Form/CategoryAdminForm.php +++ b/core/modules/aggregator/lib/Drupal/aggregator/Form/CategoryAdminForm.php @@ -9,6 +9,7 @@ use Drupal\aggregator\CategoryStorageControllerInterface; use Drupal\block\Plugin\Type\BlockManager; +use Drupal\Core\DependencyInjection\ContainerInjectionInterface; use Drupal\Core\Extension\ModuleHandlerInterface; use Drupal\Core\Form\FormBase; use Symfony\Component\DependencyInjection\ContainerInterface; @@ -16,7 +17,7 @@ /** * Provides a form for configuring aggregator categories. */ -class CategoryAdminForm extends FormBase { +class CategoryAdminForm extends FormBase implements ContainerInjectionInterface { /** * The module handler. diff --git a/core/modules/aggregator/lib/Drupal/aggregator/Form/OpmlFeedAdd.php b/core/modules/aggregator/lib/Drupal/aggregator/Form/OpmlFeedAdd.php index baf3dd3..7b704d0 100644 --- a/core/modules/aggregator/lib/Drupal/aggregator/Form/OpmlFeedAdd.php +++ b/core/modules/aggregator/lib/Drupal/aggregator/Form/OpmlFeedAdd.php @@ -10,6 +10,7 @@ use Drupal\aggregator\FeedStorageControllerInterface; use Drupal\Component\Utility\Url; use Drupal\Core\Database\Connection; +use Drupal\Core\DependencyInjection\ContainerInjectionInterface; use Drupal\Core\Entity\Query\QueryFactory; use Drupal\Core\Form\FormBase; use Symfony\Component\DependencyInjection\ContainerInterface; @@ -20,7 +21,7 @@ /** * Imports feeds from OPML. */ -class OpmlFeedAdd extends FormBase { +class OpmlFeedAdd extends FormBase implements ContainerInjectionInterface { /** * The database connection object. diff --git a/core/modules/block/custom_block/lib/Drupal/custom_block/Form/CustomBlockTypeDeleteForm.php b/core/modules/block/custom_block/lib/Drupal/custom_block/Form/CustomBlockTypeDeleteForm.php index 01433ae..1616deb 100644 --- a/core/modules/block/custom_block/lib/Drupal/custom_block/Form/CustomBlockTypeDeleteForm.php +++ b/core/modules/block/custom_block/lib/Drupal/custom_block/Form/CustomBlockTypeDeleteForm.php @@ -7,6 +7,7 @@ namespace Drupal\custom_block\Form; +use Drupal\Core\DependencyInjection\ContainerInjectionInterface; use Drupal\Core\Entity\EntityConfirmFormBase; use Drupal\Core\Entity\Query\QueryFactory; use Symfony\Component\DependencyInjection\ContainerInterface; @@ -14,7 +15,7 @@ /** * Provides a confirmation form for deleting a custom block type entity. */ -class CustomBlockTypeDeleteForm extends EntityConfirmFormBase { +class CustomBlockTypeDeleteForm extends EntityConfirmFormBase implements ContainerInjectionInterface { /** * The query factory to create entity queries. diff --git a/core/modules/block/lib/Drupal/block/BlockFormController.php b/core/modules/block/lib/Drupal/block/BlockFormController.php index 3915315..32aafff 100644 --- a/core/modules/block/lib/Drupal/block/BlockFormController.php +++ b/core/modules/block/lib/Drupal/block/BlockFormController.php @@ -9,6 +9,7 @@ use Drupal\Core\Cache\Cache; use Drupal\Core\Config\ConfigFactory; +use Drupal\Core\DependencyInjection\ContainerInjectionInterface; use Drupal\Core\Entity\EntityFormController; use Drupal\Core\Entity\EntityManager; use Drupal\Core\Entity\Query\QueryFactory; @@ -19,7 +20,7 @@ /** * Provides form controller for block instance forms. */ -class BlockFormController extends EntityFormController { +class BlockFormController extends EntityFormController implements ContainerInjectionInterface { /** * The block entity. diff --git a/core/modules/book/lib/Drupal/book/Form/BookAdminEditForm.php b/core/modules/book/lib/Drupal/book/Form/BookAdminEditForm.php index c48fb30..390e518 100644 --- a/core/modules/book/lib/Drupal/book/Form/BookAdminEditForm.php +++ b/core/modules/book/lib/Drupal/book/Form/BookAdminEditForm.php @@ -9,6 +9,7 @@ use Drupal\Component\Utility\Crypt; use Drupal\Core\Cache\CacheBackendInterface; +use Drupal\Core\DependencyInjection\ContainerInjectionInterface; use Drupal\Core\Entity\EntityStorageControllerInterface; use Drupal\Core\Form\FormBase; use Drupal\menu_link\MenuLinkStorageControllerInterface; @@ -18,7 +19,7 @@ /** * Provides a form for administering a single book's hierarchy. */ -class BookAdminEditForm extends FormBase { +class BookAdminEditForm extends FormBase implements ContainerInjectionInterface { /** * The menu cache object for this controller. diff --git a/core/modules/comment/lib/Drupal/comment/CommentFormController.php b/core/modules/comment/lib/Drupal/comment/CommentFormController.php index ecbe5b2..3af6bcc 100644 --- a/core/modules/comment/lib/Drupal/comment/CommentFormController.php +++ b/core/modules/comment/lib/Drupal/comment/CommentFormController.php @@ -11,6 +11,7 @@ use Drupal\Component\Utility\Unicode; use Drupal\Core\Cache\Cache; use Drupal\Core\Datetime\DrupalDateTime; +use Drupal\Core\DependencyInjection\ContainerInjectionInterface; use Drupal\Core\Entity\ContentEntityFormController; use Drupal\Core\Entity\EntityManager; use Drupal\Core\Language\Language; @@ -21,7 +22,7 @@ /** * Base for controller for comment forms. */ -class CommentFormController extends ContentEntityFormController { +class CommentFormController extends ContentEntityFormController implements ContainerInjectionInterface { /** * The entity manager service. diff --git a/core/modules/config/lib/Drupal/config/Form/ConfigImportForm.php b/core/modules/config/lib/Drupal/config/Form/ConfigImportForm.php index a18a971..d11b156 100644 --- a/core/modules/config/lib/Drupal/config/Form/ConfigImportForm.php +++ b/core/modules/config/lib/Drupal/config/Form/ConfigImportForm.php @@ -8,6 +8,7 @@ namespace Drupal\config\Form; use Drupal\Core\Config\StorageInterface; +use Drupal\Core\DependencyInjection\ContainerInjectionInterface; use Drupal\Core\Form\FormBase; use Drupal\Component\Archiver\ArchiveTar; use Symfony\Component\DependencyInjection\ContainerInterface; @@ -15,7 +16,7 @@ /** * Defines the configuration import form. */ -class ConfigImportForm extends FormBase { +class ConfigImportForm extends FormBase implements ContainerInjectionInterface { /** * The configuration storage. diff --git a/core/modules/config/lib/Drupal/config/Form/ConfigSync.php b/core/modules/config/lib/Drupal/config/Form/ConfigSync.php index da65a09..f33d964 100644 --- a/core/modules/config/lib/Drupal/config/Form/ConfigSync.php +++ b/core/modules/config/lib/Drupal/config/Form/ConfigSync.php @@ -8,6 +8,7 @@ namespace Drupal\config\Form; use Drupal\Component\Uuid\UuidInterface; +use Drupal\Core\DependencyInjection\ContainerInjectionInterface; use Drupal\Core\Entity\EntityManager; use Drupal\Core\Form\FormBase; use Drupal\Core\Config\StorageInterface; @@ -23,7 +24,7 @@ /** * Construct the storage changes in a configuration synchronization form. */ -class ConfigSync extends FormBase { +class ConfigSync extends FormBase implements ContainerInjectionInterface { /** * The database lock object. diff --git a/core/modules/entity/lib/Drupal/entity/Form/EntityDisplayModeFormBase.php b/core/modules/entity/lib/Drupal/entity/Form/EntityDisplayModeFormBase.php index 93f595c..3654f2d 100644 --- a/core/modules/entity/lib/Drupal/entity/Form/EntityDisplayModeFormBase.php +++ b/core/modules/entity/lib/Drupal/entity/Form/EntityDisplayModeFormBase.php @@ -7,6 +7,7 @@ namespace Drupal\entity\Form; +use Drupal\Core\DependencyInjection\ContainerInjectionInterface; use Drupal\Core\Entity\EntityFormController; use Drupal\Core\Entity\EntityManager; use Drupal\Core\Entity\Query\QueryFactory; @@ -15,7 +16,7 @@ /** * Provides the generic base class for entity display mode forms. */ -abstract class EntityDisplayModeFormBase extends EntityFormController { +abstract class EntityDisplayModeFormBase extends EntityFormController implements ContainerInjectionInterface { /** * The entity query factory. diff --git a/core/modules/field_ui/lib/Drupal/field_ui/Form/FieldDeleteForm.php b/core/modules/field_ui/lib/Drupal/field_ui/Form/FieldDeleteForm.php index f59cab8..52a22af 100644 --- a/core/modules/field_ui/lib/Drupal/field_ui/Form/FieldDeleteForm.php +++ b/core/modules/field_ui/lib/Drupal/field_ui/Form/FieldDeleteForm.php @@ -7,6 +7,7 @@ namespace Drupal\field_ui\Form; +use Drupal\Core\DependencyInjection\ContainerInjectionInterface; use Drupal\Core\Entity\EntityConfirmFormBase; use Drupal\Core\Entity\EntityManager; use Symfony\Component\DependencyInjection\ContainerInterface; @@ -14,7 +15,7 @@ /** * Provides a form for removing a field instance from a bundle. */ -class FieldDeleteForm extends EntityConfirmFormBase { +class FieldDeleteForm extends EntityConfirmFormBase implements ContainerInjectionInterface { /** * The entity manager. 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 337fdce..87d5b8d 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,6 +7,7 @@ namespace Drupal\field_ui\Form; +use Drupal\Core\DependencyInjection\ContainerInjectionInterface; use Drupal\Core\Entity\ContentEntityInterface; use Drupal\Core\Entity\EntityManager; use Drupal\Core\Form\FormBase; @@ -19,7 +20,7 @@ /** * Provides a form for the field settings edit page. */ -class FieldEditForm extends FormBase { +class FieldEditForm extends FormBase implements ContainerInjectionInterface { /** * 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 2fbe6f7..2fc877b 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,6 +7,7 @@ namespace Drupal\field_ui\Form; +use Drupal\Core\DependencyInjection\ContainerInjectionInterface; use Drupal\Core\Entity\EntityManager; use Drupal\Core\Form\FormBase; use Drupal\field\FieldInstanceInterface; @@ -16,7 +17,7 @@ /** * Provides a form for the field instance settings form. */ -class FieldInstanceEditForm extends FormBase { +class FieldInstanceEditForm extends FormBase implements ContainerInjectionInterface { /** * The field instance being edited. 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 b17831b..ac7ef9b 100644 --- a/core/modules/field_ui/lib/Drupal/field_ui/OverviewBase.php +++ b/core/modules/field_ui/lib/Drupal/field_ui/OverviewBase.php @@ -7,6 +7,7 @@ namespace Drupal\field_ui; +use Drupal\Core\DependencyInjection\ContainerInjectionInterface; use Drupal\Core\Form\FormBase; use Symfony\Component\DependencyInjection\ContainerInterface; use Drupal\Core\Entity\EntityManager; @@ -14,7 +15,7 @@ /** * Abstract base class for Field UI overview forms. */ -abstract class OverviewBase extends FormBase { +abstract class OverviewBase extends FormBase implements ContainerInjectionInterface { /** * The name of the entity type. diff --git a/core/modules/filter/lib/Drupal/filter/FilterFormatFormControllerBase.php b/core/modules/filter/lib/Drupal/filter/FilterFormatFormControllerBase.php index bd42969..423cf59 100644 --- a/core/modules/filter/lib/Drupal/filter/FilterFormatFormControllerBase.php +++ b/core/modules/filter/lib/Drupal/filter/FilterFormatFormControllerBase.php @@ -8,6 +8,7 @@ namespace Drupal\filter; use Drupal\Core\Config\ConfigFactory; +use Drupal\Core\DependencyInjection\ContainerInjectionInterface; use Drupal\Core\Entity\EntityFormController; use Drupal\Core\Entity\Query\QueryFactory; use Drupal\filter\Plugin\Filter\FilterNull; @@ -16,7 +17,7 @@ /** * Provides a base form controller for a filter format. */ -abstract class FilterFormatFormControllerBase extends EntityFormController { +abstract class FilterFormatFormControllerBase extends EntityFormController implements ContainerInjectionInterface { /** * The config factory. diff --git a/core/modules/image/lib/Drupal/image/Form/ImageStyleFormBase.php b/core/modules/image/lib/Drupal/image/Form/ImageStyleFormBase.php index 0b16e80..d3749fc 100644 --- a/core/modules/image/lib/Drupal/image/Form/ImageStyleFormBase.php +++ b/core/modules/image/lib/Drupal/image/Form/ImageStyleFormBase.php @@ -7,6 +7,7 @@ namespace Drupal\image\Form; +use Drupal\Core\DependencyInjection\ContainerInjectionInterface; use Drupal\Core\Entity\EntityFormController; use Drupal\Core\Entity\EntityStorageControllerInterface; use Symfony\Component\DependencyInjection\ContainerInterface; @@ -14,7 +15,7 @@ /** * Base form controller for image style add and edit forms. */ -abstract class ImageStyleFormBase extends EntityFormController { +abstract class ImageStyleFormBase extends EntityFormController implements ContainerInjectionInterface { /** * The image style entity storage controller. diff --git a/core/modules/locale/lib/Drupal/locale/Form/TranslateFormBase.php b/core/modules/locale/lib/Drupal/locale/Form/TranslateFormBase.php index c33da33..5ac9953 100644 --- a/core/modules/locale/lib/Drupal/locale/Form/TranslateFormBase.php +++ b/core/modules/locale/lib/Drupal/locale/Form/TranslateFormBase.php @@ -7,6 +7,7 @@ namespace Drupal\locale\Form; +use Drupal\Core\DependencyInjection\ContainerInjectionInterface; use Drupal\Core\Form\FormBase; use Drupal\Core\Language\Language; use Drupal\Core\Language\LanguageManager; @@ -19,7 +20,7 @@ * * Provides methods for searching and filtering strings. */ -abstract class TranslateFormBase extends FormBase { +abstract class TranslateFormBase extends FormBase implements ContainerInjectionInterface { /** * The locale storage. diff --git a/core/modules/menu/lib/Drupal/menu/Form/MenuDeleteForm.php b/core/modules/menu/lib/Drupal/menu/Form/MenuDeleteForm.php index ac1e7fb..73c2ed5 100644 --- a/core/modules/menu/lib/Drupal/menu/Form/MenuDeleteForm.php +++ b/core/modules/menu/lib/Drupal/menu/Form/MenuDeleteForm.php @@ -8,6 +8,7 @@ namespace Drupal\menu\Form; use Drupal\Core\Database\Connection; +use Drupal\Core\DependencyInjection\ContainerInjectionInterface; use Drupal\Core\Entity\EntityConfirmFormBase; use Drupal\Core\Entity\EntityStorageControllerInterface; use Symfony\Component\DependencyInjection\ContainerInterface; @@ -15,7 +16,7 @@ /** * Defines a confirmation form for deletion of a custom menu. */ -class MenuDeleteForm extends EntityConfirmFormBase { +class MenuDeleteForm extends EntityConfirmFormBase implements ContainerInjectionInterface { /** * The menu link storage controller. diff --git a/core/modules/menu/lib/Drupal/menu/MenuFormController.php b/core/modules/menu/lib/Drupal/menu/MenuFormController.php index 68bc6a4..64b01b8 100644 --- a/core/modules/menu/lib/Drupal/menu/MenuFormController.php +++ b/core/modules/menu/lib/Drupal/menu/MenuFormController.php @@ -8,6 +8,7 @@ namespace Drupal\menu; use Drupal\Component\Utility\NestedArray; +use Drupal\Core\DependencyInjection\ContainerInjectionInterface; use Drupal\Core\Entity\EntityFormController; use Drupal\Core\Entity\Query\QueryFactory; use Drupal\Core\Language\Language; @@ -17,7 +18,7 @@ /** * Base form controller for menu edit forms. */ -class MenuFormController extends EntityFormController { +class MenuFormController extends EntityFormController implements ContainerInjectionInterface { /** * The factory for entity queries. diff --git a/core/modules/menu_link/lib/Drupal/menu_link/MenuLinkFormController.php b/core/modules/menu_link/lib/Drupal/menu_link/MenuLinkFormController.php index 3222a68..7b242cb 100644 --- a/core/modules/menu_link/lib/Drupal/menu_link/MenuLinkFormController.php +++ b/core/modules/menu_link/lib/Drupal/menu_link/MenuLinkFormController.php @@ -7,6 +7,7 @@ namespace Drupal\menu_link; +use Drupal\Core\DependencyInjection\ContainerInjectionInterface; use Drupal\Core\Entity\EntityFormController; use Drupal\Core\Language\Language; use Drupal\Core\Path\AliasManagerInterface; @@ -17,7 +18,7 @@ /** * Form controller for the node edit forms. */ -class MenuLinkFormController extends EntityFormController { +class MenuLinkFormController extends EntityFormController implements ContainerInjectionInterface { /** * The menu link storage controller. diff --git a/core/modules/node/lib/Drupal/node/Form/NodeDeleteForm.php b/core/modules/node/lib/Drupal/node/Form/NodeDeleteForm.php index e6e469a..b3c4ec7 100644 --- a/core/modules/node/lib/Drupal/node/Form/NodeDeleteForm.php +++ b/core/modules/node/lib/Drupal/node/Form/NodeDeleteForm.php @@ -7,6 +7,7 @@ namespace Drupal\node\Form; +use Drupal\Core\DependencyInjection\ContainerInjectionInterface; use Drupal\Core\Entity\ContentEntityConfirmFormBase; use Drupal\Core\Entity\EntityStorageControllerInterface; use Drupal\Core\Routing\UrlGeneratorInterface; @@ -15,7 +16,7 @@ /** * Provides a form for deleting a node. */ -class NodeDeleteForm extends ContentEntityConfirmFormBase { +class NodeDeleteForm extends ContentEntityConfirmFormBase implements ContainerInjectionInterface { /** * The URL generator. diff --git a/core/modules/node/lib/Drupal/node/Form/NodeTypeDeleteConfirm.php b/core/modules/node/lib/Drupal/node/Form/NodeTypeDeleteConfirm.php index 04a52c0..a0dfde1 100644 --- a/core/modules/node/lib/Drupal/node/Form/NodeTypeDeleteConfirm.php +++ b/core/modules/node/lib/Drupal/node/Form/NodeTypeDeleteConfirm.php @@ -7,6 +7,7 @@ namespace Drupal\node\Form; +use Drupal\Core\DependencyInjection\ContainerInjectionInterface; use Drupal\Core\Entity\EntityConfirmFormBase; use Drupal\Core\Database\Connection; use Symfony\Component\DependencyInjection\ContainerInterface; @@ -14,7 +15,7 @@ /** * Provides a form for content type deletion. */ -class NodeTypeDeleteConfirm extends EntityConfirmFormBase { +class NodeTypeDeleteConfirm extends EntityConfirmFormBase implements ContainerInjectionInterface { /** * The database connection. diff --git a/core/modules/shortcut/lib/Drupal/shortcut/Form/ShortcutSetDeleteForm.php b/core/modules/shortcut/lib/Drupal/shortcut/Form/ShortcutSetDeleteForm.php index d7cdd9a..89ccdac 100644 --- a/core/modules/shortcut/lib/Drupal/shortcut/Form/ShortcutSetDeleteForm.php +++ b/core/modules/shortcut/lib/Drupal/shortcut/Form/ShortcutSetDeleteForm.php @@ -7,6 +7,7 @@ namespace Drupal\shortcut\Form; +use Drupal\Core\DependencyInjection\ContainerInjectionInterface; use Drupal\Core\Entity\EntityConfirmFormBase; use Drupal\shortcut\ShortcutSetStorageControllerInterface; use Symfony\Component\DependencyInjection\ContainerInterface; @@ -15,7 +16,7 @@ /** * Builds the shortcut set deletion form. */ -class ShortcutSetDeleteForm extends EntityConfirmFormBase { +class ShortcutSetDeleteForm extends EntityConfirmFormBase implements ContainerInjectionInterface { /** * The database connection. diff --git a/core/modules/simpletest/lib/Drupal/simpletest/Form/SimpletestResultsForm.php b/core/modules/simpletest/lib/Drupal/simpletest/Form/SimpletestResultsForm.php index d1d339a..a70ec79 100644 --- a/core/modules/simpletest/lib/Drupal/simpletest/Form/SimpletestResultsForm.php +++ b/core/modules/simpletest/lib/Drupal/simpletest/Form/SimpletestResultsForm.php @@ -8,6 +8,7 @@ namespace Drupal\simpletest\Form; use Drupal\Core\Database\Connection; +use Drupal\Core\DependencyInjection\ContainerInjectionInterface; use Drupal\Core\Form\FormBase; use Symfony\Component\DependencyInjection\ContainerInterface; use Symfony\Component\HttpFoundation\RedirectResponse; @@ -15,7 +16,7 @@ /** * Test results form for $test_id. */ -class SimpletestResultsForm extends FormBase { +class SimpletestResultsForm extends FormBase implements ContainerInjectionInterface { /** * Associative array of themed result images keyed by status. diff --git a/core/modules/system/lib/Drupal/system/Form/DateFormatDeleteForm.php b/core/modules/system/lib/Drupal/system/Form/DateFormatDeleteForm.php index 619a920..c5dede6 100644 --- a/core/modules/system/lib/Drupal/system/Form/DateFormatDeleteForm.php +++ b/core/modules/system/lib/Drupal/system/Form/DateFormatDeleteForm.php @@ -8,13 +8,14 @@ namespace Drupal\system\Form; use Drupal\Core\Datetime\Date; +use Drupal\Core\DependencyInjection\ContainerInjectionInterface; use Drupal\Core\Entity\EntityConfirmFormBase; use Symfony\Component\DependencyInjection\ContainerInterface; /** * Builds a form to delete a date format. */ -class DateFormatDeleteForm extends EntityConfirmFormBase { +class DateFormatDeleteForm extends EntityConfirmFormBase implements ContainerInjectionInterface { /** * The date service. diff --git a/core/modules/system/lib/Drupal/system/Form/DateFormatFormBase.php b/core/modules/system/lib/Drupal/system/Form/DateFormatFormBase.php index ccfc043..7ac6766 100644 --- a/core/modules/system/lib/Drupal/system/Form/DateFormatFormBase.php +++ b/core/modules/system/lib/Drupal/system/Form/DateFormatFormBase.php @@ -11,6 +11,7 @@ use Drupal\Core\Ajax\ReplaceCommand; use Drupal\Core\Config\Entity\ConfigStorageController; use Drupal\Core\Datetime\Date; +use Drupal\Core\DependencyInjection\ContainerInjectionInterface; use Symfony\Component\DependencyInjection\ContainerInterface; use Drupal\Core\Datetime\DrupalDateTime; use Drupal\Core\Entity\Query\QueryFactory; @@ -19,7 +20,7 @@ /** * Provides a base form controller for date formats. */ -abstract class DateFormatFormBase extends EntityFormController { +abstract class DateFormatFormBase extends EntityFormController implements ContainerInjectionInterface { /** * The date pattern type. diff --git a/core/modules/system/lib/Drupal/system/Form/ModulesListForm.php b/core/modules/system/lib/Drupal/system/Form/ModulesListForm.php index dadb227..4a5054e 100644 --- a/core/modules/system/lib/Drupal/system/Form/ModulesListForm.php +++ b/core/modules/system/lib/Drupal/system/Form/ModulesListForm.php @@ -8,6 +8,7 @@ namespace Drupal\system\Form; use Drupal\Component\Utility\Unicode; +use Drupal\Core\DependencyInjection\ContainerInjectionInterface; use Drupal\Core\Extension\ModuleHandlerInterface; use Drupal\Core\Form\FormBase; use Drupal\Core\KeyValueStore\KeyValueStoreExpirableInterface; @@ -22,7 +23,7 @@ * requires. See drupal_parse_info_file() for info on module.info.yml * descriptors. */ -class ModulesListForm extends FormBase { +class ModulesListForm extends FormBase implements ContainerInjectionInterface { /** * 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 e712bcb..5e17fe0 100644 --- a/core/modules/system/lib/Drupal/system/Form/ModulesUninstallForm.php +++ b/core/modules/system/lib/Drupal/system/Form/ModulesUninstallForm.php @@ -7,6 +7,7 @@ namespace Drupal\system\Form; +use Drupal\Core\DependencyInjection\ContainerInjectionInterface; use Drupal\Core\Extension\ModuleHandlerInterface; use Drupal\Core\Form\FormBase; use Drupal\Core\KeyValueStore\KeyValueStoreExpirableInterface; @@ -15,7 +16,7 @@ /** * Provides a form for uninstalling modules. */ -class ModulesUninstallForm extends FormBase { +class ModulesUninstallForm extends FormBase implements ContainerInjectionInterface { /** * The module handler service. diff --git a/core/modules/taxonomy/lib/Drupal/taxonomy/Form/VocabularyResetForm.php b/core/modules/taxonomy/lib/Drupal/taxonomy/Form/VocabularyResetForm.php index dda83d0..6dc8cd9 100644 --- a/core/modules/taxonomy/lib/Drupal/taxonomy/Form/VocabularyResetForm.php +++ b/core/modules/taxonomy/lib/Drupal/taxonomy/Form/VocabularyResetForm.php @@ -8,13 +8,14 @@ namespace Drupal\taxonomy\Form; use Drupal\Core\Database\Connection; +use Drupal\Core\DependencyInjection\ContainerInjectionInterface; use Drupal\Core\Entity\EntityConfirmFormBase; use Symfony\Component\DependencyInjection\ContainerInterface; /** * Provides confirmation form for resetting a vocabulary to alphabetical order. */ -class VocabularyResetForm extends EntityConfirmFormBase { +class VocabularyResetForm extends EntityConfirmFormBase implements ContainerInjectionInterface { /** * The database connection object. diff --git a/core/modules/taxonomy/lib/Drupal/taxonomy/TermFormController.php b/core/modules/taxonomy/lib/Drupal/taxonomy/TermFormController.php index 8821b09..2e8d9a3 100644 --- a/core/modules/taxonomy/lib/Drupal/taxonomy/TermFormController.php +++ b/core/modules/taxonomy/lib/Drupal/taxonomy/TermFormController.php @@ -9,6 +9,7 @@ use Drupal\Core\Cache\Cache; use Drupal\Core\Config\ConfigFactory; +use Drupal\Core\DependencyInjection\ContainerInjectionInterface; use Drupal\Core\Entity\ContentEntityFormController; use Drupal\Core\Language\Language; use Symfony\Component\DependencyInjection\ContainerInterface; @@ -16,7 +17,7 @@ /** * Base for controller for taxonomy term edit forms. */ -class TermFormController extends ContentEntityFormController { +class TermFormController extends ContentEntityFormController implements ContainerInjectionInterface { /** * The vocabulary storage. diff --git a/core/modules/user/lib/Drupal/user/Form/UserLoginForm.php b/core/modules/user/lib/Drupal/user/Form/UserLoginForm.php index 6ae96bc..3f950b1 100644 --- a/core/modules/user/lib/Drupal/user/Form/UserLoginForm.php +++ b/core/modules/user/lib/Drupal/user/Form/UserLoginForm.php @@ -7,6 +7,7 @@ namespace Drupal\user\Form; +use Drupal\Core\DependencyInjection\ContainerInjectionInterface; use Drupal\Core\Flood\FloodInterface; use Drupal\Core\Form\FormBase; use Drupal\user\UserStorageControllerInterface; @@ -15,7 +16,7 @@ /** * Provides a user login form. */ -class UserLoginForm extends FormBase { +class UserLoginForm extends FormBase implements ContainerInjectionInterface { /** * The flood service. diff --git a/core/modules/user/lib/Drupal/user/Form/UserPasswordForm.php b/core/modules/user/lib/Drupal/user/Form/UserPasswordForm.php index 7800054..236e401 100644 --- a/core/modules/user/lib/Drupal/user/Form/UserPasswordForm.php +++ b/core/modules/user/lib/Drupal/user/Form/UserPasswordForm.php @@ -7,6 +7,7 @@ namespace Drupal\user\Form; +use Drupal\Core\DependencyInjection\ContainerInjectionInterface; use Drupal\Core\Form\FormBase; use Drupal\Core\Language\Language; use Drupal\Core\Language\LanguageManager; @@ -17,7 +18,7 @@ /** * Provides a user password reset form. */ -class UserPasswordForm extends FormBase { +class UserPasswordForm extends FormBase implements ContainerInjectionInterface { /** * 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 a81c3bf..47dc865 100644 --- a/core/modules/user/lib/Drupal/user/Form/UserPermissionsForm.php +++ b/core/modules/user/lib/Drupal/user/Form/UserPermissionsForm.php @@ -9,6 +9,7 @@ use Drupal\Component\Utility\String; use Drupal\Core\Cache\Cache; +use Drupal\Core\DependencyInjection\ContainerInjectionInterface; use Drupal\Core\Extension\ModuleHandlerInterface; use Drupal\Core\Form\FormBase; use Drupal\user\RoleStorageControllerInterface; @@ -17,7 +18,7 @@ /** * Provides the user permissions administration form. */ -class UserPermissionsForm extends FormBase { +class UserPermissionsForm extends FormBase implements ContainerInjectionInterface { /** * The module handler. diff --git a/core/modules/views_ui/lib/Drupal/views_ui/Form/BreakLockForm.php b/core/modules/views_ui/lib/Drupal/views_ui/Form/BreakLockForm.php index 38958be..0040f0f 100644 --- a/core/modules/views_ui/lib/Drupal/views_ui/Form/BreakLockForm.php +++ b/core/modules/views_ui/lib/Drupal/views_ui/Form/BreakLockForm.php @@ -7,6 +7,7 @@ namespace Drupal\views_ui\Form; +use Drupal\Core\DependencyInjection\ContainerInjectionInterface; use Drupal\Core\Entity\EntityConfirmFormBase; use Drupal\Core\Entity\EntityManager; use Drupal\user\TempStoreFactory; @@ -15,7 +16,7 @@ /** * Builds the form to break the lock of an edited view. */ -class BreakLockForm extends EntityConfirmFormBase { +class BreakLockForm extends EntityConfirmFormBase implements ContainerInjectionInterface { /** * Stores the Entity manager. diff --git a/core/modules/views_ui/lib/Drupal/views_ui/ViewAddFormController.php b/core/modules/views_ui/lib/Drupal/views_ui/ViewAddFormController.php index 6bd5439..5597e66 100644 --- a/core/modules/views_ui/lib/Drupal/views_ui/ViewAddFormController.php +++ b/core/modules/views_ui/lib/Drupal/views_ui/ViewAddFormController.php @@ -7,6 +7,7 @@ namespace Drupal\views_ui; +use Drupal\Core\DependencyInjection\ContainerInjectionInterface; use Drupal\views\Plugin\views\wizard\WizardPluginBase; use Drupal\views\Plugin\views\wizard\WizardException; use Drupal\views\Plugin\ViewsPluginManager; @@ -15,7 +16,7 @@ /** * Form controller for the Views edit form. */ -class ViewAddFormController extends ViewFormControllerBase { +class ViewAddFormController extends ViewFormControllerBase implements ContainerInjectionInterface { /** * The wizard plugin manager. diff --git a/core/modules/views_ui/lib/Drupal/views_ui/ViewEditFormController.php b/core/modules/views_ui/lib/Drupal/views_ui/ViewEditFormController.php index 5f81565..17c1c9f 100644 --- a/core/modules/views_ui/lib/Drupal/views_ui/ViewEditFormController.php +++ b/core/modules/views_ui/lib/Drupal/views_ui/ViewEditFormController.php @@ -11,6 +11,7 @@ use Drupal\Core\Ajax\HtmlCommand; use Drupal\Core\Ajax\ReplaceCommand; use Drupal\Component\Utility\NestedArray; +use Drupal\Core\DependencyInjection\ContainerInjectionInterface; use Drupal\user\TempStoreFactory; use Symfony\Component\HttpFoundation\Request; use Symfony\Component\DependencyInjection\ContainerInterface; @@ -18,7 +19,7 @@ /** * Form controller for the Views edit form. */ -class ViewEditFormController extends ViewFormControllerBase { +class ViewEditFormController extends ViewFormControllerBase implements ContainerInjectionInterface { /** * The views temp store. diff --git a/core/modules/views_ui/lib/Drupal/views_ui/ViewPreviewFormController.php b/core/modules/views_ui/lib/Drupal/views_ui/ViewPreviewFormController.php index 4533f76..6e88e03 100644 --- a/core/modules/views_ui/lib/Drupal/views_ui/ViewPreviewFormController.php +++ b/core/modules/views_ui/lib/Drupal/views_ui/ViewPreviewFormController.php @@ -7,13 +7,14 @@ namespace Drupal\views_ui; +use Drupal\Core\DependencyInjection\ContainerInjectionInterface; use Drupal\user\TempStoreFactory; use Symfony\Component\DependencyInjection\ContainerInterface; /** * Form controller for the Views preview form. */ -class ViewPreviewFormController extends ViewFormControllerBase { +class ViewPreviewFormController extends ViewFormControllerBase implements ContainerInjectionInterface { /** * The views temp store.