Drupal
/
drupal
mirror of https://git.drupalcode.org/project/drupal.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Issue #2059245 by tim.plunkett, msonnabaum: Add a FormBase class containing useful methods.

8.0.x
Alex Pott 2013-08-22 03:02:00 +01:00
parent 5460c03e89
commit 410d56a7ba
57 changed files with 496 additions and 682 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
core/core.services.yml
View File

@ -159,7 +159,7 @@ services:
- { name: persist }
plugin.manager.entity:
class: Drupal\Core\Entity\EntityManager
arguments: ['@container.namespaces', '@service_container', '@module_handler', '@cache.cache', '@language_manager']
arguments: ['@container.namespaces', '@service_container', '@module_handler', '@cache.cache', '@language_manager', '@string_translation']
plugin.manager.entity.field.field_type:
class: Drupal\Core\Entity\Field\FieldTypePluginManager
arguments: ['@container.namespaces', '@cache.entity', '@language_manager', '@module_handler']

16
core/lib/Drupal/Core/Entity/EntityConfirmFormBase.php
View File

@ -7,6 +7,7 @@
namespace Drupal\Core\Entity;
use Drupal\Component\Utility\Url;
use Drupal\Core\Form\ConfirmFormInterface;
use Symfony\Component\HttpFoundation\Request;
@ -15,13 +16,6 @@ use Symfony\Component\HttpFoundation\Request;
*/
abstract class EntityConfirmFormBase extends EntityFormController implements ConfirmFormInterface {
/**
* The request object.
*
* @var \Symfony\Component\HttpFoundation\Request
*/
protected $request;
/**
* {@inheritdoc}
*/
@ -60,8 +54,7 @@ abstract class EntityConfirmFormBase extends EntityFormController implements Con
/**
* {@inheritdoc}
*/
public function buildForm(array $form, array &$form_state, Request $request = NULL) {
$this->request = $request;
public function buildForm(array $form, array &$form_state) {
$form = parent::buildForm($form, $form_state);
$form['#attributes']['class'][] = 'confirmation';
@ -94,8 +87,9 @@ abstract class EntityConfirmFormBase extends EntityFormController implements Con
$path = $this->getCancelPath();
// Prepare cancel link.
if ($this->request->query->has('destination')) {
$options = drupal_parse_url($this->request->query->get('destination'));
$query = $this->getRequest()->query;
if ($query->has('destination')) {
$options = Url::parse($query->get('destination'));
}
elseif (is_array($path)) {
$options = $path;

45
core/lib/Drupal/Core/Entity/EntityFormController.php
View File

@ -7,6 +7,7 @@
namespace Drupal\Core\Entity;
use Drupal\Core\Form\FormBase;
use Drupal\entity\EntityFormDisplayInterface;
use Drupal\Core\Extension\ModuleHandlerInterface;
use Drupal\Core\Language\Language;
@ -15,7 +16,7 @@ use Symfony\Component\DependencyInjection\ContainerInterface;
/**
* Base class for entity form controllers.
*/
class EntityFormController implements EntityFormControllerInterface {
class EntityFormController extends FormBase implements EntityFormControllerInterface {
/**
* The name of the current operation.
@ -41,36 +42,15 @@ class EntityFormController implements EntityFormControllerInterface {
*/
protected $entity;
/**
* Constructs an EntityFormController object.
*
* @param \Drupal\Core\Extension\ModuleHandlerInterface
* The module handler service.
*/
public function __construct(ModuleHandlerInterface $module_handler) {
$this->moduleHandler = $module_handler;
}
/**
* {@inheritdoc}
*/
public static function createInstance(ContainerInterface $container, $entity_type, array $entity_info) {
return new static(
$container->get('module_handler')
);
}
/**
* Sets the operation for this form.
*
* @param string $operation
* The name of the current operation.
*/
public function setOperation($operation) {
// If NULL is passed, do not overwrite the operation.
if ($operation) {
$this->operation = $operation;
}
return $this;
}
/**
@ -126,12 +106,6 @@ class EntityFormController implements EntityFormControllerInterface {
return $form;
}
/**
* {@inheritdoc}
*/
public function validateForm(array &$form, array &$form_state) {
}
/**
* {@inheritdoc}
*/
@ -269,7 +243,7 @@ class EntityFormController implements EntityFormControllerInterface {
return array(
// @todo Rename the action key from submit to save.
'submit' => array(
'#value' => t('Save'),
'#value' => $this->t('Save'),
'#validate' => array(
array($this, 'validate'),
),
@ -279,7 +253,7 @@ class EntityFormController implements EntityFormControllerInterface {
),
),
'delete' => array(
'#value' => t('Delete'),
'#value' => $this->t('Delete'),
// No need to validate the form when deleting the entity.
'#submit' => array(
array($this, 'delete'),
@ -566,4 +540,13 @@ class EntityFormController implements EntityFormControllerInterface {
public function getOperation() {
return $this->operation;
}
/**
* {@inheritdoc}
*/
public function setModuleHandler(ModuleHandlerInterface $module_handler) {
$this->moduleHandler = $module_handler;
return $this;
}
}

35
core/lib/Drupal/Core/Entity/EntityFormControllerInterface.php
View File

@ -7,7 +7,9 @@
namespace Drupal\Core\Entity;
use Drupal\Core\Extension\ModuleHandlerInterface;
use Drupal\Core\Form\BaseFormIdInterface;
use Drupal\Core\StringTranslation\TranslationInterface;
use Drupal\entity\EntityFormDisplayInterface;
/**
@ -37,6 +39,17 @@ interface EntityFormControllerInterface extends BaseFormIdInterface {
*/
public function isDefaultFormLangcode(array $form_state);
/**
* Sets the operation for this form.
*
* @param string $operation
* The name of the current operation.
*
* @return self
* The entity form.
*/
public function setOperation($operation);
/**
* Returns the operation identifying the form controller.
*
@ -139,4 +152,26 @@ interface EntityFormControllerInterface extends BaseFormIdInterface {
*/
public function submit(array $form, array &$form_state);
/**
* Sets the translation manager for this form.
*
* @param \Drupal\Core\StringTranslation\TranslationInterface $translation_manager
* The translation manager.
*
* @return self
* The entity form.
*/
public function setTranslationManager(TranslationInterface $translation_manager);
/**
* Sets the module handler for this form.
*
* @param \Drupal\Core\Extension\ModuleHandlerInterface $module_handler
* The module handler.
*
* @return self
* The entity form.
*/
public function setModuleHandler(ModuleHandlerInterface $module_handler);
}

26
core/lib/Drupal/Core/Entity/EntityManager.php
View File

@ -18,6 +18,7 @@ use Drupal\Core\Plugin\Discovery\CacheDecorator;
use Drupal\Core\Plugin\Discovery\AnnotatedClassDiscovery;
use Drupal\Core\Plugin\Discovery\InfoHookDecorator;
use Drupal\Core\Cache\CacheBackendInterface;
use Drupal\Core\StringTranslation\TranslationInterface;
use Symfony\Component\DependencyInjection\ContainerInterface;
/**
@ -87,6 +88,13 @@ class EntityManager extends PluginManagerBase {
*/
protected $fieldDefinitions;
/**
* The string translationManager.
*
* @var \Drupal\Core\StringTranslation\TranslationInterface
*/
protected $translationManager;
/**
* Constructs a new Entity plugin manager.
*
@ -101,8 +109,10 @@ class EntityManager extends PluginManagerBase {
* The cache backend to use.
* @param \Drupal\Core\Language\LanguageManager $language_manager
* The language manager.
* @param \Drupal\Core\StringTranslation\TranslationInterface $translation_manager
* The string translationManager.
*/
public function __construct(\Traversable $namespaces, ContainerInterface $container, ModuleHandlerInterface $module_handler, CacheBackendInterface $cache, LanguageManager $language_manager) {
public function __construct(\Traversable $namespaces, ContainerInterface $container, ModuleHandlerInterface $module_handler, CacheBackendInterface $cache, LanguageManager $language_manager, TranslationInterface $translation_manager) {
// Allow the plugin definition to be altered by hook_entity_info_alter().
$annotation_namespaces = array(
'Drupal\Core\Entity\Annotation' => DRUPAL_ROOT . '/core/lib',
@ -111,6 +121,7 @@ class EntityManager extends PluginManagerBase {
$this->moduleHandler = $module_handler;
$this->cache = $cache;
$this->languageManager = $language_manager;
$this->translationManager = $translation_manager;
$this->discovery = new AnnotatedClassDiscovery('Entity', $namespaces, $annotation_namespaces, 'Drupal\Core\Entity\Annotation\EntityType');
$this->discovery = new InfoHookDecorator($this->discovery, 'entity_info');
@ -229,13 +240,18 @@ class EntityManager extends PluginManagerBase {
public function getFormController($entity_type, $operation) {
if (!isset($this->controllers['form'][$operation][$entity_type])) {
$class = $this->getControllerClass($entity_type, 'form', $operation);
if (in_array('Drupal\Core\Entity\EntityControllerInterface', class_implements($class))) {
$this->controllers['form'][$operation][$entity_type] = $class::createInstance($this->container, $entity_type, $this->getDefinition($entity_type));
if (in_array('Drupal\Core\Controller\ControllerInterface', class_implements($class))) {
$controller = $class::create($this->container);
}
else {
$this->controllers['form'][$operation][$entity_type] = new $class($this->container->get('module_handler'));
$controller = new $class();
}
$this->controllers['form'][$operation][$entity_type]->setOperation($operation);
$controller
->setTranslationManager($this->translationManager)
->setModuleHandler($this->moduleHandler)
->setOperation($operation);
$this->controllers['form'][$operation][$entity_type] = $controller;
}
return $this->controllers['form'][$operation][$entity_type];
}

17
core/lib/Drupal/Core/Entity/EntityNGConfirmFormBase.php
View File

@ -7,21 +7,14 @@
namespace Drupal\Core\Entity;
use Drupal\Component\Utility\Url;
use Drupal\Core\Form\ConfirmFormInterface;
use Symfony\Component\HttpFoundation\Request;
/**
* Provides a generic base class for an entity-based confirmation form.
*/
abstract class EntityNGConfirmFormBase extends EntityFormControllerNG implements ConfirmFormInterface {
/**
* The request object.
*
* @var \Symfony\Component\HttpFoundation\Request
*/
protected $request;
/**
* {@inheritdoc}
*/
@ -60,8 +53,7 @@ abstract class EntityNGConfirmFormBase extends EntityFormControllerNG implements
/**
* {@inheritdoc}
*/
public function buildForm(array $form, array &$form_state, Request $request = NULL) {
$this->request = $request;
public function buildForm(array $form, array &$form_state) {
$form = parent::buildForm($form, $form_state);
$form['#attributes']['class'][] = 'confirmation';
@ -94,8 +86,9 @@ abstract class EntityNGConfirmFormBase extends EntityFormControllerNG implements
$path = $this->getCancelPath();
// Prepare cancel link.
if ($this->request->query->has('destination')) {
$options = drupal_parse_url($this->request->query->get('destination'));
$query = $this->getRequest()->query;
if ($query->has('destination')) {
$options = Url::parse($query->get('destination'));
}
elseif (is_array($path)) {
$options = $path;

17
core/lib/Drupal/Core/Form/ConfirmFormBase.php
View File

@ -7,12 +7,12 @@
namespace Drupal\Core\Form;
use Symfony\Component\HttpFoundation\Request;
use Drupal\Component\Utility\Url;
/**
* Provides an generic base class for a confirmation form.
*/
abstract class ConfirmFormBase implements ConfirmFormInterface {
abstract class ConfirmFormBase extends FormBase implements ConfirmFormInterface {
/**
* {@inheritdoc}
@ -45,11 +45,12 @@ abstract class ConfirmFormBase implements ConfirmFormInterface {
/**
* {@inheritdoc}
*/
public function buildForm(array $form, array &$form_state, Request $request = NULL) {
public function buildForm(array $form, array &$form_state) {
$path = $this->getCancelPath();
// Prepare cancel link.
if ($request->query->has('destination')) {
$options = drupal_parse_url($request->query->get('destination'));
$query = $this->getRequest()->query;
if ($query->has('destination')) {
$options = Url::parse($query->get('destination'));
}
elseif (is_array($path)) {
$options = $path;
@ -82,10 +83,4 @@ abstract class ConfirmFormBase implements ConfirmFormInterface {
return $form;
}
/**
* {@inheritdoc}
*/
public function validateForm(array &$form, array &$form_state) {
}
}

130
core/lib/Drupal/Core/Form/FormBase.php Normal file
View File

@ -0,0 +1,130 @@
<?php
/**
* @file
* Contains \Drupal\Core\Form\FormBase.
*/
namespace Drupal\Core\Form;
use Drupal\Core\Controller\ControllerInterface;
use Drupal\Core\StringTranslation\TranslationInterface;
use Symfony\Component\DependencyInjection\ContainerInterface;
use Symfony\Component\HttpFoundation\Request;
/**
* Provides a base class for forms.
*/
abstract class FormBase implements FormInterface, ControllerInterface {
/**
* The translation manager service.
*
* @var \Drupal\Core\StringTranslation\TranslationInterface
*/
protected $translationManager;
/**
* The current request.
*
* @var \Symfony\Component\HttpFoundation\Request
*/
protected $request;
/**
* {@inheritdoc}
*/
public static function create(ContainerInterface $container) {
return new static();
}
/**
* {@inheritdoc}
*/
public function validateForm(array &$form, array &$form_state) {
// Validation is optional.
}
/**
* Translates a string to the current language or to a given language.
*
* @param string $string
* A string containing the English string to translate.
* @param array $args
* An associative array of replacements to make after translation. Based
* on the first character of the key, the value is escaped and/or themed.
* See \Drupal\Core\Utility\String::format() for details.
* @param array $options
* An associative array of additional options, with the following elements:
* - 'langcode': The language code to translate to a language other than
* what is used to display the page.
* - 'context': The context the source string belongs to.
*
* @return string
* The translated string.
*/
protected function t($string, array $args = array(), array $options = array()) {
return $this->getTranslationManager()->translate($string, $args, $options);
}
/**
* Gets the translation manager.
*
* @return \Drupal\Core\StringTranslation\TranslationInterface
* The translation manager.
*/
protected function getTranslationManager() {
if (!$this->translationManager) {
$this->translationManager = \Drupal::translation();
}
return $this->translationManager;
}
/**
* Sets the translation manager for this form.
*
* @param \Drupal\Core\StringTranslation\TranslationInterface $translation_manager
* The translation manager.
*
* @return self
* The entity form.
*/
public function setTranslationManager(TranslationInterface $translation_manager) {
$this->translationManager = $translation_manager;
return $this;
}
/**
* Gets the request object.
*
* @return \Symfony\Component\HttpFoundation\Request $request
* The request object.
*/
protected function getRequest() {
if (!$this->request) {
$this->request = \Drupal::request();
}
return $this->request;
}
/**
* Sets the request object to use.
*
* @param \Symfony\Component\HttpFoundation\Request $request
* The request object.
*/
public function setRequest(Request $request) {
$this->request = $request;
}
/**
* Gets the current user.
*
* @return \Drupal\Core\Session\AccountInterface
* The current user.
*/
protected function getCurrentUser() {
return $this->getRequest()->attributes->get('_account');
}
}

15
core/modules/action/lib/Drupal/action/ActionAddFormController.php
View File

@ -9,15 +9,13 @@ namespace Drupal\action;
use Drupal\Component\Utility\Crypt;
use Drupal\Core\Action\ActionManager;
use Drupal\Core\Entity\EntityControllerInterface;
use Drupal\Core\Entity\EntityStorageControllerInterface;
use Drupal\Core\Extension\ModuleHandlerInterface;
use Symfony\Component\DependencyInjection\ContainerInterface;
/**
* Provides a form controller for action add forms.
*/
class ActionAddFormController extends ActionFormControllerBase implements EntityControllerInterface {
class ActionAddFormController extends ActionFormControllerBase {
/**
* The action manager.
@ -29,15 +27,13 @@ class ActionAddFormController extends ActionFormControllerBase implements Entity
/**
* Constructs a new ActionAddFormController.
*
* @param \Drupal\Core\Extension\ModuleHandlerInterface
* The module handler service.
* @param \Drupal\Core\Entity\EntityStorageControllerInterface $storage_controller
* The action storage controller.
* @param \Drupal\Core\Action\ActionManager $action_manager
* The action plugin manager.
*/
public function __construct(ModuleHandlerInterface $module_handler, EntityStorageControllerInterface $storage_controller, ActionManager $action_manager) {
parent::__construct($module_handler, $storage_controller);
public function __construct(EntityStorageControllerInterface $storage_controller, ActionManager $action_manager) {
parent::__construct($storage_controller);
$this->actionManager = $action_manager;
}
@ -45,10 +41,9 @@ class ActionAddFormController extends ActionFormControllerBase implements Entity
/**
* {@inheritdoc}
*/
public static function createInstance(ContainerInterface $container, $entity_type, array $entity_info) {
public static function create(ContainerInterface $container) {
return new static(
$container->get('module_handler'),
$container->get('plugin.manager.entity')->getStorageController($entity_type),
$container->get('plugin.manager.entity')->getStorageController('action'),
$container->get('plugin.manager.action')
);
}

15
core/modules/action/lib/Drupal/action/ActionFormControllerBase.php
View File

@ -7,9 +7,7 @@
namespace Drupal\action;
use Drupal\Core\Entity\EntityControllerInterface;
use Drupal\Core\Entity\EntityFormController;
use Drupal\Core\Extension\ModuleHandlerInterface;
use Drupal\Core\Entity\EntityStorageControllerInterface;
use Drupal\Core\Plugin\PluginFormInterface;
use Symfony\Component\DependencyInjection\ContainerInterface;
@ -17,7 +15,7 @@ use Symfony\Component\DependencyInjection\ContainerInterface;
/**
* Provides a base form controller for action forms.
*/
abstract class ActionFormControllerBase extends EntityFormController implements EntityControllerInterface {
abstract class ActionFormControllerBase extends EntityFormController {
/**
* The action plugin being configured.
@ -36,24 +34,19 @@ abstract class ActionFormControllerBase extends EntityFormController implements
/**
* Constructs a new action form.
*
* @param \Drupal\Core\Extension\ModuleHandlerInterface
* The module handler service.
* @param \Drupal\Core\Entity\EntityStorageControllerInterface $storage_controller
* The action storage controller.
*/
public function __construct(ModuleHandlerInterface $module_handler, EntityStorageControllerInterface $storage_controller) {
parent::__construct($module_handler);
public function __construct(EntityStorageControllerInterface $storage_controller) {
$this->storageController = $storage_controller;
}
/**
* {@inheritdoc}
*/
public static function createInstance(ContainerInterface $container, $entity_type, array $entity_info) {
public static function create(ContainerInterface $container) {
return new static(
$container->get('module_handler'),
$container->get('plugin.manager.entity')->getStorageController($entity_type)
$container->get('plugin.manager.entity')->getStorageController('action')
);
}

18
core/modules/aggregator/lib/Drupal/aggregator/Form/CategoryDeleteForm.php
View File

@ -13,10 +13,8 @@ use Drupal\Core\Entity\EntityManager;
use Drupal\Core\Extension\ModuleHandlerInterface;
use Drupal\Core\Form\ConfirmFormBase;
use Symfony\Component\DependencyInjection\ContainerInterface;
use Symfony\Component\HttpFoundation\Request;
use Symfony\Component\HttpKernel\Exception\NotFoundHttpException;
/**
* Provides a confirm delete form.
*/
@ -50,13 +48,6 @@ class CategoryDeleteForm extends ConfirmFormBase implements ControllerInterface
*/
protected $categoryStorageController;
/**
* The current request.
*
* @var \Symfony\Component\HttpFoundation\Request
*/
protected $request;
/**
* Creates a new CategoryDeleteForm.
*
@ -126,8 +117,6 @@ class CategoryDeleteForm extends ConfirmFormBase implements ControllerInterface
* An associative array containing the structure of the form.
* @param array $form_state
* An associative array containing the current state of the form.
* @param \Symfony\Component\HttpFoundation\Request $request
* The current request.
* @param int|null $cid
* The category ID.
*
@ -137,14 +126,13 @@ class CategoryDeleteForm extends ConfirmFormBase implements ControllerInterface
* @throws \Symfony\Component\HttpKernel\Exception\NotFoundHttpException
* If the cid param or category is not found.
*/
public function buildForm(array $form, array &$form_state, Request $request = NULL, $cid = NULL) {
public function buildForm(array $form, array &$form_state, $cid = NULL) {
$category = $this->categoryStorageController->load($cid);
if (empty($cid) || empty($category)) {
throw new NotFoundHttpException();
}
$this->category = $category;
$this->request = $request;
return parent::buildForm($form, $form_state, $request);
return parent::buildForm($form, $form_state);
}
/**
@ -158,7 +146,7 @@ class CategoryDeleteForm extends ConfirmFormBase implements ControllerInterface
$this->deleteBlocks($cid);
watchdog('aggregator', 'Category %category deleted.', array('%category' => $title));
drupal_set_message(t('The category %category has been deleted.', array('%category' => $title)));
if (preg_match('/^\/admin/', $this->request->getPathInfo())) {
if (preg_match('/^\/admin/', $this->getRequest()->getPathInfo())) {
$form_state['redirect'] = 'admin/config/services/aggregator/';
}
else {

9
core/modules/aggregator/lib/Drupal/aggregator/Form/SettingsForm.php
View File

@ -7,6 +7,7 @@
namespace Drupal\aggregator\Form;
use Drupal\Core\Config\Context\ContextInterface;
use Drupal\system\SystemConfigFormBase;
use Drupal\Core\Config\ConfigFactory;
use Drupal\aggregator\Plugin\AggregatorPluginManager;
@ -40,6 +41,8 @@ class SettingsForm extends SystemConfigFormBase {
*
* @param \Drupal\Core\Config\ConfigFactory $config_factory
* The factory for configuration objects.
* @param \Drupal\Core\Config\Context\ContextInterface $context
* The configuration context to use.
* @param \Drupal\aggregator\Plugin\AggregatorPluginManager $fetcher_manager
* The aggregator fetcher plugin manager.
* @param \Drupal\aggregator\Plugin\AggregatorPluginManager $parser_manager
@ -47,8 +50,9 @@ class SettingsForm extends SystemConfigFormBase {
* @param \Drupal\aggregator\Plugin\AggregatorPluginManager $processor_manager
* The aggregator processor plugin manager.
*/
public function __construct(ConfigFactory $config_factory, AggregatorPluginManager $fetcher_manager, AggregatorPluginManager $parser_manager, AggregatorPluginManager $processor_manager) {
$this->configFactory = $config_factory;
public function __construct(ConfigFactory $config_factory, ContextInterface $context, AggregatorPluginManager $fetcher_manager, AggregatorPluginManager $parser_manager, AggregatorPluginManager $processor_manager) {
parent::__construct($config_factory, $context);
$this->managers = array(
'fetcher' => $fetcher_manager,
'parser' => $parser_manager,
@ -68,6 +72,7 @@ class SettingsForm extends SystemConfigFormBase {
public static function create(ContainerInterface $container) {
return new static(
$container->get('config.factory'),
$container->get('config.context.free'),
$container->get('plugin.manager.aggregator.fetcher'),
$container->get('plugin.manager.aggregator.parser'),
$container->get('plugin.manager.aggregator.processor')

10
core/modules/ban/lib/Drupal/ban/Form/BanDelete.php
View File

@ -11,7 +11,6 @@ use Drupal\Core\Controller\ControllerInterface;
use Drupal\Core\Form\ConfirmFormBase;
use Drupal\ban\BanIpManager;
use Symfony\Component\DependencyInjection\ContainerInterface;
use Symfony\Component\HttpFoundation\Request;
use Symfony\Component\HttpKernel\Exception\NotFoundHttpException;
/**
@ -30,6 +29,7 @@ class BanDelete extends ConfirmFormBase implements ControllerInterface {
* Constructs a new BanDelete object.
*
* @param \Drupal\ban\BanIpManager $ip_manager
* The IP manager.
*/
public function __construct(BanIpManager $ip_manager) {
$this->ipManager = $ip_manager;
@ -55,14 +55,14 @@ class BanDelete extends ConfirmFormBase implements ControllerInterface {
* {@inheritdoc}
*/
public function getQuestion() {
return t('Are you sure you want to unblock %ip?', array('%ip' => $this->banIp));
return $this->t('Are you sure you want to unblock %ip?', array('%ip' => $this->banIp));
}
/**
* {@inheritdoc}
*/
public function getConfirmText() {
return t('Delete');
return $this->t('Delete');
}
/**
@ -78,11 +78,11 @@ class BanDelete extends ConfirmFormBase implements ControllerInterface {
* @param string $ban_id
* The IP address record ID to unban.
*/
public function buildForm(array $form, array &$form_state, $ban_id = '', Request $request = NULL) {
public function buildForm(array $form, array &$form_state, $ban_id = '') {
if (!$this->banIp = $this->ipManager->findById($ban_id)) {
throw new NotFoundHttpException();
}
return parent::buildForm($form, $form_state, $request);
return parent::buildForm($form, $form_state);
}
/**

17
core/modules/block/custom_block/lib/Drupal/custom_block/Form/CustomBlockTypeDeleteForm.php
View File

@ -8,16 +8,13 @@
namespace Drupal\custom_block\Form;
use Drupal\Core\Entity\EntityConfirmFormBase;
use Drupal\Core\Entity\EntityControllerInterface;
use Drupal\Core\Entity\Query\QueryFactory;
use Drupal\Core\Extension\ModuleHandlerInterface;
use Symfony\Component\DependencyInjection\ContainerInterface;
use Symfony\Component\HttpFoundation\Request;
/**
* Provides a confirmation form for deleting a custom block type entity.
*/
class CustomBlockTypeDeleteForm extends EntityConfirmFormBase implements EntityControllerInterface {
class CustomBlockTypeDeleteForm extends EntityConfirmFormBase {
/**
* The query factory to create entity queries.
@ -29,22 +26,18 @@ class CustomBlockTypeDeleteForm extends EntityConfirmFormBase implements EntityC
/**
* Constructs a query factory object.
*
* @param \Drupal\Core\Extension\ModuleHandlerInterface
* The module handler service.
* @param \Drupal\Core\Entity\Query\QueryFactory $query_factory
* The entity query object.
*/
public function __construct(ModuleHandlerInterface $module_handler, QueryFactory $query_factory) {
parent::__construct($module_handler);
public function __construct(QueryFactory $query_factory) {
$this->queryFactory = $query_factory;
}
/**
* {@inheritdoc}
*/
public static function createInstance(ContainerInterface $container, $entity_type, array $entity_info) {
public static function create(ContainerInterface $container) {
return new static(
$container->get('module_handler'),
$container->get('entity.query')
);
}
@ -73,7 +66,7 @@ class CustomBlockTypeDeleteForm extends EntityConfirmFormBase implements EntityC
/**
* {@inheritdoc}
*/
public function buildForm(array $form, array &$form_state, Request $request = NULL) {
public function buildForm(array $form, array &$form_state) {
$blocks = $this->queryFactory->get('custom_block')->condition('type', $this->entity->id())->execute();
if (!empty($blocks)) {
$caption = '<p>' . format_plural(count($blocks), '%label is used by 1 custom block on your site. You can not remove this block type until you have removed all of the %label blocks.', '%label is used by @count custom blocks on your site. You may not remove %label until you have removed all of the %label custom blocks.', array('%label' => $this->entity->label())) . '</p>';
@ -81,7 +74,7 @@ class CustomBlockTypeDeleteForm extends EntityConfirmFormBase implements EntityC
return $form;
}
else {
return parent::buildForm($form, $form_state, $request);
return parent::buildForm($form, $form_state);
}
}

13
core/modules/block/lib/Drupal/block/BlockFormController.php
View File

@ -7,18 +7,16 @@
namespace Drupal\block;
use Drupal\Core\Entity\EntityControllerInterface;
use Drupal\Core\Entity\EntityFormController;
use Drupal\Core\Entity\EntityManager;
use Drupal\Core\Entity\Query\QueryFactory;
use Drupal\Core\Extension\ModuleHandlerInterface;
use Drupal\Core\Language\Language;
use Symfony\Component\DependencyInjection\ContainerInterface;
/**
* Provides form controller for block instance forms.
*/
class BlockFormController extends EntityFormController implements EntityControllerInterface {
class BlockFormController extends EntityFormController {
/**
* The block storage controller.
@ -37,16 +35,12 @@ class BlockFormController extends EntityFormController implements EntityControll
/**
* Constructs a BlockFormController object.
*
* @param \Drupal\Core\Extension\ModuleHandlerInterface
* The module handler service.
* @param \Drupal\Core\Entity\EntityManager $entity_manager
* The entity manager.
* @param \Drupal\Core\Entity\Query\QueryFactory $entity_query_factory
* The entity query factory.
*/
public function __construct(ModuleHandlerInterface $module_handler, EntityManager $entity_manager, QueryFactory $entity_query_factory) {
parent::__construct($module_handler);
public function __construct(EntityManager $entity_manager, QueryFactory $entity_query_factory) {
$this->storageController = $entity_manager->getStorageController('block');
$this->entityQueryFactory = $entity_query_factory;
}
@ -54,9 +48,8 @@ class BlockFormController extends EntityFormController implements EntityControll
/**
* {@inheritdoc}
*/
public static function createInstance(ContainerInterface $container, $entity_type, array $entity_info) {
public static function create(ContainerInterface $container) {
return new static(
$container->get('module_handler'),
$container->get('plugin.manager.entity'),
$container->get('entity.query')
);

5
core/modules/block/tests/lib/Drupal/block/Tests/BlockFormControllerTest.php
View File

@ -78,10 +78,7 @@ class BlockFormControllerTest extends UnitTestCase {
->method('getStorageController')
->will($this->returnValue($block_storage));
$module_handler = $this->getMockBuilder('Drupal\Core\Extension\ModuleHandlerInterface')
->getMock();
$block_form_controller = new BlockFormController($module_handler, $entity_manager, $query_factory);
$block_form_controller = new BlockFormController($entity_manager, $query_factory);
// Ensure that the block with just one other instance gets the next available
// name suggestion.

51
core/modules/config/lib/Drupal/config/Form/ConfigSync.php
View File

@ -7,25 +7,22 @@
namespace Drupal\config\Form;
use Symfony\Component\EventDispatcher\EventDispatcherInterface;
use Symfony\Component\DependencyInjection\ContainerInterface;
use Drupal\Core\Controller\ControllerInterface;
use Drupal\Core\Form\FormInterface;
use Drupal\Core\Entity\EntityManager;
use Drupal\Core\Form\FormBase;
use Drupal\Core\Config\StorageInterface;
use Drupal\Core\Lock\LockBackendInterface;
use Drupal\Core\Config\StorageComparer;
use Drupal\Core\Config\ConfigImporter;
use Drupal\Core\Config\ConfigException;
use Drupal\Core\Config\ConfigFactory;
use Drupal\Core\StringTranslation\Translator\TranslatorInterface;
use Drupal\Core\Routing\PathBasedGeneratorInterface;
use \Drupal\Core\Entity\EntityManager;
use Symfony\Component\EventDispatcher\EventDispatcherInterface;
use Symfony\Component\DependencyInjection\ContainerInterface;
/**
* Construct the storage changes in a configuration synchronization form.
*/
class ConfigSync implements ControllerInterface, FormInterface {
class ConfigSync extends FormBase {
/**
* The database lock object.
@ -65,14 +62,6 @@ class ConfigSync implements ControllerInterface, FormInterface {
*/
protected $entity_manager;
/**
* The translation manager service.
*
* @var \Drupal\Core\StringTranslation\Translator\TranslatorInterface
*/
protected $translationManager;
/**
* URL generator service.
*
@ -83,8 +72,6 @@ class ConfigSync implements ControllerInterface, FormInterface {
/**
* Constructs the object.
*
* @param \Drupal\Core\Database\Connection; $database
* The database object.
* @param \Drupal\Core\Config\StorageInterface $sourceStorage
* The source storage object.
* @param \Drupal\Core\Config\StorageInterface $targetStorage
@ -95,21 +82,18 @@ class ConfigSync implements ControllerInterface, FormInterface {
* Event dispatcher.
* @param \Drupal\Core\Config\ConfigFactory $config_factory
* Configuration object factory.
* @param \Drupal\Core\Entity\EntityManager
* @param \Drupal\Core\Entity\EntityManager $entity_manager
* Entity manager.
* @param \Drupal\Core\StringTranslation\Translator\TranslatorInterface $translation_manager
* The translation manager.
* @param \Drupal\Core\Routing\PathBasedGeneratorInterface $url_generator
* The url generator service.
*/
public function __construct(StorageInterface $sourceStorage, StorageInterface $targetStorage, LockBackendInterface $lock, EventDispatcherInterface $event_dispatcher, ConfigFactory $config_factory, EntityManager $entity_manger, TranslatorInterface $translation_manager, PathBasedGeneratorInterface $url_generator) {
public function __construct(StorageInterface $sourceStorage, StorageInterface $targetStorage, LockBackendInterface $lock, EventDispatcherInterface $event_dispatcher, ConfigFactory $config_factory, EntityManager $entity_manager, PathBasedGeneratorInterface $url_generator) {
$this->sourceStorage = $sourceStorage;
$this->targetStorage = $targetStorage;
$this->lock = $lock;
$this->eventDispatcher = $event_dispatcher;
$this->configFactory = $config_factory;
$this->entity_manager = $entity_manger;
$this->translationManager = $translation_manager;
$this->entity_manager = $entity_manager;
$this->urlGenerator = $url_generator;
}
@ -124,7 +108,6 @@ class ConfigSync implements ControllerInterface, FormInterface {
$container->get('event_dispatcher'),
$container->get('config.factory'),
$container->get('plugin.manager.entity'),
$container->get('string_translation'),
$container->get('url_generator')
);
}
@ -143,14 +126,14 @@ class ConfigSync implements ControllerInterface, FormInterface {
$form['actions'] = array('#type' => 'actions');
$form['actions']['submit'] = array(
'#type' => 'submit',
'#value' => $this->translationManager->translate('Import all'),
'#value' => $this->t('Import all'),
);
$source_list = $this->sourceStorage->listAll();
$config_comparer = new StorageComparer($this->sourceStorage, $this->targetStorage);
if (empty($source_list) || !$config_comparer->createChangelist()->hasChanges()) {
$form['no_changes'] = array(
'#markup' => $this->translationManager->translate('There are no configuration changes.'),
'#markup' => $this->t('There are no configuration changes.'),
);
$form['actions']['#access'] = FALSE;
return $form;
@ -194,7 +177,7 @@ class ConfigSync implements ControllerInterface, FormInterface {
foreach ($config_files as $config_file) {
$links['view_diff'] = array(
'title' => $this->translationManager->translate('View differences'),
'title' => $this->t('View differences'),
'href' => $this->urlGenerator->getPathFromRoute('config_diff', array('config_file' => $config_file)),
'attributes' => array(
'class' => array('use-ajax'),
@ -219,12 +202,6 @@ class ConfigSync implements ControllerInterface, FormInterface {
return $form;
}
/**
* {@inheritdoc}
*/
public function validateForm(array &$form, array &$form_state) {
}
/**
* {@inheritdoc}
*/
@ -237,13 +214,13 @@ class ConfigSync implements ControllerInterface, FormInterface {
$this->lock
);
if ($config_importer->alreadyImporting()) {
drupal_set_message($this->translationManager->translate('Another request may be synchronizing configuration already.'));
drupal_set_message($this->t('Another request may be synchronizing configuration already.'));
}
else{
try {
$config_importer->import();
drupal_flush_all_caches();
drupal_set_message($this->translationManager->translate('The configuration was imported successfully.'));
drupal_set_message($this->t('The configuration was imported successfully.'));
}
catch (ConfigException $e) {
// Return a negative result for UI purposes. We do not differentiate
@ -252,7 +229,7 @@ class ConfigSync implements ControllerInterface, FormInterface {
// multiple developers or site builders attempt to do it without
// coordinating.
watchdog_exception('config_import', $e);
drupal_set_message($this->translationManager->translate('The import failed due to an error. Any errors have been logged.'), 'error');
drupal_set_message($this->t('The import failed due to an error. Any errors have been logged.'), 'error');
}
}
}

41
core/modules/entity/lib/Drupal/entity/Form/EntityDisplayModeAddForm.php
View File

@ -7,10 +7,6 @@
namespace Drupal\entity\Form;
use Drupal\Component\Plugin\PluginManagerInterface;
use Drupal\Core\Entity\Query\QueryFactory;
use Drupal\Core\Extension\ModuleHandlerInterface;
use Symfony\Component\DependencyInjection\ContainerInterface;
use Symfony\Component\HttpKernel\Exception\NotFoundHttpException;
/**
@ -23,43 +19,6 @@ class EntityDisplayModeAddForm extends EntityDisplayModeFormBase {
*/
protected $entityType;
/**
* The entity manager.
*
* @var \Drupal\Component\Plugin\PluginManagerInterface
*/
protected $entityManager;
/**
* Constructs a new EntityDisplayModeAddForm.
*
* @param \Drupal\Core\Extension\ModuleHandlerInterface $module_handler
* The module handler.
* @param \Drupal\Core\Entity\Query\QueryFactory $query_factory
* The entity query factory.
* @param array $entity_info
* The entity type definition.
* @param \Drupal\Component\Plugin\PluginManagerInterface $entity_manager
* The entity manager.
*/
public function __construct(ModuleHandlerInterface $module_handler, QueryFactory $query_factory, array $entity_info, PluginManagerInterface $entity_manager) {
parent::__construct($module_handler, $query_factory, $entity_info);
$this->entityManager = $entity_manager;
}
/**
* {@inheritdoc}
*/
public static function createInstance(ContainerInterface $container, $entity_type, array $entity_info) {
return new static(
$container->get('module_handler'),
$container->get('entity.query'),
$entity_info,
$container->get('plugin.manager.entity')
);
}
/**
* {@inheritdoc}
*/

37
core/modules/entity/lib/Drupal/entity/Form/EntityDisplayModeFormBase.php
View File

@ -7,16 +7,15 @@
namespace Drupal\entity\Form;
use Drupal\Core\Entity\EntityControllerInterface;
use Drupal\Core\Entity\EntityFormController;
use Drupal\Core\Entity\EntityManager;
use Drupal\Core\Entity\Query\QueryFactory;
use Drupal\Core\Extension\ModuleHandlerInterface;
use Symfony\Component\DependencyInjection\ContainerInterface;
/**
* Provides the generic base class for entity display mode forms.
*/
abstract class EntityDisplayModeFormBase extends EntityFormController implements EntityControllerInterface {
abstract class EntityDisplayModeFormBase extends EntityFormController {
/**
* The entity query factory.
@ -32,34 +31,44 @@ abstract class EntityDisplayModeFormBase extends EntityFormController implements
*/
protected $entityInfo;
/**
* The entity manager.
*
* @var \Drupal\Component\Plugin\PluginManagerInterface
*/
protected $entityManager;
/**
* Constructs a new EntityDisplayModeFormBase.
*
* @param \Drupal\Core\Extension\ModuleHandlerInterface $module_handler
* The module handler.
* @param \Drupal\Core\Entity\Query\QueryFactory $query_factory
* The entity query factory.
* @param array $entity_info
* The entity type definition.
* @param \Drupal\Core\Entity\EntityManager $entity_manager
* The entity manager.
*/
public function __construct(ModuleHandlerInterface $module_handler, QueryFactory $query_factory, array $entity_info) {
parent::__construct($module_handler);
public function __construct(QueryFactory $query_factory, EntityManager $entity_manager) {
$this->queryFactory = $query_factory;
$this->entityInfo = $entity_info;
$this->entityManager = $entity_manager;
}
/**
* {@inheritdoc}
*/
public static function createInstance(ContainerInterface $container, $entity_type, array $entity_info) {
public static function create(ContainerInterface $container) {
return new static(
$container->get('module_handler'),
$container->get('entity.query'),
$entity_info
$container->get('plugin.manager.entity')
);
}
/**
* {@inheritdoc}
*/
protected function init(array &$form_state) {
parent::init($form_state);
$this->entityInfo = $this->entityManager->getDefinition($this->entity->entityType());
}
/**
* {@inheritdoc}
*/

12
core/modules/field_ui/lib/Drupal/field_ui/Form/FieldDeleteForm.php
View File

@ -8,15 +8,13 @@
namespace Drupal\field_ui\Form;
use Drupal\Core\Entity\EntityConfirmFormBase;
use Drupal\Core\Entity\EntityControllerInterface;
use Drupal\Core\Entity\EntityManager;
use Drupal\Core\Extension\ModuleHandlerInterface;
use Symfony\Component\DependencyInjection\ContainerInterface;
/**
* Provides a form for removing a field instance from a bundle.
*/
class FieldDeleteForm extends EntityConfirmFormBase implements EntityControllerInterface {
class FieldDeleteForm extends EntityConfirmFormBase {
/**
* The entity manager.
@ -28,22 +26,18 @@ class FieldDeleteForm extends EntityConfirmFormBase implements EntityControllerI
/**
* Constructs a new FieldDeleteForm object.
*
* @param \Drupal\Core\Extension\ModuleHandlerInterface
* The module handler service.
* @param \Drupal\Core\Entity\EntityManager $entity_manager
* The entity manager.
*/
public function __construct(ModuleHandlerInterface $module_handler, EntityManager $entity_manager) {
parent::__construct($module_handler);
public function __construct(EntityManager $entity_manager) {
$this->entityManager = $entity_manager;
}
/**
* {@inheritdoc}
*/
public static function createInstance(ContainerInterface $container, $entity_type, array $entity_info) {
public static function create(ContainerInterface $container) {
return new static(
$container->get('module_handler'),
$container->get('plugin.manager.entity')
);
}

12
core/modules/filter/lib/Drupal/filter/FilterFormatFormControllerBase.php
View File

@ -8,17 +8,15 @@
namespace Drupal\filter;
use Drupal\Core\Config\ConfigFactory;
use Drupal\Core\Entity\EntityControllerInterface;
use Drupal\Core\Entity\EntityFormController;
use Drupal\Core\Entity\Query\QueryFactory;
use Drupal\Core\Extension\ModuleHandlerInterface;
use Drupal\filter\Plugin\Filter\FilterNull;
use Symfony\Component\DependencyInjection\ContainerInterface;
/**
* Provides a base form controller for a filter format.
*/
abstract class FilterFormatFormControllerBase extends EntityFormController implements EntityControllerInterface {
abstract class FilterFormatFormControllerBase extends EntityFormController {
/**
* The config factory.
@ -37,15 +35,12 @@ abstract class FilterFormatFormControllerBase extends EntityFormController imple
/**
* Constructs a new FilterFormatFormControllerBase.
*
* @param \Drupal\Core\Extension\ModuleHandlerInterface
* The module handler service.
* @param \Drupal\Core\Config\ConfigFactory $config_factory
* The config factory.
* @param \Drupal\Core\Entity\Query\QueryFactory $query_factory
* The entity query factory.
*/
public function __construct(ModuleHandlerInterface $module_handler, ConfigFactory $config_factory, QueryFactory $query_factory) {
parent::__construct($module_handler);
public function __construct(ConfigFactory $config_factory, QueryFactory $query_factory) {
$this->configFactory = $config_factory;
$this->queryFactory = $query_factory;
}
@ -53,9 +48,8 @@ abstract class FilterFormatFormControllerBase extends EntityFormController imple
/**
* {@inheritdoc}
*/
public static function createInstance(ContainerInterface $container, $entity_type, array $entity_info) {
public static function create(ContainerInterface $container) {
return new static(
$container->get('module_handler'),
$container->get('config.factory'),
$container->get('entity.query')
);

5
core/modules/forum/lib/Drupal/forum/Form/DeleteForm.php
View File

@ -9,7 +9,6 @@ namespace Drupal\forum\Form;
use Drupal\Core\Form\ConfirmFormBase;
use Drupal\taxonomy\Entity\Term;
use Symfony\Component\HttpFoundation\Request;
/**
* Builds the form to delete a forum term.
@ -54,10 +53,10 @@ class DeleteForm extends ConfirmFormBase {
/**
* {@inheritdoc}
*/
public function buildForm(array $form, array &$form_state, Term $taxonomy_term = NULL, Request $request = NULL) {
public function buildForm(array $form, array &$form_state, Term $taxonomy_term = NULL) {
$this->taxonomyTerm = $taxonomy_term;
return parent::buildForm($form, $form_state, $request);
return parent::buildForm($form, $form_state);
}
/**

12
core/modules/forum/lib/Drupal/forum/Form/ForumFormController.php
View File

@ -9,8 +9,6 @@ namespace Drupal\forum\Form;
use Drupal\Core\Cache\Cache;
use Drupal\Core\Config\ConfigFactory;
use Drupal\Core\Entity\EntityControllerInterface;
use Drupal\Core\Extension\ModuleHandlerInterface;
use Drupal\taxonomy\TermFormController;
use Drupal\taxonomy\TermStorageControllerInterface;
use Symfony\Component\DependencyInjection\ContainerInterface;
@ -19,7 +17,7 @@ use Symfony\Component\HttpFoundation\Request;
/**
* Base form controller for forum term edit forms.
*/
class ForumFormController extends TermFormController implements EntityControllerInterface {
class ForumFormController extends TermFormController {
/**
* Reusable type field to use in status messages.
@ -59,8 +57,6 @@ class ForumFormController extends TermFormController implements EntityController
/**
* Constructs a new ForumFormController object.
*
* @param \Drupal\Core\Extension\ModuleHandlerInterface $module_handler
* The module handler.
* @param \Drupal\Core\Config\ConfigFactory $config_factory
* The config factory service.
* @param \Symfony\Component\HttpFoundation\Request $request
@ -68,8 +64,7 @@ class ForumFormController extends TermFormController implements EntityController
* @param \Drupal\taxonomy\TermStorageControllerInterface $storage_controller
* The storage controller.
*/
public function __construct(ModuleHandlerInterface $module_handler, ConfigFactory $config_factory, Request $request, TermStorageControllerInterface $storage_controller) {
parent::__construct($module_handler);
public function __construct(ConfigFactory $config_factory, Request $request, TermStorageControllerInterface $storage_controller) {
$this->config = $config_factory->get('forum.settings');
$this->request = $request;
$this->storageController = $storage_controller;
@ -78,9 +73,8 @@ class ForumFormController extends TermFormController implements EntityController
/**
* {@inheritdoc}
*/
public static function createInstance(ContainerInterface $container, $entity_type, array $entity_info) {
public static function create(ContainerInterface $container) {
return new static(
$container->get('module_handler'),
$container->get('config.factory'),
$container->get('request'),
$container->get('plugin.manager.entity')->getStorageController('taxonomy_term')

5
core/modules/image/lib/Drupal/image/Form/ImageEffectDeleteForm.php
View File

@ -9,7 +9,6 @@ namespace Drupal\image\Form;
use Drupal\Core\Form\ConfirmFormBase;
use Drupal\image\ImageStyleInterface;
use Symfony\Component\HttpFoundation\Request;
/**
* Form for deleting an image effect.
@ -61,11 +60,11 @@ class ImageEffectDeleteForm extends ConfirmFormBase {
/**
* {@inheritdoc}
*/
public function buildForm(array $form, array &$form_state, ImageStyleInterface $image_style = NULL, $image_effect = NULL, Request $request = NULL) {
public function buildForm(array $form, array &$form_state, ImageStyleInterface $image_style = NULL, $image_effect = NULL) {
$this->imageStyle = $image_style;
$this->imageEffect = $this->imageStyle->getEffect($image_effect);
return parent::buildForm($form, $form_state, $request);
return parent::buildForm($form, $form_state);
}
/**

6
core/modules/image/lib/Drupal/image/Form/ImageStyleAddForm.php
View File

@ -7,8 +7,6 @@
namespace Drupal\image\Form;
use Drupal\image\Form\ImageStyleFormBase;
/**
* Controller for image style addition forms.
*/
@ -19,7 +17,7 @@ class ImageStyleAddForm extends ImageStyleFormBase {
*/
public function save(array $form, array &$form_state) {
parent::save($form, $form_state);
drupal_set_message($this->translator->translate('Style %name was created.', array('%name' => $this->entity->label())));
drupal_set_message($this->t('Style %name was created.', array('%name' => $this->entity->label())));
}
/**
@ -27,7 +25,7 @@ class ImageStyleAddForm extends ImageStyleFormBase {
*/
public function actions(array $form, array &$form_state) {
$actions = parent::actions($form, $form_state);
$actions['submit']['#value'] = $this->translator->translate('Create new style');
$actions['submit']['#value'] = $this->t('Create new style');
return $actions;
}

49
core/modules/image/lib/Drupal/image/Form/ImageStyleEditForm.php
View File

@ -8,10 +8,7 @@
namespace Drupal\image\Form;
use Drupal\Core\Entity\EntityStorageControllerInterface;
use Drupal\Core\Extension\ModuleHandlerInterface;
use Drupal\Core\StringTranslation\Translator\TranslatorInterface;
use Drupal\image\ConfigurableImageEffectInterface;
use Drupal\image\Form\ImageStyleFormBase;
use Drupal\image\ImageEffectManager;
use Drupal\Component\Utility\String;
use Symfony\Component\DependencyInjection\ContainerInterface;
@ -31,28 +28,22 @@ class ImageStyleEditForm extends ImageStyleFormBase {
/**
* Constructs an ImageStyleEditForm object.
*
* @param \Drupal\Core\Extension\ModuleHandlerInterface $module_handler
* The module handler service.
* @param \Drupal\Core\Entity\EntityStorageControllerInterface $image_style_storage
* The storage controller.
* @param \Drupal\image\ImageEffectManager $image_effect_manager
* The image effect manager service.
* @param \Drupal\Core\StringTranslation\Translator\TranslatorInterface $translator
* The translator service.
*/
public function __construct(ModuleHandlerInterface $module_handler, EntityStorageControllerInterface $image_style_storage, TranslatorInterface $translator, ImageEffectManager $image_effect_manager) {
parent::__construct($module_handler, $image_style_storage, $translator);
public function __construct(EntityStorageControllerInterface $image_style_storage, ImageEffectManager $image_effect_manager) {
parent::__construct($image_style_storage);
$this->imageEffectManager = $image_effect_manager;
}
/**
* {@inheritdoc}
*/
public static function createInstance(ContainerInterface $container, $entity_type, array $entity_info) {
public static function create(ContainerInterface $container) {
return new static(
$container->get('module_handler'),
$container->get('plugin.manager.entity')->getStorageController($entity_type),
$container->get('string_translation'),
$container->get('plugin.manager.entity')->getStorageController('image_style'),
$container->get('plugin.manager.image.effect')
);
}
@ -63,7 +54,7 @@ class ImageStyleEditForm extends ImageStyleFormBase {
public function form(array $form, array &$form_state) {
// @todo Remove drupal_set_title() in http://drupal.org/node/1981644
$title = $this->translator->translate('Edit style %name', array('%name' => $this->entity->label()));
$title = $this->t('Edit style %name', array('%name' => $this->entity->label()));
drupal_set_title($title, PASS_THROUGH);
$form['#tree'] = TRUE;
@ -73,7 +64,7 @@ class ImageStyleEditForm extends ImageStyleFormBase {
$preview_arguments = array('#theme' => 'image_style_preview', '#style' => $this->entity);
$form['preview'] = array(
'#type' => 'item',
'#title' => $this->translator->translate('Preview'),
'#title' => $this->t('Preview'),
'#markup' => drupal_render($preview_arguments),
// Render preview above parent elements.
'#weight' => -5,
@ -94,7 +85,7 @@ class ImageStyleEditForm extends ImageStyleFormBase {
$form['effects'][$key]['summary'] = $effect->getSummary();
$form['effects'][$key]['weight'] = array(
'#type' => 'weight',
'#title' => $this->translator->translate('Weight for @title', array('@title' => $effect->label())),
'#title' => $this->t('Weight for @title', array('@title' => $effect->label())),
'#title_display' => 'invisible',
'#default_value' => $effect->getWeight(),
);
@ -103,12 +94,12 @@ class ImageStyleEditForm extends ImageStyleFormBase {
$is_configurable = $effect instanceof ConfigurableImageEffectInterface;
if ($is_configurable) {
$links['edit'] = array(
'title' => $this->translator->translate('edit'),
'title' => $this->t('edit'),
'href' => 'admin/config/media/image-styles/manage/' . $this->entity->id() . '/effects/' . $key,
);
}
$links['delete'] = array(
'title' => $this->translator->translate('delete'),
'title' => $this->t('delete'),
'href' => 'admin/config/media/image-styles/manage/' . $this->entity->id() . '/effects/' . $key . '/delete',
);
$form['effects'][$key]['operations'] = array(
@ -117,13 +108,13 @@ class ImageStyleEditForm extends ImageStyleFormBase {
);
$form['effects'][$key]['configure'] = array(
'#type' => 'link',
'#title' => $this->translator->translate('edit'),
'#title' => $this->t('edit'),
'#href' => 'admin/config/media/image-styles/manage/' . $this->entity->id() . '/effects/' . $key,
'#access' => $is_configurable,
);
$form['effects'][$key]['remove'] = array(
'#type' => 'link',
'#title' => $this->translator->translate('delete'),
'#title' => $this->t('delete'),
'#href' => 'admin/config/media/image-styles/manage/' . $this->entity->id() . '/effects/' . $key . '/delete',
);
}
@ -143,20 +134,20 @@ class ImageStyleEditForm extends ImageStyleFormBase {
);
$form['effects']['new']['new'] = array(
'#type' => 'select',
'#title' => $this->translator->translate('Effect'),
'#title' => $this->t('Effect'),
'#title_display' => 'invisible',
'#options' => $new_effect_options,
'#empty_option' => $this->translator->translate('Select a new effect'),
'#empty_option' => $this->t('Select a new effect'),
);
$form['effects']['new']['weight'] = array(
'#type' => 'weight',
'#title' => $this->translator->translate('Weight for new effect'),
'#title' => $this->t('Weight for new effect'),
'#title_display' => 'invisible',
'#default_value' => count($form['effects']) - 1,
);
$form['effects']['new']['add'] = array(
'#type' => 'submit',
'#value' => $this->translator->translate('Add'),
'#value' => $this->t('Add'),
'#validate' => array(array($this, 'effectValidate')),
'#submit' => array(array($this, 'effectSave')),
);
@ -169,7 +160,7 @@ class ImageStyleEditForm extends ImageStyleFormBase {
*/
public function effectValidate($form, &$form_state) {
if (!$form_state['values']['new']) {
form_error($form['effects']['new']['new'], $this->translator->translate('Select an effect to add.'));
form_error($form['effects']['new']['new'], $this->t('Select an effect to add.'));
}
}
@ -189,7 +180,7 @@ class ImageStyleEditForm extends ImageStyleFormBase {
$status = parent::save($form, $form_state);
if ($status == SAVED_UPDATED) {
drupal_set_message($this->translator->translate('Changes to the style have been saved.'));
drupal_set_message($this->t('Changes to the style have been saved.'));
}
// Check if this field has any configuration options.
@ -209,7 +200,7 @@ class ImageStyleEditForm extends ImageStyleFormBase {
);
$effect_id = $this->entity->saveImageEffect($effect);
if (!empty($effect_id)) {
drupal_set_message($this->translator->translate('The image effect was successfully applied.'));
drupal_set_message($this->t('The image effect was successfully applied.'));
}
}
}
@ -225,7 +216,7 @@ class ImageStyleEditForm extends ImageStyleFormBase {
}
parent::save($form, $form_state);
drupal_set_message($this->translator->translate('Changes to the style have been saved.'));
drupal_set_message($this->t('Changes to the style have been saved.'));
}
/**
@ -233,7 +224,7 @@ class ImageStyleEditForm extends ImageStyleFormBase {
*/
public function actions(array $form, array &$form_state) {
$actions = parent::actions($form, $form_state);
$actions['submit']['#value'] = $this->translator->translate('Update style');
$actions['submit']['#value'] = $this->t('Update style');
return $actions;
}

28
core/modules/image/lib/Drupal/image/Form/ImageStyleFormBase.php
View File

@ -7,17 +7,14 @@
namespace Drupal\image\Form;
use Drupal\Core\Entity\EntityControllerInterface;
use Drupal\Core\Entity\EntityFormController;
use Drupal\Core\Entity\EntityStorageControllerInterface;
use Drupal\Core\Extension\ModuleHandlerInterface;
use Drupal\Core\StringTranslation\Translator\TranslatorInterface;
use Symfony\Component\DependencyInjection\ContainerInterface;
/**
* Base form controller for image style add and edit forms.
*/
abstract class ImageStyleFormBase extends EntityFormController implements EntityControllerInterface {
abstract class ImageStyleFormBase extends EntityFormController {
/**
* The image style entity storage controller.
@ -26,37 +23,22 @@ abstract class ImageStyleFormBase extends EntityFormController implements Entity
*/
protected $imageStyleStorage;
/**
* The translator service.
*
* @var \Drupal\Core\StringTranslation\Translator\TranslatorInterface
*/
protected $translator;
/**
* Constructs a base class for image style add and edit forms.
*
* @param \Drupal\Core\Extension\ModuleHandlerInterface $module_handler
* The module handler service.
* @param \Drupal\Core\Entity\EntityStorageControllerInterface $image_style_storage
* The image style entity storage controller.
* @param \Drupal\Core\StringTranslation\Translator\TranslatorInterface $translator
* The translator service.
*/
public function __construct(ModuleHandlerInterface $module_handler, EntityStorageControllerInterface $image_style_storage, TranslatorInterface $translator) {
parent::__construct($module_handler);
public function __construct(EntityStorageControllerInterface $image_style_storage) {
$this->imageStyleStorage = $image_style_storage;
$this->translator = $translator;
}
/**
* {@inheritdoc}
*/
public static function createInstance(ContainerInterface $container, $entity_type, array $entity_info) {
public static function create(ContainerInterface $container) {
return new static(
$container->get('module_handler'),
$container->get('plugin.manager.entity')->getStorageController($entity_type),
$container->get('string_translation')
$container->get('plugin.manager.entity')->getStorageController('image_style')
);
}
@ -67,7 +49,7 @@ abstract class ImageStyleFormBase extends EntityFormController implements Entity
$form['label'] = array(
'#type' => 'textfield',
'#title' => $this->translator->translate('Image style name'),
'#title' => $this->t('Image style name'),
'#default_value' => $this->entity->label(),
'#required' => TRUE,
);

12
core/modules/menu/lib/Drupal/menu/Form/MenuDeleteForm.php
View File

@ -9,15 +9,13 @@ namespace Drupal\menu\Form;
use Drupal\Core\Database\Connection;
use Drupal\Core\Entity\EntityConfirmFormBase;
use Drupal\Core\Entity\EntityControllerInterface;
use Drupal\Core\Entity\EntityStorageControllerInterface;
use Drupal\Core\Extension\ModuleHandlerInterface;
use Symfony\Component\DependencyInjection\ContainerInterface;
/**
* Defines a confirmation form for deletion of a custom menu.
*/
class MenuDeleteForm extends EntityConfirmFormBase implements EntityControllerInterface {
class MenuDeleteForm extends EntityConfirmFormBase {
/**
* The menu link storage controller.
@ -36,15 +34,12 @@ class MenuDeleteForm extends EntityConfirmFormBase implements EntityControllerIn
/**
* Constructs a new MenuDeleteForm.
*
* @param \Drupal\Core\Extension\ModuleHandlerInterface
* The module handler service.
* @param \Drupal\Core\Entity\EntityStorageControllerInterface $storage_controller
* The menu link storage controller.
* @param \Drupal\Core\Database\Connection $connection
* The database connection.
*/
public function __construct(ModuleHandlerInterface $module_handler, EntityStorageControllerInterface $storage_controller, Connection $connection) {
parent::__construct($module_handler);
public function __construct(EntityStorageControllerInterface $storage_controller, Connection $connection) {
$this->storageController = $storage_controller;
$this->connection = $connection;
}
@ -52,9 +47,8 @@ class MenuDeleteForm extends EntityConfirmFormBase implements EntityControllerIn
/**
* {@inheritdoc}
*/
public static function createInstance(ContainerInterface $container, $entity_type, array $entity_info) {
public static function create(ContainerInterface $container) {
return new static(
$container->get('module_handler'),
$container->get('plugin.manager.entity')->getStorageController('menu_link'),
$container->get('database')
);

13
core/modules/menu/lib/Drupal/menu/MenuFormController.php
View File

@ -8,10 +8,8 @@
namespace Drupal\menu;
use Drupal\Component\Utility\NestedArray;
use Drupal\Core\Entity\EntityControllerInterface;
use Drupal\Core\Entity\EntityFormController;
use Drupal\Core\Entity\Query\QueryFactory;
use Drupal\Core\Extension\ModuleHandlerInterface;
use Drupal\Core\Language\Language;
use Drupal\menu_link\MenuLinkStorageControllerInterface;
use Symfony\Component\DependencyInjection\ContainerInterface;
@ -19,7 +17,7 @@ use Symfony\Component\DependencyInjection\ContainerInterface;
/**
* Base form controller for menu edit forms.
*/
class MenuFormController extends EntityFormController implements EntityControllerInterface {
class MenuFormController extends EntityFormController {
/**
* The factory for entity queries.
@ -45,16 +43,12 @@ class MenuFormController extends EntityFormController implements EntityControlle
/**
* Constructs a MenuFormController object.
*
* @param \Drupal\Core\Extension\ModuleHandlerInterface $module_handler
* The module handler to invoke hooks on.
* @param \Drupal\Core\Entity\Query\QueryFactory $entity_query_factory
* The factory for entity queries.
* @param \Drupal\menu_link\MenuLinkStorageControllerInterface $menu_link_storage
* The menu link storage controller.
*/
public function __construct(ModuleHandlerInterface $module_handler, QueryFactory $entity_query_factory, MenuLinkStorageControllerInterface $menu_link_storage) {
parent::__construct($module_handler);
public function __construct(QueryFactory $entity_query_factory, MenuLinkStorageControllerInterface $menu_link_storage) {
$this->entityQueryFactory = $entity_query_factory;
$this->menuLinkStorage = $menu_link_storage;
}
@ -62,9 +56,8 @@ class MenuFormController extends EntityFormController implements EntityControlle
/**
* {@inheritdoc}
*/
public static function createInstance(ContainerInterface $container, $entity_type, array $entity_info) {
public static function create(ContainerInterface $container) {
return new static(
$container->get('module_handler'),
$container->get('entity.query'),
$container->get('plugin.manager.entity')->getStorageController('menu_link')
);

16
core/modules/menu_link/lib/Drupal/menu_link/MenuLinkFormController.php
View File

@ -7,10 +7,8 @@
namespace Drupal\menu_link;
use Drupal\Core\Entity\EntityControllerInterface;
use Drupal\Core\Entity\EntityFormController;
use Drupal\Core\Language\Language;
use Drupal\Core\Extension\ModuleHandlerInterface;
use Drupal\Core\Path\AliasManagerInterface;
use Drupal\Core\Routing\UrlGenerator;
use Drupal\menu_link\MenuLinkStorageControllerInterface;
@ -19,7 +17,7 @@ use Symfony\Component\DependencyInjection\ContainerInterface;
/**
* Form controller for the node edit forms.
*/
class MenuLinkFormController extends EntityFormController implements EntityControllerInterface {
class MenuLinkFormController extends EntityFormController {
/**
* The menu link storage controller.
@ -45,13 +43,14 @@ class MenuLinkFormController extends EntityFormController implements EntityContr
/**
* Constructs a new MenuLinkFormController object.
*
* @param \Drupal\Core\Extension\ModuleHandlerInterface
* The module handler service.
* @param \Drupal\menu_link\MenuLinkStorageControllerInterface $menu_link_storage_controller
* The menu link storage.
* @param \Drupal\Core\Path\AliasManagerInterface $path_alias_manager
* The path alias manager.
* @param \Drupal\Core\Routing\UrlGenerator $url_generator
* The URL generator.
*/
public function __construct(ModuleHandlerInterface $module_handler, MenuLinkStorageControllerInterface $menu_link_storage_controller, AliasManagerInterface $path_alias_manager, UrlGenerator $url_generator) {
parent::__construct($module_handler);
public function __construct(MenuLinkStorageControllerInterface $menu_link_storage_controller, AliasManagerInterface $path_alias_manager, UrlGenerator $url_generator) {
$this->menuLinkStorageController = $menu_link_storage_controller;
$this->pathAliasManager = $path_alias_manager;
$this->urlGenerator = $url_generator;
@ -60,9 +59,8 @@ class MenuLinkFormController extends EntityFormController implements EntityContr
/**
* {@inheritdoc}
*/
public static function createInstance(ContainerInterface $container, $entity_type, array $entity_info, $operation = NULL) {
public static function create(ContainerInterface $container) {
return new static(
$container->get('module_handler'),
$container->get('plugin.manager.entity')->getStorageController('menu_link'),
$container->get('path.alias_manager.cached'),
$container->get('url_generator')

5
core/modules/node/lib/Drupal/node/Form/DeleteMultiple.php
View File

@ -14,7 +14,6 @@ use Drupal\Component\Utility\String;
use Drupal\user\TempStoreFactory;
use Symfony\Component\HttpFoundation\RedirectResponse;
use Symfony\Component\DependencyInjection\ContainerInterface;
use Symfony\Component\HttpFoundation\Request;
/**
* Provides a node deletion confirmation form.
@ -96,7 +95,7 @@ class DeleteMultiple extends ConfirmFormBase implements ControllerInterface {
/**
* {@inheritdoc}
*/
public function buildForm(array $form, array &$form_state, Request $request = NULL) {
public function buildForm(array $form, array &$form_state) {
$this->nodes = $this->tempStoreFactory->get('node_multiple_delete_confirm')->get($GLOBALS['user']->id());
if (empty($this->nodes)) {
return new RedirectResponse(url($this->getCancelPath(), array('absolute' => TRUE)));
@ -108,7 +107,7 @@ class DeleteMultiple extends ConfirmFormBase implements ControllerInterface {
return String::checkPlain($node->label());
}, $this->nodes),
);
return parent::buildForm($form, $form_state, $request);
return parent::buildForm($form, $form_state);
}
/**

13
core/modules/node/lib/Drupal/node/Form/NodeDeleteForm.php
View File

@ -7,10 +7,8 @@
namespace Drupal\node\Form;
use Drupal\Core\Entity\EntityControllerInterface;
use Drupal\Core\Entity\EntityNGConfirmFormBase;
use Drupal\Core\Entity\EntityStorageControllerInterface;
use Drupal\Core\Extension\ModuleHandlerInterface;
use Drupal\Core\Routing\PathBasedGeneratorInterface;
use Symfony\Component\DependencyInjection\ContainerInterface;
use Symfony\Component\Routing\Generator\UrlGeneratorInterface;
@ -18,7 +16,7 @@ use Symfony\Component\Routing\Generator\UrlGeneratorInterface;
/**
* Provides a form for deleting a node.
*/
class NodeDeleteForm extends EntityNGConfirmFormBase implements EntityControllerInterface {
class NodeDeleteForm extends EntityNGConfirmFormBase {
/**
* The URL generator.
@ -37,16 +35,12 @@ class NodeDeleteForm extends EntityNGConfirmFormBase implements EntityController
/**
* Constructs a NodeDeleteForm object.
*
* @param \Drupal\Core\Extension\ModuleHandlerInterface $module_handler
* The module handler service.
* @param \Drupal\Core\Routing\PathBasedGeneratorInterface $url_generator
* The URL generator.
* @param \Drupal\Core\Entity\EntityStorageControllerInterface $node_type_storage
* The node type storage.
*/
public function __construct(ModuleHandlerInterface $module_handler, PathBasedGeneratorInterface $url_generator, EntityStorageControllerInterface $node_type_storage) {
parent::__construct($module_handler);
public function __construct(PathBasedGeneratorInterface $url_generator, EntityStorageControllerInterface $node_type_storage) {
$this->urlGenerator = $url_generator;
$this->nodeTypeStorage = $node_type_storage;
}
@ -54,9 +48,8 @@ class NodeDeleteForm extends EntityNGConfirmFormBase implements EntityController
/**
* {@inheritdoc}
*/
public static function createInstance(ContainerInterface $container, $entity_type, array $entity_info) {
public static function create(ContainerInterface $container) {
return new static(
$container->get('module_handler'),
$container->get('url_generator'),
$container->get('plugin.manager.entity')->getStorageController('node_type')
);

5
core/modules/node/lib/Drupal/node/Form/NodeRevisionDeleteForm.php
View File

@ -13,7 +13,6 @@ use Drupal\Core\Entity\EntityStorageControllerInterface;
use Drupal\Core\Form\ConfirmFormBase;
use Drupal\node\NodeInterface;
use Symfony\Component\DependencyInjection\ContainerInterface;
use Symfony\Component\HttpFoundation\Request;
/**
* Provides a form for reverting a node revision.
@ -107,9 +106,9 @@ class NodeRevisionDeleteForm extends ConfirmFormBase implements ControllerInterf
/**
* {@inheritdoc}
*/
public function buildForm(array $form, array &$form_state, Request $request = NULL, $node_revision = NULL) {
public function buildForm(array $form, array &$form_state, $node_revision = NULL) {
$this->revision = $this->nodeStorage->loadRevision($node_revision);
return parent::buildForm($form, $form_state, $request);
return parent::buildForm($form, $form_state);
}
/**

5
core/modules/node/lib/Drupal/node/Form/NodeRevisionRevertForm.php
View File

@ -12,7 +12,6 @@ use Drupal\Core\Entity\EntityStorageControllerInterface;
use Drupal\Core\Form\ConfirmFormBase;
use Drupal\node\NodeInterface;
use Symfony\Component\DependencyInjection\ContainerInterface;
use Symfony\Component\HttpFoundation\Request;
/**
* Provides a form for reverting a node revision.
@ -90,9 +89,9 @@ class NodeRevisionRevertForm extends ConfirmFormBase implements ControllerInterf
/**
* {@inheritdoc}
*/
public function buildForm(array $form, array &$form_state, Request $request = NULL, $node_revision = NULL) {
public function buildForm(array $form, array &$form_state, $node_revision = NULL) {
$this->revision = $this->nodeStorage->loadRevision($node_revision);
return parent::buildForm($form, $form_state, $request);
return parent::buildForm($form, $form_state);
}
/**

17
core/modules/node/lib/Drupal/node/Form/NodeTypeDeleteConfirm.php
View File

@ -8,16 +8,13 @@
namespace Drupal\node\Form;
use Drupal\Core\Entity\EntityConfirmFormBase;
use Drupal\Core\Entity\EntityControllerInterface;
use Drupal\Core\Extension\ModuleHandlerInterface;
use Drupal\Core\Database\Connection;
use Symfony\Component\DependencyInjection\ContainerInterface;
use Symfony\Component\HttpFoundation\Request;
/**
* Provides a form for content type deletion.
*/
class NodeTypeDeleteConfirm extends EntityConfirmFormBase implements EntityControllerInterface {
class NodeTypeDeleteConfirm extends EntityConfirmFormBase {
/**
* The database connection.
@ -29,22 +26,18 @@ class NodeTypeDeleteConfirm extends EntityConfirmFormBase implements EntityContr
/**
* Constructs a new NodeTypeDeleteConfirm object.
*
* @param \Drupal\Core\Extension\ModuleHandlerInterface
* The module handler service.
* @param \Drupal\Core\Database\Connection $database
* The database connection.
*/
public function __construct(ModuleHandlerInterface $module_handler, Connection $database) {
parent::__construct($module_handler);
public function __construct(Connection $database) {
$this->database = $database;
}
/**
* {@inheritdoc}
*/
public static function createInstance(ContainerInterface $container, $entity_type, array $entity_info) {
public static function create(ContainerInterface $container) {
return new static(
$container->get('module_handler'),
$container->get('database')
);
}
@ -73,7 +66,7 @@ class NodeTypeDeleteConfirm extends EntityConfirmFormBase implements EntityContr
/**
* {@inheritdoc}
*/
public function buildForm(array $form, array &$form_state, Request $request = NULL) {
public function buildForm(array $form, array &$form_state) {
$num_nodes = $this->database->query("SELECT COUNT(*) FROM {node} WHERE type = :type", array(':type' => $this->entity->id()))->fetchField();
if ($num_nodes) {
drupal_set_title($this->getQuestion(), PASS_THROUGH);
@ -82,7 +75,7 @@ class NodeTypeDeleteConfirm extends EntityConfirmFormBase implements EntityContr
return $form;
}
return parent::buildForm($form, $form_state, $request);
return parent::buildForm($form, $form_state);
}
/**

3
core/modules/node/lib/Drupal/node/NodeTypeFormController.php
View File

@ -8,13 +8,12 @@
namespace Drupal\node;
use Drupal\Core\Entity\EntityFormController;
use Drupal\Core\Entity\EntityControllerInterface;
use Symfony\Component\DependencyInjection\ContainerInterface;
/**
* Form controller for node type forms.
*/
class NodeTypeFormController extends EntityFormController implements EntityControllerInterface {
class NodeTypeFormController extends EntityFormController {
/**
* {@inheritdoc}

5
core/modules/path/lib/Drupal/path/Form/DeleteForm.php
View File

@ -11,7 +11,6 @@ use Drupal\Core\Controller\ControllerInterface;
use Drupal\Core\Form\ConfirmFormBase;
use Drupal\Core\Path\Path;
use Symfony\Component\DependencyInjection\ContainerInterface;
use Symfony\Component\HttpFoundation\Request;
/**
* Builds the form to delete a path alias.
@ -75,10 +74,10 @@ class DeleteForm extends ConfirmFormBase implements ControllerInterface {
/**
* Overrides \Drupal\Core\Form\ConfirmFormBase::buildForm().
*/
public function buildForm(array $form, array &$form_state, $pid = NULL, Request $request = NULL) {
public function buildForm(array $form, array &$form_state, $pid = NULL) {
$this->pathAlias = $this->path->load(array('pid' => $pid));
return parent::buildForm($form, $form_state, $request);
return parent::buildForm($form, $form_state);
}
/**

5
core/modules/shortcut/lib/Drupal/shortcut/Form/LinkDelete.php
View File

@ -9,7 +9,6 @@ namespace Drupal\shortcut\Form;
use Drupal\Core\Form\ConfirmFormBase;
use Drupal\menu_link\Entity\MenuLink;
use Symfony\Component\HttpFoundation\Request;
/**
* Builds the shortcut link deletion form.
@ -54,10 +53,10 @@ class LinkDelete extends ConfirmFormBase {
/**
* {@inheritdoc}
*/
public function buildForm(array $form, array &$form_state, MenuLink $menu_link = NULL, Request $request = NULL) {
public function buildForm(array $form, array &$form_state, MenuLink $menu_link = NULL) {
$this->menuLink = $menu_link;
return parent::buildForm($form, $form_state, $request);
return parent::buildForm($form, $form_state);
}
/**

15
core/modules/shortcut/lib/Drupal/shortcut/Form/ShortcutSetDeleteForm.php
View File

@ -8,17 +8,14 @@
namespace Drupal\shortcut\Form;
use Drupal\Core\Entity\EntityConfirmFormBase;
use Drupal\Core\Entity\EntityControllerInterface;
use Drupal\Core\Extension\ModuleHandlerInterface;
use Drupal\shortcut\ShortcutSetStorageControllerInterface;
use Symfony\Component\DependencyInjection\ContainerInterface;
use Drupal\Core\Database\Connection;
use Symfony\Component\HttpFoundation\Request;
/**
* Builds the shortcut set deletion form.
*/
class ShortcutSetDeleteForm extends EntityConfirmFormBase implements EntityControllerInterface {
class ShortcutSetDeleteForm extends EntityConfirmFormBase {
/**
* The database connection.
@ -37,8 +34,7 @@ class ShortcutSetDeleteForm extends EntityConfirmFormBase implements EntityContr
/**
* Constructs a ShortcutSetDeleteForm object.
*/
public function __construct(ModuleHandlerInterface $module_handler, Connection $database, ShortcutSetStorageControllerInterface $storage_controller) {
parent::__construct($module_handler);
public function __construct(Connection $database, ShortcutSetStorageControllerInterface $storage_controller) {
$this->database = $database;
$this->storageController = $storage_controller;
}
@ -46,9 +42,8 @@ class ShortcutSetDeleteForm extends EntityConfirmFormBase implements EntityContr
/**
* {@inheritdoc}
*/
public static function createInstance(ContainerInterface $container, $entity_type, array $entity_info) {
public static function create(ContainerInterface $container) {
return new static(
$container->get('module_handler'),
$container->get('database'),
$container->get('plugin.manager.entity')->getStorageController('shortcut_set')
);
@ -78,7 +73,7 @@ class ShortcutSetDeleteForm extends EntityConfirmFormBase implements EntityContr
/**
* {@inheritdoc}
*/
public function buildForm(array $form, array &$form_state, Request $request = NULL) {
public function buildForm(array $form, array &$form_state) {
// Find out how many users are directly assigned to this shortcut set, and
// make a message.
$number = $this->storageController->countAssignedUsers($this->entity);
@ -99,7 +94,7 @@ class ShortcutSetDeleteForm extends EntityConfirmFormBase implements EntityContr
'#markup' => $info,
);
return parent::buildForm($form, $form_state, $request);
return parent::buildForm($form, $form_state);
}
/**

15
core/modules/statistics/lib/Drupal/statistics/StatisticsSettingsForm.php
View File

@ -6,9 +6,10 @@
namespace Drupal\statistics;
use Drupal\Core\Config\Context\ContextInterface;
use Drupal\Core\Extension\ModuleHandlerInterface;
use Drupal\system\SystemConfigFormBase;
use Drupal\Core\Config\ConfigFactory;
use Drupal\Core\Extension\ModuleHandler;
use Symfony\Component\DependencyInjection\ContainerInterface;
/**
@ -19,7 +20,7 @@ class StatisticsSettingsForm extends SystemConfigFormBase {
/**
* The module handler.
*
* @var \Drupal\Core\Extension\ModuleHandler
* @var \Drupal\Core\Extension\ModuleHandlerInterface
*/
protected $moduleHandler;
@ -28,11 +29,14 @@ class StatisticsSettingsForm extends SystemConfigFormBase {
*
* @param \Drupal\Core\Config\ConfigFactory $config_factory
* The factory for configuration objects.
* @param \Drupal\Core\Extension\ModuleHandler $module_handler
* @param \Drupal\Core\Config\Context\ContextInterface $context
* The configuration context to use.
* @param \Drupal\Core\Extension\ModuleHandlerInterface $module_handler
* The module handler.
*/
public function __construct(ConfigFactory $config_factory, ModuleHandler $module_handler) {
$this->configFactory = $config_factory;
public function __construct(ConfigFactory $config_factory, ContextInterface $context, ModuleHandlerInterface $module_handler) {
parent::__construct($config_factory, $context);
$this->moduleHandler = $module_handler;
}
@ -42,6 +46,7 @@ class StatisticsSettingsForm extends SystemConfigFormBase {
public static function create(ContainerInterface $container) {
return new static(
$container->get('config.factory'),
$container->get('config.context.free'),
$container->get('module_handler')
);
}

14
core/modules/system/lib/Drupal/system/Form/DateFormatDeleteForm.php
View File

@ -7,17 +7,14 @@
namespace Drupal\system\Form;
use Drupal\Core\Controller\ControllerInterface;
use Drupal\Core\Datetime\Date;
use Drupal\Core\Entity\EntityConfirmFormBase;
use Drupal\Core\Entity\EntityControllerInterface;
use Drupal\Core\Extension\ModuleHandlerInterface;
use Symfony\Component\DependencyInjection\ContainerInterface;
/**
* Builds a form to delete a date format.
*/
class DateFormatDeleteForm extends EntityConfirmFormBase implements EntityControllerInterface {
class DateFormatDeleteForm extends EntityConfirmFormBase {
/**
* The date service.
@ -29,23 +26,18 @@ class DateFormatDeleteForm extends EntityConfirmFormBase implements EntityContro
/**
* Constructs an DateFormatDeleteForm object.
*
* @param \Drupal\Core\Extension\ModuleHandlerInterface $module_handler
* The module handler service.
* @param \Drupal\Core\Datetime\Date $date_service
* The date service.
*/
public function __construct(ModuleHandlerInterface $module_handler, Date $date_service) {
parent::__construct($module_handler);
public function __construct(Date $date_service) {
$this->dateService = $date_service;
}
/**
* {@inheritdoc}
*/
public static function createInstance(ContainerInterface $container, $entity_type, array $entity_info) {
public static function create(ContainerInterface $container) {
return new static(
$container->get('module_handler'),
$container->get('date')
);
}

13
core/modules/system/lib/Drupal/system/Form/DateFormatFormBase.php
View File

@ -10,8 +10,6 @@ namespace Drupal\system\Form;
use Drupal\Core\Ajax\AjaxResponse;
use Drupal\Core\Ajax\ReplaceCommand;
use Drupal\Core\Datetime\Date;
use Drupal\Core\Entity\EntityControllerInterface;
use Drupal\Core\Extension\ModuleHandlerInterface;
use Symfony\Component\DependencyInjection\ContainerInterface;
use Drupal\Core\Datetime\DrupalDateTime;
use Drupal\Core\Entity\Query\QueryFactory;
@ -20,7 +18,7 @@ use Drupal\Core\Entity\EntityFormController;
/**
* Provides a base form controller for date formats.
*/
abstract class DateFormatFormBase extends EntityFormController implements EntityControllerInterface {
abstract class DateFormatFormBase extends EntityFormController {
/**
* The date pattern type.
@ -46,16 +44,12 @@ abstract class DateFormatFormBase extends EntityFormController implements Entity
/**
* Constructs a new date format form.
*
* @param \Drupal\Core\Extension\ModuleHandlerInterface $module_handler
* The module handler.
* @param \Drupal\Core\Entity\Query\QueryFactory $query_factory
* The entity query factory.
* @param \Drupal\Core\Datetime\Date $date_service
* The date service.
*/
function __construct(ModuleHandlerInterface $module_handler, QueryFactory $query_factory, Date $date_service) {
parent::__construct($module_handler);
public function __construct(QueryFactory $query_factory, Date $date_service) {
$date = new DrupalDateTime();
$this->patternType = $date->canUseIntl() ? DrupalDateTime::INTL : DrupalDateTime::PHP;
@ -66,9 +60,8 @@ abstract class DateFormatFormBase extends EntityFormController implements Entity
/**
* {@inheritdoc}
*/
public static function createInstance(ContainerInterface $container, $entity_type, array $entity_info) {
public static function create(ContainerInterface $container) {
return new static(
$container->get('module_handler'),
$container->get('entity.query'),
$container->get('date')
);

8
core/modules/system/lib/Drupal/system/Form/DateFormatLocalizeResetForm.php
View File

@ -11,7 +11,6 @@ use Drupal\Core\Controller\ControllerInterface;
use Drupal\Core\Form\ConfirmFormBase;
use Drupal\Core\Config\ConfigFactory;
use Symfony\Component\DependencyInjection\ContainerInterface;
use Symfony\Component\HttpFoundation\Request;
/**
* Builds a form for enabling a module.
@ -34,6 +33,9 @@ class DateFormatLocalizeResetForm extends ConfirmFormBase implements ControllerI
/**
* Constructs a DateFormatLocalizeResetForm object.
*
* @param \Drupal\Core\Config\ConfigFactory $config_factory
* The config factory.
*/
public function __construct(ConfigFactory $config_factory) {
$this->configFactory = $config_factory;
@ -92,10 +94,10 @@ class DateFormatLocalizeResetForm extends ConfirmFormBase implements ControllerI
* The language code.
*
*/
public function buildForm(array $form, array &$form_state, $langcode = NULL, Request $request = NULL) {
public function buildForm(array $form, array &$form_state, $langcode = NULL) {
$this->language = language_load($langcode);
return parent::buildForm($form, $form_state, $request);
return parent::buildForm($form, $form_state);
}
/**

61
core/modules/system/lib/Drupal/system/Form/ModulesListConfirmForm.php
View File

@ -11,10 +11,8 @@ use Drupal\Core\Controller\ControllerInterface;
use Drupal\Core\Extension\ModuleHandlerInterface;
use Drupal\Core\Form\ConfirmFormBase;
use Drupal\Core\KeyValueStore\KeyValueStoreExpirableInterface;
use Drupal\Core\StringTranslation\TranslationManager;
use Symfony\Component\DependencyInjection\ContainerInterface;
use Symfony\Component\HttpFoundation\RedirectResponse;
use Symfony\Component\HttpFoundation\Request;
/**
* Builds a confirmation form for enabling modules with dependencies.
@ -35,20 +33,6 @@ class ModulesListConfirmForm extends ConfirmFormBase implements ControllerInterf
*/
protected $keyValueExpirable;
/**
* The translation manager service.
*
* @var \Drupal\Core\StringTranslation\TranslationManager
*/
protected $translationManager;
/**
* The request object.
*
* @var \Symfony\Component\HttpFoundation\Request
*/
protected $request;
/**
* An associative list of modules to enable or disable.
*
@ -56,17 +40,6 @@ class ModulesListConfirmForm extends ConfirmFormBase implements ControllerInterf
*/
protected $modules = array();
/**
* {@inheritdoc}
*/
public static function create(ContainerInterface $container) {
return new static(
$container->get('module_handler'),
$container->get('keyvalue.expirable')->get('module_list'),
$container->get('string_translation')
);
}
/**
* Constructs a ModulesListConfirmForm object.
*
@ -74,20 +47,27 @@ class ModulesListConfirmForm extends ConfirmFormBase implements ControllerInterf
* The module handler.
* @param \Drupal\Core\KeyValueStore\KeyValueStoreExpirableInterface $key_value_expirable
* The key value expirable factory.
* @param \Drupal\Core\StringTranslation\TranslationManager
* The translation manager.
*/
public function __construct(ModuleHandlerInterface $module_handler, KeyValueStoreExpirableInterface $key_value_expirable, TranslationManager $translation_manager) {
public function __construct(ModuleHandlerInterface $module_handler, KeyValueStoreExpirableInterface $key_value_expirable) {
$this->moduleHandler = $module_handler;
$this->keyValueExpirable = $key_value_expirable;
$this->translationManager = $translation_manager;
}
/**
* {@inheritdoc}
*/
public static function create(ContainerInterface $container) {
return new static(
$container->get('module_handler'),
$container->get('keyvalue.expirable')->get('module_list')
);
}
/**
* {@inheritdoc}
*/
public function getQuestion() {
return $this->translationManager->translate('Some required modules must be enabled');
return $this->t('Some required modules must be enabled');
}
/**
@ -101,14 +81,14 @@ class ModulesListConfirmForm extends ConfirmFormBase implements ControllerInterf
* {@inheritdoc}
*/
public function getConfirmText() {
return $this->translationManager->translate('Continue');
return $this->t('Continue');
}
/**
* {@inheritdoc}
*/
public function getDescription() {
return $this->translationManager->translate('Would you like to continue with the above?');
return $this->t('Would you like to continue with the above?');
}
/**
@ -121,8 +101,8 @@ class ModulesListConfirmForm extends ConfirmFormBase implements ControllerInterf
/**
* {@inheritdoc}
*/
public function buildForm(array $form, array &$form_state, Request $request = NULL) {
$account = $request->attributes->get('_account')->id();
public function buildForm(array $form, array &$form_state) {
$account = $this->getCurrentUser()->id();
$this->modules = $this->keyValueExpirable->get($account);
// Redirect to the modules list page if the key value store is empty.
@ -130,9 +110,6 @@ class ModulesListConfirmForm extends ConfirmFormBase implements ControllerInterf
return new RedirectResponse(url($this->getCancelPath(), array('absolute' => TRUE)));
}
// Store the request for use in the submit handler.
$this->request = $request;
$items = array();
// Display a list of required modules that have to be installed as well but
// were not manually selected.
@ -155,7 +132,7 @@ class ModulesListConfirmForm extends ConfirmFormBase implements ControllerInterf
'#items' => $items,
);
return parent::buildForm($form, $form_state, $this->request);
return parent::buildForm($form, $form_state);
}
/**
@ -163,7 +140,7 @@ class ModulesListConfirmForm extends ConfirmFormBase implements ControllerInterf
*/
public function submitForm(array &$form, array &$form_state) {
// Remove the key value store entry.
$account = $this->request->attributes->get('_account')->id();
$account = $this->getCurrentUser()->id();
$this->keyValueExpirable->delete($account);
// Gets list of modules prior to install process.
@ -181,7 +158,7 @@ class ModulesListConfirmForm extends ConfirmFormBase implements ControllerInterf
// message if there are changes.
if ($before != $this->moduleHandler->getModuleList()) {
drupal_flush_all_caches();
drupal_set_message($this->translationManager->translate('The configuration options have been saved.'));
drupal_set_message($this->t('The configuration options have been saved.'));
}
$form_state['redirect'] = $this->getCancelPath();

95
core/modules/system/lib/Drupal/system/Form/ModulesListForm.php
View File

@ -7,15 +7,11 @@
namespace Drupal\system\Form;
use Drupal\Core\Controller\ControllerInterface;
use Drupal\Core\Extension\ModuleHandlerInterface;
use Drupal\Core\Form\FormInterface;
use Drupal\Core\KeyValueStore\KeyValueExpirableFactory;
use Drupal\Core\KeyValueStore\KeyValueStoreExpirableInterface;
use Drupal\Core\StringTranslation\TranslationManager;
use Drupal\Component\Utility\Unicode;
use Drupal\Core\Extension\ModuleHandlerInterface;
use Drupal\Core\Form\FormBase;
use Drupal\Core\KeyValueStore\KeyValueStoreExpirableInterface;
use Symfony\Component\DependencyInjection\ContainerInterface;
use Symfony\Component\HttpFoundation\Request;
/**
* Provides module enable/disable interface.
@ -25,7 +21,7 @@ use Symfony\Component\HttpFoundation\Request;
* requires. See drupal_parse_info_file() for info on module.info.yml
* descriptors.
*/
class ModulesListForm implements FormInterface, ControllerInterface {
class ModulesListForm extends FormBase {
/**
* The module handler service.
@ -41,28 +37,13 @@ class ModulesListForm implements FormInterface, ControllerInterface {
*/
protected $keyValueExpirable;
/**
* The translation manager service.
*
* @var \Drupal\Core\StringTranslation\TranslationManager
*/
protected $translationManager;
/**
* The request object.
*
* @var \Symfony\Component\HttpFoundation\Request
*/
protected $request;
/**
* {@inheritdoc}
*/
public static function create(ContainerInterface $container) {
return new static(
$container->get('module_handler'),
$container->get('keyvalue.expirable')->get('module_list'),
$container->get('string_translation')
$container->get('keyvalue.expirable')->get('module_list')
);
}
@ -73,13 +54,10 @@ class ModulesListForm implements FormInterface, ControllerInterface {
* The module handler.
* @param \Drupal\Core\KeyValueStore\KeyValueStoreExpirableInterface $key_value_expirable
* The key value expirable factory.
* @param \Drupal\Core\StringTranslation\TranslationManager
* The translation manager.
*/
public function __construct(ModuleHandlerInterface $module_handler, KeyValueStoreExpirableInterface $key_value_expirable, TranslationManager $translation_manager) {
public function __construct(ModuleHandlerInterface $module_handler, KeyValueStoreExpirableInterface $key_value_expirable) {
$this->moduleHandler = $module_handler;
$this->keyValueExpirable = $key_value_expirable;
$this->translationManager = $translation_manager;
}
/**
@ -92,16 +70,13 @@ class ModulesListForm implements FormInterface, ControllerInterface {
/**
* {@inheritdoc}
*/
public function buildForm(array $form, array &$form_state, Request $request = NULL) {
public function buildForm(array $form, array &$form_state) {
require_once DRUPAL_ROOT . '/core/includes/install.inc';
$distribution = check_plain(drupal_install_profile_distribution_name());
// Include system.admin.inc so we can use the sort callbacks.
$this->moduleHandler->loadInclude('system', 'inc', 'system.admin');
// Store the request for use in the submit handler.
$this->request = $request;
$form['filters'] = array(
'#type' => 'container',
'#attributes' => array(
@ -111,14 +86,14 @@ class ModulesListForm implements FormInterface, ControllerInterface {
$form['filters']['text'] = array(
'#type' => 'search',
'#title' => $this->translationManager->translate('Search'),
'#title' => $this->t('Search'),
'#size' => 30,
'#placeholder' => $this->translationManager->translate('Enter module name'),
'#placeholder' => $this->t('Enter module name'),
'#attributes' => array(
'class' => array('table-filter-text'),
'data-table' => '#system-modules',
'autocomplete' => 'off',
'title' => $this->translationManager->translate('Enter a part of the module name or description to filter by.'),
'title' => $this->t('Enter a part of the module name or description to filter by.'),
),
);
@ -139,12 +114,12 @@ class ModulesListForm implements FormInterface, ControllerInterface {
foreach (element_children($form['modules']) as $package) {
$form['modules'][$package] += array(
'#type' => 'details',
'#title' => $this->translationManager->translate($package),
'#title' => $this->t($package),
'#theme' => 'system_modules_details',
'#header' => array(
array('data' => '<span class="visually-hidden">' . $this->translationManager->translate('Enabled') . '</span>', 'class' => array('checkbox')),
array('data' => $this->translationManager->translate('Name'), 'class' => array('name')),
array('data' => $this->translationManager->translate('Description'), 'class' => array('description', RESPONSIVE_PRIORITY_LOW)),
array('data' => '<span class="visually-hidden">' . $this->t('Enabled') . '</span>', 'class' => array('checkbox')),
array('data' => $this->t('Name'), 'class' => array('name')),
array('data' => $this->t('Description'), 'class' => array('description', RESPONSIVE_PRIORITY_LOW)),
),
'#attributes' => array('class' => array('package-listing')),
// Ensure that the "Core" package comes first.
@ -159,7 +134,7 @@ class ModulesListForm implements FormInterface, ControllerInterface {
$form['actions'] = array('#type' => 'actions');
$form['actions']['submit'] = array(
'#type' => 'submit',
'#value' => $this->translationManager->translate('Save configuration'),
'#value' => $this->t('Save configuration'),
);
return $form;
@ -184,7 +159,7 @@ class ModulesListForm implements FormInterface, ControllerInterface {
$row['#required_by'] = array();
$row['name']['#markup'] = $module->info['name'];
$row['description']['#markup'] = $this->translationManager->translate($module->info['description']);
$row['description']['#markup'] = $this->t($module->info['description']);
$row['version']['#markup'] = $module->info['version'];
// Add links for each module.
@ -197,9 +172,9 @@ class ModulesListForm implements FormInterface, ControllerInterface {
if ($this->moduleHandler->invoke($module->name, 'help', array("admin/help#$module->name", $help))) {
$row['links']['help'] = array(
'#type' => 'link',
'#title' => $this->translationManager->translate('Help'),
'#title' => $this->t('Help'),
'#href' => "admin/help/$module->name",
'#options' => array('attributes' => array('class' => array('module-link', 'module-link-help'), 'title' => $this->translationManager->translate('Help'))),
'#options' => array('attributes' => array('class' => array('module-link', 'module-link-help'), 'title' => $this->t('Help'))),
);
}
}
@ -209,9 +184,9 @@ class ModulesListForm implements FormInterface, ControllerInterface {
if ($module->status && user_access('administer permissions') && in_array($module->name, $this->moduleHandler->getImplementations('permission'))) {
$row['links']['permissions'] = array(
'#type' => 'link',
'#title' => $this->translationManager->translate('Permissions'),
'#title' => $this->t('Permissions'),
'#href' => 'admin/people/permissions',
'#options' => array('fragment' => 'module-' . $module->name, 'attributes' => array('class' => array('module-link', 'module-link-permissions'), 'title' => $this->translationManager->translate('Configure permissions'))),
'#options' => array('fragment' => 'module-' . $module->name, 'attributes' => array('class' => array('module-link', 'module-link-permissions'), 'title' => $this->t('Configure permissions'))),
);
}
@ -221,7 +196,7 @@ class ModulesListForm implements FormInterface, ControllerInterface {
if (($configure = menu_get_item($module->info['configure'])) && $configure['access']) {
$row['links']['configure'] = array(
'#type' => 'link',
'#title' => $this->translationManager->translate('Configure'),
'#title' => $this->t('Configure'),
'#href' => $configure['href'],
'#options' => array('attributes' => array('class' => array('module-link', 'module-link-configure'), 'title' => $configure['description'])),
);
@ -231,7 +206,7 @@ class ModulesListForm implements FormInterface, ControllerInterface {
// Present a checkbox for installing and indicating the status of a module.
$row['enable'] = array(
'#type' => 'checkbox',
'#title' => $this->translationManager->translate('Enable'),
'#title' => $this->t('Enable'),
'#default_value' => (bool) $module->status,
);
@ -249,7 +224,7 @@ class ModulesListForm implements FormInterface, ControllerInterface {
// Check the core compatibility.
if ($module->info['core'] != DRUPAL_CORE_COMPATIBILITY) {
$compatible = FALSE;
$status .= $this->translationManager->translate('This version is not compatible with Drupal !core_version and should be replaced.', array(
$status .= $this->t('This version is not compatible with Drupal !core_version and should be replaced.', array(
'!core_version' => DRUPAL_CORE_COMPATIBILITY,
));
}
@ -258,7 +233,7 @@ class ModulesListForm implements FormInterface, ControllerInterface {
if (version_compare(phpversion(), $module->info['php']) < 0) {
$compatible = FALSE;
$required = $module->info['php'] . (substr_count($module->info['php'], '.') < 2 ? '.*' : '');
$status .= $this->translationManager->translate('This module requires PHP version @php_required and is incompatible with PHP version !php_version.', array(
$status .= $this->t('This module requires PHP version @php_required and is incompatible with PHP version !php_version.', array(
'@php_required' => $required,
'!php_version' => phpversion(),
));
@ -276,7 +251,7 @@ class ModulesListForm implements FormInterface, ControllerInterface {
// If this module requires other modules, add them to the array.
foreach ($module->requires as $dependency => $version) {
if (!isset($modules[$dependency])) {
$row['#requires'][$dependency] = $this->translationManager->translate('@module (<span class="admin-missing">missing</span>)', array('@module' => Unicode::ucfirst($dependency)));
$row['#requires'][$dependency] = $this->t('@module (<span class="admin-missing">missing</span>)', array('@module' => Unicode::ucfirst($dependency)));
$row['enable']['#disabled'] = TRUE;
}
// Only display visible modules.
@ -285,7 +260,7 @@ class ModulesListForm implements FormInterface, ControllerInterface {
// Disable the module's checkbox if it is incompatible with the
// dependency's version.
if ($incompatible_version = drupal_check_incompatibility($version, str_replace(DRUPAL_CORE_COMPATIBILITY . '-', '', $modules[$dependency]->info['version']))) {
$row['#requires'][$dependency] = $this->translationManager->translate('@module (<span class="admin-missing">incompatible with</span> version @version)', array(
$row['#requires'][$dependency] = $this->t('@module (<span class="admin-missing">incompatible with</span> version @version)', array(
'@module' => $name . $incompatible_version,
'@version' => $modules[$dependency]->info['version'],
));
@ -294,16 +269,16 @@ class ModulesListForm implements FormInterface, ControllerInterface {
// Disable the checkbox if the dependency is incompatible with this
// version of Drupal core.
elseif ($modules[$dependency]->info['core'] != DRUPAL_CORE_COMPATIBILITY) {
$row['#requires'][$dependency] = $this->translationManager->translate('@module (<span class="admin-missing">incompatible with</span> this version of Drupal core)', array(
$row['#requires'][$dependency] = $this->t('@module (<span class="admin-missing">incompatible with</span> this version of Drupal core)', array(
'@module' => $name,
));
$row['enable']['#disabled'] = TRUE;
}
elseif ($modules[$dependency]->status) {
$row['#requires'][$dependency] = $this->translationManager->translate('@module', array('@module' => $name));
$row['#requires'][$dependency] = $this->t('@module', array('@module' => $name));
}
else {
$row['#requires'][$dependency] = $this->translationManager->translate('@module (<span class="admin-disabled">disabled</span>)', array('@module' => $name));
$row['#requires'][$dependency] = $this->t('@module (<span class="admin-disabled">disabled</span>)', array('@module' => $name));
}
}
}
@ -313,11 +288,11 @@ class ModulesListForm implements FormInterface, ControllerInterface {
foreach ($module->required_by as $dependent => $version) {
if (isset($modules[$dependent]) && empty($modules[$dependent]->info['hidden'])) {
if ($modules[$dependent]->status == 1 && $module->status == 1) {
$row['#required_by'][$dependent] = $this->translationManager->translate('@module', array('@module' => $modules[$dependent]->info['name']));
$row['#required_by'][$dependent] = $this->t('@module', array('@module' => $modules[$dependent]->info['name']));
$row['enable']['#disabled'] = TRUE;
}
else {
$row['#required_by'][$dependent] = $this->translationManager->translate('@module (<span class="admin-disabled">disabled</span>)', array('@module' => $modules[$dependent]->info['name']));
$row['#required_by'][$dependent] = $this->t('@module (<span class="admin-disabled">disabled</span>)', array('@module' => $modules[$dependent]->info['name']));
}
}
}
@ -409,12 +384,6 @@ class ModulesListForm implements FormInterface, ControllerInterface {
return $modules;
}
/**
* {@inheritdoc}
*/
public function validateForm(array &$form, array &$form_state) {
}
/**
* {@inheritdoc}
*/
@ -426,7 +395,7 @@ class ModulesListForm implements FormInterface, ControllerInterface {
// dependencies that are not enabled yet, redirect to the confirmation form.
if (!empty($modules['dependencies']) || !empty($modules['missing'])) {
// Write the list of changed module states into a key value store.
$account = $this->request->attributes->get('_account')->id();
$account = $this->getCurrentUser()->id();
$this->keyValueExpirable->setWithExpire($account, $modules, 60);
// Redirect to the confirmation form.

64
core/modules/system/lib/Drupal/system/Form/ModulesUninstallConfirmForm.php
View File

@ -8,12 +8,9 @@
namespace Drupal\system\Form;
use Drupal\Core\Form\ConfirmFormBase;
use Drupal\Core\StringTranslation\TranslationManager;
use Symfony\Component\HttpFoundation\Request;
use Symfony\Component\HttpFoundation\RedirectResponse;
use Symfony\Component\DependencyInjection\ContainerInterface;
use Drupal\Core\Controller\ControllerInterface;
use Drupal\Core\KeyValueStore\KeyValueExpirableFactory;
use Drupal\Core\KeyValueStore\KeyValueStoreExpirableInterface;
use Drupal\Core\Extension\ModuleHandlerInterface;
@ -36,20 +33,6 @@ class ModulesUninstallConfirmForm extends ConfirmFormBase implements ControllerI
*/
protected $keyValueExpirable;
/**
* The translation manager service.
*
* @var \Drupal\Core\StringTranslation\TranslationManager
*/
protected $translationManager;
/**
* The request object.
*
* @var \Symfony\Component\HttpFoundation\Request
*/
protected $request;
/**
* An array of modules to uninstall.
*
@ -57,17 +40,6 @@ class ModulesUninstallConfirmForm extends ConfirmFormBase implements ControllerI
*/
protected $modules = array();
/**
* {@inheritdoc}
*/
public static function create(ContainerInterface $container) {
return new static(
$container->get('module_handler'),
$container->get('keyvalue.expirable')->get('modules_uninstall'),
$container->get('string_translation')
);
}
/**
* Constructs a ModulesUninstallConfirmForm object.
*
@ -75,27 +47,34 @@ class ModulesUninstallConfirmForm extends ConfirmFormBase implements ControllerI
* The module handler.
* @param \Drupal\Core\KeyValueStore\KeyValueStoreExpirableInterface $key_value_expirable
* The key value expirable factory.
* @param \Drupal\Core\StringTranslation\TranslationManager
* The translation manager.
*/
public function __construct(ModuleHandlerInterface $module_handler, KeyValueStoreExpirableInterface $key_value_expirable, TranslationManager $translation_manager) {
public function __construct(ModuleHandlerInterface $module_handler, KeyValueStoreExpirableInterface $key_value_expirable) {
$this->moduleHandler = $module_handler;
$this->keyValueExpirable = $key_value_expirable;
$this->translationManager = $translation_manager;
}
/**
* {@inheritdoc}
*/
public static function create(ContainerInterface $container) {
return new static(
$container->get('module_handler'),
$container->get('keyvalue.expirable')->get('modules_uninstall')
);
}
/**
* {@inheritdoc}
*/
public function getQuestion() {
return $this->translationManager->translate('Confirm uninstall');
return $this->t('Confirm uninstall');
}
/**
* {@inheritdoc}
*/
public function getConfirmText() {
return $this->translationManager->translate('Uninstall');
return $this->t('Uninstall');
}
/**
@ -109,7 +88,7 @@ class ModulesUninstallConfirmForm extends ConfirmFormBase implements ControllerI
* {@inheritdoc}
*/
public function getDescription() {
return $this->translationManager->translate('Would you like to continue with uninstalling the above?');
return $this->t('Would you like to continue with uninstalling the above?');
}
/**
@ -122,12 +101,9 @@ class ModulesUninstallConfirmForm extends ConfirmFormBase implements ControllerI
/**
* {@inheritdoc}
*/
public function buildForm(array $form, array &$form_state, Request $request = NULL) {
// Store the request for use in the submit handler.
$this->request = $request;
public function buildForm(array $form, array &$form_state) {
// Retrieve the list of modules from the key value store.
$account = $request->attributes->get('_account')->id();
$account = $this->getCurrentUser()->id();
$this->modules = $this->keyValueExpirable->get($account);
// Prevent this page from showing when the module list is empty.
@ -136,7 +112,7 @@ class ModulesUninstallConfirmForm extends ConfirmFormBase implements ControllerI
}
$data = system_rebuild_module_data();
$form['text']['#markup'] = '<p>' . $this->translationManager->translate('The following modules will be completely uninstalled from your site, and <em>all data from these modules will be lost</em>!') . '</p>';
$form['text']['#markup'] = '<p>' . $this->t('The following modules will be completely uninstalled from your site, and <em>all data from these modules will be lost</em>!') . '</p>';
$form['modules'] = array(
'#theme' => 'item_list',
'#items' => array_map(function ($module) use ($data) {
@ -144,7 +120,7 @@ class ModulesUninstallConfirmForm extends ConfirmFormBase implements ControllerI
}, $this->modules),
);
return parent::buildForm($form, $form_state, $request);
return parent::buildForm($form, $form_state);
}
/**
@ -152,13 +128,13 @@ class ModulesUninstallConfirmForm extends ConfirmFormBase implements ControllerI
*/
public function submitForm(array &$form, array &$form_state) {
// Clear the key value store entry.
$account = $this->request->attributes->get('_account')->id();
$account = $this->getCurrentUser()->id();
$this->keyValueExpirable->delete($account);
// Uninstall the modules.
$this->moduleHandler->uninstall($this->modules);
drupal_set_message($this->translationManager->translate('The selected modules have been uninstalled.'));
drupal_set_message($this->t('The selected modules have been uninstalled.'));
$form_state['redirect'] = 'admin/modules/uninstall';
}

49
core/modules/system/lib/Drupal/system/Form/ModulesUninstallForm.php
View File

@ -7,19 +7,15 @@
namespace Drupal\system\Form;
use Drupal\Core\Form\FormInterface;
use Drupal\Core\StringTranslation\TranslationManager;
use Symfony\Component\DependencyInjection\ContainerInterface;
use Drupal\Core\Controller\ControllerInterface;
use Drupal\Core\KeyValueStore\KeyValueExpirableFactory;
use Drupal\Core\KeyValueStore\KeyValueStoreExpirableInterface;
use Drupal\Core\Extension\ModuleHandlerInterface;
use Symfony\Component\HttpFoundation\Request;
use Drupal\Core\Form\FormBase;
use Drupal\Core\KeyValueStore\KeyValueStoreExpirableInterface;
use Symfony\Component\DependencyInjection\ContainerInterface;
/**
* Provides a form for uninstalling modules.
*/
class ModulesUninstallForm implements FormInterface, ControllerInterface {
class ModulesUninstallForm extends FormBase {
/**
* The module handler service.
@ -35,28 +31,13 @@ class ModulesUninstallForm implements FormInterface, ControllerInterface {
*/
protected $keyValueExpirable;
/**
* The translation manager service.
*
* @var \Drupal\Core\StringTranslation\TranslationManager
*/
protected $translationManager;
/**
* The request object.
*
* @var \Symfony\Component\HttpFoundation\Request
*/
protected $request;
/**
* {@inheritdoc}
*/
public static function create(ContainerInterface $container) {
return new static(
$container->get('module_handler'),
$container->get('keyvalue.expirable')->get('modules_uninstall'),
$container->get('string_translation')
$container->get('keyvalue.expirable')->get('modules_uninstall')
);
}
@ -67,13 +48,10 @@ class ModulesUninstallForm implements FormInterface, ControllerInterface {
* The module handler.
* @param \Drupal\Core\KeyValueStore\KeyValueStoreExpirableInterface $key_value_expirable
* The key value expirable factory.
* @param \Drupal\Core\StringTranslation\TranslationManager $translation_manager
* The translation manager.
*/
public function __construct(ModuleHandlerInterface $module_handler, KeyValueStoreExpirableInterface $key_value_expirable, TranslationManager $translation_manager) {
public function __construct(ModuleHandlerInterface $module_handler, KeyValueStoreExpirableInterface $key_value_expirable) {
$this->moduleHandler = $module_handler;
$this->keyValueExpirable = $key_value_expirable;
$this->translationManager = $translation_manager;
}
/**
@ -86,10 +64,7 @@ class ModulesUninstallForm implements FormInterface, ControllerInterface {
/**
* {@inheritdoc}
*/
public function buildForm(array $form, array &$form_state, Request $request = NULL) {
// Store the request for use in the submit handler.
$this->request = $request;
public function buildForm(array $form, array &$form_state) {
// Make sure the install API is available.
include_once DRUPAL_ROOT . '/core/includes/install.inc';
@ -118,11 +93,11 @@ class ModulesUninstallForm implements FormInterface, ControllerInterface {
$name = $module->info['name'] ?: $module->name;
$form['modules'][$module->name]['#module_name'] = $name;
$form['modules'][$module->name]['name']['#markup'] = $name;
$form['modules'][$module->name]['description']['#markup'] = $this->translationManager->translate($module->info['description']);
$form['modules'][$module->name]['description']['#markup'] = $this->t($module->info['description']);
$form['uninstall'][$module->name] = array(
'#type' => 'checkbox',
'#title' => $this->translationManager->translate('Uninstall @module module', array('@module' => $name)),
'#title' => $this->t('Uninstall @module module', array('@module' => $name)),
'#title_display' => 'invisible',
);
@ -141,7 +116,7 @@ class ModulesUninstallForm implements FormInterface, ControllerInterface {
$form['actions'] = array('#type' => 'actions');
$form['actions']['submit'] = array(
'#type' => 'submit',
'#value' => $this->translationManager->translate('Uninstall'),
'#value' => $this->t('Uninstall'),
);
return $form;
@ -153,7 +128,7 @@ class ModulesUninstallForm implements FormInterface, ControllerInterface {
public function validateForm(array &$form, array &$form_state) {
// Form submitted, but no modules selected.
if (!array_filter($form_state['values']['uninstall'])) {
drupal_set_message($this->translationManager->translate('No modules selected.'), 'error');
drupal_set_message($this->t('No modules selected.'), 'error');
$form_state['redirect'] = 'admin/modules/uninstall';
}
}
@ -165,7 +140,7 @@ class ModulesUninstallForm implements FormInterface, ControllerInterface {
// Save all the values in an expirable key value store.
$modules = $form_state['values']['uninstall'];
$uninstall = array_keys(array_filter($modules));
$account = $this->request->attributes->get('_account')->id();
$account = $this->getCurrentUser()->id();
$this->keyValueExpirable->setWithExpire($account, $uninstall, 60);
// Redirect to the confirm form.

2
core/modules/system/lib/Drupal/system/Form/ThemeSettingsForm.php
View File

@ -35,7 +35,7 @@ class ThemeSettingsForm extends SystemConfigFormBase {
* The factory for configuration objects.
* @param \Drupal\Core\Config\Context\ContextInterface $context
* The configuration context to use.
* @param Drupal\Core\Extension\ModuleHandlerInterface
* @param \Drupal\Core\Extension\ModuleHandlerInterface
* The module handler instance to use.
*/
public function __construct(ConfigFactory $config_factory, ContextInterface $context, ModuleHandlerInterface $module_handler) {

15
core/modules/system/lib/Drupal/system/SystemConfigFormBase.php
View File

@ -7,16 +7,15 @@
namespace Drupal\system;
use Drupal\Core\Form\FormInterface;
use Drupal\Core\Controller\ControllerInterface;
use Drupal\Core\Config\ConfigFactory;
use Drupal\Core\Config\Context\ContextInterface;
use Drupal\Core\Form\FormBase;
use Symfony\Component\DependencyInjection\ContainerInterface;
/**
* Base class for implementing system configuration forms.
*/
abstract class SystemConfigFormBase implements FormInterface, ControllerInterface {
abstract class SystemConfigFormBase extends FormBase {
/**
* Stores the configuration factory.
@ -55,7 +54,7 @@ abstract class SystemConfigFormBase implements FormInterface, ControllerInterfac
$form['actions']['#type'] = 'actions';
$form['actions']['submit'] = array(
'#type' => 'submit',
'#value' => t('Save configuration'),
'#value' => $this->t('Save configuration'),
'#button_type' => 'primary',
);
@ -65,17 +64,11 @@ abstract class SystemConfigFormBase implements FormInterface, ControllerInterfac
return $form;
}
/**
* Implements \Drupal\Core\Form\FormInterface::validateForm().
*/
public function validateForm(array &$form, array &$form_state) {
}
/**
* Implements \Drupal\Core\Form\FormInterface::submitForm().
*/
public function submitForm(array &$form, array &$form_state) {
drupal_set_message(t('The configuration options have been saved.'));
drupal_set_message($this->t('The configuration options have been saved.'));
}
}

5
core/modules/system/tests/modules/form_test/lib/Drupal/form_test/ConfirmFormTestForm.php
View File

@ -8,7 +8,6 @@
namespace Drupal\form_test;
use Drupal\Core\Form\ConfirmFormBase;
use Symfony\Component\HttpFoundation\Request;
/**
* Provides a test confirmation form.
@ -60,10 +59,10 @@ class ConfirmFormTestForm extends ConfirmFormBase {
/**
* {@inheritdoc}
*/
public function buildForm(array $form, array &$form_state, Request $request = NULL) {
public function buildForm(array $form, array &$form_state) {
$form['element'] = array('#markup' => '<p>The ConfirmFormTestForm::buildForm() method was used for this form.</p>');
return parent::buildForm($form, $form_state, $request);
return parent::buildForm($form, $form_state);
}
/**

12
core/modules/taxonomy/lib/Drupal/taxonomy/Form/TermDeleteForm.php
View File

@ -8,16 +8,14 @@
namespace Drupal\taxonomy\Form;
use Symfony\Component\DependencyInjection\ContainerInterface;
use Drupal\Core\Entity\EntityControllerInterface;
use Drupal\taxonomy\VocabularyStorageControllerInterface;
use Drupal\Core\Entity\EntityNGConfirmFormBase;
use Drupal\Core\Extension\ModuleHandlerInterface;
use Drupal\Core\Cache\Cache;
/**
* Provides a deletion confirmation form for taxonomy term.
*/
class TermDeleteForm extends EntityNGConfirmFormBase implements EntityControllerInterface {
class TermDeleteForm extends EntityNGConfirmFormBase {
/**
* The taxonomy vocabulary storage controller.
@ -29,20 +27,18 @@ class TermDeleteForm extends EntityNGConfirmFormBase implements EntityController
/**
* Constructs a new TermDelete object.
*
* @param \Drupal\Core\Entity\EntityStorageControllerInterface $storage_controller
* @param \Drupal\taxonomy\VocabularyStorageControllerInterface $storage_controller
* The Entity manager.
*/
public function __construct(ModuleHandlerInterface $module_handler, VocabularyStorageControllerInterface $storage_controller) {
parent::__construct($module_handler);
public function __construct(VocabularyStorageControllerInterface $storage_controller) {
$this->vocabularyStorageController = $storage_controller;
}
/**
* {@inheritdoc}
*/
public static function createInstance(ContainerInterface $container, $entity_type, array $entity_info) {
public static function create(ContainerInterface $container) {
return new static(
$container->get('module_handler'),
$container->get('plugin.manager.entity')->getStorageController('taxonomy_vocabulary')
);
}

12
core/modules/taxonomy/lib/Drupal/taxonomy/Form/VocabularyResetForm.php
View File

@ -9,15 +9,12 @@ namespace Drupal\taxonomy\Form;
use Drupal\Core\Database\Connection;
use Drupal\Core\Entity\EntityConfirmFormBase;
use Drupal\Core\Entity\EntityControllerInterface;
use Drupal\Core\Extension\ModuleHandlerInterface;
use Symfony\Component\DependencyInjection\ContainerInterface;
use Symfony\Component\HttpFoundation\Request;
/**
* Provides confirmation form for resetting a vocabulary to alphabetical order.
*/
class VocabularyResetForm extends EntityConfirmFormBase implements EntityControllerInterface {
class VocabularyResetForm extends EntityConfirmFormBase {
/**
* The database connection object.
@ -29,18 +26,15 @@ class VocabularyResetForm extends EntityConfirmFormBase implements EntityControl
/**
* Constructs a new VocabularyResetForm object.
*/
public function __construct(ModuleHandlerInterface $module_handler, Connection $connection) {
parent::__construct($module_handler);
public function __construct(Connection $connection) {
$this->connection = $connection;
}
/**
* {@inheritdoc}
*/
public static function createInstance(ContainerInterface $container, $entity_type, array $entity_info) {
public static function create(ContainerInterface $container) {
return new static(
$container->get('module_handler'),
$container->get('database')
);
}

1
core/modules/taxonomy/lib/Drupal/taxonomy/TermFormController.php
View File

@ -205,4 +205,5 @@ class TermFormController extends EntityFormControllerNG {
}
$form_state['redirect'] = array('taxonomy/term/' . $this->entity->id() . '/delete', array('query' => $destination));
}
}

10
core/modules/views_ui/lib/Drupal/views_ui/Form/BreakLockForm.php
View File

@ -8,16 +8,14 @@
namespace Drupal\views_ui\Form;
use Drupal\Core\Entity\EntityConfirmFormBase;
use Drupal\Core\Entity\EntityControllerInterface;
use Drupal\Core\Entity\EntityManager;
use Drupal\user\TempStoreFactory;
use Symfony\Component\DependencyInjection\ContainerInterface;
use Symfony\Component\HttpFoundation\Request;
/**
* Builds the form to break the lock of an edited view.
*/
class BreakLockForm extends EntityConfirmFormBase implements EntityControllerInterface {
class BreakLockForm extends EntityConfirmFormBase {
/**
* Stores the Entity manager.
@ -49,7 +47,7 @@ class BreakLockForm extends EntityConfirmFormBase implements EntityControllerInt
/**
* {@inheritdoc}
*/
public static function createInstance(ContainerInterface $container, $entity_type, array $entity_info) {
public static function create(ContainerInterface $container) {
return new static(
$container->get('plugin.manager.entity'),
$container->get('user.tempstore')
@ -100,12 +98,12 @@ class BreakLockForm extends EntityConfirmFormBase implements EntityControllerInt
/**
* {@inheritdoc}
*/
public function buildForm(array $form, array &$form_state, Request $request = NULL) {
public function buildForm(array $form, array &$form_state) {
if (!$this->tempStore->getMetadata($this->entity->id())) {
$form['message']['#markup'] = t('There is no lock on view %name to break.', array('%name' => $this->entity->id()));
return $form;
}
return parent::buildForm($form, $form_state, $request);
return parent::buildForm($form, $form_state);
}
/**

13
core/modules/views_ui/lib/Drupal/views_ui/ViewAddFormController.php
View File

@ -7,8 +7,6 @@
namespace Drupal\views_ui;
use Drupal\Core\Entity\EntityControllerInterface;
use Drupal\Core\Extension\ModuleHandlerInterface;
use Drupal\views\Plugin\views\wizard\WizardPluginBase;
use Drupal\views\Plugin\views\wizard\WizardException;
use Drupal\views\Plugin\ViewsPluginManager;
@ -17,7 +15,7 @@ use Symfony\Component\DependencyInjection\ContainerInterface;
/**
* Form controller for the Views edit form.
*/
class ViewAddFormController extends ViewFormControllerBase implements EntityControllerInterface {
class ViewAddFormController extends ViewFormControllerBase {
/**
* The wizard plugin manager.
@ -29,23 +27,18 @@ class ViewAddFormController extends ViewFormControllerBase implements EntityCont
/**
* Constructs a new ViewEditFormController object.
*
* @param \Drupal\Core\Extension\ModuleHandlerInterface
* The module handler service.
* @param \Drupal\views\Plugin\ViewsPluginManager $wizard_manager
* The wizard plugin manager.
*/
public function __construct(ModuleHandlerInterface $module_handler, ViewsPluginManager $wizard_manager) {
parent::__construct($module_handler);
public function __construct(ViewsPluginManager $wizard_manager) {
$this->wizardManager = $wizard_manager;
}
/**
* {@inheritdoc}
*/
public static function createInstance(ContainerInterface $container, $entity_type, array $entity_info) {
public static function create(ContainerInterface $container) {
return new static(
$container->get('module_handler'),
$container->get('plugin.manager.views.wizard')
);
}

14
core/modules/views_ui/lib/Drupal/views_ui/ViewEditFormController.php
View File

@ -10,10 +10,7 @@ namespace Drupal\views_ui;
use Drupal\Core\Ajax\AjaxResponse;
use Drupal\Core\Ajax\HtmlCommand;
use Drupal\Core\Ajax\ReplaceCommand;
use Drupal\Core\Extension\ModuleHandlerInterface;
use Drupal\Component\Utility\NestedArray;
use Drupal\views\ViewExecutable;
use Drupal\Core\Entity\EntityControllerInterface;
use Drupal\user\TempStoreFactory;
use Symfony\Component\HttpFoundation\Request;
use Symfony\Component\DependencyInjection\ContainerInterface;
@ -21,7 +18,7 @@ use Symfony\Component\DependencyInjection\ContainerInterface;
/**
* Form controller for the Views edit form.
*/
class ViewEditFormController extends ViewFormControllerBase implements EntityControllerInterface {
class ViewEditFormController extends ViewFormControllerBase {
/**
* The views temp store.
@ -40,16 +37,12 @@ class ViewEditFormController extends ViewFormControllerBase implements EntityCon
/**
* Constructs a new ViewEditFormController object.
*
* @param \Drupal\Core\Extension\ModuleHandlerInterface
* The module handler service.
* @param \Drupal\user\TempStoreFactory $temp_store_factory
* The factory for the temp store object.
* @param \Symfony\Component\HttpFoundation\Request $request
* The request object.
*/
public function __construct(ModuleHandlerInterface $module_handler, TempStoreFactory $temp_store_factory, Request $request) {
parent::__construct($module_handler);
public function __construct(TempStoreFactory $temp_store_factory, Request $request) {
$this->tempStore = $temp_store_factory->get('views');
$this->request = $request;
}
@ -57,9 +50,8 @@ class ViewEditFormController extends ViewFormControllerBase implements EntityCon
/**
* {@inheritdoc}
*/
public static function createInstance(ContainerInterface $container, $entity_type, array $entity_info, $operation = NULL) {
public static function create(ContainerInterface $container) {
return new static(
$container->get('module_handler'),
$container->get('user.tempstore'),
$container->get('request')
);

13
core/modules/views_ui/lib/Drupal/views_ui/ViewPreviewFormController.php
View File

@ -7,15 +7,13 @@
namespace Drupal\views_ui;
use Drupal\Core\Entity\EntityControllerInterface;
use Drupal\Core\Extension\ModuleHandlerInterface;
use Drupal\user\TempStoreFactory;
use Symfony\Component\DependencyInjection\ContainerInterface;
/**
* Form controller for the Views preview form.
*/
class ViewPreviewFormController extends ViewFormControllerBase implements EntityControllerInterface {
class ViewPreviewFormController extends ViewFormControllerBase {
/**
* The views temp store.
@ -27,23 +25,18 @@ class ViewPreviewFormController extends ViewFormControllerBase implements Entity
/**
* Constructs a new ViewPreviewFormController object.
*
* @param \Drupal\Core\Extension\ModuleHandlerInterface
* The module handler service.
* @param \Drupal\user\TempStoreFactory $temp_store_factory
* The factory for the temp store object.
*/
public function __construct(ModuleHandlerInterface $module_handler, TempStoreFactory $temp_store_factory) {
parent::__construct($module_handler);
public function __construct(TempStoreFactory $temp_store_factory) {
$this->tempStore = $temp_store_factory->get('views');
}
/**
* {@inheritdoc}
*/
public static function createInstance(ContainerInterface $container, $entity_type, array $entity_info) {
public static function create(ContainerInterface $container) {
return new static(
$container->get('module_handler'),
$container->get('user.tempstore')
);
}