' . 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())) . '
'; @@ -82,7 +83,7 @@ public function buildForm(array $form, array &$form_state) { /** * {@inheritdoc} */ - public function submit(array $form, array &$form_state) { + public function submit(array $form, FormStateInterface $form_state) { $this->entity->delete(); drupal_set_message(t('Custom block type %label has been deleted.', array('%label' => $this->entity->label()))); watchdog('block_content', 'Custom block type %label has been deleted.', array('%label' => $this->entity->label()), WATCHDOG_NOTICE); diff --git a/core/modules/block_content/src/Plugin/Block/BlockContentBlock.php b/core/modules/block_content/src/Plugin/Block/BlockContentBlock.php index 49a53dc91a8d8e091a4ce0b305803fcaa91d53c7..8a5a4091001fc4883fbd16c5c2abd04eeddef121 100644 --- a/core/modules/block_content/src/Plugin/Block/BlockContentBlock.php +++ b/core/modules/block_content/src/Plugin/Block/BlockContentBlock.php @@ -11,6 +11,7 @@ use Drupal\block\BlockManagerInterface; use Drupal\Core\Entity\EntityManager; use Drupal\Core\Entity\EntityManagerInterface; +use Drupal\Core\Form\FormStateInterface; use Drupal\Core\Plugin\ContainerFactoryPluginInterface; use Drupal\Core\Extension\ModuleHandlerInterface; use Drupal\Core\Session\AccountInterface; @@ -120,7 +121,7 @@ public function defaultConfiguration() { * * Adds body and description fields to the block configuration form. */ - public function blockForm($form, &$form_state) { + public function blockForm($form, FormStateInterface $form_state) { $form['block_content']['view_mode'] = array( '#type' => 'select', '#options' => $this->entityManager->getViewModeOptions('block_content'), @@ -133,9 +134,9 @@ public function blockForm($form, &$form_state) { } /** - * Overrides \Drupal\block\BlockBase::blockSubmit(). + * {@inheritdoc} */ - public function blockSubmit($form, &$form_state) { + public function blockSubmit($form, FormStateInterface $form_state) { // Invalidate the block cache to update custom block-based derivatives. if ($this->moduleHandler->moduleExists('block')) { $this->configuration['view_mode'] = $form_state['values']['block_content']['view_mode']; diff --git a/core/modules/book/book.module b/core/modules/book/book.module index 1177ebeabb10d0179a1a2e2294d791a7157158fb..c791b68c49e4f8b6b20422af422165d445b0a92f 100644 --- a/core/modules/book/book.module +++ b/core/modules/book/book.module @@ -9,6 +9,7 @@ use Drupal\book\BookManagerInterface; use Drupal\Component\Utility\String; use Drupal\Core\Entity\EntityInterface; +use Drupal\Core\Form\FormStateInterface; use Drupal\Core\Render\Element; use Drupal\Core\Routing\RouteMatchInterface; use Drupal\node\NodeInterface; @@ -159,7 +160,7 @@ function book_node_links_alter(array &$node_links, NodeInterface $node, array &$ * * @see book_pick_book_nojs_submit() */ -function book_form_node_form_alter(&$form, &$form_state, $form_id) { +function book_form_node_form_alter(&$form, FormStateInterface $form_state, $form_id) { $node = $form_state['controller']->getEntity(); $account = \Drupal::currentUser(); $access = $account->hasPermission('administer book outlines'); @@ -194,7 +195,7 @@ function book_form_node_form_alter(&$form, &$form_state, $form_id) { * * @todo: Remove this in favor of an entity field. */ -function book_node_builder($entity_type, NodeInterface $entity, &$form, &$form_state) { +function book_node_builder($entity_type, NodeInterface $entity, &$form, FormStateInterface $form_state) { $entity->book = $form_state['values']['book']; // Always save a revision for non-administrators. @@ -215,7 +216,7 @@ function book_node_builder($entity_type, NodeInterface $entity, &$form, &$form_s * @see book_form_update() * @see book_form_node_form_alter() */ -function book_pick_book_nojs_submit($form, &$form_state) { +function book_pick_book_nojs_submit($form, FormStateInterface $form_state) { $node = $form_state['controller']->getEntity(); $node->book = $form_state['values']['book']; $form_state['rebuild'] = TRUE; @@ -310,7 +311,7 @@ function book_node_predelete(EntityInterface $node) { /** * Implements hook_node_prepare_form(). */ -function book_node_prepare_form(NodeInterface $node, $operation, array &$form_state) { +function book_node_prepare_form(NodeInterface $node, $operation, FormStateInterface $form_state) { /** @var \Drupal\book\BookManagerInterface $book_manager */ $book_manager = \Drupal::service('book.manager'); diff --git a/core/modules/book/src/BookManager.php b/core/modules/book/src/BookManager.php index c491cf475ec06921dc385b0e650552b9e32f2d05..45f9adf2c9cb1d2c6a208a5a9f072854471c1253 100644 --- a/core/modules/book/src/BookManager.php +++ b/core/modules/book/src/BookManager.php @@ -11,6 +11,7 @@ use Drupal\Core\Cache\Cache; use Drupal\Core\Database\Connection; use Drupal\Core\Entity\EntityManagerInterface; +use Drupal\Core\Form\FormStateInterface; use Drupal\Core\Session\AccountInterface; use Drupal\Core\StringTranslation\TranslationInterface; use Drupal\Core\StringTranslation\StringTranslationTrait; @@ -168,7 +169,7 @@ protected function findChildrenRelativeDepth(array $book_link) { /** * {@inheritdoc} */ - public function addFormElements(array $form, array &$form_state, NodeInterface $node, AccountInterface $account, $collapsed = TRUE) { + public function addFormElements(array $form, FormStateInterface $form_state, NodeInterface $node, AccountInterface $account, $collapsed = TRUE) { // If the form is being processed during the Ajax callback of our book bid // dropdown, then $form_state will hold the value that was selected. if (isset($form_state['values']['book'])) { diff --git a/core/modules/book/src/BookManagerInterface.php b/core/modules/book/src/BookManagerInterface.php index 81dfe080d0efdb006c140ffd8c77b536d1737103..72ca61ea82a44e61addfa92b11d38ed7fb0dc41b 100644 --- a/core/modules/book/src/BookManagerInterface.php +++ b/core/modules/book/src/BookManagerInterface.php @@ -7,6 +7,7 @@ namespace Drupal\book; +use Drupal\Core\Form\FormStateInterface; use Drupal\Core\Session\AccountInterface; use Drupal\node\NodeInterface; @@ -203,8 +204,8 @@ public function getBookParents(array $item, array $parent = array()); * * @param array $form * An associative array containing the structure of the form. - * @param array $form_state - * An associative array containing the current state of the form. + * @param \Drupal\Core\Form\FormStateInterface $form_state + * The current state of the form. * @param \Drupal\node\NodeInterface $node * The node whose form is being viewed. * @param \Drupal\Core\Session\AccountInterface $account @@ -215,7 +216,7 @@ public function getBookParents(array $item, array $parent = array()); * @return array * The form structure, with the book elements added. */ - public function addFormElements(array $form, array &$form_state, NodeInterface $node, AccountInterface $account, $collapsed = TRUE); + public function addFormElements(array $form, FormStateInterface $form_state, NodeInterface $node, AccountInterface $account, $collapsed = TRUE); /** * Deletes node's entry from book table. diff --git a/core/modules/book/src/Form/BookAdminEditForm.php b/core/modules/book/src/Form/BookAdminEditForm.php index f52c2e4c1633cc16bc9fffdd2a23675710cacf2a..9a342f086fa694b13fb886cfa1c79f67975f75f4 100644 --- a/core/modules/book/src/Form/BookAdminEditForm.php +++ b/core/modules/book/src/Form/BookAdminEditForm.php @@ -11,6 +11,7 @@ use Drupal\Component\Utility\Crypt; use Drupal\Core\Entity\EntityStorageInterface; use Drupal\Core\Form\FormBase; +use Drupal\Core\Form\FormStateInterface; use Drupal\Core\Render\Element; use Drupal\node\NodeInterface; use Symfony\Component\DependencyInjection\ContainerInterface; @@ -68,7 +69,7 @@ public function getFormId() { /** * {@inheritdoc} */ - public function buildForm(array $form, array &$form_state, NodeInterface $node = NULL) { + public function buildForm(array $form, FormStateInterface $form_state, NodeInterface $node = NULL) { $form['#title'] = $node->label(); $form['#node'] = $node; $this->bookAdminTable($node, $form); @@ -83,7 +84,7 @@ public function buildForm(array $form, array &$form_state, NodeInterface $node = /** * {@inheritdoc} */ - public function validateForm(array &$form, array &$form_state) { + public function validateForm(array &$form, FormStateInterface $form_state) { if ($form_state['values']['tree_hash'] != $form_state['values']['tree_current_hash']) { $this->setFormError('', $form_state, $this->t('This book has been modified by another user, the changes could not be saved.')); } @@ -92,7 +93,7 @@ public function validateForm(array &$form, array &$form_state) { /** * {@inheritdoc} */ - public function submitForm(array &$form, array &$form_state) { + public function submitForm(array &$form, FormStateInterface $form_state) { // Save elements in the same order as defined in post rather than the form. // This ensures parents are updated before their children, preventing orphans. $order = array_flip(array_keys($form_state['input']['table'])); diff --git a/core/modules/book/src/Form/BookOutlineForm.php b/core/modules/book/src/Form/BookOutlineForm.php index f4a97a185380aacfff1466755908c18aaf6a2157..82a07aadc3e2a5d9d7f5b6ec8a185bcaeae86be7 100644 --- a/core/modules/book/src/Form/BookOutlineForm.php +++ b/core/modules/book/src/Form/BookOutlineForm.php @@ -10,6 +10,7 @@ use Drupal\book\BookManagerInterface; use Drupal\Core\Entity\ContentEntityForm; use Drupal\Core\Entity\EntityManagerInterface; +use Drupal\Core\Form\FormStateInterface; use Symfony\Component\DependencyInjection\ContainerInterface; /** @@ -64,7 +65,7 @@ public function getBaseFormID() { /** * {@inheritdoc} */ - public function form(array $form, array &$form_state) { + public function form(array $form, FormStateInterface $form_state) { $form['#title'] = $this->entity->label(); if (!isset($this->entity->book)) { @@ -87,7 +88,7 @@ public function form(array $form, array &$form_state) { /** * {@inheritdoc} */ - protected function actions(array $form, array &$form_state) { + protected function actions(array $form, FormStateInterface $form_state) { $actions = parent::actions($form, $form_state); $actions['submit']['#value'] = $this->entity->book['original_bid'] ? $this->t('Update book outline') : $this->t('Add to book outline'); $actions['delete']['#value'] = $this->t('Remove from book outline'); @@ -100,7 +101,7 @@ protected function actions(array $form, array &$form_state) { * * @see book_remove_button_submit() */ - public function submit(array $form, array &$form_state) { + public function submit(array $form, FormStateInterface $form_state) { $form_state['redirect_route'] = array( 'route_name' => 'node.view', 'route_parameters' => array( @@ -132,7 +133,7 @@ public function submit(array $form, array &$form_state) { /** * {@inheritdoc} */ - public function delete(array $form, array &$form_state) { + public function delete(array $form, FormStateInterface $form_state) { $form_state['redirect_route'] = $this->entity->urlInfo('book-remove-form'); } diff --git a/core/modules/book/src/Form/BookRemoveForm.php b/core/modules/book/src/Form/BookRemoveForm.php index b24bc511ab5c99d42ee25c92f01a18119e9ee76f..8ea734292f30c753b765464b44bc04623e98ebed 100644 --- a/core/modules/book/src/Form/BookRemoveForm.php +++ b/core/modules/book/src/Form/BookRemoveForm.php @@ -9,6 +9,7 @@ use Drupal\book\BookManagerInterface; use Drupal\Core\Form\ConfirmFormBase; +use Drupal\Core\Form\FormStateInterface; use Drupal\Core\Url; use Drupal\node\NodeInterface; use Symfony\Component\DependencyInjection\ContainerInterface; @@ -61,7 +62,7 @@ public function getFormId() { /** * {@inheritdoc} */ - public function buildForm(array $form, array &$form_state, NodeInterface $node = NULL) { + public function buildForm(array $form, FormStateInterface $form_state, NodeInterface $node = NULL) { $this->node = $node; return parent::buildForm($form, $form_state); } @@ -103,7 +104,7 @@ public function getCancelUrl() { /** * {@inheritdoc} */ - public function submitForm(array &$form, array &$form_state) { + public function submitForm(array &$form, FormStateInterface $form_state) { if ($this->bookManager->checkNodeIsRemovable($this->node)) { $this->bookManager->deleteFromBook($this->node->id()); drupal_set_message($this->t('The post has been removed from the book.')); diff --git a/core/modules/book/src/Form/BookSettingsForm.php b/core/modules/book/src/Form/BookSettingsForm.php index 140f8e55be08f0d1c1e7e5619a764ac690ba4d5f..4a7535e5391020de9646b104c94eeb1ca1a8f1de 100644 --- a/core/modules/book/src/Form/BookSettingsForm.php +++ b/core/modules/book/src/Form/BookSettingsForm.php @@ -8,6 +8,7 @@ namespace Drupal\book\Form; use Drupal\Core\Form\ConfigFormBase; +use Drupal\Core\Form\FormStateInterface; /** * Configure book settings for this site. @@ -24,7 +25,7 @@ public function getFormId() { /** * {@inheritdoc} */ - public function buildForm(array $form, array &$form_state) { + public function buildForm(array $form, FormStateInterface $form_state) { $types = node_type_get_names(); $config = $this->config('book.settings'); $form['book_allowed_types'] = array( @@ -50,7 +51,7 @@ public function buildForm(array $form, array &$form_state) { /** * {@inheritdoc} */ - public function validateForm(array &$form, array &$form_state) { + public function validateForm(array &$form, FormStateInterface $form_state) { $child_type = $form_state['values']['book_child_type']; if (empty($form_state['values']['book_allowed_types'][$child_type])) { $this->setFormError('book_child_type', $form_state, $this->t('The content type for the %add-child link must be one of those selected as an allowed book outline type.', array('%add-child' => $this->t('Add child page')))); @@ -62,7 +63,7 @@ public function validateForm(array &$form, array &$form_state) { /** * {@inheritdoc} */ - public function submitForm(array &$form, array &$form_state) { + public function submitForm(array &$form, FormStateInterface $form_state) { $allowed_types = array_filter($form_state['values']['book_allowed_types']); // We need to save the allowed types in an array ordered by machine_name so // that we can save them in the correct order if node type changes. diff --git a/core/modules/book/src/Plugin/Block/BookNavigationBlock.php b/core/modules/book/src/Plugin/Block/BookNavigationBlock.php index 5e85d9973c3b25cbf71d36caa265b940a28a5570..51d0a0d71d7f026734faaa388fe98182ec96c645 100644 --- a/core/modules/book/src/Plugin/Block/BookNavigationBlock.php +++ b/core/modules/book/src/Plugin/Block/BookNavigationBlock.php @@ -9,6 +9,7 @@ use Drupal\block\BlockBase; use Drupal\book\BookManagerInterface; +use Drupal\Core\Form\FormStateInterface; use Drupal\Core\Plugin\ContainerFactoryPluginInterface; use Symfony\Component\DependencyInjection\ContainerInterface; use Symfony\Component\HttpFoundation\RequestStack; @@ -82,9 +83,9 @@ public function defaultConfiguration() { } /** - * Overrides \Drupal\block\BlockBase::blockForm() + * {@inheritdoc} */ - function blockForm($form, &$form_state) { + function blockForm($form, FormStateInterface $form_state) { $options = array( 'all pages' => t('Show block on all pages'), 'book pages' => t('Show block only on book pages'), @@ -101,9 +102,9 @@ function blockForm($form, &$form_state) { } /** - * Overrides \Drupal\block\BlockBase::blockSubmit(). + * {@inheritdoc} */ - public function blockSubmit($form, &$form_state) { + public function blockSubmit($form, FormStateInterface $form_state) { $this->configuration['block_mode'] = $form_state['values']['book_block_mode']; } diff --git a/core/modules/ckeditor/src/CKEditorPluginConfigurableInterface.php b/core/modules/ckeditor/src/CKEditorPluginConfigurableInterface.php index 619eb5163623264a36ced615fefe62cbdc50030c..a5084fdf5c99491f4b4e6051b6ff7a7be8dfef7f 100644 --- a/core/modules/ckeditor/src/CKEditorPluginConfigurableInterface.php +++ b/core/modules/ckeditor/src/CKEditorPluginConfigurableInterface.php @@ -7,6 +7,7 @@ namespace Drupal\ckeditor; +use Drupal\Core\Form\FormStateInterface; use Drupal\editor\Entity\Editor; /** @@ -36,7 +37,7 @@ interface CKEditorPluginConfigurableInterface extends CKEditorPluginInterface { * * @param array $form * An empty form array to be populated with a configuration form, if any. - * @param array $form_state + * @param \Drupal\Core\Form\FormStateInterface $form_state * The state of the entire filter administration form. * @param \Drupal\editor\Entity\Editor $editor * A configured text editor object. @@ -44,6 +45,6 @@ interface CKEditorPluginConfigurableInterface extends CKEditorPluginInterface { * @return array|FALSE * A render array for the settings form, or FALSE if there is none. */ - public function settingsForm(array $form, array &$form_state, Editor $editor); + public function settingsForm(array $form, FormStateInterface $form_state, Editor $editor); } diff --git a/core/modules/ckeditor/src/CKEditorPluginManager.php b/core/modules/ckeditor/src/CKEditorPluginManager.php index dab891d704cea8626973081a6dc83e1a04d3053e..289c906be2f83a534685b907cc94fd545649318a 100644 --- a/core/modules/ckeditor/src/CKEditorPluginManager.php +++ b/core/modules/ckeditor/src/CKEditorPluginManager.php @@ -8,6 +8,7 @@ namespace Drupal\ckeditor; use Drupal\Component\Utility\NestedArray; +use Drupal\Core\Form\FormStateInterface; use Drupal\Core\Plugin\DefaultPluginManager; use Drupal\Core\Cache\CacheBackendInterface; use Drupal\Core\Extension\ModuleHandlerInterface; @@ -147,12 +148,12 @@ public function getButtons() { * * @param array &$form * A reference to an associative array containing the structure of the form. - * @param array &$form_state - * A reference to a keyed array containing the current state of the form. + * @param \Drupal\Core\Form\FormStateInterface $form_state + * The current state of the form. * @param \Drupal\editor\Entity\Editor $editor * A configured text editor object. */ - public function injectPluginSettingsForm(array &$form, array &$form_state, Editor $editor) { + public function injectPluginSettingsForm(array &$form, FormStateInterface $form_state, Editor $editor) { $definitions = $this->getDefinitions(); foreach (array_keys($definitions) as $plugin_id) { diff --git a/core/modules/ckeditor/src/Plugin/CKEditorPlugin/DrupalImage.php b/core/modules/ckeditor/src/Plugin/CKEditorPlugin/DrupalImage.php index d9f411c5a0c176cc804a673ca6e2e474fb2b53a2..4a1329cca9c3920032567a5f125c44556d27c019 100644 --- a/core/modules/ckeditor/src/Plugin/CKEditorPlugin/DrupalImage.php +++ b/core/modules/ckeditor/src/Plugin/CKEditorPlugin/DrupalImage.php @@ -9,6 +9,7 @@ use Drupal\ckeditor\CKEditorPluginBase; use Drupal\ckeditor\CKEditorPluginConfigurableInterface; +use Drupal\Core\Form\FormStateInterface; use Drupal\editor\Entity\Editor; /** @@ -66,7 +67,7 @@ public function getButtons() { * @see \Drupal\editor\Form\EditorImageDialog * @see editor_image_upload_settings_form() */ - public function settingsForm(array $form, array &$form_state, Editor $editor) { + public function settingsForm(array $form, FormStateInterface $form_state, Editor $editor) { form_load_include($form_state, 'inc', 'editor', 'editor.admin'); $form['image_upload'] = editor_image_upload_settings_form($editor); $form['image_upload']['#attached']['library'][] = 'ckeditor/drupal.ckeditor.drupalimage.admin'; @@ -83,7 +84,7 @@ public function settingsForm(array $form, array &$form_state, Editor $editor) { * @see \Drupal\editor\Form\EditorImageDialog * @see editor_image_upload_settings_form() */ - function validateImageUploadSettings(array $element, array &$form_state) { + function validateImageUploadSettings(array $element, FormStateInterface $form_state) { $settings = &$form_state['values']['editor']['settings']['plugins']['drupalimage']['image_upload']; $form_state['editor']->setImageUploadSettings($settings); unset($form_state['values']['editor']['settings']['plugins']['drupalimage']); diff --git a/core/modules/ckeditor/src/Plugin/CKEditorPlugin/StylesCombo.php b/core/modules/ckeditor/src/Plugin/CKEditorPlugin/StylesCombo.php index 2184cf2a116e287ae12e3014eb807bd68a9d74aa..963436df361724cd39e5db9c66f41de9807452a5 100644 --- a/core/modules/ckeditor/src/Plugin/CKEditorPlugin/StylesCombo.php +++ b/core/modules/ckeditor/src/Plugin/CKEditorPlugin/StylesCombo.php @@ -10,6 +10,7 @@ use Drupal\ckeditor\CKEditorPluginBase; use Drupal\ckeditor\CKEditorPluginConfigurableInterface; use Drupal\Component\Utility\NestedArray; +use Drupal\Core\Form\FormStateInterface; use Drupal\editor\Entity\Editor; /** @@ -66,7 +67,7 @@ public function getButtons() { /** * Implements \Drupal\ckeditor\Plugin\CKEditorPluginConfigurableInterface::settingsForm(). */ - public function settingsForm(array $form, array &$form_state, Editor $editor) { + public function settingsForm(array $form, FormStateInterface $form_state, Editor $editor) { // Defaults. $config = array('styles' => ''); $settings = $editor->getSettings(); @@ -94,7 +95,7 @@ public function settingsForm(array $form, array &$form_state, Editor $editor) { /** * #element_validate handler for the "styles" element in settingsForm(). */ - public function validateStylesValue(array $element, array &$form_state) { + public function validateStylesValue(array $element, FormStateInterface $form_state) { if ($this->generateStylesSetSetting($element['#value']) === FALSE) { form_error($element, $form_state, t('The provided list of styles is syntactically incorrect.')); } diff --git a/core/modules/ckeditor/src/Plugin/Editor/CKEditor.php b/core/modules/ckeditor/src/Plugin/Editor/CKEditor.php index d538b60a6b049af344b52723dfa48d8c0ef5bd8e..b377f73b9bc8271f49fa0343813969d6c0e04efc 100644 --- a/core/modules/ckeditor/src/Plugin/Editor/CKEditor.php +++ b/core/modules/ckeditor/src/Plugin/Editor/CKEditor.php @@ -10,6 +10,7 @@ use Drupal\Core\Cache\CacheBackendInterface; use Drupal\Core\Extension\ModuleHandlerInterface; use Drupal\ckeditor\CKEditorPluginManager; +use Drupal\Core\Form\FormStateInterface; use Drupal\Core\Language\LanguageManager; use Drupal\Core\Render\Element; use Drupal\editor\Plugin\EditorBase; @@ -127,7 +128,7 @@ public function getDefaultSettings() { /** * {@inheritdoc} */ - public function settingsForm(array $form, array &$form_state, EditorEntity $editor) { + public function settingsForm(array $form, FormStateInterface $form_state, EditorEntity $editor) { $settings = $editor->getSettings(); $ckeditor_settings_toolbar = array( @@ -234,7 +235,7 @@ public function settingsForm(array $form, array &$form_state, EditorEntity $edit /** * {@inheritdoc} */ - public function settingsFormSubmit(array $form, array &$form_state) { + public function settingsFormSubmit(array $form, FormStateInterface $form_state) { // Modify the toolbar settings by reference. The values in // $form_state['values']['editor']['settings'] will be saved directly by // editor_form_filter_admin_format_submit(). diff --git a/core/modules/ckeditor/tests/modules/src/Plugin/CKEditorPlugin/LlamaContextualAndButton.php b/core/modules/ckeditor/tests/modules/src/Plugin/CKEditorPlugin/LlamaContextualAndButton.php index 171e3b3d384c5dbcee5713f7ba156ef85bb18a2e..4c43cb754c966d8be80737bf552ade44366530a9 100644 --- a/core/modules/ckeditor/tests/modules/src/Plugin/CKEditorPlugin/LlamaContextualAndButton.php +++ b/core/modules/ckeditor/tests/modules/src/Plugin/CKEditorPlugin/LlamaContextualAndButton.php @@ -11,6 +11,7 @@ use Drupal\ckeditor\CKEditorPluginContextualInterface; use Drupal\ckeditor\CKEditorPluginConfigurableInterface; use Drupal\Component\Plugin\PluginBase; +use Drupal\Core\Form\FormStateInterface; use Drupal\editor\Entity\Editor; /** @@ -61,7 +62,7 @@ function getFile() { /** * Implements \Drupal\ckeditor\Plugin\CKEditorPluginConfigurableInterface::settingsForm(). */ - function settingsForm(array $form, array &$form_state, Editor $editor) { + function settingsForm(array $form, FormStateInterface $form_state, Editor $editor) { // Defaults. $config = array('ultra_llama_mode' => FALSE); $settings = $editor->getSettings(); diff --git a/core/modules/color/color.module b/core/modules/color/color.module index f0137cfc3f3ea5217ed76dd6f5a1fbb1287dffec..1f03e18faa9c0dc1e1473310f4a796414b80268f 100644 --- a/core/modules/color/color.module +++ b/core/modules/color/color.module @@ -9,6 +9,7 @@ use Drupal\Component\Utility\Environment; use Drupal\Component\Utility\SafeMarkup; use Drupal\Component\Utility\String; +use Drupal\Core\Form\FormStateInterface; use Drupal\Core\Routing\RouteMatchInterface; /** @@ -44,7 +45,7 @@ function color_theme() { /** * Implements hook_form_FORM_ID_alter(). */ -function color_form_system_theme_settings_alter(&$form, &$form_state) { +function color_form_system_theme_settings_alter(&$form, FormStateInterface $form_state) { if (isset($form_state['build_info']['args'][0]) && ($theme = $form_state['build_info']['args'][0]) && color_get_info($theme) && function_exists('gd_info')) { $form['color'] = array( '#type' => 'details', @@ -166,7 +167,7 @@ function color_get_palette($theme, $default = FALSE) { * @see color_scheme_form_validate() * @see color_scheme_form_submit() */ -function color_scheme_form($complete_form, &$form_state, $theme) { +function color_scheme_form($complete_form, FormStateInterface $form_state, $theme) { $base = drupal_get_path('module', 'color'); $info = color_get_info($theme); @@ -286,14 +287,14 @@ function template_preprocess_color_scheme_form(&$variables) { * @param string|bool $input * The incoming input to populate the form element. If this is FALSE, * the element's default value should be returned. - * @param array $form_state - * A keyed array containing the current state of the form. + * @param \Drupal\Core\Form\FormStateInterface $form_state + * The current state of the form. * * @return string * The data that will appear in the $form_state['values'] collection for this * element. Return nothing to use the default. */ -function color_palette_color_value($element, $input = FALSE, $form_state = array()) { +function color_palette_color_value($element, $input = FALSE, FormStateInterface $form_state) { // If we suspect a possible cross-site request forgery attack, only accept // hexadecimal CSS color strings from user input, to avoid problems when this // value is used in the JavaScript preview. @@ -329,7 +330,7 @@ function color_valid_hexadecimal_string($color) { * * @see color_scheme_form_submit() */ -function color_scheme_form_validate($form, &$form_state) { +function color_scheme_form_validate($form, FormStateInterface $form_state) { // Only accept hexadecimal CSS color strings to avoid XSS upon use. foreach ($form_state['values']['palette'] as $key => $color) { if (!color_valid_hexadecimal_string($color)) { @@ -343,7 +344,7 @@ function color_scheme_form_validate($form, &$form_state) { * * @see color_scheme_form_validate() */ -function color_scheme_form_submit($form, &$form_state) { +function color_scheme_form_submit($form, FormStateInterface $form_state) { // Get theme coloring info. if (!isset($form_state['values']['info'])) { diff --git a/core/modules/comment/comment.module b/core/modules/comment/comment.module index ab0df062c3405a01bd83d1dcb5d60159d238edcf..d5391f366b3b8739d97d67c7e5328175adcbf829 100644 --- a/core/modules/comment/comment.module +++ b/core/modules/comment/comment.module @@ -18,6 +18,7 @@ use Drupal\Component\Utility\String; use Drupal\Core\Entity\ContentEntityInterface; use Drupal\Core\Entity\EntityInterface; +use Drupal\Core\Form\FormStateInterface; use Drupal\Core\Routing\RouteMatchInterface; use Drupal\entity\Entity\EntityViewDisplay; use Drupal\Core\Entity\Display\EntityViewDisplayInterface; @@ -749,11 +750,13 @@ function comment_user_predelete($account) { * * @param \Drupal\comment\CommentInterface $comment * The comment entity to preview. + * @param Drupal\Core\Form\FormStateInterface $form_state + * The current state of the form. * * @return array * An array as expected by drupal_render(). */ -function comment_preview(CommentInterface $comment, array &$form_state) { +function comment_preview(CommentInterface $comment, FormStateInterface $form_state) { $preview_build = array(); $entity = $comment->getCommentedEntity(); diff --git a/core/modules/comment/src/CommentForm.php b/core/modules/comment/src/CommentForm.php index db4178d94f6d50badc095589b8923221f1649925..9701e49f779ac30633738084ef3261957f723079 100644 --- a/core/modules/comment/src/CommentForm.php +++ b/core/modules/comment/src/CommentForm.php @@ -13,6 +13,7 @@ use Drupal\Core\Datetime\DrupalDateTime; use Drupal\Core\Entity\ContentEntityForm; use Drupal\Core\Entity\EntityManagerInterface; +use Drupal\Core\Form\FormStateInterface; use Drupal\Core\Language\Language; use Drupal\Core\Language\LanguageInterface; use Drupal\Core\Session\AccountInterface; @@ -56,7 +57,7 @@ public function __construct(EntityManagerInterface $entity_manager, AccountInter /** * {@inheritdoc} */ - protected function init(array &$form_state) { + protected function init(FormStateInterface $form_state) { $comment = $this->entity; // Make the comment inherit the current content language unless specifically @@ -72,7 +73,7 @@ protected function init(array &$form_state) { /** * Overrides Drupal\Core\Entity\EntityForm::form(). */ - public function form(array $form, array &$form_state) { + public function form(array $form, FormStateInterface $form_state) { /** @var \Drupal\comment\CommentInterface $comment */ $comment = $this->entity; $entity = $this->entityManager->getStorage($comment->getCommentedEntityTypeId())->load($comment->getCommentedEntityId()); @@ -218,7 +219,7 @@ public function form(array $form, array &$form_state) { /** * Overrides Drupal\Core\Entity\EntityForm::actions(). */ - protected function actions(array $form, array &$form_state) { + protected function actions(array $form, FormStateInterface $form_state) { $element = parent::actions($form, $form_state); /* @var \Drupal\comment\CommentInterface $comment */ $comment = $this->entity; @@ -255,7 +256,7 @@ protected function actions(array $form, array &$form_state) { /** * Overrides Drupal\Core\Entity\EntityForm::validate(). */ - public function validate(array $form, array &$form_state) { + public function validate(array $form, FormStateInterface $form_state) { parent::validate($form, $form_state); $entity = $this->entity; @@ -289,7 +290,7 @@ public function validate(array $form, array &$form_state) { /** * Overrides EntityForm::buildEntity(). */ - public function buildEntity(array $form, array &$form_state) { + public function buildEntity(array $form, FormStateInterface $form_state) { $comment = parent::buildEntity($form, $form_state); if (!empty($form_state['values']['date']) && $form_state['values']['date'] instanceOf DrupalDateTime) { $comment->setCreatedTime($form_state['values']['date']->getTimestamp()); @@ -304,7 +305,7 @@ public function buildEntity(array $form, array &$form_state) { /** * Overrides Drupal\Core\Entity\EntityForm::submit(). */ - public function submit(array $form, array &$form_state) { + public function submit(array $form, FormStateInterface $form_state) { /** @var \Drupal\comment\CommentInterface $comment */ $comment = parent::submit($form, $form_state); @@ -346,9 +347,9 @@ public function submit(array $form, array &$form_state) { * @param $form * An associative array containing the structure of the form. * @param $form_state - * A reference to a keyed array containing the current state of the form. + * The current state of the form. */ - public function preview(array &$form, array &$form_state) { + public function preview(array &$form, FormStateInterface $form_state) { $comment = $this->entity; $form_state['comment_preview'] = comment_preview($comment, $form_state); $form_state['comment_preview']['#title'] = $this->t('Preview comment'); @@ -358,7 +359,7 @@ public function preview(array &$form, array &$form_state) { /** * Overrides Drupal\Core\Entity\EntityForm::save(). */ - public function save(array $form, array &$form_state) { + public function save(array $form, FormStateInterface $form_state) { $comment = $this->entity; $entity = $comment->getCommentedEntity(); $field_name = $comment->getFieldName(); diff --git a/core/modules/comment/src/CommentTypeForm.php b/core/modules/comment/src/CommentTypeForm.php index 43367a57928c6e58b29b031bcba2e5341c8d8c80..332e911308d1248f543e9c45b4f063592e5f36fc 100644 --- a/core/modules/comment/src/CommentTypeForm.php +++ b/core/modules/comment/src/CommentTypeForm.php @@ -10,6 +10,7 @@ use Drupal\Core\Entity\EntityForm; use Drupal\Core\Entity\EntityManagerInterface; use Drupal\Core\Entity\EntityTypeInterface; +use Drupal\Core\Form\FormStateInterface; use Psr\Log\LoggerInterface; use Symfony\Component\DependencyInjection\ContainerInterface; @@ -58,7 +59,7 @@ public function __construct(EntityManagerInterface $entity_manager, LoggerInterf /** * {@inheritdoc} */ - public function form(array $form, array &$form_state) { + public function form(array $form, FormStateInterface $form_state) { $form = parent::form($form, $form_state); $comment_type = $this->entity; @@ -132,7 +133,7 @@ public function form(array $form, array &$form_state) { /** * {@inheritdoc} */ - public function save(array $form, array &$form_state) { + public function save(array $form, FormStateInterface $form_state) { $comment_type = $this->entity; $status = $comment_type->save(); diff --git a/core/modules/comment/src/Form/CommentAdminOverview.php b/core/modules/comment/src/Form/CommentAdminOverview.php index fd8f6dc5ec5a5728a960b0c8400e10184f243513..b1d3cb7461918c4c5ae655520b00f8f348c06ebf 100644 --- a/core/modules/comment/src/Form/CommentAdminOverview.php +++ b/core/modules/comment/src/Form/CommentAdminOverview.php @@ -14,6 +14,7 @@ use Drupal\Core\Entity\EntityManagerInterface; use Drupal\Core\Extension\ModuleHandlerInterface; use Drupal\Core\Form\FormBase; +use Drupal\Core\Form\FormStateInterface; use Symfony\Component\DependencyInjection\ContainerInterface; /** @@ -92,15 +93,15 @@ public function getFormID() { * * @param array $form * An associative array containing the structure of the form. - * @param array $form_state - * An associative array containing the current state of the form. + * @param \Drupal\Core\Form\FormStateInterface $form_state + * The current state of the form. * @param string $type * The type of the overview form ('approval' or 'new'). * * @return array * The form structure. */ - public function buildForm(array $form, array &$form_state, $type = 'new') { + public function buildForm(array $form, FormStateInterface $form_state, $type = 'new') { // Build an 'Update options' form. $form['options'] = array( @@ -250,7 +251,7 @@ public function buildForm(array $form, array &$form_state, $type = 'new') { /** * {@inheritdoc} */ - public function validateForm(array &$form, array &$form_state) { + public function validateForm(array &$form, FormStateInterface $form_state) { $form_state['values']['comments'] = array_diff($form_state['values']['comments'], array(0)); // We can't execute any 'Update options' if no comments were selected. if (count($form_state['values']['comments']) == 0) { @@ -261,7 +262,7 @@ public function validateForm(array &$form, array &$form_state) { /** * {@inheritdoc} */ - public function submitForm(array &$form, array &$form_state) { + public function submitForm(array &$form, FormStateInterface $form_state) { $operation = $form_state['values']['operation']; $cids = $form_state['values']['comments']; diff --git a/core/modules/comment/src/Form/CommentTypeDeleteForm.php b/core/modules/comment/src/Form/CommentTypeDeleteForm.php index 85092db47bb286daec375bf4aaebd5241ed98bf7..64da7c491fcb375eea0013abb2275ce06fe57109 100644 --- a/core/modules/comment/src/Form/CommentTypeDeleteForm.php +++ b/core/modules/comment/src/Form/CommentTypeDeleteForm.php @@ -11,6 +11,7 @@ use Drupal\Core\Entity\EntityConfirmFormBase; use Drupal\Core\Entity\EntityManager; use Drupal\Core\Entity\Query\QueryFactory; +use Drupal\Core\Form\FormStateInterface; use Drupal\Core\Url; use Drupal\field\Entity\FieldStorageConfig; use Psr\Log\LoggerInterface; @@ -111,7 +112,7 @@ public function getConfirmText() { /** * {@inheritdoc} */ - public function buildForm(array $form, array &$form_state) { + public function buildForm(array $form, FormStateInterface $form_state) { $comments = $this->queryFactory->get('comment')->condition('comment_type', $this->entity->id())->execute(); $entity_type = $this->entity->getTargetEntityTypeId(); $caption = ''; @@ -140,7 +141,7 @@ public function buildForm(array $form, array &$form_state) { /** * {@inheritdoc} */ - public function submit(array $form, array &$form_state) { + public function submit(array $form, FormStateInterface $form_state) { $this->entity->delete(); $form_state['redirect_route']['route_name'] = 'comment.type_list'; drupal_set_message($this->t('Comment type %label has been deleted.', array('%label' => $this->entity->label()))); diff --git a/core/modules/comment/src/Form/ConfirmDeleteMultiple.php b/core/modules/comment/src/Form/ConfirmDeleteMultiple.php index 5a0b062f14bf01a5787439f42a55ea9140704e6d..39fe5382527bec0f5e13b3383621a42fc0577f5a 100644 --- a/core/modules/comment/src/Form/ConfirmDeleteMultiple.php +++ b/core/modules/comment/src/Form/ConfirmDeleteMultiple.php @@ -10,6 +10,7 @@ use Drupal\comment\CommentStorageInterface; use Drupal\Component\Utility\String; use Drupal\Core\Form\ConfirmFormBase; +use Drupal\Core\Form\FormStateInterface; use Drupal\Core\Url; use Symfony\Component\DependencyInjection\ContainerInterface; @@ -82,7 +83,7 @@ public function getConfirmText() { /** * {@inheritdoc} */ - public function buildForm(array $form, array &$form_state) { + public function buildForm(array $form, FormStateInterface $form_state) { $edit = $form_state['input']; $form['comments'] = array( @@ -116,7 +117,7 @@ public function buildForm(array $form, array &$form_state) { /** * {@inheritdoc} */ - public function submitForm(array &$form, array &$form_state) { + public function submitForm(array &$form, FormStateInterface $form_state) { if ($form_state['values']['confirm']) { $this->commentStorage->delete($this->comments); $count = count($form_state['values']['comments']); diff --git a/core/modules/comment/src/Form/DeleteForm.php b/core/modules/comment/src/Form/DeleteForm.php index b8cbae629333ef2b8bbef5d1aedf25da52ed73dd..1ee7b4c4a5d50673c8085bfe30fc5755ef95dda4 100644 --- a/core/modules/comment/src/Form/DeleteForm.php +++ b/core/modules/comment/src/Form/DeleteForm.php @@ -8,6 +8,7 @@ namespace Drupal\comment\Form; use Drupal\Core\Entity\ContentEntityConfirmFormBase; +use Drupal\Core\Form\FormStateInterface; /** * Provides the comment delete confirmation form. @@ -46,7 +47,7 @@ public function getConfirmText() { /** * {@inheritdoc} */ - public function submit(array $form, array &$form_state) { + public function submit(array $form, FormStateInterface $form_state) { // Delete the comment and its replies. $this->entity->delete(); drupal_set_message($this->t('The comment and all its replies have been deleted.')); diff --git a/core/modules/comment/src/Plugin/Action/UnpublishByKeywordComment.php b/core/modules/comment/src/Plugin/Action/UnpublishByKeywordComment.php index ad59c96309007294f09f9cc426fcc92ecda1da5c..87ec9e7c8bcbf471845a90696c175219e53ac143 100644 --- a/core/modules/comment/src/Plugin/Action/UnpublishByKeywordComment.php +++ b/core/modules/comment/src/Plugin/Action/UnpublishByKeywordComment.php @@ -10,6 +10,7 @@ use Drupal\Component\Utility\Tags; use Drupal\Core\Action\ConfigurableActionBase; use Drupal\comment\CommentInterface; +use Drupal\Core\Form\FormStateInterface; /** * Unpublishes a comment containing certain keywords. @@ -49,7 +50,7 @@ public function defaultConfiguration() { /** * {@inheritdoc} */ - public function buildConfigurationForm(array $form, array &$form_state) { + public function buildConfigurationForm(array $form, FormStateInterface $form_state) { $form['keywords'] = array( '#title' => t('Keywords'), '#type' => 'textarea', @@ -62,7 +63,7 @@ public function buildConfigurationForm(array $form, array &$form_state) { /** * {@inheritdoc} */ - public function submitConfigurationForm(array &$form, array &$form_state) { + public function submitConfigurationForm(array &$form, FormStateInterface $form_state) { $this->configuration['keywords'] = Tags::explode($form_state['values']['keywords']); } diff --git a/core/modules/comment/src/Plugin/Field/FieldFormatter/CommentDefaultFormatter.php b/core/modules/comment/src/Plugin/Field/FieldFormatter/CommentDefaultFormatter.php index be7bf534290bcd92ec38e3719bfee9bf8d382264..e5ad723bd48ffd94f8553aaa13d51e0aba9dcd91 100644 --- a/core/modules/comment/src/Plugin/Field/FieldFormatter/CommentDefaultFormatter.php +++ b/core/modules/comment/src/Plugin/Field/FieldFormatter/CommentDefaultFormatter.php @@ -13,6 +13,7 @@ use Drupal\Core\Entity\EntityViewBuilderInterface; use Drupal\Core\Entity\EntityFormBuilderInterface; use Drupal\Core\Field\FieldItemListInterface; +use Drupal\Core\Form\FormStateInterface; use Drupal\Core\Session\AccountInterface; use Drupal\Core\Field\FieldDefinitionInterface; use Drupal\Core\Field\FormatterBase; @@ -232,7 +233,7 @@ public function viewElements(FieldItemListInterface $items) { /** * {@inheritdoc} */ - public function settingsForm(array $form, array &$form_state) { + public function settingsForm(array $form, FormStateInterface $form_state) { $element = array(); $element['pager_id'] = array( '#type' => 'select', diff --git a/core/modules/comment/src/Plugin/Field/FieldType/CommentItem.php b/core/modules/comment/src/Plugin/Field/FieldType/CommentItem.php index 33a88b5f75e5a79993e6af8b13bcf0d06616dd52..57e41d8c4649556f67a2c0f52224b308eb59664b 100644 --- a/core/modules/comment/src/Plugin/Field/FieldType/CommentItem.php +++ b/core/modules/comment/src/Plugin/Field/FieldType/CommentItem.php @@ -10,6 +10,7 @@ use Drupal\comment\CommentManagerInterface; use Drupal\comment\Entity\CommentType; use Drupal\Core\Field\FieldStorageDefinitionInterface; +use Drupal\Core\Form\FormStateInterface; use Drupal\Core\TypedData\DataDefinition; use Drupal\Core\Field\FieldItemBase; use Drupal\Core\Session\AnonymousUserSession; @@ -98,7 +99,7 @@ public static function schema(FieldStorageDefinitionInterface $field_definition) /** * {@inheritdoc} */ - public function instanceSettingsForm(array $form, array &$form_state) { + public function instanceSettingsForm(array $form, FormStateInterface $form_state) { $element = array(); $settings = $this->getSettings(); @@ -188,7 +189,7 @@ public function isEmpty() { /** * {@inheritdoc} */ - public function settingsForm(array &$form, array &$form_state, $has_data) { + public function settingsForm(array &$form, FormStateInterface $form_state, $has_data) { $element = array(); // @todo Inject entity storage once typed-data supports container injection. diff --git a/core/modules/comment/src/Plugin/Field/FieldWidget/CommentWidget.php b/core/modules/comment/src/Plugin/Field/FieldWidget/CommentWidget.php index f9fdf73d6a5edb16cdc33bec71d0f407b00aa348..87309c513ba70b4ef81963c77250866933ea25b3 100644 --- a/core/modules/comment/src/Plugin/Field/FieldWidget/CommentWidget.php +++ b/core/modules/comment/src/Plugin/Field/FieldWidget/CommentWidget.php @@ -10,6 +10,7 @@ use Drupal\comment\Plugin\Field\FieldType\CommentItemInterface; use Drupal\Core\Field\FieldItemListInterface; use Drupal\Core\Field\WidgetBase; +use Drupal\Core\Form\FormStateInterface; /** * Provides a default comment widget. @@ -27,7 +28,7 @@ class CommentWidget extends WidgetBase { /** * {@inheritdoc} */ - public function formElement(FieldItemListInterface $items, $delta, array $element, array &$form, array &$form_state) { + public function formElement(FieldItemListInterface $items, $delta, array $element, array &$form, FormStateInterface $form_state) { $entity = $items->getEntity(); $element['status'] = array( @@ -89,7 +90,7 @@ public function formElement(FieldItemListInterface $items, $delta, array $elemen /** * {@inheritdoc} */ - public function massageFormValues(array $values, array $form, array &$form_state) { + public function massageFormValues(array $values, array $form, FormStateInterface $form_state) { // Add default values for statistics properties because we don't want to // have them in form. foreach ($values as &$value) { diff --git a/core/modules/comment/src/Plugin/views/field/Comment.php b/core/modules/comment/src/Plugin/views/field/Comment.php index 1a47a4af0d76959a0587f03a9c0e7996c9486a2e..25c001d5e622b38b5985ff7d2960eeae96b7879c 100644 --- a/core/modules/comment/src/Plugin/views/field/Comment.php +++ b/core/modules/comment/src/Plugin/views/field/Comment.php @@ -7,6 +7,7 @@ namespace Drupal\comment\Plugin\views\field; +use Drupal\Core\Form\FormStateInterface; use Drupal\views\ResultRow; use Drupal\views\ViewExecutable; use Drupal\views\Plugin\views\display\DisplayPluginBase; @@ -60,7 +61,7 @@ protected function defineOptions() { /** * Provide link-to-comment option */ - public function buildOptionsForm(&$form, &$form_state) { + public function buildOptionsForm(&$form, FormStateInterface $form_state) { $form['link_to_comment'] = array( '#title' => t('Link this field to its comment'), '#description' => t("Enable to override this field's links."), diff --git a/core/modules/comment/src/Plugin/views/field/EntityLink.php b/core/modules/comment/src/Plugin/views/field/EntityLink.php index f84821029c920616167a2df62816546f7f784f5d..c1dae3907f818fae11204d6e5f0c5b0194c354ff 100644 --- a/core/modules/comment/src/Plugin/views/field/EntityLink.php +++ b/core/modules/comment/src/Plugin/views/field/EntityLink.php @@ -7,6 +7,7 @@ namespace Drupal\comment\Plugin\views\field; +use Drupal\Core\Form\FormStateInterface; use Drupal\views\Plugin\views\field\FieldPluginBase; use Drupal\views\ResultRow; @@ -32,7 +33,7 @@ protected function defineOptions() { return $options; } - public function buildOptionsForm(&$form, &$form_state) { + public function buildOptionsForm(&$form, FormStateInterface $form_state) { $form['teaser'] = array( '#type' => 'checkbox', '#title' => t('Show teaser-style link'), diff --git a/core/modules/comment/src/Plugin/views/field/Link.php b/core/modules/comment/src/Plugin/views/field/Link.php index a57ff12580ffcf29c84d147f336bff637466c893..4a3842e9141f91c82b1930083fb0d1b05f1130e4 100644 --- a/core/modules/comment/src/Plugin/views/field/Link.php +++ b/core/modules/comment/src/Plugin/views/field/Link.php @@ -8,6 +8,7 @@ namespace Drupal\comment\Plugin\views\field; use Drupal\Core\Entity\EntityManagerInterface; +use Drupal\Core\Form\FormStateInterface; use Drupal\views\Plugin\views\field\FieldPluginBase; use Drupal\Core\Plugin\ContainerFactoryPluginInterface; use Drupal\views\ResultRow; @@ -65,7 +66,7 @@ protected function defineOptions() { return $options; } - public function buildOptionsForm(&$form, &$form_state) { + public function buildOptionsForm(&$form, FormStateInterface $form_state) { $form['text'] = array( '#type' => 'textfield', '#title' => t('Text to display'), diff --git a/core/modules/comment/src/Plugin/views/field/LinkEdit.php b/core/modules/comment/src/Plugin/views/field/LinkEdit.php index f6137ade107b11c69a25bc5f55ac912de8fcb7b3..76371434e98af008d7b6784f9488ff91d62b5988 100644 --- a/core/modules/comment/src/Plugin/views/field/LinkEdit.php +++ b/core/modules/comment/src/Plugin/views/field/LinkEdit.php @@ -7,6 +7,7 @@ namespace Drupal\comment\Plugin\views\field; +use Drupal\Core\Form\FormStateInterface; use Drupal\views\ResultRow; /** @@ -25,7 +26,7 @@ protected function defineOptions() { return $options; } - public function buildOptionsForm(&$form, &$form_state) { + public function buildOptionsForm(&$form, FormStateInterface $form_state) { parent::buildOptionsForm($form, $form_state); $form['destination'] = array( diff --git a/core/modules/comment/src/Plugin/views/field/NodeNewComments.php b/core/modules/comment/src/Plugin/views/field/NodeNewComments.php index 336615723d4442c360a523f3baada944404e2f94..748291bd9c284f140cf4e8b598408cc7368f1257 100644 --- a/core/modules/comment/src/Plugin/views/field/NodeNewComments.php +++ b/core/modules/comment/src/Plugin/views/field/NodeNewComments.php @@ -9,6 +9,7 @@ use Drupal\Core\Database\Connection; use Drupal\comment\CommentInterface; +use Drupal\Core\Form\FormStateInterface; use Drupal\views\Plugin\views\field\Numeric; use Drupal\views\Plugin\views\display\DisplayPluginBase; use Drupal\views\ResultRow; @@ -82,7 +83,7 @@ protected function defineOptions() { return $options; } - public function buildOptionsForm(&$form, &$form_state) { + public function buildOptionsForm(&$form, FormStateInterface $form_state) { $form['link_to_comment'] = array( '#title' => t('Link this field to new comments'), '#description' => t("Enable to override this field's links."), diff --git a/core/modules/comment/src/Plugin/views/field/Username.php b/core/modules/comment/src/Plugin/views/field/Username.php index c400144a8e1e2cad8bc21f97c70dca6e230e31d5..b526dbcc50f217f49a6ff37220b88a0a3af85f1a 100644 --- a/core/modules/comment/src/Plugin/views/field/Username.php +++ b/core/modules/comment/src/Plugin/views/field/Username.php @@ -7,6 +7,7 @@ namespace Drupal\comment\Plugin\views\field; +use Drupal\Core\Form\FormStateInterface; use Drupal\views\ResultRow; use Drupal\views\ViewExecutable; use Drupal\views\Plugin\views\display\DisplayPluginBase; @@ -39,7 +40,7 @@ protected function defineOptions() { return $options; } - public function buildOptionsForm(&$form, &$form_state) { + public function buildOptionsForm(&$form, FormStateInterface $form_state) { $form['link_to_user'] = array( '#title' => t("Link this field to its user or an author's homepage"), '#type' => 'checkbox', diff --git a/core/modules/comment/src/Plugin/views/row/CommentRow.php b/core/modules/comment/src/Plugin/views/row/CommentRow.php index 2d347281c7d358d6b832d81ea3186fbe99ced143..5256b5662cce84bd53d1c483f6c6c37f403a61e5 100644 --- a/core/modules/comment/src/Plugin/views/row/CommentRow.php +++ b/core/modules/comment/src/Plugin/views/row/CommentRow.php @@ -7,6 +7,7 @@ namespace Drupal\comment\Plugin\views\row; +use Drupal\Core\Form\FormStateInterface; use Drupal\views\Plugin\views\row\EntityRow; /** @@ -31,7 +32,7 @@ protected function defineOptions() { /** * {@inheritdoc} */ - public function buildOptionsForm(&$form, &$form_state) { + public function buildOptionsForm(&$form, FormStateInterface $form_state) { parent::buildOptionsForm($form, $form_state); $form['links'] = array( diff --git a/core/modules/comment/src/Plugin/views/row/Rss.php b/core/modules/comment/src/Plugin/views/row/Rss.php index 8b8fc4a313e0098e9023e104ff9b1bb253d29634..d24eefe25d3ab2d7d4d44ac80beb88d43511b0f5 100644 --- a/core/modules/comment/src/Plugin/views/row/Rss.php +++ b/core/modules/comment/src/Plugin/views/row/Rss.php @@ -7,6 +7,7 @@ namespace Drupal\comment\Plugin\views\row; +use Drupal\Core\Form\FormStateInterface; use Drupal\views\Plugin\views\row\RowPluginBase; /** @@ -36,7 +37,7 @@ protected function defineOptions() { return $options; } - public function buildOptionsForm(&$form, &$form_state) { + public function buildOptionsForm(&$form, FormStateInterface $form_state) { parent::buildOptionsForm($form, $form_state); $form['view_mode'] = array( diff --git a/core/modules/comment/src/Plugin/views/wizard/Comment.php b/core/modules/comment/src/Plugin/views/wizard/Comment.php index c2c4ff46561f00207e7c33e38c4d17018abd5899..5227f39dddb63fba71bc49c98e789833237bb2d9 100644 --- a/core/modules/comment/src/Plugin/views/wizard/Comment.php +++ b/core/modules/comment/src/Plugin/views/wizard/Comment.php @@ -7,6 +7,7 @@ namespace Drupal\comment\Plugin\views\wizard; +use Drupal\Core\Form\FormStateInterface; use Drupal\views\Plugin\views\wizard\WizardPluginBase; /** @@ -73,7 +74,7 @@ protected function rowStyleOptions() { return $options; } - protected function buildFormStyle(array &$form, array &$form_state, $type) { + protected function buildFormStyle(array &$form, FormStateInterface $form_state, $type) { parent::buildFormStyle($form, $form_state, $type); $style_form =& $form['displays'][$type]['options']['style']; // Some style plugins don't support row plugins so stop here if that's the @@ -101,7 +102,7 @@ protected function buildFormStyle(array &$form, array &$form_state, $type) { /** * {@inheritdoc} */ - protected function pageDisplayOptions(array $form, array &$form_state) { + protected function pageDisplayOptions(array $form, FormStateInterface $form_state) { $display_options = parent::pageDisplayOptions($form, $form_state); $row_plugin = isset($form_state['values']['page']['style']['row_plugin']) ? $form_state['values']['page']['style']['row_plugin'] : NULL; $row_options = isset($form_state['values']['page']['style']['row_options']) ? $form_state['values']['page']['style']['row_options'] : array(); @@ -112,7 +113,7 @@ protected function pageDisplayOptions(array $form, array &$form_state) { /** * Overrides Drupal\views\Plugin\views\wizard\WizardPluginBase::blockDisplayOptions(). */ - protected function blockDisplayOptions(array $form, array &$form_state) { + protected function blockDisplayOptions(array $form, FormStateInterface $form_state) { $display_options = parent::blockDisplayOptions($form, $form_state); $row_plugin = isset($form_state['values']['block']['style']['row_plugin']) ? $form_state['values']['block']['style']['row_plugin'] : NULL; $row_options = isset($form_state['values']['block']['style']['row_options']) ? $form_state['values']['block']['style']['row_options'] : array(); diff --git a/core/modules/config/src/Form/ConfigExportForm.php b/core/modules/config/src/Form/ConfigExportForm.php index c3518180f96cd65f2fccba6cf55edb1aa6dffcc9..e76a56c5824a4e7c0f3e35c9ec4e559da3e11db1 100644 --- a/core/modules/config/src/Form/ConfigExportForm.php +++ b/core/modules/config/src/Form/ConfigExportForm.php @@ -8,6 +8,7 @@ namespace Drupal\config\Form; use Drupal\Core\Form\FormBase; +use Drupal\Core\Form\FormStateInterface; /** * Defines the configuration export form. @@ -24,7 +25,7 @@ public function getFormId() { /** * {@inheritdoc} */ - public function buildForm(array $form, array &$form_state) { + public function buildForm(array $form, FormStateInterface $form_state) { $form['description'] = array( '#markup' => '' . $this->t('Use the export button below to download your site configuration.') . '
', ); @@ -38,7 +39,7 @@ public function buildForm(array $form, array &$form_state) { /** * {@inheritdoc} */ - public function submitForm(array &$form, array &$form_state) { + public function submitForm(array &$form, FormStateInterface $form_state) { $form_state['redirect_route']['route_name'] = 'config.export_download'; } diff --git a/core/modules/config/src/Form/ConfigImportForm.php b/core/modules/config/src/Form/ConfigImportForm.php index 97d039ee310d6849dc987744a13aee6706053770..00315e1650a5a40775a47f0f81ef9fb87c88b553 100644 --- a/core/modules/config/src/Form/ConfigImportForm.php +++ b/core/modules/config/src/Form/ConfigImportForm.php @@ -10,6 +10,7 @@ use Drupal\Core\Archiver\ArchiveTar; use Drupal\Core\Config\StorageInterface; use Drupal\Core\Form\FormBase; +use Drupal\Core\Form\FormStateInterface; use Symfony\Component\DependencyInjection\ContainerInterface; /** @@ -53,7 +54,7 @@ public function getFormId() { /** * {@inheritdoc} */ - public function buildForm(array $form, array &$form_state) { + public function buildForm(array $form, FormStateInterface $form_state) { $form['description'] = array( '#markup' => '' . $this->t('Use the upload button below.') . '
', ); @@ -73,7 +74,7 @@ public function buildForm(array $form, array &$form_state) { /** * {@inheritdoc} */ - public function validateForm(array &$form, array &$form_state) { + public function validateForm(array &$form, FormStateInterface $form_state) { $file_upload = $this->getRequest()->files->get('files[import_tarball]', NULL, TRUE); if ($file_upload && $file_upload->isValid()) { $form_state['values']['import_tarball'] = $file_upload->getRealPath(); @@ -86,7 +87,7 @@ public function validateForm(array &$form, array &$form_state) { /** * {@inheritdoc} */ - public function submitForm(array &$form, array &$form_state) { + public function submitForm(array &$form, FormStateInterface $form_state) { if ($path = $form_state['values']['import_tarball']) { $this->configStorage->deleteAll(); try { diff --git a/core/modules/config/src/Form/ConfigSingleExportForm.php b/core/modules/config/src/Form/ConfigSingleExportForm.php index 14255b5d58742b44ca83d71208ea358617131835..28d1069095ac8f7b008c64731964ec1a809d2f17 100644 --- a/core/modules/config/src/Form/ConfigSingleExportForm.php +++ b/core/modules/config/src/Form/ConfigSingleExportForm.php @@ -12,6 +12,8 @@ use Drupal\Core\Entity\EntityManagerInterface; use Drupal\Core\Entity\EntityTypeInterface; use Drupal\Core\Form\FormBase; +use Drupal\Core\Form\FormState; +use Drupal\Core\Form\FormStateInterface; use Symfony\Component\DependencyInjection\ContainerInterface; /** @@ -73,7 +75,7 @@ public function getFormID() { /** * {@inheritdoc} */ - public function buildForm(array $form, array &$form_state, $config_type = NULL, $config_name = NULL) { + public function buildForm(array $form, FormStateInterface $form_state, $config_type = NULL, $config_name = NULL) { foreach ($this->entityManager->getDefinitions() as $entity_type => $definition) { if ($definition->isSubclassOf('Drupal\Core\Config\Entity\ConfigEntityInterface')) { $this->definitions[$entity_type] = $definition; @@ -121,10 +123,10 @@ public function buildForm(array $form, array &$form_state, $config_type = NULL, '#suffix' => '', ); if ($config_type && $config_name) { - $fake_form_state = array('values' => array( + $fake_form_state = new FormState(array('values' => array( 'config_type' => $config_type, 'config_name' => $config_name, - )); + ))); $form['export'] = $this->updateExport($form, $fake_form_state); } return $form; @@ -133,7 +135,7 @@ public function buildForm(array $form, array &$form_state, $config_type = NULL, /** * Handles switching the configuration type selector. */ - public function updateConfigurationType($form, &$form_state) { + public function updateConfigurationType($form, FormStateInterface $form_state) { $form['config_name']['#options'] = $this->findConfiguration($form_state['values']['config_type']); return $form['config_name']; } @@ -141,7 +143,7 @@ public function updateConfigurationType($form, &$form_state) { /** * Handles switching the export textarea. */ - public function updateExport($form, &$form_state) { + public function updateExport($form, FormStateInterface $form_state) { // Determine the full config name for the selected config entity. if ($form_state['values']['config_type'] !== 'system.simple') { $definition = $this->entityManager->getDefinition($form_state['values']['config_type']); @@ -197,7 +199,7 @@ protected function findConfiguration($config_type) { /** * {@inheritdoc} */ - public function submitForm(array &$form, array &$form_state) { + public function submitForm(array &$form, FormStateInterface $form_state) { // Nothing to submit. } diff --git a/core/modules/config/src/Form/ConfigSingleImportForm.php b/core/modules/config/src/Form/ConfigSingleImportForm.php index 0793c5889f4c9233c7a7c1e175671f055207e093..faff0e987b071b0df6c4c1e2edcf65d84696cc9f 100644 --- a/core/modules/config/src/Form/ConfigSingleImportForm.php +++ b/core/modules/config/src/Form/ConfigSingleImportForm.php @@ -11,6 +11,7 @@ use Drupal\Core\Config\StorageInterface; use Drupal\Core\Entity\EntityManagerInterface; use Drupal\Core\Form\ConfirmFormBase; +use Drupal\Core\Form\FormStateInterface; use Drupal\Core\Url; use Symfony\Component\DependencyInjection\ContainerInterface; @@ -114,7 +115,7 @@ public function getQuestion() { /** * {@inheritdoc} */ - public function buildForm(array $form, array &$form_state) { + public function buildForm(array $form, FormStateInterface $form_state) { // When this is the confirmation step fall through to the confirmation form. if ($this->data) { return parent::buildForm($form, $form_state); @@ -177,7 +178,7 @@ public function buildForm(array $form, array &$form_state) { /** * {@inheritdoc} */ - public function validateForm(array &$form, array &$form_state) { + public function validateForm(array &$form, FormStateInterface $form_state) { // The confirmation step needs no additional validation. if ($this->data) { return; @@ -232,7 +233,7 @@ public function validateForm(array &$form, array &$form_state) { /** * {@inheritdoc} */ - public function submitForm(array &$form, array &$form_state) { + public function submitForm(array &$form, FormStateInterface $form_state) { // If this form has not yet been confirmed, store the values and rebuild. if (!$this->data) { $form_state['rebuild'] = TRUE; diff --git a/core/modules/config/src/Form/ConfigSync.php b/core/modules/config/src/Form/ConfigSync.php index 7c48dd538e5adda0f65673f4fcce49b509fce6e7..a93c0ff2d757d707e21ee359033f1c41abe2053b 100644 --- a/core/modules/config/src/Form/ConfigSync.php +++ b/core/modules/config/src/Form/ConfigSync.php @@ -17,6 +17,7 @@ use Drupal\Core\Config\ConfigManagerInterface; use Drupal\Core\Form\FormBase; use Drupal\Core\Config\StorageInterface; +use Drupal\Core\Form\FormStateInterface; use Drupal\Core\Lock\LockBackendInterface; use Drupal\Core\Config\StorageComparer; use Drupal\Core\Routing\UrlGeneratorInterface; @@ -152,7 +153,7 @@ public function getFormId() { /** * {@inheritdoc} */ - public function buildForm(array $form, array &$form_state) { + public function buildForm(array $form, FormStateInterface $form_state) { $form['actions'] = array('#type' => 'actions'); $form['actions']['submit'] = array( '#type' => 'submit', @@ -270,7 +271,7 @@ public function buildForm(array $form, array &$form_state) { /** * {@inheritdoc} */ - public function submitForm(array &$form, array &$form_state) { + public function submitForm(array &$form, FormStateInterface $form_state) { $config_importer = new ConfigImporter( $form_state['storage_comparer'], $this->eventDispatcher, diff --git a/core/modules/config/tests/config_test/src/ConfigTestForm.php b/core/modules/config/tests/config_test/src/ConfigTestForm.php index 8a680b207ece610886f390c29d020cd8f3aaea82..cbe4c6f2896e02ffae0ce60871d324bb7564e1db 100644 --- a/core/modules/config/tests/config_test/src/ConfigTestForm.php +++ b/core/modules/config/tests/config_test/src/ConfigTestForm.php @@ -8,6 +8,7 @@ namespace Drupal\config_test; use Drupal\Core\Entity\EntityForm; +use Drupal\Core\Form\FormStateInterface; /** * Form controller for the test config edit forms. @@ -15,9 +16,9 @@ class ConfigTestForm extends EntityForm { /** - * Overrides Drupal\Core\Entity\EntityForm::form(). + * {@inheritdoc} */ - public function form(array $form, array &$form_state) { + public function form(array $form, FormStateInterface $form_state) { $form = parent::form($form, $form_state); $entity = $this->entity; @@ -67,9 +68,9 @@ public function form(array $form, array &$form_state) { } /** - * Overrides Drupal\Core\Entity\EntityForm::save(). + * {@inheritdoc} */ - public function save(array $form, array &$form_state) { + public function save(array $form, FormStateInterface $form_state) { $entity = $this->entity; $status = $entity->save(); diff --git a/core/modules/config/tests/config_test/src/Form/ConfigTestDeleteForm.php b/core/modules/config/tests/config_test/src/Form/ConfigTestDeleteForm.php index 63cdfd6498ca048dab715252a2fbf4ee92d5fa01..d344a4e29b6fd53b7cbb3efccb083160ff562758 100644 --- a/core/modules/config/tests/config_test/src/Form/ConfigTestDeleteForm.php +++ b/core/modules/config/tests/config_test/src/Form/ConfigTestDeleteForm.php @@ -8,6 +8,7 @@ use Drupal\Component\Utility\String; use Drupal\Core\Entity\EntityConfirmFormBase; +use Drupal\Core\Form\FormStateInterface; use Drupal\Core\Url; /** @@ -39,7 +40,7 @@ public function getCancelUrl() { /** * {@inheritdoc} */ - public function submit(array $form, array &$form_state) { + public function submit(array $form, FormStateInterface $form_state) { $this->entity->delete(); drupal_set_message(String::format('%label configuration has been deleted.', array('%label' => $this->entity->label()))); $form_state['redirect_route'] = $this->getCancelUrl(); diff --git a/core/modules/config_translation/src/Form/ConfigTranslationAddForm.php b/core/modules/config_translation/src/Form/ConfigTranslationAddForm.php index 9556be26d8181dcbaedc2a844dbdb157641af0cc..1930c3bf524d2a6833a71abc8d0e3d71ced681da 100644 --- a/core/modules/config_translation/src/Form/ConfigTranslationAddForm.php +++ b/core/modules/config_translation/src/Form/ConfigTranslationAddForm.php @@ -7,6 +7,7 @@ namespace Drupal\config_translation\Form; +use Drupal\Core\Form\FormStateInterface; use Symfony\Component\HttpFoundation\Request; /** @@ -24,7 +25,7 @@ public function getFormId() { /** * {@inheritdoc} */ - public function buildForm(array $form, array &$form_state, Request $request = NULL, $plugin_id = NULL, $langcode = NULL) { + public function buildForm(array $form, FormStateInterface $form_state, Request $request = NULL, $plugin_id = NULL, $langcode = NULL) { $form = parent::buildForm($form, $form_state, $request, $plugin_id, $langcode); $form['#title'] = $this->t('Add @language translation for %label', array( '%label' => $this->mapper->getTitle(), @@ -36,7 +37,7 @@ public function buildForm(array $form, array &$form_state, Request $request = NU /** * {@inheritdoc} */ - public function submitForm(array &$form, array &$form_state) { + public function submitForm(array &$form, FormStateInterface $form_state) { parent::submitForm($form, $form_state); drupal_set_message($this->t('Successfully saved @language translation.', array('@language' => $this->language->name))); } diff --git a/core/modules/config_translation/src/Form/ConfigTranslationDeleteForm.php b/core/modules/config_translation/src/Form/ConfigTranslationDeleteForm.php index e064b1a2d077a96f02bf9816b7103d4066ceb89e..fc9c73004022529c02f2b05664d3cf6b5670db9b 100644 --- a/core/modules/config_translation/src/Form/ConfigTranslationDeleteForm.php +++ b/core/modules/config_translation/src/Form/ConfigTranslationDeleteForm.php @@ -11,6 +11,7 @@ use Drupal\Core\Cache\Cache; use Drupal\Core\Extension\ModuleHandlerInterface; use Drupal\Core\Form\ConfirmFormBase; +use Drupal\Core\Form\FormStateInterface; use Drupal\Core\Url; use Drupal\language\ConfigurableLanguageManagerInterface; use Symfony\Component\DependencyInjection\ContainerInterface; @@ -115,7 +116,7 @@ public function getFormID() { /** * {@inheritdoc} */ - public function buildForm(array $form, array &$form_state, Request $request = NULL, $plugin_id = NULL, $langcode = NULL) { + public function buildForm(array $form, FormStateInterface $form_state, Request $request = NULL, $plugin_id = NULL, $langcode = NULL) { /** @var \Drupal\config_translation\ConfigMapperInterface $mapper */ $mapper = $this->configMapperManager->createInstance($plugin_id); $mapper->populateFromRequest($request); @@ -133,7 +134,7 @@ public function buildForm(array $form, array &$form_state, Request $request = NU /** * {@inheritdoc} */ - public function submitForm(array &$form, array &$form_state) { + public function submitForm(array &$form, FormStateInterface $form_state) { foreach ($this->mapper->getConfigNames() as $name) { $this->languageManager->getLanguageConfigOverride($this->language->id, $name)->delete(); } diff --git a/core/modules/config_translation/src/Form/ConfigTranslationEditForm.php b/core/modules/config_translation/src/Form/ConfigTranslationEditForm.php index 565d07aee2926531b99b2e55d43a9bb0e3be4346..91e479731b74d266aa86d69d9b9a9b1ead06865c 100644 --- a/core/modules/config_translation/src/Form/ConfigTranslationEditForm.php +++ b/core/modules/config_translation/src/Form/ConfigTranslationEditForm.php @@ -7,6 +7,7 @@ namespace Drupal\config_translation\Form; +use Drupal\Core\Form\FormStateInterface; use Symfony\Component\HttpFoundation\Request; /** @@ -24,7 +25,7 @@ public function getFormId() { /** * {@inheritdoc} */ - public function buildForm(array $form, array &$form_state, Request $request = NULL, $plugin_id = NULL, $langcode = NULL) { + public function buildForm(array $form, FormStateInterface $form_state, Request $request = NULL, $plugin_id = NULL, $langcode = NULL) { $form = parent::buildForm($form, $form_state, $request, $plugin_id, $langcode); $form['#title'] = $this->t('Edit @language translation for %label', array( '%label' => $this->mapper->getTitle(), @@ -36,7 +37,7 @@ public function buildForm(array $form, array &$form_state, Request $request = NU /** * {@inheritdoc} */ - public function submitForm(array &$form, array &$form_state) { + public function submitForm(array &$form, FormStateInterface $form_state) { parent::submitForm($form, $form_state); drupal_set_message($this->t('Successfully updated @language translation.', array('@language' => $this->language->name))); } diff --git a/core/modules/config_translation/src/Form/ConfigTranslationFormBase.php b/core/modules/config_translation/src/Form/ConfigTranslationFormBase.php index 5b6125ad9fc11cb990fa66ce4a12464f9c9e429d..29ed2c9672ffd8b5e3c155706bf4a115bd83b9ee 100644 --- a/core/modules/config_translation/src/Form/ConfigTranslationFormBase.php +++ b/core/modules/config_translation/src/Form/ConfigTranslationFormBase.php @@ -14,6 +14,7 @@ use Drupal\Core\Extension\ModuleHandlerInterface; use Drupal\Core\Form\BaseFormIdInterface; use Drupal\Core\Form\FormBase; +use Drupal\Core\Form\FormStateInterface; use Drupal\Core\Language\LanguageInterface; use Drupal\language\Config\LanguageConfigOverride; use Drupal\language\ConfigurableLanguageManagerInterface; @@ -138,8 +139,8 @@ public function getBaseFormID() { * * @param array $form * An associative array containing the structure of the form. - * @param array $form_state - * An associative array containing the current state of the form. + * @param \Drupal\Core\Form\FormStateInterface $form_state + * The current state of the form. * @param \Symfony\Component\HttpFoundation\Request $request * (optional) Page request object. * @param string $plugin_id @@ -155,7 +156,7 @@ public function getBaseFormID() { * Throws an exception if the language code provided as a query parameter in * the request does not match an active language. */ - public function buildForm(array $form, array &$form_state, Request $request = NULL, $plugin_id = NULL, $langcode = NULL) { + public function buildForm(array $form, FormStateInterface $form_state, Request $request = NULL, $plugin_id = NULL, $langcode = NULL) { /** @var \Drupal\config_translation\ConfigMapperInterface $mapper */ $mapper = $this->configMapperManager->createInstance($plugin_id); $mapper->populateFromRequest($request); @@ -214,7 +215,7 @@ public function buildForm(array $form, array &$form_state, Request $request = NU /** * {@inheritdoc} */ - public function submitForm(array &$form, array &$form_state) { + public function submitForm(array &$form, FormStateInterface $form_state) { $form_values = $form_state['values']['config_names']; // For the form submission handling, use the raw data. diff --git a/core/modules/config_translation/src/FormElement/DateFormat.php b/core/modules/config_translation/src/FormElement/DateFormat.php index 2e089cb1bdaab926b42f7903dfcc5ffd271e1990..d00a71e575dae11d5621bfbb31e3f023d2353a19 100644 --- a/core/modules/config_translation/src/FormElement/DateFormat.php +++ b/core/modules/config_translation/src/FormElement/DateFormat.php @@ -10,6 +10,7 @@ use Drupal\Component\Utility\NestedArray; use Drupal\Core\Ajax\AjaxResponse; use Drupal\Core\Ajax\ReplaceCommand; +use Drupal\Core\Form\FormStateInterface; use Drupal\Core\Language\LanguageInterface; use Drupal\Core\StringTranslation\StringTranslationTrait; use Drupal\Core\TypedData\DataDefinitionInterface; @@ -46,7 +47,7 @@ public function getFormElement(DataDefinitionInterface $definition, LanguageInte * * @param array $form * Form API array structure. - * @param array $form_state + * @param \Drupal\Core\Form\FormStateInterface $form_state * Form state information. * * @return AjaxResponse @@ -54,7 +55,7 @@ public function getFormElement(DataDefinitionInterface $definition, LanguageInte * the given format cannot be identified or was empty, the response will * be empty as well. */ - public static function ajaxSample(array $form, array $form_state) { + public static function ajaxSample(array $form, FormStateInterface $form_state) { $response = new AjaxResponse(); $format_value = NestedArray::getValue($form_state['values'], $form_state['triggering_element']['#array_parents']); diff --git a/core/modules/config_translation/tests/modules/config_translation_test/config_translation_test.module b/core/modules/config_translation/tests/modules/config_translation_test/config_translation_test.module index d38be9733923a8b9c0e6bcbaf043a7a1530be976..582be7c32da48e8ff4be255edbf3e396c4f94a67 100644 --- a/core/modules/config_translation/tests/modules/config_translation_test/config_translation_test.module +++ b/core/modules/config_translation/tests/modules/config_translation_test/config_translation_test.module @@ -6,6 +6,7 @@ */ use Drupal\Core\Extension\Extension; +use Drupal\Core\Form\FormStateInterface; /** * Implements hook_system_info_alter(). @@ -47,7 +48,7 @@ function config_translation_test_config_translation_info_alter(&$info) { * * @see \Drupal\config_translation\Form\ConfigTranslationFormBase */ -function config_translation_test_form_config_translation_form_alter(&$form, &$form_state) { +function config_translation_test_form_config_translation_form_alter(&$form, FormStateInterface $form_state) { if (\Drupal::state()->get('config_translation_test_alter_form_alter')) { $form['#base_altered'] = TRUE; } @@ -60,7 +61,7 @@ function config_translation_test_form_config_translation_form_alter(&$form, &$fo * * @see \Drupal\config_translation\Form\ConfigTranslationAddForm */ -function config_translation_test_form_config_translation_add_form_alter(&$form, &$form_state) { +function config_translation_test_form_config_translation_add_form_alter(&$form, FormStateInterface $form_state) { if (\Drupal::state()->get('config_translation_test_alter_form_alter')) { $form['#altered'] = TRUE; } @@ -77,7 +78,7 @@ function config_translation_test_form_config_translation_add_form_alter(&$form, * * @see \Drupal\config_translation\Form\ConfigTranslationEditForm */ -function config_translation_test_form_config_translation_edit_form_alter(&$form, &$form_state) { +function config_translation_test_form_config_translation_edit_form_alter(&$form, FormStateInterface $form_state) { if (\Drupal::state()->get('config_translation_test_alter_form_alter')) { $form['#altered'] = TRUE; } diff --git a/core/modules/contact/contact.module b/core/modules/contact/contact.module index e8485c11c1ae26d78ca90f72753ec6dbf7cfd812..bee5dcfb03132c8bb40b28386aedee4f4d632ee8 100644 --- a/core/modules/contact/contact.module +++ b/core/modules/contact/contact.module @@ -5,6 +5,7 @@ * Enables the use of personal and site-wide contact forms. */ +use Drupal\Core\Form\FormStateInterface; use Drupal\Core\Routing\RouteMatchInterface; /** @@ -162,7 +163,7 @@ function contact_mail($key, &$message, $params) { * * @see \Drupal\user\ProfileForm::form() */ -function contact_form_user_form_alter(&$form, &$form_state) { +function contact_form_user_form_alter(&$form, FormStateInterface $form_state) { $form['contact'] = array( '#type' => 'details', '#title' => t('Contact settings'), @@ -185,7 +186,7 @@ function contact_form_user_form_alter(&$form, &$form_state) { /** * Submit callback for the user profile form to save the contact page setting. */ -function contact_user_profile_form_submit($form, &$form_state) { +function contact_user_profile_form_submit($form, FormStateInterface $form_state) { $account = $form_state['controller']->getEntity(); if ($account->id() && isset($form_state['values']['contact'])) { \Drupal::service('user.data')->set('contact', $account->id(), 'enabled', (int) $form_state['values']['contact']); @@ -199,7 +200,7 @@ function contact_user_profile_form_submit($form, &$form_state) { * * @see user_admin_settings() */ -function contact_form_user_admin_settings_alter(&$form, &$form_state) { +function contact_form_user_admin_settings_alter(&$form, FormStateInterface $form_state) { $form['contact'] = array( '#type' => 'details', '#title' => t('Contact settings'), @@ -221,7 +222,7 @@ function contact_form_user_admin_settings_alter(&$form, &$form_state) { * * @see contact_form_user_admin_settings_alter() */ -function contact_form_user_admin_settings_submit($form, &$form_state) { +function contact_form_user_admin_settings_submit($form, FormStateInterface $form_state) { \Drupal::config('contact.settings') ->set('user_default_enabled', $form_state['values']['contact_default_status']) ->save(); diff --git a/core/modules/contact/src/CategoryForm.php b/core/modules/contact/src/CategoryForm.php index fd315a60c1bfe57025a845127eb66ac3138bec69..df91084619682066bb141238ab54f1feb51ee8d7 100644 --- a/core/modules/contact/src/CategoryForm.php +++ b/core/modules/contact/src/CategoryForm.php @@ -9,6 +9,7 @@ use Drupal\Core\Entity\EntityForm; use Drupal\Core\Entity\EntityTypeInterface; +use Drupal\Core\Form\FormStateInterface; /** * Base form for category edit forms. @@ -18,7 +19,7 @@ class CategoryForm extends EntityForm { /** * {@inheritdoc} */ - public function form(array $form, array &$form_state) { + public function form(array $form, FormStateInterface $form_state) { $form = parent::form($form, $form_state); $category = $this->entity; @@ -72,7 +73,7 @@ public function form(array $form, array &$form_state) { /** * {@inheritdoc} */ - public function validate(array $form, array &$form_state) { + public function validate(array $form, FormStateInterface $form_state) { parent::validate($form, $form_state); // Validate and each email recipient. @@ -90,7 +91,7 @@ public function validate(array $form, array &$form_state) { /** * {@inheritdoc} */ - public function save(array $form, array &$form_state) { + public function save(array $form, FormStateInterface $form_state) { $category = $this->entity; $status = $category->save(); $contact_settings = $this->config('contact.settings'); diff --git a/core/modules/contact/src/Form/CategoryDeleteForm.php b/core/modules/contact/src/Form/CategoryDeleteForm.php index 9117a7511da21739a7bfc7741bab2440fd0a01e0..5fddb0855abed51c4a9ff8caa0e5f15a4462acd8 100644 --- a/core/modules/contact/src/Form/CategoryDeleteForm.php +++ b/core/modules/contact/src/Form/CategoryDeleteForm.php @@ -8,6 +8,7 @@ namespace Drupal\contact\Form; use Drupal\Core\Entity\EntityConfirmFormBase; +use Drupal\Core\Form\FormStateInterface; use Drupal\Core\Url; /** @@ -39,7 +40,7 @@ public function getConfirmText() { /** * {@inheritdoc} */ - public function submit(array $form, array &$form_state) { + public function submit(array $form, FormStateInterface $form_state) { $this->entity->delete(); drupal_set_message($this->t('Category %label has been deleted.', array('%label' => $this->entity->label()))); watchdog('contact', 'Category %label has been deleted.', array('%label' => $this->entity->label()), WATCHDOG_NOTICE); diff --git a/core/modules/contact/src/MessageForm.php b/core/modules/contact/src/MessageForm.php index d289f384dfd1a34bd3566650e2b502861be22fc7..30ac4105602082dc51391e34df210750954087f0 100644 --- a/core/modules/contact/src/MessageForm.php +++ b/core/modules/contact/src/MessageForm.php @@ -11,6 +11,7 @@ use Drupal\Core\Entity\ContentEntityForm; use Drupal\Core\Entity\EntityManagerInterface; use Drupal\Core\Flood\FloodInterface; +use Drupal\Core\Form\FormStateInterface; use Drupal\Core\Language\Language; use Drupal\Core\Language\LanguageInterface; use Drupal\Core\Language\LanguageManagerInterface; @@ -72,7 +73,7 @@ public static function create(ContainerInterface $container) { /** * {@inheritdoc} */ - public function form(array $form, array &$form_state) { + public function form(array $form, FormStateInterface $form_state) { $user = $this->currentUser(); $message = $this->entity; $form = parent::form($form, $form_state, $message); @@ -150,7 +151,7 @@ public function form(array $form, array &$form_state) { /** * {@inheritdoc} */ - public function actions(array $form, array &$form_state) { + public function actions(array $form, FormStateInterface $form_state) { $elements = parent::actions($form, $form_state); $elements['submit']['#value'] = $this->t('Send message'); $elements['preview'] = array( @@ -169,7 +170,7 @@ public function actions(array $form, array &$form_state) { /** * Form submission handler for the 'preview' action. */ - public function preview(array $form, array &$form_state) { + public function preview(array $form, FormStateInterface $form_state) { $message = $this->entity; $message->preview = TRUE; $form_state['rebuild'] = TRUE; @@ -178,7 +179,7 @@ public function preview(array $form, array &$form_state) { /** * {@inheritdoc} */ - public function save(array $form, array &$form_state) { + public function save(array $form, FormStateInterface $form_state) { $user = $this->currentUser(); $language_interface = $this->languageManager->getCurrentLanguage(); @@ -271,7 +272,7 @@ public function save(array $form, array &$form_state) { /** * {@inheritdoc} */ - protected function init(array &$form_state) { + protected function init(FormStateInterface $form_state) { $message = $this->entity; // Make the message inherit the current content language unless specifically diff --git a/core/modules/contact/src/Plugin/views/field/ContactLink.php b/core/modules/contact/src/Plugin/views/field/ContactLink.php index 15313e0089cb0d8d949aa8c07736f7d1af504271..8b0ce91862a0d0415c58e861f196acdde43ea135 100644 --- a/core/modules/contact/src/Plugin/views/field/ContactLink.php +++ b/core/modules/contact/src/Plugin/views/field/ContactLink.php @@ -9,6 +9,7 @@ use Drupal\Core\Access\AccessManagerInterface; use Drupal\Core\Entity\EntityInterface; +use Drupal\Core\Form\FormStateInterface; use Drupal\Core\Session\AccountInterface; use Drupal\user\Plugin\views\field\Link; use Drupal\views\ResultRow; @@ -84,7 +85,7 @@ public static function create(ContainerInterface $container, array $configuratio /** * {@inheritdoc} */ - public function buildOptionsForm(&$form, &$form_state) { + public function buildOptionsForm(&$form, FormStateInterface $form_state) { parent::buildOptionsForm($form, $form_state); $form['text']['#title'] = t('Link label'); $form['text']['#required'] = TRUE; diff --git a/core/modules/content_translation/content_translation.admin.inc b/core/modules/content_translation/content_translation.admin.inc index 7e7e790eeacb26f35a942df98f793822c9b421c7..9b33f0e58f5ba92c5000b9b0bbd76dad6b242212 100644 --- a/core/modules/content_translation/content_translation.admin.inc +++ b/core/modules/content_translation/content_translation.admin.inc @@ -8,6 +8,7 @@ use Drupal\Component\Utility\String; use Drupal\Core\Entity\ContentEntityTypeInterface; use Drupal\Core\Field\FieldDefinitionInterface; +use Drupal\Core\Form\FormStateInterface; use Drupal\Core\Language\LanguageInterface; use Drupal\Core\Render\Element; use Drupal\field\FieldInstanceConfigInterface; @@ -60,7 +61,7 @@ function content_translation_field_sync_widget(FieldDefinitionInterface $field) /** * (proxied) Implements hook_form_FORM_ID_alter(). */ -function _content_translation_form_language_content_settings_form_alter(array &$form, array &$form_state) { +function _content_translation_form_language_content_settings_form_alter(array &$form, FormStateInterface $form_state) { // Inject into the content language settings the translation settings if the // user has the required permission. if (!\Drupal::currentUser()->hasPermission('administer content translation')) { @@ -254,7 +255,7 @@ function _content_translation_preprocess_language_content_settings_table(&$varia * * @see content_translation_admin_settings_form_submit() */ -function content_translation_form_language_content_settings_validate(array $form, array &$form_state) { +function content_translation_form_language_content_settings_validate(array $form, FormStateInterface $form_state) { $settings = &$form_state['values']['settings']; foreach ($settings as $entity_type => $entity_settings) { foreach ($entity_settings as $bundle => $bundle_settings) { @@ -284,7 +285,7 @@ function content_translation_form_language_content_settings_validate(array $form * * @see content_translation_admin_settings_form_validate() */ -function content_translation_form_language_content_settings_submit(array $form, array &$form_state) { +function content_translation_form_language_content_settings_submit(array $form, FormStateInterface $form_state) { $entity_types = $form_state['values']['entity_types']; $settings = &$form_state['values']['settings']; diff --git a/core/modules/content_translation/content_translation.module b/core/modules/content_translation/content_translation.module index 21144a5ff5f0f7b2d9dba19994a5ceb8f825580c..c79213a998f5dd5231e6fa82dca4ca5c4e17751a 100644 --- a/core/modules/content_translation/content_translation.module +++ b/core/modules/content_translation/content_translation.module @@ -9,6 +9,7 @@ use Drupal\Core\Entity\EntityFormInterface; use Drupal\Core\Entity\EntityInterface; use Drupal\Core\Entity\EntityTypeInterface; +use Drupal\Core\Form\FormStateInterface; use Drupal\Core\Language\LanguageInterface; use Drupal\Core\Routing\RouteMatchInterface; use Drupal\field\Entity\FieldInstanceConfig; @@ -366,8 +367,8 @@ function content_translation_controller($entity_type_id) { /** * Returns the entity form for the given form. * - * @param array $form_state - * The form state array holding the entity form. + * @param \Drupal\Core\Form\FormStateInterface $form_state + * The current form state holding the entity form. * * @return \Drupal\Core\Entity\EntityFormInterface; * An instance of the content translation form interface or FALSE if not an @@ -375,7 +376,7 @@ function content_translation_controller($entity_type_id) { * * @todo Move to \Drupal\content_translation\ContentTranslationManager. */ -function content_translation_form_controller(array $form_state) { +function content_translation_form_controller($form_state) { return isset($form_state['controller']) && $form_state['controller'] instanceof EntityFormInterface ? $form_state['controller'] : FALSE; } @@ -458,7 +459,7 @@ function content_translation_permission() { /** * Implements hook_form_alter(). */ -function content_translation_form_alter(array &$form, array &$form_state) { +function content_translation_form_alter(array &$form, FormStateInterface $form_state) { $form_controller = content_translation_form_controller($form_state); $entity = $form_controller ? $form_controller->getEntity() : NULL; @@ -644,7 +645,7 @@ function content_translation_entity_extra_field_info() { /** * Implements hook_form_FORM_ID_alter() for 'field_ui_instance_edit_form'. */ -function content_translation_form_field_ui_field_instance_edit_form_alter(array &$form, array &$form_state) { +function content_translation_form_field_ui_field_instance_edit_form_alter(array &$form, FormStateInterface $form_state) { $instance = $form_state['instance']; $bundle_is_translatable = content_translation_enabled($instance->entity_type, $instance->bundle); @@ -722,10 +723,10 @@ function content_translation_element_info_alter(&$type) { * The bundle of the entity being configured for translation. * @param array $form * The configuration form array. - * @param array $form_state - * The configuration form state array. + * @param \Drupal\Core\Form\FormStateInterface $form_state + * The current state of the form. */ -function content_translation_enable_widget($entity_type, $bundle, array &$form, array &$form_state) { +function content_translation_enable_widget($entity_type, $bundle, array &$form, FormStateInterface $form_state) { $key = $form_state['content_translation']['key']; if (!isset($form_state['language'][$key])) { $form_state['language'][$key] = array(); @@ -745,7 +746,7 @@ function content_translation_enable_widget($entity_type, $bundle, array &$form, * @return * Processed language configuration element. */ -function content_translation_language_configuration_element_process(array $element, array &$form_state, array &$form) { +function content_translation_language_configuration_element_process(array $element, FormStateInterface $form_state, array &$form) { if (empty($element['#content_translation_skip_alter']) && \Drupal::currentUser()->hasPermission('administer content translation')) { $form_state['content_translation']['key'] = $element['#name']; $context = $form_state['language'][$element['#name']]; @@ -772,7 +773,7 @@ function content_translation_language_configuration_element_process(array $eleme * * @see content_translation_language_configuration_element_submit() */ -function content_translation_language_configuration_element_validate($element, array &$form_state, array $form) { +function content_translation_language_configuration_element_validate($element, FormStateInterface $form_state, array $form) { $key = $form_state['content_translation']['key']; $values = $form_state['values'][$key]; if (!$values['language_show'] && $values['content_translation'] && \Drupal::languageManager()->isLanguageLocked($values['langcode'])) { @@ -793,7 +794,7 @@ function content_translation_language_configuration_element_validate($element, a * * @see content_translation_language_configuration_element_validate() */ -function content_translation_language_configuration_element_submit(array $form, array &$form_state) { +function content_translation_language_configuration_element_submit(array $form, FormStateInterface $form_state) { $key = $form_state['content_translation']['key']; $context = $form_state['language'][$key]; $enabled = $form_state['values'][$key]['content_translation']; @@ -808,7 +809,7 @@ function content_translation_language_configuration_element_submit(array $form, /** * Implements hook_form_FORM_ID_alter() for language_content_settings_form(). */ -function content_translation_form_language_content_settings_form_alter(array &$form, array &$form_state) { +function content_translation_form_language_content_settings_form_alter(array &$form, FormStateInterface $form_state) { module_load_include('inc', 'content_translation', 'content_translation.admin'); _content_translation_form_language_content_settings_form_alter($form, $form_state); } diff --git a/core/modules/content_translation/src/ContentTranslationHandler.php b/core/modules/content_translation/src/ContentTranslationHandler.php index 7510d2e0799005a8302ecf4781def2acfff2b810..d14a945d4f63fc001b8228b95f582c19124916ff 100644 --- a/core/modules/content_translation/src/ContentTranslationHandler.php +++ b/core/modules/content_translation/src/ContentTranslationHandler.php @@ -9,6 +9,7 @@ use Drupal\Core\Entity\EntityInterface; use Drupal\Core\Entity\EntityTypeInterface; +use Drupal\Core\Form\FormStateInterface; use Drupal\Core\Language\LanguageInterface; use Drupal\Core\Render\Element; @@ -75,14 +76,14 @@ public function getTranslationAccess(EntityInterface $entity, $op) { /** * {@inheritdoc} */ - public function getSourceLangcode(array $form_state) { + public function getSourceLangcode($form_state) { return isset($form_state['content_translation']['source']) ? $form_state['content_translation']['source']->id : FALSE; } /** * {@inheritdoc} */ - public function entityFormAlter(array &$form, array &$form_state, EntityInterface $entity) { + public function entityFormAlter(array &$form, FormStateInterface $form_state, EntityInterface $entity) { $form_controller = content_translation_form_controller($form_state); $form_langcode = $form_controller->getFormLangcode($form_state); $entity_langcode = $entity->getUntranslated()->language()->id; @@ -371,7 +372,7 @@ protected function addTranslatabilityClue(&$element) { * * @see \Drupal\content_translation\ContentTranslationHandler::entityFormAlter() */ - public function entityFormEntityBuild($entity_type, EntityInterface $entity, array $form, array &$form_state) { + public function entityFormEntityBuild($entity_type, EntityInterface $entity, array $form, FormStateInterface $form_state) { $form_controller = content_translation_form_controller($form_state); $form_langcode = $form_controller->getFormLangcode($form_state); @@ -410,7 +411,7 @@ public function entityFormEntityBuild($entity_type, EntityInterface $entity, arr * * Validates the submitted content translation metadata. */ - function entityFormValidate($form, &$form_state) { + function entityFormValidate($form, FormStateInterface $form_state) { if (!empty($form_state['values']['content_translation'])) { $translation = $form_state['values']['content_translation']; // Validate the "authored by" field. @@ -429,7 +430,7 @@ function entityFormValidate($form, &$form_state) { * * Takes care of the source language change. */ - public function entityFormSourceChange($form, &$form_state) { + public function entityFormSourceChange($form, FormStateInterface $form_state) { $form_controller = content_translation_form_controller($form_state); $entity = $form_controller->getEntity(); $source = $form_state['values']['source_langcode']['source']; @@ -445,7 +446,7 @@ public function entityFormSourceChange($form, &$form_state) { * * Takes care of entity deletion. */ - function entityFormDelete($form, &$form_state) { + function entityFormDelete($form, FormStateInterface $form_state) { $form_controller = content_translation_form_controller($form_state); $entity = $form_controller->getEntity(); if (count($entity->getTranslationLanguages()) > 1) { @@ -458,7 +459,7 @@ function entityFormDelete($form, &$form_state) { * * Takes care of content translation deletion. */ - function entityFormDeleteTranslation($form, &$form_state) { + function entityFormDeleteTranslation($form, FormStateInterface $form_state) { $form_controller = content_translation_form_controller($form_state); $entity = $form_controller->getEntity(); $path = $entity->getSystemPath('drupal:content-translation-overview'); diff --git a/core/modules/content_translation/src/ContentTranslationHandlerInterface.php b/core/modules/content_translation/src/ContentTranslationHandlerInterface.php index c41fd2739f17c06a74ce73560969c1416f2ff8e9..67c4d0d00e1cefd5534679205d7f84648d9fec1c 100644 --- a/core/modules/content_translation/src/ContentTranslationHandlerInterface.php +++ b/core/modules/content_translation/src/ContentTranslationHandlerInterface.php @@ -8,6 +8,7 @@ namespace Drupal\content_translation; use Drupal\Core\Entity\EntityInterface; +use Drupal\Core\Form\FormStateInterface; /** * Interface for providing content translation. @@ -37,13 +38,13 @@ public function getTranslationAccess(EntityInterface $entity, $op); /** * Retrieves the source language for the translation being created. * - * @param array $form_state - * The form state array. + * @param \Drupal\Core\Form\FormStateInterface $form_state + * The current state of the form. * * @return string * The source language code. */ - public function getSourceLangcode(array $form_state); + public function getSourceLangcode($form_state); /** * Marks translations as outdated. @@ -61,11 +62,11 @@ public function retranslate(EntityInterface $entity, $langcode = NULL); * * @param array $form * The entity form to be altered to provide the translation workflow. - * @param array $form_state - * The form state array. + * @param \Drupal\Core\Form\FormStateInterface $form_state + * The current state of the form. * @param \Drupal\Core\Entity\EntityInterface $entity * The entity being created or edited. */ - public function entityFormAlter(array &$form, array &$form_state, EntityInterface $entity); + public function entityFormAlter(array &$form, FormStateInterface $form_state, EntityInterface $entity); } diff --git a/core/modules/content_translation/src/Form/ContentTranslationDeleteForm.php b/core/modules/content_translation/src/Form/ContentTranslationDeleteForm.php index af2d3af0e4690c22a489a93558b0bc642c2cd5c2..a26512457353d895e16fc8a31f785bb7a1f60280 100644 --- a/core/modules/content_translation/src/Form/ContentTranslationDeleteForm.php +++ b/core/modules/content_translation/src/Form/ContentTranslationDeleteForm.php @@ -8,6 +8,7 @@ namespace Drupal\content_translation\Form; use Drupal\Core\Form\ConfirmFormBase; +use Drupal\Core\Form\FormStateInterface; use Drupal\Core\Url; /** @@ -39,7 +40,7 @@ public function getFormId() { /** * {@inheritdoc} */ - public function buildForm(array $form, array &$form_state, $_entity_type_id = NULL, $language = NULL) { + public function buildForm(array $form, FormStateInterface $form_state, $_entity_type_id = NULL, $language = NULL) { $this->entity = $this->getRequest()->attributes->get($_entity_type_id); $this->language = language_load($language); return parent::buildForm($form, $form_state); @@ -69,7 +70,7 @@ public function getCancelUrl() { /** * {@inheritdoc} */ - public function submitForm(array &$form, array &$form_state) { + public function submitForm(array &$form, FormStateInterface $form_state) { // Remove the translated values. $this->entity->removeTranslation($this->language->id); $this->entity->save(); diff --git a/core/modules/content_translation/src/Plugin/views/field/TranslationLink.php b/core/modules/content_translation/src/Plugin/views/field/TranslationLink.php index 2a6ec7957143ec0217678f0b649c1311a84bd0b0..9d234abf34a2981788d25cc30a718f2d2ea5212b 100644 --- a/core/modules/content_translation/src/Plugin/views/field/TranslationLink.php +++ b/core/modules/content_translation/src/Plugin/views/field/TranslationLink.php @@ -7,6 +7,7 @@ namespace Drupal\content_translation\Plugin\views\field; +use Drupal\Core\Form\FormStateInterface; use Drupal\views\Plugin\views\field\FieldPluginBase; use Drupal\Core\Entity\EntityInterface; use Drupal\views\ResultRow; @@ -32,7 +33,7 @@ protected function defineOptions() { /** * Overrides \Drupal\views\Plugin\views\field\FieldPluginBase::buildOptionsForm(). */ - public function buildOptionsForm(&$form, &$form_state) { + public function buildOptionsForm(&$form, FormStateInterface $form_state) { $form['text'] = array( '#type' => 'textfield', '#title' => t('Text to display'), diff --git a/core/modules/contextual/src/Plugin/views/field/ContextualLinks.php b/core/modules/contextual/src/Plugin/views/field/ContextualLinks.php index aff000c43eef384bb18be58e2480a57220ddd7a3..dd8c990a4bac987d2d4fd21ac1b06f4ea419df78 100644 --- a/core/modules/contextual/src/Plugin/views/field/ContextualLinks.php +++ b/core/modules/contextual/src/Plugin/views/field/ContextualLinks.php @@ -9,6 +9,7 @@ use Drupal\Component\Serialization\Json; use Drupal\Component\Utility\UrlHelper; +use Drupal\Core\Form\FormStateInterface; use Drupal\views\Plugin\views\field\FieldPluginBase; use Drupal\views\ResultRow; @@ -37,7 +38,7 @@ protected function defineOptions() { return $options; } - public function buildOptionsForm(&$form, &$form_state) { + public function buildOptionsForm(&$form, FormStateInterface $form_state) { $all_fields = $this->view->display_handler->getFieldLabels(); // Offer to include only those fields that follow this one. $field_options = array_slice($all_fields, 0, array_search($this->options['id'], array_keys($all_fields))); diff --git a/core/modules/datetime/datetime.module b/core/modules/datetime/datetime.module index b5f98ddd516da81eda1aabdadda8ece5090039cd..e70bad37f11721c928b231d0a4d856596d747446 100644 --- a/core/modules/datetime/datetime.module +++ b/core/modules/datetime/datetime.module @@ -7,6 +7,7 @@ use Drupal\Component\Utility\NestedArray; use Drupal\Core\Datetime\DrupalDateTime; +use Drupal\Core\Form\FormStateInterface; use Drupal\Core\Routing\RouteMatchInterface; use Drupal\Core\Template\Attribute; use Drupal\datetime\DateHelper; @@ -119,10 +120,10 @@ function datetime_theme() { * * @param array $element * The form element whose value is being validated. - * @param array $form_state + * @param \Drupal\Core\Form\FormStateInterface $form_state * The current state of the form. */ -function datetime_datetime_widget_validate(&$element, &$form_state) { +function datetime_datetime_widget_validate(&$element, FormStateInterface $form_state) { if (!form_get_errors($form_state)) { $input_exists = FALSE; $input = NestedArray::getValue($form_state['values'], $element['#parents'], $input_exists); @@ -157,10 +158,10 @@ function datetime_datetime_widget_validate(&$element, &$form_state) { * * @param array $element * The form element whose value is being validated. - * @param array $form_state + * @param \Drupal\Core\Form\FormStateInterface $form_state * The current state of the form. */ -function datetime_datelist_widget_validate(&$element, &$form_state) { +function datetime_datelist_widget_validate(&$element, FormStateInterface $form_state) { if (!form_get_errors($form_state)) { $input_exists = FALSE; $input = NestedArray::getValue($form_state['values'], $element['#parents'], $input_exists); @@ -352,13 +353,13 @@ function template_preprocess_datetime_wrapper(&$variables) { * * @param array $element * The form element whose value is being processed. - * @param array $form_state + * @param \Drupal\Core\Form\FormStateInterface $form_state * The current state of the form. * * @return array * The form element whose value has been processed. */ -function datetime_datetime_form_process($element, &$form_state) { +function datetime_datetime_form_process($element, FormStateInterface $form_state) { $format_settings = array(); // The value callback has populated the #value array. $date = !empty($element['#value']['object']) ? $element['#value']['object'] : NULL; @@ -527,10 +528,10 @@ function form_type_datetime_value($element, $input = FALSE) { * * @param array $element * The form element whose value is being validated. - * @param array $form_state + * @param \Drupal\Core\Form\FormStateInterface $form_state * The current state of the form. */ -function datetime_datetime_validate($element, &$form_state) { +function datetime_datetime_validate($element, FormStateInterface $form_state) { $input_exists = FALSE; $input = NestedArray::getValue($form_state['values'], $element['#parents'], $input_exists); @@ -675,10 +676,10 @@ function datetime_format_example($format) { * * @param array $element * The form element whose value is being processed. - * @param array $form_state + * @param \Drupal\Core\Form\FormStateInterface $form_state * The current state of the form. */ -function datetime_datelist_form_process($element, &$form_state) { +function datetime_datelist_form_process($element, FormStateInterface $form_state) { // Load translated date part labels from the appropriate calendar plugin. $date_helper = new DateHelper(); @@ -788,14 +789,12 @@ function datetime_datelist_form_process($element, &$form_state) { * @param array $element * The element being processed. * @param array|false $input - * - * @param array $form_state - * (optional) The current state of the form. Defaults to an empty array. + * @param \Drupal\Core\Form\FormStateInterface $form_state + * The current state of the form. * * @return array - * */ -function form_type_datelist_value($element, $input = FALSE, &$form_state = array()) { +function form_type_datelist_value($element, $input = FALSE, FormStateInterface $form_state) { $parts = $element['#date_part_order']; $increment = $element['#date_increment']; @@ -871,10 +870,10 @@ function form_type_datelist_value($element, $input = FALSE, &$form_state = array * * @param array $element * The element being processed. - * @param array $form_state + * @param \Drupal\Core\Form\FormStateInterface $form_state * The current state of the form. */ -function datetime_datelist_validate($element, &$form_state) { +function datetime_datelist_validate($element, FormStateInterface $form_state) { $input_exists = FALSE; $input = NestedArray::getValue($form_state['values'], $element['#parents'], $input_exists); if ($input_exists) { @@ -1001,7 +1000,7 @@ function datetime_range_years($string, $date = NULL) { /** * Implements hook_form_BASE_FORM_ID_alter() for node forms. */ -function datetime_form_node_form_alter(&$form, &$form_state, $form_id) { +function datetime_form_node_form_alter(&$form, FormStateInterface $form_state, $form_id) { // Alter the 'Authored on' date to use datetime. $form['created']['#type'] = 'datetime'; $date_format = entity_load('date_format', 'html_date')->getPattern(); @@ -1013,7 +1012,7 @@ function datetime_form_node_form_alter(&$form, &$form_state, $form_id) { /** * Implements hook_node_prepare_form(). */ -function datetime_node_prepare_form(NodeInterface $node, $operation, array &$form_state) { +function datetime_node_prepare_form(NodeInterface $node, $operation, FormStateInterface $form_state) { // Prepare the 'Authored on' date to use datetime. $node->date = DrupalDateTime::createFromTimestamp($node->getCreatedTime()); } diff --git a/core/modules/datetime/src/Plugin/Field/FieldFormatter/DateTimeDefaultFormatter.php b/core/modules/datetime/src/Plugin/Field/FieldFormatter/DateTimeDefaultFormatter.php index c282db6c82bc2934114d265652862c3f0b7cecd1..5bff36f326c9071a53f8141aabee760250e3ef74 100644 --- a/core/modules/datetime/src/Plugin/Field/FieldFormatter/DateTimeDefaultFormatter.php +++ b/core/modules/datetime/src/Plugin/Field/FieldFormatter/DateTimeDefaultFormatter.php @@ -12,6 +12,7 @@ use Drupal\Core\Entity\EntityStorageInterface; use Drupal\Core\Field\FieldDefinitionInterface; use Drupal\Core\Field\FieldItemListInterface; +use Drupal\Core\Form\FormStateInterface; use Drupal\Core\Plugin\ContainerFactoryPluginInterface; use Drupal\Core\Field\FormatterBase; use Symfony\Component\DependencyInjection\ContainerInterface; @@ -162,7 +163,7 @@ function dateFormat($date) { /** * {@inheritdoc} */ - public function settingsForm(array $form, array &$form_state) { + public function settingsForm(array $form, FormStateInterface $form_state) { $time = new DrupalDateTime(); $format_types = $this->dateStorage->loadMultiple(); foreach ($format_types as $type => $type_info) { diff --git a/core/modules/datetime/src/Plugin/Field/FieldType/DateTimeFieldItemList.php b/core/modules/datetime/src/Plugin/Field/FieldType/DateTimeFieldItemList.php index 75a59ec4eb96cd6600b55698f16853dbdb9657b0..4ed473b9866730671e3f138be934cd1c4a6ce79b 100644 --- a/core/modules/datetime/src/Plugin/Field/FieldType/DateTimeFieldItemList.php +++ b/core/modules/datetime/src/Plugin/Field/FieldType/DateTimeFieldItemList.php @@ -11,6 +11,7 @@ use Drupal\Core\Entity\ContentEntityInterface; use Drupal\Core\Field\FieldDefinitionInterface; use Drupal\Core\Field\FieldItemList; +use Drupal\Core\Form\FormStateInterface; /** * Represents a configurable entity datetime field. @@ -25,7 +26,7 @@ class DateTimeFieldItemList extends FieldItemList { /** * {@inheritdoc} */ - public function defaultValuesForm(array &$form, array &$form_state) { + public function defaultValuesForm(array &$form, FormStateInterface $form_state) { if (empty($this->getFieldDefinition()->default_value_function)) { $default_value = $this->getFieldDefinition()->default_value; @@ -48,12 +49,12 @@ public function defaultValuesForm(array &$form, array &$form_state) { /** * {@inheritdoc} */ - public function defaultValuesFormValidate(array $element, array &$form, array &$form_state) { } + public function defaultValuesFormValidate(array $element, array &$form, FormStateInterface $form_state) { } /** * {@inheritdoc} */ - public function defaultValuesFormSubmit(array $element, array &$form, array &$form_state) { + public function defaultValuesFormSubmit(array $element, array &$form, FormStateInterface $form_state) { if ($form_state['values']['default_value_input']['default_date']) { return array($form_state['values']['default_value_input']); } diff --git a/core/modules/datetime/src/Plugin/Field/FieldType/DateTimeItem.php b/core/modules/datetime/src/Plugin/Field/FieldType/DateTimeItem.php index 615ca1e236c25eb48167a4dde856dab92c847023..992af1e828d8afbf753d14d3bee86176ebab3aab 100644 --- a/core/modules/datetime/src/Plugin/Field/FieldType/DateTimeItem.php +++ b/core/modules/datetime/src/Plugin/Field/FieldType/DateTimeItem.php @@ -8,6 +8,7 @@ namespace Drupal\datetime\Plugin\Field\FieldType; use Drupal\Core\Field\FieldStorageDefinitionInterface; +use Drupal\Core\Form\FormStateInterface; use Drupal\Core\TypedData\DataDefinition; use Drupal\Core\Field\FieldItemBase; @@ -83,7 +84,7 @@ public static function schema(FieldStorageDefinitionInterface $field_definition) /** * {@inheritdoc} */ - public function settingsForm(array &$form, array &$form_state, $has_data) { + public function settingsForm(array &$form, FormStateInterface $form_state, $has_data) { $element = array(); $element['datetime_type'] = array( diff --git a/core/modules/datetime/src/Plugin/Field/FieldWidget/DateTimeDatelistWidget.php b/core/modules/datetime/src/Plugin/Field/FieldWidget/DateTimeDatelistWidget.php index c9c3195a38bcb14a727536302bb05d73ffa6ae7d..6d05a063174c886769eb0916a317667604df538b 100644 --- a/core/modules/datetime/src/Plugin/Field/FieldWidget/DateTimeDatelistWidget.php +++ b/core/modules/datetime/src/Plugin/Field/FieldWidget/DateTimeDatelistWidget.php @@ -8,6 +8,7 @@ use Drupal\Core\Field\FieldItemListInterface; use Drupal\Core\Field\WidgetBase; +use Drupal\Core\Form\FormStateInterface; use Drupal\datetime\Plugin\Field\FieldType\DateTimeItem; /** @@ -37,7 +38,7 @@ public static function defaultSettings() { /** * {@inheritdoc} */ - public function formElement(FieldItemListInterface $items, $delta, array $element, array &$form, array &$form_state) { + public function formElement(FieldItemListInterface $items, $delta, array $element, array &$form, FormStateInterface $form_state) { $date_order = $this->getSetting('date_order'); $time_type = $this->getSetting('time_type'); $increment = $this->getSetting('increment'); @@ -122,7 +123,7 @@ public function formElement(FieldItemListInterface $items, $delta, array $elemen /** * {@inheritdoc} */ - function settingsForm(array $form, array &$form_state) { + function settingsForm(array $form, FormStateInterface $form_state) { $element = parent::settingsForm($form, $form_state); $element['date_order'] = array( diff --git a/core/modules/datetime/src/Plugin/Field/FieldWidget/DateTimeDefaultWidget.php b/core/modules/datetime/src/Plugin/Field/FieldWidget/DateTimeDefaultWidget.php index 00426c0f9c647ffa111bf91f9428cf3c92144fe8..a411eb441eaa409dcb8a7a9df71102cd6dd0f9c0 100644 --- a/core/modules/datetime/src/Plugin/Field/FieldWidget/DateTimeDefaultWidget.php +++ b/core/modules/datetime/src/Plugin/Field/FieldWidget/DateTimeDefaultWidget.php @@ -10,6 +10,7 @@ use Drupal\Core\Field\FieldItemListInterface; use Drupal\Core\Field\WidgetBase; use Drupal\Core\Field\FieldDefinitionInterface; +use Drupal\Core\Form\FormStateInterface; use Drupal\Core\Plugin\ContainerFactoryPluginInterface; use Drupal\datetime\Plugin\Field\FieldType\DateTimeItem; use Symfony\Component\DependencyInjection\ContainerInterface; @@ -60,7 +61,7 @@ public static function create(ContainerInterface $container, array $configuratio /** * {@inheritdoc} */ - public function formElement(FieldItemListInterface $items, $delta, array $element, array &$form, array &$form_state) { + public function formElement(FieldItemListInterface $items, $delta, array $element, array &$form, FormStateInterface $form_state) { // We are nesting some sub-elements inside the parent, so we need a wrapper. // We also need to add another #title attribute at the top level for ease in // identifying this item in error messages. We do not want to display this diff --git a/core/modules/dblog/dblog.module b/core/modules/dblog/dblog.module index b2068793e346e9b8831ead057586db1f5bccd7ea..c941c06b4482c4a9e6a8865eb1f476d580d7a5b9 100644 --- a/core/modules/dblog/dblog.module +++ b/core/modules/dblog/dblog.module @@ -11,6 +11,7 @@ * @see watchdog() */ +use Drupal\Core\Form\FormStateInterface; use Drupal\Core\Routing\RouteMatchInterface; /** @@ -112,6 +113,6 @@ function dblog_form_system_logging_settings_alter(&$form, $form_state) { * * @see dblog_form_system_logging_settings_alter() */ -function dblog_logging_settings_submit($form, &$form_state) { +function dblog_logging_settings_submit($form, FormStateInterface $form_state) { \Drupal::config('dblog.settings')->set('row_limit', $form_state['values']['dblog_row_limit'])->save(); } diff --git a/core/modules/dblog/src/Form/DblogClearLogConfirmForm.php b/core/modules/dblog/src/Form/DblogClearLogConfirmForm.php index d20181bc9f20fba840e30f7febedf228b854af24..d2b6a89342f00cdabb423615608f5ad8ec7f5b7a 100644 --- a/core/modules/dblog/src/Form/DblogClearLogConfirmForm.php +++ b/core/modules/dblog/src/Form/DblogClearLogConfirmForm.php @@ -7,6 +7,7 @@ namespace Drupal\dblog\Form; +use Drupal\Core\Form\FormStateInterface; use Drupal\Core\Url; use Drupal\Core\Database\Connection; use Drupal\Core\Form\ConfirmFormBase; @@ -67,7 +68,7 @@ public function getCancelUrl() { /** * {@inheritdoc} */ - public function submitForm(array &$form, array &$form_state) { + public function submitForm(array &$form, FormStateInterface $form_state) { $_SESSION['dblog_overview_filter'] = array(); $this->connection->delete('watchdog')->execute(); drupal_set_message($this->t('Database log cleared.')); diff --git a/core/modules/dblog/src/Form/DblogClearLogForm.php b/core/modules/dblog/src/Form/DblogClearLogForm.php index 133ab439d2125a8cef91e01083493d511da92a72..f3781d4eb80e88e3024feb9be94b39ad04e51868 100644 --- a/core/modules/dblog/src/Form/DblogClearLogForm.php +++ b/core/modules/dblog/src/Form/DblogClearLogForm.php @@ -9,6 +9,7 @@ use Drupal\Core\Database\Connection; use Drupal\Core\Form\FormBase; +use Drupal\Core\Form\FormStateInterface; use Drupal\Core\Url; use Symfony\Component\DependencyInjection\ContainerInterface; @@ -53,7 +54,7 @@ public function getFormID() { /** * {@inheritdoc} */ - public function buildForm(array $form, array &$form_state) { + public function buildForm(array $form, FormStateInterface $form_state) { $form['dblog_clear'] = array( '#type' => 'details', '#title' => $this->t('Clear log messages'), @@ -69,7 +70,7 @@ public function buildForm(array $form, array &$form_state) { /** * {@inheritdoc} */ - public function submitForm(array &$form, array &$form_state) { + public function submitForm(array &$form, FormStateInterface $form_state) { $form_state['redirect_route'] = new Url('dblog.confirm'); } diff --git a/core/modules/dblog/src/Form/DblogFilterForm.php b/core/modules/dblog/src/Form/DblogFilterForm.php index 2422472e5d2d7171bc0b334e98ed2b6fa89489d7..aae57840347749cdecb88376dd3b003b362db9b8 100644 --- a/core/modules/dblog/src/Form/DblogFilterForm.php +++ b/core/modules/dblog/src/Form/DblogFilterForm.php @@ -8,6 +8,7 @@ namespace Drupal\dblog\Form; use Drupal\Core\Form\FormBase; +use Drupal\Core\Form\FormStateInterface; /** * Provides the database logging filter form. @@ -24,7 +25,7 @@ public function getFormID() { /** * {@inheritdoc} */ - public function buildForm(array $form, array &$form_state) { + public function buildForm(array $form, FormStateInterface $form_state) { $filters = dblog_filters(); $form['filters'] = array( @@ -67,7 +68,7 @@ public function buildForm(array $form, array &$form_state) { /** * {@inheritdoc} */ - public function validateForm(array &$form, array &$form_state) { + public function validateForm(array &$form, FormStateInterface $form_state) { if (empty($form_state['values']['type']) && empty($form_state['values']['severity'])) { $this->setFormError('type', $form_state, $this->t('You must select something to filter by.')); } @@ -76,7 +77,7 @@ public function validateForm(array &$form, array &$form_state) { /** * {@inheritdoc} */ - public function submitForm(array &$form, array &$form_state) { + public function submitForm(array &$form, FormStateInterface $form_state) { $filters = dblog_filters(); foreach ($filters as $name => $filter) { if (isset($form_state['values'][$name])) { @@ -88,7 +89,7 @@ public function submitForm(array &$form, array &$form_state) { /** * Resets the filter form. */ - public function resetForm(array &$form, array &$form_state) { + public function resetForm(array &$form, FormStateInterface $form_state) { $_SESSION['dblog_overview_filter'] = array(); } diff --git a/core/modules/dblog/src/Plugin/views/field/DblogMessage.php b/core/modules/dblog/src/Plugin/views/field/DblogMessage.php index e6595d2d6b7cb0ba6977cec4d771aec6c1ce026e..6c94184599569b42d1c8b6a15c72182c8bf01f19 100644 --- a/core/modules/dblog/src/Plugin/views/field/DblogMessage.php +++ b/core/modules/dblog/src/Plugin/views/field/DblogMessage.php @@ -8,6 +8,7 @@ namespace Drupal\dblog\Plugin\views\field; use Drupal\Component\Utility\String; +use Drupal\Core\Form\FormStateInterface; use Drupal\views\Plugin\views\field\FieldPluginBase; use Drupal\views\ResultRow; use Drupal\views\ViewExecutable; @@ -46,7 +47,7 @@ protected function defineOptions() { /** * {@inheritdoc} */ - public function buildOptionsForm(&$form, &$form_state) { + public function buildOptionsForm(&$form, FormStateInterface $form_state) { parent::buildOptionsForm($form, $form_state); $form['replace_variables'] = array( diff --git a/core/modules/editor/editor.module b/core/modules/editor/editor.module index 40c1eb74135131dd2909d0a3ea0eea1169d635ff..4ee1dddfeabe2c04d8a076e02e46bf3c41fe0e8f 100644 --- a/core/modules/editor/editor.module +++ b/core/modules/editor/editor.module @@ -7,6 +7,7 @@ use Drupal\Component\Utility\Html; use Drupal\Core\Entity\ContentEntityInterface; +use Drupal\Core\Form\FormStateInterface; use Drupal\Core\Render\Element; use Drupal\Core\Routing\RouteMatchInterface; use Drupal\editor\Entity\Editor; @@ -91,7 +92,7 @@ function editor_form_filter_admin_overview_alter(&$form, $form_state) { /** * Implements hook_form_BASE_FORM_ID_alter() for 'filter_format_form'. */ -function editor_form_filter_format_form_alter(&$form, &$form_state) { +function editor_form_filter_format_form_alter(&$form, FormStateInterface $form_state) { if (!isset($form_state['editor'])) { $format_id = $form_state['controller']->getEntity()->id(); $form_state['editor'] = editor_load($format_id); @@ -168,7 +169,7 @@ function editor_form_filter_format_form_alter(&$form, &$form_state) { /** * Button submit handler for filter_format_form()'s 'editor_configure' button. */ -function editor_form_filter_admin_format_editor_configure($form, &$form_state) { +function editor_form_filter_admin_format_editor_configure($form, FormStateInterface $form_state) { $editor = $form_state['editor']; if (isset($form_state['values']['editor']['editor'])) { if ($form_state['values']['editor']['editor'] === '') { @@ -188,14 +189,14 @@ function editor_form_filter_admin_format_editor_configure($form, &$form_state) { /** * AJAX callback handler for filter_format_form(). */ -function editor_form_filter_admin_form_ajax($form, &$form_state) { +function editor_form_filter_admin_form_ajax($form, FormStateInterface $form_state) { return $form['editor']['settings']; } /** * Additional validate handler for filter_format_form(). */ -function editor_form_filter_admin_format_validate($form, &$form_state) { +function editor_form_filter_admin_format_validate($form, FormStateInterface $form_state) { // This validate handler is not applicable when using the 'Configure' button. if ($form_state['triggering_element']['#name'] === 'editor_configure') { return; @@ -213,7 +214,7 @@ function editor_form_filter_admin_format_validate($form, &$form_state) { /** * Additional submit handler for filter_format_form(). */ -function editor_form_filter_admin_format_submit($form, &$form_state) { +function editor_form_filter_admin_format_submit($form, FormStateInterface $form_state) { // Delete the existing editor if disabling or switching between editors. $format_id = $form_state['controller']->getEntity()->id(); $original_editor = editor_load($format_id); diff --git a/core/modules/editor/src/Form/EditorImageDialog.php b/core/modules/editor/src/Form/EditorImageDialog.php index 82524b60d3cf451d4dc2d08b2781ccad9b391fb8..f8c45e988c480f0669e0e1ce1280c52d43bae747 100644 --- a/core/modules/editor/src/Form/EditorImageDialog.php +++ b/core/modules/editor/src/Form/EditorImageDialog.php @@ -10,6 +10,7 @@ use Drupal\Component\Utility\Bytes; use Drupal\Component\Utility\SafeMarkup; use Drupal\Core\Form\FormBase; +use Drupal\Core\Form\FormStateInterface; use Drupal\filter\Entity\FilterFormat; use Drupal\Core\Ajax\AjaxResponse; use Drupal\Core\Ajax\HtmlCommand; @@ -34,7 +35,7 @@ public function getFormId() { * @param \Drupal\filter\Entity\FilterFormat $filter_format * The filter format for which this dialog corresponds. */ - public function buildForm(array $form, array &$form_state, FilterFormat $filter_format = NULL) { + public function buildForm(array $form, FormStateInterface $form_state, FilterFormat $filter_format = NULL) { // The default values are set directly from \Drupal::request()->request, // provided by the editor plugin opening the dialog. if (!isset($form_state['image_element'])) { @@ -184,7 +185,7 @@ public function buildForm(array $form, array &$form_state, FilterFormat $filter_ /** * {@inheritdoc} */ - public function submitForm(array &$form, array &$form_state) { + public function submitForm(array &$form, FormStateInterface $form_state) { $response = new AjaxResponse(); // Convert any uploaded files from the FID values to data-editor-file-uuid diff --git a/core/modules/editor/src/Form/EditorLinkDialog.php b/core/modules/editor/src/Form/EditorLinkDialog.php index b0beb5bb3b609b2db099ec3b264ff477a244fce8..8f31c3c9afe52742f6a944811877d8d687dbd5d7 100644 --- a/core/modules/editor/src/Form/EditorLinkDialog.php +++ b/core/modules/editor/src/Form/EditorLinkDialog.php @@ -8,6 +8,7 @@ namespace Drupal\editor\Form; use Drupal\Core\Form\FormBase; +use Drupal\Core\Form\FormStateInterface; use Drupal\filter\Entity\FilterFormat; use Drupal\Core\Ajax\AjaxResponse; use Drupal\Core\Ajax\HtmlCommand; @@ -32,7 +33,7 @@ public function getFormId() { * @param \Drupal\filter\Entity\FilterFormat $filter_format * The filter format for which this dialog corresponds. */ - public function buildForm(array $form, array &$form_state, FilterFormat $filter_format = NULL) { + public function buildForm(array $form, FormStateInterface $form_state, FilterFormat $filter_format = NULL) { // The default values are set directly from \Drupal::request()->request, // provided by the editor plugin opening the dialog. $input = isset($form_state['input']['editor_object']) ? $form_state['input']['editor_object'] : array(); @@ -78,7 +79,7 @@ public function buildForm(array $form, array &$form_state, FilterFormat $filter_ /** * {@inheritdoc} */ - public function submitForm(array &$form, array &$form_state) { + public function submitForm(array &$form, FormStateInterface $form_state) { $response = new AjaxResponse(); if (form_get_errors($form_state)) { diff --git a/core/modules/editor/src/Plugin/EditorBase.php b/core/modules/editor/src/Plugin/EditorBase.php index 32e44089fb09e00918e3fe8d9eef0ae0ab958e14..4cb1fe2fa9a50f15275aa53776b90010ae598d86 100644 --- a/core/modules/editor/src/Plugin/EditorBase.php +++ b/core/modules/editor/src/Plugin/EditorBase.php @@ -7,6 +7,7 @@ namespace Drupal\editor\Plugin; +use Drupal\Core\Form\FormStateInterface; use Drupal\Core\Plugin\PluginBase; use Drupal\editor\Entity\Editor; use Drupal\editor\Plugin\EditorPluginInterface; @@ -54,20 +55,20 @@ public function getDefaultSettings() { /** * {@inheritdoc} */ - public function settingsForm(array $form, array &$form_state, Editor $editor) { + public function settingsForm(array $form, FormStateInterface $form_state, Editor $editor) { return $form; } /** * {@inheritdoc} */ - public function settingsFormValidate(array $form, array &$form_state) { + public function settingsFormValidate(array $form, FormStateInterface $form_state) { } /** * {@inheritdoc} */ - public function settingsFormSubmit(array $form, array &$form_state) { + public function settingsFormSubmit(array $form, FormStateInterface $form_state) { } } diff --git a/core/modules/editor/src/Plugin/EditorPluginInterface.php b/core/modules/editor/src/Plugin/EditorPluginInterface.php index c6b6c5411fcbdafcae0cb97044f7f2e84c9bc590..10ad314e015015f012deeb302143793233cbc101 100644 --- a/core/modules/editor/src/Plugin/EditorPluginInterface.php +++ b/core/modules/editor/src/Plugin/EditorPluginInterface.php @@ -8,6 +8,7 @@ namespace Drupal\editor\Plugin; use Drupal\Component\Plugin\PluginInspectionInterface; +use Drupal\Core\Form\FormStateInterface; use Drupal\editor\Entity\Editor; /** @@ -37,7 +38,7 @@ public function getDefaultSettings(); * * @param array $form * An empty form array to be populated with a configuration form, if any. - * @param array $form_state + * @param \Drupal\Core\Form\FormStateInterface $form_state * The state of the entire filter administration form. * @param \Drupal\editor\Entity\Editor $editor * A configured text editor object. @@ -45,7 +46,7 @@ public function getDefaultSettings(); * @return array * A render array for the settings form. */ - public function settingsForm(array $form, array &$form_state, Editor $editor); + public function settingsForm(array $form, FormStateInterface $form_state, Editor $editor); /** * Validates the settings form for an editor. @@ -56,10 +57,10 @@ public function settingsForm(array $form, array &$form_state, Editor $editor); * * @param array $form * An associative array containing the structure of the form. - * @param array $form_state - * A reference to a keyed array containing the current state of the form. + * @param \Drupal\Core\Form\FormStateInterface $form_state + * The current state of the form. */ - public function settingsFormValidate(array $form, array &$form_state); + public function settingsFormValidate(array $form, FormStateInterface $form_state); /** * Modifies any values in the form state to prepare them for saving. @@ -69,10 +70,10 @@ public function settingsFormValidate(array $form, array &$form_state); * * @param array $form * An associative array containing the structure of the form. - * @param array $form_state - * A reference to a keyed array containing the current state of the form. + * @param \Drupal\Core\Form\FormStateInterface $form_state + * The current state of the form. */ - public function settingsFormSubmit(array $form, array &$form_state); + public function settingsFormSubmit(array $form, FormStateInterface $form_state); /** * Returns JavaScript settings to be attached. diff --git a/core/modules/editor/tests/modules/src/Plugin/Editor/UnicornEditor.php b/core/modules/editor/tests/modules/src/Plugin/Editor/UnicornEditor.php index 5015759dc42ade8a2879be713879a4ff98577a67..6937fb25f8e7104d3d0c82f91d74a860b154a5b1 100644 --- a/core/modules/editor/tests/modules/src/Plugin/Editor/UnicornEditor.php +++ b/core/modules/editor/tests/modules/src/Plugin/Editor/UnicornEditor.php @@ -7,6 +7,7 @@ namespace Drupal\editor_test\Plugin\Editor; +use Drupal\Core\Form\FormStateInterface; use Drupal\editor\Plugin\EditorBase; use Drupal\editor\Entity\Editor as EditorEntity; @@ -33,7 +34,7 @@ function getDefaultSettings() { /** * {@inheritdoc} */ - function settingsForm(array $form, array &$form_state, EditorEntity $editor) { + function settingsForm(array $form, FormStateInterface $form_state, EditorEntity $editor) { $form['foo'] = array( '#title' => t('Foo'), '#type' => 'textfield', diff --git a/core/modules/entity/src/Entity/EntityFormDisplay.php b/core/modules/entity/src/Entity/EntityFormDisplay.php index 836503274f91280c91905fba401e782f3e604fc0..6457e236602a0db41691fe85aa270e83a7b4d6a9 100644 --- a/core/modules/entity/src/Entity/EntityFormDisplay.php +++ b/core/modules/entity/src/Entity/EntityFormDisplay.php @@ -9,6 +9,7 @@ use Drupal\Core\Entity\ContentEntityInterface; use Drupal\Core\Entity\Display\EntityFormDisplayInterface; +use Drupal\Core\Form\FormStateInterface; use Drupal\entity\EntityDisplayBase; /** @@ -148,7 +149,7 @@ public function getRenderer($field_name) { /** * {@inheritdoc} */ - public function buildForm(ContentEntityInterface $entity, array &$form, array &$form_state) { + public function buildForm(ContentEntityInterface $entity, array &$form, FormStateInterface $form_state) { // Set #parents to 'top-level' by default. $form += array('#parents' => array()); @@ -197,7 +198,7 @@ public function processForm($element, $form_state, $form) { /** * {@inheritdoc} */ - public function extractFormValues(ContentEntityInterface $entity, array &$form, array &$form_state) { + public function extractFormValues(ContentEntityInterface $entity, array &$form, FormStateInterface $form_state) { $extracted = array(); foreach ($entity as $name => $items) { if ($widget = $this->getRenderer($name)) { @@ -211,7 +212,7 @@ public function extractFormValues(ContentEntityInterface $entity, array &$form, /** * {@inheritdoc} */ - public function validateFormValues(ContentEntityInterface $entity, array &$form, array &$form_state) { + public function validateFormValues(ContentEntityInterface $entity, array &$form, FormStateInterface $form_state) { foreach ($entity as $field_name => $items) { // Only validate the fields that actually appear in the form, and let the // widget assign the violations to the right form elements. diff --git a/core/modules/entity/src/Form/EntityDisplayModeAddForm.php b/core/modules/entity/src/Form/EntityDisplayModeAddForm.php index 49be44f55501fd49bd38420a3eaf2c6790e6ff6d..296fde24df4c0319f0efae06ac52a8c659070600 100644 --- a/core/modules/entity/src/Form/EntityDisplayModeAddForm.php +++ b/core/modules/entity/src/Form/EntityDisplayModeAddForm.php @@ -7,6 +7,7 @@ namespace Drupal\entity\Form; +use Drupal\Core\Form\FormStateInterface; use Symfony\Component\HttpKernel\Exception\NotFoundHttpException; /** @@ -24,7 +25,7 @@ class EntityDisplayModeAddForm extends EntityDisplayModeFormBase { /** * {@inheritdoc} */ - public function buildForm(array $form, array &$form_state, $entity_type_id = NULL) { + public function buildForm(array $form, FormStateInterface $form_state, $entity_type_id = NULL) { $this->targetEntityTypeId = $entity_type_id; $form = parent::buildForm($form, $form_state); // Change replace_pattern to avoid undesired dots. @@ -37,7 +38,7 @@ public function buildForm(array $form, array &$form_state, $entity_type_id = NUL /** * {@inheritdoc} */ - public function validate(array $form, array &$form_state) { + public function validate(array $form, FormStateInterface $form_state) { parent::validate($form, $form_state); form_set_value($form['id'], $this->targetEntityTypeId . '.' . $form_state['values']['id'], $form_state); diff --git a/core/modules/entity/src/Form/EntityDisplayModeDeleteForm.php b/core/modules/entity/src/Form/EntityDisplayModeDeleteForm.php index 091d5fe7f40e05dff2f6e1bf618ac0decc82a54d..b76d56b0ce0d3c6321c32e1ce0ac074e293bd305 100644 --- a/core/modules/entity/src/Form/EntityDisplayModeDeleteForm.php +++ b/core/modules/entity/src/Form/EntityDisplayModeDeleteForm.php @@ -8,6 +8,7 @@ namespace Drupal\entity\Form; use Drupal\Core\Entity\EntityConfirmFormBase; +use Drupal\Core\Form\FormStateInterface; use Drupal\Core\Url; /** @@ -48,7 +49,7 @@ public function getConfirmText() { /** * {@inheritdoc} */ - public function submit(array $form, array &$form_state) { + public function submit(array $form, FormStateInterface $form_state) { parent::submit($form, $form_state); $entity_type = $this->entity->getEntityType(); diff --git a/core/modules/entity/src/Form/EntityDisplayModeFormBase.php b/core/modules/entity/src/Form/EntityDisplayModeFormBase.php index e848413e0de9ac8c9d5a02bf9edb14612f6a106c..52e3388382f0f0385f0621762e96331d630e6d82 100644 --- a/core/modules/entity/src/Form/EntityDisplayModeFormBase.php +++ b/core/modules/entity/src/Form/EntityDisplayModeFormBase.php @@ -10,6 +10,7 @@ use Drupal\Core\Entity\EntityForm; use Drupal\Core\Entity\EntityManagerInterface; use Drupal\Core\Entity\Query\QueryFactory; +use Drupal\Core\Form\FormStateInterface; use Symfony\Component\DependencyInjection\ContainerInterface; /** @@ -64,7 +65,7 @@ public static function create(ContainerInterface $container) { /** * {@inheritdoc} */ - protected function init(array &$form_state) { + protected function init(FormStateInterface $form_state) { parent::init($form_state); $this->entityType = $this->entityManager->getDefinition($this->entity->getEntityTypeId()); } @@ -72,7 +73,7 @@ protected function init(array &$form_state) { /** * {@inheritdoc} */ - public function form(array $form, array &$form_state) { + public function form(array $form, FormStateInterface $form_state) { $form['label'] = array( '#type' => 'textfield', '#title' => t('Label'), @@ -102,13 +103,11 @@ public function form(array $form, array &$form_state) { * The entity ID. * @param array $element * The form element. - * @param array $form_state - * The form state. * * @return bool * TRUE if the display mode exists, FALSE otherwise. */ - public function exists($entity_id, array $element, array $form_state) { + public function exists($entity_id, array $element) { // Do not allow to add internal 'default' view mode. if ($entity_id == 'default') { return TRUE; @@ -122,7 +121,7 @@ public function exists($entity_id, array $element, array $form_state) { /** * {@inheritdoc} */ - public function save(array $form, array &$form_state) { + public function save(array $form, FormStateInterface $form_state) { drupal_set_message(t('Saved the %label @entity-type.', array('%label' => $this->entity->label(), '@entity-type' => $this->entityType->getLowercaseLabel()))); $this->entity->save(); \Drupal::entityManager()->clearCachedFieldDefinitions(); diff --git a/core/modules/entity_reference/entity_reference.module b/core/modules/entity_reference/entity_reference.module index 7fcc560f6b41b0127ef6987801bf7cff52fcfbee..d1babc8daaf8764c2dba3389247a144a00cc6c06 100644 --- a/core/modules/entity_reference/entity_reference.module +++ b/core/modules/entity_reference/entity_reference.module @@ -7,6 +7,7 @@ use Drupal\Component\Utility\NestedArray; use Drupal\Core\Database\Query\AlterableInterface; +use Drupal\Core\Form\FormStateInterface; use Drupal\Core\Render\Element; use Drupal\Core\Routing\RouteMatchInterface; use Drupal\field\Entity\FieldStorageConfig; @@ -147,7 +148,7 @@ function _entity_reference_form_process_merge_parent($element) { /** * Form element validation handler; Filters the #value property of an element. */ -function _entity_reference_element_validate_filter(&$element, &$form_state) { +function _entity_reference_element_validate_filter(&$element, FormStateInterface $form_state) { $element['#value'] = array_filter($element['#value']); form_set_value($element, $element['#value'], $form_state); } @@ -167,7 +168,7 @@ function entity_reference_settings_ajax($form, $form_state) { * * @see entity_reference_field_instance_settings_form() */ -function entity_reference_settings_ajax_submit($form, &$form_state) { +function entity_reference_settings_ajax_submit($form, FormStateInterface $form_state) { $form_state['rebuild'] = TRUE; } diff --git a/core/modules/entity_reference/src/ConfigurableEntityReferenceItem.php b/core/modules/entity_reference/src/ConfigurableEntityReferenceItem.php index 269ad8c0e5af4310d6709aeb8f3c95ae7c4dc7de..032a36592263f8816e46a45675c4220f67a5c57c 100644 --- a/core/modules/entity_reference/src/ConfigurableEntityReferenceItem.php +++ b/core/modules/entity_reference/src/ConfigurableEntityReferenceItem.php @@ -10,6 +10,7 @@ use Drupal\Component\Utility\String; use Drupal\Core\Field\FieldStorageDefinitionInterface; use Drupal\Core\Field\Plugin\Field\FieldType\EntityReferenceItem; +use Drupal\Core\Form\FormStateInterface; use Drupal\Core\Form\OptGroup; use Drupal\Core\Session\AccountInterface; use Drupal\Core\TypedData\AllowedValuesInterface; @@ -159,7 +160,7 @@ public static function schema(FieldStorageDefinitionInterface $field_definition) /** * {@inheritdoc} */ - public function settingsForm(array &$form, array &$form_state, $has_data) { + public function settingsForm(array &$form, FormStateInterface $form_state, $has_data) { $element['target_type'] = array( '#type' => 'select', '#title' => t('Type of item to reference'), @@ -176,7 +177,7 @@ public function settingsForm(array &$form, array &$form_state, $has_data) { /** * {@inheritdoc} */ - public function instanceSettingsForm(array $form, array &$form_state) { + public function instanceSettingsForm(array $form, FormStateInterface $form_state) { $instance = $form_state['instance']; // Get all selection plugins for this entity type. @@ -247,10 +248,10 @@ public function instanceSettingsForm(array $form, array &$form_state) { * * @param array $form * The form where the settings form is being included in. - * @param array $form_state + * @param \Drupal\Core\Form\FormStateInterface $form_state * The form state of the (entire) configuration form. */ - public static function instanceSettingsFormValidate(array $form, array &$form_state) { + public static function instanceSettingsFormValidate(array $form, FormStateInterface $form_state) { if (isset($form_state['values']['instance'])) { unset($form_state['values']['instance']['settings']['handler_submit']); $form_state['instance']->settings = $form_state['values']['instance']['settings']; diff --git a/core/modules/entity_reference/src/Plugin/Field/FieldFormatter/EntityReferenceEntityFormatter.php b/core/modules/entity_reference/src/Plugin/Field/FieldFormatter/EntityReferenceEntityFormatter.php index 15f1df117f4462d1516f1d1c6981d762f7967668..448343e9c01a409d5d596601265cf35ae3809560 100644 --- a/core/modules/entity_reference/src/Plugin/Field/FieldFormatter/EntityReferenceEntityFormatter.php +++ b/core/modules/entity_reference/src/Plugin/Field/FieldFormatter/EntityReferenceEntityFormatter.php @@ -8,6 +8,7 @@ namespace Drupal\entity_reference\Plugin\Field\FieldFormatter; use Drupal\Core\Field\FieldItemListInterface; +use Drupal\Core\Form\FormStateInterface; use Drupal\entity_reference\RecursiveRenderingException; /** @@ -37,7 +38,7 @@ public static function defaultSettings() { /** * {@inheritdoc} */ - public function settingsForm(array $form, array &$form_state) { + public function settingsForm(array $form, FormStateInterface $form_state) { $elements['view_mode'] = array( '#type' => 'select', '#options' => \Drupal::entityManager()->getViewModeOptions($this->getFieldSetting('target_type')), diff --git a/core/modules/entity_reference/src/Plugin/Field/FieldFormatter/EntityReferenceLabelFormatter.php b/core/modules/entity_reference/src/Plugin/Field/FieldFormatter/EntityReferenceLabelFormatter.php index 54a1ae786796f52a155ec995f649d0b56866b13e..154759f2329be01dd48b9dad67e72192a3b3dd62 100644 --- a/core/modules/entity_reference/src/Plugin/Field/FieldFormatter/EntityReferenceLabelFormatter.php +++ b/core/modules/entity_reference/src/Plugin/Field/FieldFormatter/EntityReferenceLabelFormatter.php @@ -9,6 +9,7 @@ use Drupal\Component\Utility\String; use Drupal\Core\Field\FieldItemListInterface; +use Drupal\Core\Form\FormStateInterface; /** * Plugin implementation of the 'entity reference label' formatter. @@ -36,7 +37,7 @@ public static function defaultSettings() { /** * {@inheritdoc} */ - public function settingsForm(array $form, array &$form_state) { + public function settingsForm(array $form, FormStateInterface $form_state) { $elements['link'] = array( '#title' => t('Link label to the referenced entity'), '#type' => 'checkbox', diff --git a/core/modules/entity_reference/src/Plugin/Field/FieldType/ConfigurableEntityReferenceFieldItemList.php b/core/modules/entity_reference/src/Plugin/Field/FieldType/ConfigurableEntityReferenceFieldItemList.php index 3d4bec31aafbc522298903086eae8b034dc580ad..25d854677ae06be5eceac9028c2c120f9963bd79 100644 --- a/core/modules/entity_reference/src/Plugin/Field/FieldType/ConfigurableEntityReferenceFieldItemList.php +++ b/core/modules/entity_reference/src/Plugin/Field/FieldType/ConfigurableEntityReferenceFieldItemList.php @@ -10,6 +10,7 @@ use Drupal\Core\Field\EntityReferenceFieldItemList; use Drupal\Core\Entity\ContentEntityInterface; use Drupal\Core\Field\FieldDefinitionInterface; +use Drupal\Core\Form\FormStateInterface; /** * Represents a configurable entity_reference entity field. @@ -73,7 +74,7 @@ public static function processDefaultValue($default_value, ContentEntityInterfac /** * {@inheritdoc} */ - public function defaultValuesFormSubmit(array $element, array &$form, array &$form_state) { + public function defaultValuesFormSubmit(array $element, array &$form, FormStateInterface $form_state) { $default_value = parent::defaultValuesFormSubmit($element, $form, $form_state); // Convert numeric IDs to UUIDs to ensure config deployability. diff --git a/core/modules/entity_reference/src/Plugin/Field/FieldWidget/AutocompleteTagsWidget.php b/core/modules/entity_reference/src/Plugin/Field/FieldWidget/AutocompleteTagsWidget.php index f930de2890954a67662eea248e921161bc38a3e5..b289a0641cd4a9cc5cf163272a54590176935fba 100644 --- a/core/modules/entity_reference/src/Plugin/Field/FieldWidget/AutocompleteTagsWidget.php +++ b/core/modules/entity_reference/src/Plugin/Field/FieldWidget/AutocompleteTagsWidget.php @@ -8,6 +8,7 @@ namespace Drupal\entity_reference\Plugin\Field\FieldWidget; use Drupal\Component\Utility\Tags; +use Drupal\Core\Form\FormStateInterface; /** * Plugin implementation of the 'entity_reference autocomplete-tags' widget. @@ -39,7 +40,7 @@ public static function defaultSettings() { /** * {@inheritdoc} */ - public function elementValidate($element, &$form_state, $form) { + public function elementValidate($element, FormStateInterface $form_state, $form) { $value = array(); // If a value was entered into the autocomplete. $handler = \Drupal::service('plugin.manager.entity_reference.selection')->getSelectionHandler($this->fieldDefinition); diff --git a/core/modules/entity_reference/src/Plugin/Field/FieldWidget/AutocompleteWidget.php b/core/modules/entity_reference/src/Plugin/Field/FieldWidget/AutocompleteWidget.php index 234eb7ab19989ad91022ec620e056b09bd455d37..3633b5db593967ebaf691e1a4b0212d59678dddf 100644 --- a/core/modules/entity_reference/src/Plugin/Field/FieldWidget/AutocompleteWidget.php +++ b/core/modules/entity_reference/src/Plugin/Field/FieldWidget/AutocompleteWidget.php @@ -8,6 +8,7 @@ namespace Drupal\entity_reference\Plugin\Field\FieldWidget; use Drupal\Core\Field\FieldItemListInterface; +use Drupal\Core\Form\FormStateInterface; /** * Plugin implementation of the 'entity_reference autocomplete' widget. @@ -57,7 +58,7 @@ protected function getEntityIds(FieldItemListInterface $items, $delta) { /** * {@inheritdoc} */ - public function elementValidate($element, &$form_state, $form) { + public function elementValidate($element, FormStateInterface $form_state, $form) { $auto_create = $this->getSelectionHandlerSetting('auto_create'); // If a value was entered into the autocomplete. diff --git a/core/modules/entity_reference/src/Plugin/Field/FieldWidget/AutocompleteWidgetBase.php b/core/modules/entity_reference/src/Plugin/Field/FieldWidget/AutocompleteWidgetBase.php index 2ed1dfee063a3acf4760f5773cb87225109ad0a7..975ec4f1796966330b8c97762555e350aae2ebd5 100644 --- a/core/modules/entity_reference/src/Plugin/Field/FieldWidget/AutocompleteWidgetBase.php +++ b/core/modules/entity_reference/src/Plugin/Field/FieldWidget/AutocompleteWidgetBase.php @@ -10,6 +10,7 @@ use Drupal\Component\Utility\Tags; use Drupal\Core\Field\FieldItemListInterface; use Drupal\Core\Field\WidgetBase; +use Drupal\Core\Form\FormStateInterface; use Drupal\user\EntityOwnerInterface; use Symfony\Component\Validator\ConstraintViolationInterface; @@ -21,7 +22,7 @@ abstract class AutocompleteWidgetBase extends WidgetBase { /** * {@inheritdoc} */ - public function settingsForm(array $form, array &$form_state) { + public function settingsForm(array $form, FormStateInterface $form_state) { $element['match_operator'] = array( '#type' => 'radios', '#title' => t('Autocomplete matching'), @@ -70,7 +71,7 @@ public function settingsSummary() { /** * {@inheritdoc} */ - public function formElement(FieldItemListInterface $items, $delta, array $element, array &$form, array &$form_state) { + public function formElement(FieldItemListInterface $items, $delta, array $element, array &$form, FormStateInterface $form_state) { $entity = $items->getEntity(); // Prepare the autocomplete route parameters. @@ -103,14 +104,14 @@ public function formElement(FieldItemListInterface $items, $delta, array $elemen /** * {@inheritdoc} */ - public function errorElement(array $element, ConstraintViolationInterface $error, array $form, array &$form_state) { + public function errorElement(array $element, ConstraintViolationInterface $error, array $form, FormStateInterface $form_state) { return $element['target_id']; } /** * Validates an element. */ - public function elementValidate($element, &$form_state, $form) { } + public function elementValidate($element, FormStateInterface $form_state, $form) { } /** * Gets the entity labels. diff --git a/core/modules/entity_reference/src/Plugin/Type/Selection/SelectionBroken.php b/core/modules/entity_reference/src/Plugin/Type/Selection/SelectionBroken.php index eab272ec8331d8dcabc5c5d8e2760001f72e6fce..37a526448d2cf056a7dcc69a0b76d814b06bc159 100644 --- a/core/modules/entity_reference/src/Plugin/Type/Selection/SelectionBroken.php +++ b/core/modules/entity_reference/src/Plugin/Type/Selection/SelectionBroken.php @@ -9,6 +9,7 @@ use Drupal\Core\Database\Query\SelectInterface; use Drupal\Core\Field\FieldDefinitionInterface; +use Drupal\Core\Form\FormStateInterface; /** * A null implementation of SelectionInterface. @@ -49,7 +50,7 @@ public function validateReferenceableEntities(array $ids) { /** * {@inheritdoc} */ - public function validateAutocompleteInput($input, &$element, &$form_state, $form, $strict = TRUE) { } + public function validateAutocompleteInput($input, &$element, FormStateInterface $form_state, $form, $strict = TRUE) { } /** * {@inheritdoc} diff --git a/core/modules/entity_reference/src/Plugin/Type/Selection/SelectionInterface.php b/core/modules/entity_reference/src/Plugin/Type/Selection/SelectionInterface.php index 28fc2c54b51e84b9f27b1f298c331de6f173a6e1..eb3b8aeabfc9bd014b2a16f487c70a9a65c6e894 100644 --- a/core/modules/entity_reference/src/Plugin/Type/Selection/SelectionInterface.php +++ b/core/modules/entity_reference/src/Plugin/Type/Selection/SelectionInterface.php @@ -9,6 +9,7 @@ use Drupal\Core\Database\Query\SelectInterface; use Drupal\Core\Field\FieldDefinitionInterface; +use Drupal\Core\Form\FormStateInterface; /** * Interface definition for Entity Reference Selection plugins. @@ -54,6 +55,10 @@ public function validateReferenceableEntities(array $ids); * Single string from autocomplete widget. * @param array $element * The form element to set a form error. + * @param \Drupal\Core\Form\FormStateInterface $form_state + * The current form state. + * @param array $form + * The form. * @param boolean $strict * Whether to trigger a form error if an element from $input (eg. an entity) * is not found. Defaults to TRUE. @@ -63,7 +68,7 @@ public function validateReferenceableEntities(array $ids); * * @see \Drupal\entity_reference\Plugin\Field\FieldWidget::elementValidate() */ - public function validateAutocompleteInput($input, &$element, &$form_state, $form, $strict = TRUE); + public function validateAutocompleteInput($input, &$element, FormStateInterface $form_state, $form, $strict = TRUE); /** * Allows the selection to alter the SelectQuery generated by EntityFieldQuery. diff --git a/core/modules/entity_reference/src/Plugin/entity_reference/selection/SelectionBase.php b/core/modules/entity_reference/src/Plugin/entity_reference/selection/SelectionBase.php index 11ee6cd0b0d4bb50a16986b545f779a16ca3d25c..fbb653706b231139343863f69ecf501efa645db1 100644 --- a/core/modules/entity_reference/src/Plugin/entity_reference/selection/SelectionBase.php +++ b/core/modules/entity_reference/src/Plugin/entity_reference/selection/SelectionBase.php @@ -12,6 +12,7 @@ use Drupal\Core\Database\Query\SelectInterface; use Drupal\Core\Entity\EntityInterface; use Drupal\Core\Field\FieldDefinitionInterface; +use Drupal\Core\Form\FormStateInterface; use Drupal\entity_reference\Plugin\Type\Selection\SelectionInterface; /** @@ -229,7 +230,7 @@ public function validateReferenceableEntities(array $ids) { /** * {@inheritdoc} */ - public function validateAutocompleteInput($input, &$element, &$form_state, $form, $strict = TRUE) { + public function validateAutocompleteInput($input, &$element, FormStateInterface $form_state, $form, $strict = TRUE) { $bundled_entities = $this->getReferenceableEntities($input, '=', 6); $entities = array(); foreach ($bundled_entities as $entities_list) { diff --git a/core/modules/entity_reference/src/Plugin/views/row/EntityReference.php b/core/modules/entity_reference/src/Plugin/views/row/EntityReference.php index b975b0acd0218a8dc9ed10ab0d25b5b1f5a4516a..8434e971f39cbaa9746b2f1fc2a8a2b54c0bdf9e 100644 --- a/core/modules/entity_reference/src/Plugin/views/row/EntityReference.php +++ b/core/modules/entity_reference/src/Plugin/views/row/EntityReference.php @@ -7,6 +7,7 @@ namespace Drupal\entity_reference\Plugin\views\row; +use Drupal\Core\Form\FormStateInterface; use Drupal\views\Plugin\views\row\Fields; /** @@ -38,7 +39,7 @@ protected function defineOptions() { /** * Overrides \Drupal\views\Plugin\views\row\Fields::buildOptionsForm(). */ - public function buildOptionsForm(&$form, &$form_state) { + public function buildOptionsForm(&$form, FormStateInterface $form_state) { parent::buildOptionsForm($form, $form_state); // Expand the description of the 'Inline field' checkboxes. diff --git a/core/modules/entity_reference/src/Plugin/views/style/EntityReference.php b/core/modules/entity_reference/src/Plugin/views/style/EntityReference.php index 37a446b91c0cdb0516bb74bface10f88e1409193..d0b3bbe49860844a5aee789b1ec9cb00d27ea9a8 100644 --- a/core/modules/entity_reference/src/Plugin/views/style/EntityReference.php +++ b/core/modules/entity_reference/src/Plugin/views/style/EntityReference.php @@ -8,6 +8,7 @@ namespace Drupal\entity_reference\Plugin\views\style; use Drupal\Component\Utility\Xss; +use Drupal\Core\Form\FormStateInterface; use Drupal\views\Plugin\views\style\StylePluginBase; /** @@ -54,7 +55,7 @@ protected function defineOptions() { /** * Overrides \Drupal\views\Plugin\views\style\StylePluginBase\StylePluginBase::buildOptionsForm(). */ - public function buildOptionsForm(&$form, &$form_state) { + public function buildOptionsForm(&$form, FormStateInterface $form_state) { parent::buildOptionsForm($form, $form_state); $options = $this->displayHandler->getFieldLabels(TRUE); diff --git a/core/modules/field/field.api.php b/core/modules/field/field.api.php index 62a8c1cad43377c8708f74f804411a71b6d24b65..543561e7b0aa7ea91716734275c5da305a3e9999 100644 --- a/core/modules/field/field.api.php +++ b/core/modules/field/field.api.php @@ -105,7 +105,7 @@ function hook_field_widget_info_alter(array &$info) { * @param $element * The field widget form element as constructed by hook_field_widget_form(). * @param $form_state - * An associative array containing the current state of the form. + * The current state of the form. * @param $context * An associative array containing the following key-value pairs: * - form: The form structure to which widgets are being attached. This may be @@ -120,7 +120,7 @@ function hook_field_widget_info_alter(array &$info) { * @see \Drupal\Core\Field\WidgetBase::formSingleElement() * @see hook_field_widget_WIDGET_TYPE_form_alter() */ -function hook_field_widget_form_alter(&$element, &$form_state, $context) { +function hook_field_widget_form_alter(&$element, \Drupal\Core\Form\FormStateInterface $form_state, $context) { // Add a css class to widget form elements for all fields of type mytype. $field_definition = $context['items']->getFieldDefinition(); if ($field_definition->getType() == 'mytype') { @@ -139,7 +139,7 @@ function hook_field_widget_form_alter(&$element, &$form_state, $context) { * @param $element * The field widget form element as constructed by hook_field_widget_form(). * @param $form_state - * An associative array containing the current state of the form. + * The current state of the form. * @param $context * An associative array. See hook_field_widget_form_alter() for the structure * and content of the array. @@ -147,7 +147,7 @@ function hook_field_widget_form_alter(&$element, &$form_state, $context) { * @see \Drupal\Core\Field\WidgetBase::formSingleElement() * @see hook_field_widget_form_alter() */ -function hook_field_widget_WIDGET_TYPE_form_alter(&$element, &$form_state, $context) { +function hook_field_widget_WIDGET_TYPE_form_alter(&$element, \Drupal\Core\Form\FormStateInterface $form_state, $context) { // Code here will only act on widgets of type WIDGET_TYPE. For example, // hook_field_widget_mymodule_autocomplete_form_alter() will only act on // widgets of type 'mymodule_autocomplete'. diff --git a/core/modules/field/field.module b/core/modules/field/field.module index 444a92dbf43232adf6fc1b43428cce1a5529a463..8bcb693e0a7862134d7eeb4a2dd5761753e9ed1c 100644 --- a/core/modules/field/field.module +++ b/core/modules/field/field.module @@ -10,6 +10,7 @@ use Drupal\Core\Config\ConfigImporter; use Drupal\Core\Entity\EntityTypeInterface; use Drupal\Core\Extension\Extension; +use Drupal\Core\Form\FormStateInterface; use Drupal\Core\Routing\RouteMatchInterface; /* @@ -344,7 +345,7 @@ function field_config_import_steps_alter(&$sync_steps, ConfigImporter $config_im * * @see \Drupal\field\ConfigImporterFieldPurger */ -function field_form_config_admin_import_form_alter(&$form, &$form_state) { +function field_form_config_admin_import_form_alter(&$form, FormStateInterface $form_state) { // Only display the message when there is a storage comparer available and the // form is not submitted. if (isset($form_state['storage_comparer']) && empty($form_state['input'])) { diff --git a/core/modules/field/src/Plugin/views/argument/FieldList.php b/core/modules/field/src/Plugin/views/argument/FieldList.php index 5bfd9350dd385526c04f443e515c41ad9b56d0b6..08c7756eed334daa119830598198962d5d173534 100644 --- a/core/modules/field/src/Plugin/views/argument/FieldList.php +++ b/core/modules/field/src/Plugin/views/argument/FieldList.php @@ -8,6 +8,7 @@ namespace Drupal\field\Plugin\views\argument; use Drupal\Component\Utility\String; +use Drupal\Core\Form\FormStateInterface; use Drupal\views\ViewExecutable; use Drupal\views\Plugin\views\display\DisplayPluginBase; use Drupal\views\Plugin\views\argument\Numeric; @@ -47,7 +48,7 @@ protected function defineOptions() { return $options; } - public function buildOptionsForm(&$form, &$form_state) { + public function buildOptionsForm(&$form, FormStateInterface $form_state) { parent::buildOptionsForm($form, $form_state); $form['summary']['human'] = array( diff --git a/core/modules/field/src/Plugin/views/argument/ListString.php b/core/modules/field/src/Plugin/views/argument/ListString.php index 02d049a55b8a0baf2a1aa93f16bd186f42398913..eee75e2d4a564dcc3e510cbdffc27eb4048e379e 100644 --- a/core/modules/field/src/Plugin/views/argument/ListString.php +++ b/core/modules/field/src/Plugin/views/argument/ListString.php @@ -8,6 +8,7 @@ namespace Drupal\field\Plugin\views\argument; use Drupal\Component\Utility\String as UtilityString; +use Drupal\Core\Form\FormStateInterface; use Drupal\views\ViewExecutable; use Drupal\views\Plugin\views\display\DisplayPluginBase; use Drupal\views\Plugin\views\argument\String; @@ -48,7 +49,7 @@ protected function defineOptions() { return $options; } - public function buildOptionsForm(&$form, &$form_state) { + public function buildOptionsForm(&$form, FormStateInterface $form_state) { parent::buildOptionsForm($form, $form_state); $form['summary']['human'] = array( diff --git a/core/modules/field/src/Plugin/views/field/Field.php b/core/modules/field/src/Plugin/views/field/Field.php index ad3543b4652680aa3f884bd6386697a3d5ba3be1..e4103f38f73a8f5e4b067bbea5c1126f29bcce1c 100644 --- a/core/modules/field/src/Plugin/views/field/Field.php +++ b/core/modules/field/src/Plugin/views/field/Field.php @@ -16,6 +16,7 @@ use Drupal\Core\Field\FieldDefinition; use Drupal\Core\Field\FieldStorageDefinitionInterface; use Drupal\Core\Field\FormatterPluginManager; +use Drupal\Core\Form\FormStateInterface; use Drupal\Core\Language\LanguageInterface; use Drupal\Core\Language\LanguageManager; use Drupal\Core\Render\Element; @@ -435,7 +436,7 @@ protected function defineOptions() { /** * {@inheritdoc} */ - public function buildOptionsForm(&$form, &$form_state) { + public function buildOptionsForm(&$form, FormStateInterface $form_state) { parent::buildOptionsForm($form, $form_state); $field = $this->getFieldDefinition(); @@ -516,7 +517,7 @@ public function buildOptionsForm(&$form, &$form_state) { /** * Provide options for multiple value fields. */ - function multiple_options_form(&$form, &$form_state) { + function multiple_options_form(&$form, FormStateInterface $form_state) { $field = $this->getFieldDefinition(); $form['multiple_field_settings'] = array( @@ -639,7 +640,7 @@ function multiple_options_form(&$form, &$form_state) { /** * Extend the groupby form with group columns. */ - public function buildGroupByForm(&$form, &$form_state) { + public function buildGroupByForm(&$form, FormStateInterface $form_state) { parent::buildGroupByForm($form, $form_state); // With "field API" fields, the column target of the grouping function // and any additional grouping columns must be specified. @@ -672,7 +673,7 @@ public function buildGroupByForm(&$form, &$form_state) { ); } - public function submitGroupByForm(&$form, &$form_state) { + public function submitGroupByForm(&$form, FormStateInterface $form_state) { parent::submitGroupByForm($form, $form_state); $item = &$form_state['handler']->options; diff --git a/core/modules/field/src/Tests/FieldAttachOtherTest.php b/core/modules/field/src/Tests/FieldAttachOtherTest.php index 7356bcebaa11f05ca7085a476b60a4019a21bfdd..a74e4d28653fd92034df5f00205f20616fffae96 100644 --- a/core/modules/field/src/Tests/FieldAttachOtherTest.php +++ b/core/modules/field/src/Tests/FieldAttachOtherTest.php @@ -7,6 +7,7 @@ namespace Drupal\field\Tests; +use Drupal\Core\Form\FormState; use Drupal\Core\Language\LanguageInterface; /** @@ -265,7 +266,7 @@ function testEntityFormDisplayBuildForm() { // Test generating widgets for all fields. $display = entity_get_form_display($entity_type, $this->instance->bundle, 'default'); $form = array(); - $form_state = \Drupal::formBuilder()->getFormStateDefaults(); + $form_state = new FormState(); $display->buildForm($entity, $form, $form_state); $this->assertEqual($form[$this->field_name]['widget']['#title'], $this->instance->getLabel(), "First field's form title is {$this->instance->getLabel()}"); @@ -287,7 +288,7 @@ function testEntityFormDisplayBuildForm() { } } $form = array(); - $form_state = \Drupal::formBuilder()->getFormStateDefaults(); + $form_state = new FormState(); $display->buildForm($entity, $form, $form_state); $this->assertFalse(isset($form[$this->field_name]), 'The first field does not exist in the form'); @@ -310,7 +311,7 @@ function testEntityFormDisplayExtractFormValues() { // Build the form for all fields. $display = entity_get_form_display($entity_type, $this->instance->bundle, 'default'); $form = array(); - $form_state = \Drupal::formBuilder()->getFormStateDefaults(); + $form_state = new FormState(); $display->buildForm($entity_init, $form, $form_state); // Simulate incoming values. diff --git a/core/modules/field/src/Tests/FormTest.php b/core/modules/field/src/Tests/FormTest.php index 2457aa72a90753ca3f598543a6bcf62eaba8c7a8..262a96ddadda4e1066b752bc62026feb13e24daf 100644 --- a/core/modules/field/src/Tests/FormTest.php +++ b/core/modules/field/src/Tests/FormTest.php @@ -9,6 +9,7 @@ use Drupal\Component\Utility\String; use Drupal\Core\Field\FieldStorageDefinitionInterface; +use Drupal\Core\Form\FormState; /** * Tests field form handling. @@ -531,7 +532,7 @@ function testFieldFormAccess() { $display = entity_get_form_display($entity_type, $entity_type, 'default'); $form = array(); - $form_state = \Drupal::formBuilder()->getFormStateDefaults(); + $form_state = new FormState(); $display->buildForm($entity, $form, $form_state); $this->assertFalse($form[$field_name_no_access]['#access'], 'Field #access is FALSE for the field without edit access.'); diff --git a/core/modules/field/tests/modules/field_test/field_test.module b/core/modules/field/tests/modules/field_test/field_test.module index 13c846dbbf89d335851caaaff27e7e17489cf6a0..499c8832e98dcdfc9e75326ed2462838ae91230b 100644 --- a/core/modules/field/tests/modules/field_test/field_test.module +++ b/core/modules/field/tests/modules/field_test/field_test.module @@ -2,6 +2,7 @@ use Drupal\Core\Entity\EntityInterface; use Drupal\field\FieldStorageConfigInterface; +use Drupal\Core\Form\FormStateInterface; /** * @file @@ -115,7 +116,7 @@ function field_test_entity_display_build_alter(&$output, $context) { /** * Implements hook_field_widget_form_alter(). */ -function field_test_field_widget_form_alter(&$element, &$form_state, $context) { +function field_test_field_widget_form_alter(&$element, FormStateInterface $form_state, $context) { $field_definition = $context['items']->getFieldDefinition(); switch ($field_definition->getName()) { case 'alter_test_text': diff --git a/core/modules/field/tests/modules/field_test/src/Form/NestedEntityTestForm.php b/core/modules/field/tests/modules/field_test/src/Form/NestedEntityTestForm.php index 89aa42c02f7e659aeb0a5d30d540b74bbeabf021..ea5a30e010c52cd46b2bd9e5ac0f06d805190966 100644 --- a/core/modules/field/tests/modules/field_test/src/Form/NestedEntityTestForm.php +++ b/core/modules/field/tests/modules/field_test/src/Form/NestedEntityTestForm.php @@ -9,6 +9,7 @@ use Drupal\Core\Entity\EntityInterface; use Drupal\Core\Form\FormBase; +use Drupal\Core\Form\FormStateInterface; use Drupal\entity\Entity\EntityFormDisplay; /** @@ -26,7 +27,7 @@ public function getFormId() { /** * {@inheritdoc] */ - public function buildForm(array $form, array &$form_state, EntityInterface $entity_1 = NULL, EntityInterface $entity_2 = NULL) { + public function buildForm(array $form, FormStateInterface $form_state, EntityInterface $entity_1 = NULL, EntityInterface $entity_2 = NULL) { // First entity. $form_state['entity_1'] = $entity_1; $form_state['form_display_1'] = EntityFormDisplay::collectRenderDisplay($entity_1, 'default'); @@ -57,7 +58,7 @@ public function buildForm(array $form, array &$form_state, EntityInterface $enti /** * {@inheritdoc] */ - public function validateForm(array &$form, array &$form_state) { + public function validateForm(array &$form, FormStateInterface $form_state) { $entity_1 = $form_state['entity_1']; /** @var \Drupal\Core\Entity\Display\EntityFormDisplayInterface $form_display_1 */ $form_display_1 = $form_state['form_display_1']; @@ -74,7 +75,7 @@ public function validateForm(array &$form, array &$form_state) { /** * {@inheritdoc] */ - public function submitForm(array &$form, array &$form_state) { + public function submitForm(array &$form, FormStateInterface $form_state) { /** @var \Drupal\Core\Entity\EntityInterface $entity_1 */ $entity_1 = $form_state['entity_1']; $entity_1->save(); diff --git a/core/modules/field/tests/modules/field_test/src/Plugin/Field/FieldFormatter/TestFieldDefaultFormatter.php b/core/modules/field/tests/modules/field_test/src/Plugin/Field/FieldFormatter/TestFieldDefaultFormatter.php index 3e61ca1cea8b714c29574c3f4dca57b40510decb..d195a31d3e35a1ad33932ad1653ac0d1cb980cce 100644 --- a/core/modules/field/tests/modules/field_test/src/Plugin/Field/FieldFormatter/TestFieldDefaultFormatter.php +++ b/core/modules/field/tests/modules/field_test/src/Plugin/Field/FieldFormatter/TestFieldDefaultFormatter.php @@ -9,6 +9,7 @@ use Drupal\Core\Field\FormatterBase; use Drupal\Core\Field\FieldItemListInterface; +use Drupal\Core\Form\FormStateInterface; /** * Plugin implementation of the 'field_test_default' formatter. @@ -37,7 +38,7 @@ public static function defaultSettings() { /** * {@inheritdoc} */ - public function settingsForm(array $form, array &$form_state) { + public function settingsForm(array $form, FormStateInterface $form_state) { $element['test_formatter_setting'] = array( '#title' => t('Setting'), '#type' => 'textfield', diff --git a/core/modules/field/tests/modules/field_test/src/Plugin/Field/FieldFormatter/TestFieldEmptySettingFormatter.php b/core/modules/field/tests/modules/field_test/src/Plugin/Field/FieldFormatter/TestFieldEmptySettingFormatter.php index 7cd25fb2c0c412a0fa393453b1709011e9d21f2d..84938ece0285679f0c30956f14f47e72bdb1e4a0 100644 --- a/core/modules/field/tests/modules/field_test/src/Plugin/Field/FieldFormatter/TestFieldEmptySettingFormatter.php +++ b/core/modules/field/tests/modules/field_test/src/Plugin/Field/FieldFormatter/TestFieldEmptySettingFormatter.php @@ -9,6 +9,7 @@ use Drupal\Core\Field\FormatterBase; use Drupal\Core\Field\FieldItemListInterface; +use Drupal\Core\Form\FormStateInterface; /** * Plugin implementation of the 'field_empty_setting' formatter. @@ -36,7 +37,7 @@ public static function defaultSettings() { /** * {@inheritdoc} */ - public function settingsForm(array $form, array &$form_state) { + public function settingsForm(array $form, FormStateInterface $form_state) { $element['field_empty_setting'] = array( '#title' => t('Setting'), '#type' => 'textfield', diff --git a/core/modules/field/tests/modules/field_test/src/Plugin/Field/FieldFormatter/TestFieldMultipleFormatter.php b/core/modules/field/tests/modules/field_test/src/Plugin/Field/FieldFormatter/TestFieldMultipleFormatter.php index 1aeb570db846711f515530e5d3d5c261f5ca486e..a310ad3e321a8d867759ffde098e8ff43fa8db5e 100644 --- a/core/modules/field/tests/modules/field_test/src/Plugin/Field/FieldFormatter/TestFieldMultipleFormatter.php +++ b/core/modules/field/tests/modules/field_test/src/Plugin/Field/FieldFormatter/TestFieldMultipleFormatter.php @@ -9,6 +9,7 @@ use Drupal\Core\Field\FormatterBase; use Drupal\Core\Field\FieldItemListInterface; +use Drupal\Core\Form\FormStateInterface; /** * Plugin implementation of the 'field_test_multiple' formatter. @@ -37,7 +38,7 @@ public static function defaultSettings() { /** * {@inheritdoc} */ - public function settingsForm(array $form, array &$form_state) { + public function settingsForm(array $form, FormStateInterface $form_state) { $element['test_formatter_setting_multiple'] = array( '#title' => t('Setting'), '#type' => 'textfield', diff --git a/core/modules/field/tests/modules/field_test/src/Plugin/Field/FieldFormatter/TestFieldPrepareViewFormatter.php b/core/modules/field/tests/modules/field_test/src/Plugin/Field/FieldFormatter/TestFieldPrepareViewFormatter.php index beb17e9de486d67df9834d84c906692dc9443f38..211c1cdf1b7ab7def3b665a9f8b99ce3f564400d 100644 --- a/core/modules/field/tests/modules/field_test/src/Plugin/Field/FieldFormatter/TestFieldPrepareViewFormatter.php +++ b/core/modules/field/tests/modules/field_test/src/Plugin/Field/FieldFormatter/TestFieldPrepareViewFormatter.php @@ -9,6 +9,7 @@ use Drupal\Core\Field\FormatterBase; use Drupal\Core\Field\FieldItemListInterface; +use Drupal\Core\Form\FormStateInterface; /** * Plugin implementation of the 'field_test_with_prepare_view' formatter. @@ -37,7 +38,7 @@ public static function defaultSettings() { /** * {@inheritdoc} */ - public function settingsForm(array $form, array &$form_state) { + public function settingsForm(array $form, FormStateInterface $form_state) { $element['test_formatter_setting_additional'] = array( '#title' => t('Setting'), '#type' => 'textfield', diff --git a/core/modules/field/tests/modules/field_test/src/Plugin/Field/FieldType/TestItem.php b/core/modules/field/tests/modules/field_test/src/Plugin/Field/FieldType/TestItem.php index 45302e39c359ae9f39363808cbbcaf05624b2394..52349643798223f0ef0c980ed2de13175f290fcd 100644 --- a/core/modules/field/tests/modules/field_test/src/Plugin/Field/FieldType/TestItem.php +++ b/core/modules/field/tests/modules/field_test/src/Plugin/Field/FieldType/TestItem.php @@ -8,6 +8,7 @@ namespace Drupal\field_test\Plugin\Field\FieldType; use Drupal\Core\Field\FieldStorageDefinitionInterface; +use Drupal\Core\Form\FormStateInterface; use Drupal\Core\TypedData\DataDefinition; use Drupal\Core\Field\FieldItemBase; @@ -76,7 +77,7 @@ public static function schema(FieldStorageDefinitionInterface $field_definition) /** * {@inheritdoc} */ - public function settingsForm(array &$form, array &$form_state, $has_data) { + public function settingsForm(array &$form, FormStateInterface $form_state, $has_data) { $form['test_field_storage_setting'] = array( '#type' => 'textfield', '#title' => t('Field test field storage setting'), @@ -91,7 +92,7 @@ public function settingsForm(array &$form, array &$form_state, $has_data) { /** * {@inheritdoc} */ - public function instanceSettingsForm(array $form, array &$form_state) { + public function instanceSettingsForm(array $form, FormStateInterface $form_state) { $form['test_instance_setting'] = array( '#type' => 'textfield', '#title' => t('Field test field instance setting'), diff --git a/core/modules/field/tests/modules/field_test/src/Plugin/Field/FieldWidget/TestFieldWidget.php b/core/modules/field/tests/modules/field_test/src/Plugin/Field/FieldWidget/TestFieldWidget.php index 1fcc8bc20ef717b512bf99056a8cb00303811c61..71b8afaa54617b71082cfb22fc4f2389079bfcce 100644 --- a/core/modules/field/tests/modules/field_test/src/Plugin/Field/FieldWidget/TestFieldWidget.php +++ b/core/modules/field/tests/modules/field_test/src/Plugin/Field/FieldWidget/TestFieldWidget.php @@ -9,6 +9,7 @@ use Drupal\Core\Field\FieldItemListInterface; use Drupal\Core\Field\WidgetBase; +use Drupal\Core\Form\FormStateInterface; use Symfony\Component\Validator\ConstraintViolationInterface; /** @@ -38,7 +39,7 @@ public static function defaultSettings() { /** * {@inheritdoc} */ - public function settingsForm(array $form, array &$form_state) { + public function settingsForm(array $form, FormStateInterface $form_state) { $element['test_widget_setting'] = array( '#type' => 'textfield', '#title' => t('Field test field widget setting'), @@ -61,7 +62,7 @@ public function settingsSummary() { /** * {@inheritdoc} */ - public function formElement(FieldItemListInterface $items, $delta, array $element, array &$form, array &$form_state) { + public function formElement(FieldItemListInterface $items, $delta, array $element, array &$form, FormStateInterface $form_state) { $element += array( '#type' => 'textfield', '#default_value' => isset($items[$delta]->value) ? $items[$delta]->value : '', @@ -72,7 +73,7 @@ public function formElement(FieldItemListInterface $items, $delta, array $elemen /** * {@inheritdoc} */ - public function errorElement(array $element, ConstraintViolationInterface $error, array $form, array &$form_state) { + public function errorElement(array $element, ConstraintViolationInterface $violation, array $form, FormStateInterface $form_state) { return $element['value']; } diff --git a/core/modules/field/tests/modules/field_test/src/Plugin/Field/FieldWidget/TestFieldWidgetMultiple.php b/core/modules/field/tests/modules/field_test/src/Plugin/Field/FieldWidget/TestFieldWidgetMultiple.php index ac4609ce61fc7a60490f6739b17991e230fc17ea..5ad37f483d0ff7fa0f27f26bd7f37514ff6e1f9a 100644 --- a/core/modules/field/tests/modules/field_test/src/Plugin/Field/FieldWidget/TestFieldWidgetMultiple.php +++ b/core/modules/field/tests/modules/field_test/src/Plugin/Field/FieldWidget/TestFieldWidgetMultiple.php @@ -9,6 +9,7 @@ use Drupal\Core\Field\FieldItemListInterface; use Drupal\Core\Field\WidgetBase; +use Drupal\Core\Form\FormStateInterface; use Symfony\Component\Validator\ConstraintViolationInterface; /** @@ -40,7 +41,7 @@ public static function defaultSettings() { /** * {@inheritdoc} */ - public function settingsForm(array $form, array &$form_state) { + public function settingsForm(array $form, FormStateInterface $form_state) { $element['test_widget_setting_multiple'] = array( '#type' => 'textfield', '#title' => t('Field test field widget setting'), @@ -63,7 +64,7 @@ public function settingsSummary() { /** * {@inheritdoc} */ - public function formElement(FieldItemListInterface $items, $delta, array $element, array &$form, array &$form_state) { + public function formElement(FieldItemListInterface $items, $delta, array $element, array &$form, FormStateInterface $form_state) { $values = array(); foreach ($items as $item) { $values[] = $item->value; @@ -79,14 +80,14 @@ public function formElement(FieldItemListInterface $items, $delta, array $elemen /** * {@inheritdoc} */ - public function errorElement(array $element, ConstraintViolationInterface $error, array $form, array &$form_state) { + public function errorElement(array $element, ConstraintViolationInterface $violation, array $form, FormStateInterface $form_state) { return $element; } /** * Element validation helper. */ - public static function multipleValidate($element, &$form_state) { + public static function multipleValidate($element, FormStateInterface $form_state) { $values = array_map('trim', explode(',', $element['#value'])); $items = array(); foreach ($values as $value) { diff --git a/core/modules/field_ui/field_ui.api.php b/core/modules/field_ui/field_ui.api.php index 070f020d911fb3830e6e082161d704604b803d51..b67d89b17b03a96496cff22665f496ed1d1fc82a 100644 --- a/core/modules/field_ui/field_ui.api.php +++ b/core/modules/field_ui/field_ui.api.php @@ -21,7 +21,7 @@ * The entity view mode. * @param array $form * The (entire) configuration form array. - * @param array $form_state + * @param \Drupal\Core\Form\FormStateInterface $form_state * The form state. * * @return array @@ -54,7 +54,7 @@ function hook_field_formatter_third_party_settings_form(\Drupal\Core\Field\Forma * The entity form mode. * @param array $form * The (entire) configuration form array. - * @param array $form_state + * @param \Drupal\Core\Form\FormStateInterface $form_state * The form state. * * @return array diff --git a/core/modules/field_ui/field_ui.module b/core/modules/field_ui/field_ui.module index 4d475b4051b7dcfd2081295378bc91852537e696..336b5877c649eb0849d1f89f88c2686d7022f246 100644 --- a/core/modules/field_ui/field_ui.module +++ b/core/modules/field_ui/field_ui.module @@ -6,6 +6,7 @@ */ use Drupal\Core\Entity\EntityInterface; +use Drupal\Core\Form\FormStateInterface; use Drupal\Core\Render\Element; use Drupal\Core\Routing\RouteMatchInterface; use Drupal\entity\EntityViewModeInterface; @@ -198,7 +199,7 @@ function field_ui_entity_operation(EntityInterface $entity) { * * @see field_ui_form_node_type_form_alter() */ -function field_ui_form_node_type_form_submit($form, &$form_state) { +function field_ui_form_node_type_form_submit($form, FormStateInterface $form_state) { if ($form_state['triggering_element']['#parents'][0] === 'save_continue' && $route_info = FieldUI::getOverviewRouteInfo('node', $form_state['values']['type'])) { $form_state['redirect_route'] = $route_info; } diff --git a/core/modules/field_ui/src/DisplayOverview.php b/core/modules/field_ui/src/DisplayOverview.php index 3c55ec0afaae55ce36a703b4087f8026e8db9af1..6d5a677eddaded7c46e5b8c70788964bb0e79470 100644 --- a/core/modules/field_ui/src/DisplayOverview.php +++ b/core/modules/field_ui/src/DisplayOverview.php @@ -16,6 +16,7 @@ use Drupal\Core\Field\FieldTypePluginManager; use Drupal\Core\Field\FormatterInterface; use Drupal\Core\Field\PluginSettingsInterface; +use Drupal\Core\Form\FormStateInterface; use Symfony\Component\DependencyInjection\ContainerInterface; /** @@ -77,7 +78,7 @@ public function getFormId() { /** * {@inheritdoc} */ - public function buildForm(array $form, array &$form_state, $entity_type_id = NULL, $bundle = NULL) { + public function buildForm(array $form, FormStateInterface $form_state, $entity_type_id = NULL, $bundle = NULL) { if ($this->getRequest()->attributes->has('view_mode_name')) { $this->mode = $this->getRequest()->attributes->get('view_mode_name'); } @@ -88,7 +89,7 @@ public function buildForm(array $form, array &$form_state, $entity_type_id = NUL /** * {@inheritdoc} */ - protected function buildFieldRow(FieldDefinitionInterface $field_definition, EntityDisplayInterface $entity_display, array $form, array &$form_state) { + protected function buildFieldRow(FieldDefinitionInterface $field_definition, EntityDisplayInterface $entity_display, array $form, FormStateInterface $form_state) { $field_row = parent::buildFieldRow($field_definition, $entity_display, $form, $form_state); $field_name = $field_definition->getName(); @@ -233,7 +234,7 @@ protected function getFieldLabelOptions() { /** * {@inheritdoc} */ - protected function thirdPartySettingsForm(PluginSettingsInterface $plugin, FieldDefinitionInterface $field_definition, array $form, array &$form_state) { + protected function thirdPartySettingsForm(PluginSettingsInterface $plugin, FieldDefinitionInterface $field_definition, array $form, FormStateInterface $form_state) { $settings_form = array(); // Invoke hook_field_formatter_third_party_settings_form(), keying resulting // subforms by module name. diff --git a/core/modules/field_ui/src/DisplayOverviewBase.php b/core/modules/field_ui/src/DisplayOverviewBase.php index f4503137d7429e94e09db978ca609c91b4ef8138..e76b6b6dfa17cfe156730cec61280a7bfab3eb89 100644 --- a/core/modules/field_ui/src/DisplayOverviewBase.php +++ b/core/modules/field_ui/src/DisplayOverviewBase.php @@ -16,6 +16,7 @@ use Drupal\Core\Field\FieldDefinitionInterface; use Drupal\Core\Field\FieldTypePluginManagerInterface; use Drupal\Core\Field\PluginSettingsInterface; +use Drupal\Core\Form\FormStateInterface; use Symfony\Component\DependencyInjection\ContainerInterface; /** @@ -116,7 +117,7 @@ protected function getFieldDefinitions() { /** * {@inheritdoc} */ - public function buildForm(array $form, array &$form_state, $entity_type_id = NULL, $bundle = NULL) { + public function buildForm(array $form, FormStateInterface $form_state, $entity_type_id = NULL, $bundle = NULL) { parent::buildForm($form, $form_state, $entity_type_id, $bundle); if (empty($this->mode)) { @@ -127,10 +128,6 @@ public function buildForm(array $form, array &$form_state, $entity_type_id = NUL $extra_fields = $this->getExtraFields(); $entity_display = $this->getEntityDisplay($this->mode); - $form_state += array( - 'plugin_settings_edit' => NULL, - ); - $form += array( '#entity_type' => $this->entity_type, '#bundle' => $this->bundle, @@ -257,13 +254,13 @@ public function buildForm(array $form, array &$form_state, $entity_type_id = NUL * The entity display. * @param array $form * An associative array containing the structure of the form. - * @param array $form_state - * A reference to a keyed array containing the current state of the form. + * @param \Drupal\Core\Form\FormStateInterface $form_state + * The current state of the form. * * @return array * A table row array. */ - protected function buildFieldRow(FieldDefinitionInterface $field_definition, EntityDisplayInterface $entity_display, array $form, array &$form_state) { + protected function buildFieldRow(FieldDefinitionInterface $field_definition, EntityDisplayInterface $entity_display, array $form, FormStateInterface $form_state) { $field_name = $field_definition->getName(); $display_options = $entity_display->getComponent($field_name); $label = $field_definition->getLabel(); @@ -509,7 +506,7 @@ protected function buildExtraFieldRow($field_id, $extra_field, EntityDisplayInte /** * {@inheritdoc} */ - public function submitForm(array &$form, array &$form_state) { + public function submitForm(array &$form, FormStateInterface $form_state) { $form_values = $form_state['values']; $display = $this->getEntityDisplay($this->mode); @@ -615,7 +612,7 @@ public function submitForm(array &$form, array &$form_state) { /** * Form submission handler for multistep buttons. */ - public function multistepSubmit($form, &$form_state) { + public function multistepSubmit($form, FormStateInterface $form_state) { $trigger = $form_state['triggering_element']; $op = $trigger['#op']; @@ -659,7 +656,7 @@ public function multistepSubmit($form, &$form_state) { /** * Ajax handler for multistep buttons. */ - public function multistepAjax($form, &$form_state) { + public function multistepAjax($form, FormStateInterface $form_state) { $trigger = $form_state['triggering_element']; $op = $trigger['#op']; @@ -887,13 +884,13 @@ abstract protected function getOverviewRoute($mode); * The field definition. * @param array $form * The (entire) configuration form array. - * @param array $form_state + * @param \Drupal\Core\Form\FormStateInterface $form_state * The form state. * * @return array * The widget or formatter third party settings form. */ - abstract protected function thirdPartySettingsForm(PluginSettingsInterface $plugin, FieldDefinitionInterface $field_definition, array $form, array &$form_state); + abstract protected function thirdPartySettingsForm(PluginSettingsInterface $plugin, FieldDefinitionInterface $field_definition, array $form, FormStateInterface $form_state); /** * Alters the widget or formatter settings summary. diff --git a/core/modules/field_ui/src/FieldOverview.php b/core/modules/field_ui/src/FieldOverview.php index c962dc9ca9f438729bc70cbb34741723e620cf45..ed2ef0b6639d0c1a908ab007d4c7f1266cec0625 100644 --- a/core/modules/field_ui/src/FieldOverview.php +++ b/core/modules/field_ui/src/FieldOverview.php @@ -12,6 +12,7 @@ use Drupal\Core\Entity\EntityManagerInterface; use Drupal\Core\Extension\ModuleHandlerInterface; use Drupal\Core\Field\FieldTypePluginManagerInterface; +use Drupal\Core\Form\FormStateInterface; use Drupal\Core\Render\Element; use Drupal\field_ui\OverviewBase; use Symfony\Component\DependencyInjection\ContainerInterface; @@ -77,7 +78,7 @@ public function getFormId() { /** * {@inheritdoc} */ - public function buildForm(array $form, array &$form_state, $entity_type_id = NULL, $bundle = NULL) { + public function buildForm(array $form, FormStateInterface $form_state, $entity_type_id = NULL, $bundle = NULL) { parent::buildForm($form, $form_state, $entity_type_id, $bundle); // Gather bundle information. @@ -281,7 +282,7 @@ public function buildForm(array $form, array &$form_state, $entity_type_id = NUL /** * {@inheritdoc} */ - public function validateForm(array &$form, array &$form_state) { + public function validateForm(array &$form, FormStateInterface $form_state) { $this->validateAddNew($form, $form_state); $this->validateAddExisting($form, $form_state); } @@ -291,12 +292,12 @@ public function validateForm(array &$form, array &$form_state) { * * @param array $form * An associative array containing the structure of the form. - * @param array $form_state - * A reference to a keyed array containing the current state of the form. + * @param \Drupal\Core\Form\FormStateInterface $form_state + * The current state of the form. * * @see \Drupal\field_ui\FieldOverview::validateForm() */ - protected function validateAddNew(array $form, array &$form_state) { + protected function validateAddNew(array $form, FormStateInterface $form_state) { $field = $form_state['values']['fields']['_add_new_field']; // Validate if any information was provided in the 'add new field' row. @@ -331,12 +332,12 @@ protected function validateAddNew(array $form, array &$form_state) { * * @param array $form * An associative array containing the structure of the form. - * @param array $form_state - * A reference to a keyed array containing the current state of the form. + * @param \Drupal\Core\Form\FormStateInterface $form_state + * The current state of the form. * * @see \Drupal\field_ui\FieldOverview::validate() */ - protected function validateAddExisting(array $form, array &$form_state) { + protected function validateAddExisting(array $form, FormStateInterface $form_state) { // The form element might be absent if no existing fields can be added to // this bundle. if (isset($form_state['values']['fields']['_add_existing_field'])) { @@ -361,7 +362,7 @@ protected function validateAddExisting(array $form, array &$form_state) { /** * Overrides \Drupal\field_ui\OverviewBase::submitForm(). */ - public function submitForm(array &$form, array &$form_state) { + public function submitForm(array &$form, FormStateInterface $form_state) { $error = FALSE; $form_values = $form_state['values']['fields']; $destinations = array(); diff --git a/core/modules/field_ui/src/Form/FieldInstanceConfigDeleteForm.php b/core/modules/field_ui/src/Form/FieldInstanceConfigDeleteForm.php index 95f84f645ec2b35876d3468466d171eccebbfa8c..940d991da4a5131f2de1c95f6fa3286eedaee64c 100644 --- a/core/modules/field_ui/src/Form/FieldInstanceConfigDeleteForm.php +++ b/core/modules/field_ui/src/Form/FieldInstanceConfigDeleteForm.php @@ -9,6 +9,7 @@ use Drupal\Core\Entity\EntityConfirmFormBase; use Drupal\Core\Entity\EntityManagerInterface; +use Drupal\Core\Form\FormStateInterface; use Drupal\field_ui\FieldUI; use Symfony\Component\DependencyInjection\ContainerInterface; @@ -67,7 +68,7 @@ public function getCancelUrl() { /** * {@inheritdoc} */ - public function submit(array $form, array &$form_state) { + public function submit(array $form, FormStateInterface $form_state) { $field_storage = $this->entity->getFieldStorageDefinition(); $bundles = entity_get_bundles(); $bundle_label = $bundles[$this->entity->entity_type][$this->entity->bundle]['label']; diff --git a/core/modules/field_ui/src/Form/FieldInstanceEditForm.php b/core/modules/field_ui/src/Form/FieldInstanceEditForm.php index 12f881dffc0a6de46ecebdcd23641c2852e51dbc..b03fd16340119133955b7dee71bfdfd9aa9d74f7 100644 --- a/core/modules/field_ui/src/Form/FieldInstanceEditForm.php +++ b/core/modules/field_ui/src/Form/FieldInstanceEditForm.php @@ -10,6 +10,7 @@ use Drupal\Core\Entity\EntityManagerInterface; use Drupal\Core\Form\FormBase; use Drupal\Component\Utility\String; +use Drupal\Core\Form\FormStateInterface; use Drupal\field\FieldInstanceConfigInterface; use Drupal\field_ui\FieldUI; use Symfony\Component\DependencyInjection\ContainerInterface; @@ -62,7 +63,7 @@ public function getFormId() { /** * {@inheritdoc} */ - public function buildForm(array $form, array &$form_state, FieldInstanceConfigInterface $field_instance_config = NULL) { + public function buildForm(array $form, FormStateInterface $form_state, FieldInstanceConfigInterface $field_instance_config = NULL) { $this->instance = $form_state['instance'] = $field_instance_config; $bundle = $this->instance->bundle; @@ -164,7 +165,7 @@ public function buildForm(array $form, array &$form_state, FieldInstanceConfigIn /** * {@inheritdoc} */ - public function validateForm(array &$form, array &$form_state) { + public function validateForm(array &$form, FormStateInterface $form_state) { if (isset($form['instance']['default_value'])) { $items = $form['#entity']->get($this->instance->getName()); $items->defaultValuesFormValidate($form['instance']['default_value'], $form, $form_state); @@ -174,7 +175,7 @@ public function validateForm(array &$form, array &$form_state) { /** * {@inheritdoc} */ - public function submitForm(array &$form, array &$form_state) { + public function submitForm(array &$form, FormStateInterface $form_state) { // Handle the default value. $default_value = array(); if (isset($form['instance']['default_value'])) { @@ -209,7 +210,7 @@ public function submitForm(array &$form, array &$form_state) { /** * Redirects to the field instance deletion form. */ - public function delete(array &$form, array &$form_state) { + public function delete(array &$form, FormStateInterface $form_state) { $destination = array(); $request = $this->getRequest(); if ($request->query->has('destination')) { diff --git a/core/modules/field_ui/src/Form/FieldStorageEditForm.php b/core/modules/field_ui/src/Form/FieldStorageEditForm.php index 7fb5819427724d24910c7623168ad604fb2343b9..830396c533b6e9426451605453896148f93601f8 100644 --- a/core/modules/field_ui/src/Form/FieldStorageEditForm.php +++ b/core/modules/field_ui/src/Form/FieldStorageEditForm.php @@ -10,6 +10,7 @@ use Drupal\Core\Entity\EntityManagerInterface; use Drupal\Core\Field\FieldStorageDefinitionInterface; use Drupal\Core\Form\FormBase; +use Drupal\Core\Form\FormStateInterface; use Drupal\Core\TypedData\TypedDataManager; use Drupal\field\FieldInstanceConfigInterface; use Drupal\field_ui\FieldUI; @@ -74,7 +75,7 @@ public static function create(ContainerInterface $container) { /** * {@inheritdoc} */ - public function buildForm(array $form, array &$form_state, FieldInstanceConfigInterface $field_instance_config = NULL) { + public function buildForm(array $form, FormStateInterface $form_state, FieldInstanceConfigInterface $field_instance_config = NULL) { $this->instance = $form_state['instance'] = $field_instance_config; $form['#title'] = $this->instance->label(); @@ -159,7 +160,7 @@ public function buildForm(array $form, array &$form_state, FieldInstanceConfigIn /** * {@inheritdoc} */ - public function validateForm(array &$form, array &$form_state) { + public function validateForm(array &$form, FormStateInterface $form_state) { // Validate field cardinality. $cardinality = $form_state['values']['field']['cardinality']; $cardinality_number = $form_state['values']['field']['cardinality_number']; @@ -171,7 +172,7 @@ public function validateForm(array &$form, array &$form_state) { /** * {@inheritdoc} */ - public function submitForm(array &$form, array &$form_state) { + public function submitForm(array &$form, FormStateInterface $form_state) { $form_values = $form_state['values']; $field_values = $form_values['field']; diff --git a/core/modules/field_ui/src/FormDisplayOverview.php b/core/modules/field_ui/src/FormDisplayOverview.php index 3a2546ba102a90176d06ae7e587f6d852f08e420..4857a53ae2bcfca594fedee5267199e84826dcea 100644 --- a/core/modules/field_ui/src/FormDisplayOverview.php +++ b/core/modules/field_ui/src/FormDisplayOverview.php @@ -15,6 +15,7 @@ use Drupal\Core\Field\FieldDefinitionInterface; use Drupal\Core\Field\FieldTypePluginManager; use Drupal\Core\Field\PluginSettingsInterface; +use Drupal\Core\Form\FormStateInterface; use Symfony\Component\DependencyInjection\ContainerInterface; /** @@ -76,7 +77,7 @@ public function getFormId() { /** * {@inheritdoc} */ - public function buildForm(array $form, array &$form_state, $entity_type_id = NULL, $bundle = NULL) { + public function buildForm(array $form, FormStateInterface $form_state, $entity_type_id = NULL, $bundle = NULL) { if ($this->getRequest()->attributes->has('form_mode_name')) { $this->mode = $this->getRequest()->attributes->get('form_mode_name'); } @@ -87,7 +88,7 @@ public function buildForm(array $form, array &$form_state, $entity_type_id = NUL /** * {@inheritdoc} */ - protected function buildFieldRow(FieldDefinitionInterface $field_definition, EntityDisplayInterface $entity_display, array $form, array &$form_state) { + protected function buildFieldRow(FieldDefinitionInterface $field_definition, EntityDisplayInterface $entity_display, array $form, FormStateInterface $form_state) { $field_row = parent::buildFieldRow($field_definition, $entity_display, $form, $form_state); $field_name = $field_definition->getName(); @@ -183,7 +184,7 @@ protected function getOverviewRoute($mode) { /** * {@inheritdoc} */ - protected function thirdPartySettingsForm(PluginSettingsInterface $plugin, FieldDefinitionInterface $field_definition, array $form, array &$form_state) { + protected function thirdPartySettingsForm(PluginSettingsInterface $plugin, FieldDefinitionInterface $field_definition, array $form, FormStateInterface $form_state) { $settings_form = array(); // Invoke hook_field_widget_third_party_settings_form(), keying resulting // subforms by module name. diff --git a/core/modules/field_ui/src/OverviewBase.php b/core/modules/field_ui/src/OverviewBase.php index 17104e0e5e97d7c16324a4d75ac77cdb60047643..7132eda3ac1644a3d55fc0031b829bb286382ed7 100644 --- a/core/modules/field_ui/src/OverviewBase.php +++ b/core/modules/field_ui/src/OverviewBase.php @@ -9,6 +9,7 @@ use Drupal\Core\Entity\EntityManagerInterface; use Drupal\Core\Form\FormBase; +use Drupal\Core\Form\FormStateInterface; use Drupal\Core\Render\Element; use Symfony\Component\DependencyInjection\ContainerInterface; @@ -74,7 +75,7 @@ public static function create(ContainerInterface $container) { /** * {@inheritdoc} */ - public function buildForm(array $form, array &$form_state, $entity_type_id = NULL, $bundle = NULL) { + public function buildForm(array $form, FormStateInterface $form_state, $entity_type_id = NULL, $bundle = NULL) { $entity_type = $this->entityManager->getDefinition($entity_type_id); $this->bundleEntityType = $entity_type->getBundleEntityType(); if (!isset($form_state['bundle'])) { @@ -89,9 +90,9 @@ public function buildForm(array $form, array &$form_state, $entity_type_id = NUL } /** - * Implements \Drupal\Core\Form\FormInterface::submitForm(). + * {@inheritdoc} */ - public function submitForm(array &$form, array &$form_state) { + public function submitForm(array &$form, FormStateInterface $form_state) { } /** diff --git a/core/modules/file/file.module b/core/modules/file/file.module index 824be6d8c13670078c4705b0e67cfb734aaaa6d1..a48a7a78d78a7282ca54f6e5a129372427d95a25 100644 --- a/core/modules/file/file.module +++ b/core/modules/file/file.module @@ -8,6 +8,7 @@ use Drupal\Component\Utility\SafeMarkup; use Drupal\Component\Utility\String; use Drupal\Core\Field\FieldDefinitionInterface; +use Drupal\Core\Form\FormStateInterface; use Drupal\Core\Render\Element; use Drupal\Core\Routing\RouteMatchInterface; use Drupal\file\Entity\File; @@ -686,8 +687,8 @@ function file_cron() { * @param $form_field_name * A string that is the associative array key of the upload form element in * the form array. - * @param array $form_state - * An associative array containing the current state of the form. + * @param \Drupal\Core\Form\FormStateInterface $form_state + * The current state of the form. * @param $validators * An optional, associative array of callback functions used to validate the * file. See file_validate() for a full discussion of the array format. @@ -1103,7 +1104,7 @@ function file_token_info() { * * This function is assigned as a #process callback in file_element_info(). */ -function file_managed_file_process($element, &$form_state, $form) { +function file_managed_file_process($element, FormStateInterface $form_state, $form) { // Append the '-upload' to the #id so the field label's 'for' attribute // corresponds with the file element. $element['#id'] .= '-upload'; @@ -1250,7 +1251,7 @@ function file_managed_file_process($element, &$form_state, $form) { * * This function is assigned as a #value_callback in file_element_info(). */ -function file_managed_file_value(&$element, $input, &$form_state) { +function file_managed_file_value(&$element, $input, FormStateInterface $form_state) { // Find the current value of this field. $fids = !empty($input['fids']) ? explode(' ', $input['fids']) : array(); foreach ($fids as $key => $fid) { @@ -1326,7 +1327,7 @@ function file_managed_file_value(&$element, $input, &$form_state) { * This function is assigned as a #element_validate callback in * file_element_info(). */ -function file_managed_file_validate(&$element, &$form_state) { +function file_managed_file_validate(&$element, FormStateInterface $form_state) { // If referencing an existing file, only allow if there are existing // references. This prevents unmanaged files from being deleted if this // item were to be deleted. @@ -1364,7 +1365,7 @@ function file_managed_file_validate(&$element, &$form_state) { * * @see file_managed_file_process() */ -function file_managed_file_submit($form, &$form_state) { +function file_managed_file_submit($form, FormStateInterface $form_state) { // Determine whether it was the upload or the remove button that was clicked, // and set $element to the managed_file element that contains that button. $parents = $form_state['triggering_element']['#array_parents']; @@ -1428,14 +1429,14 @@ function file_managed_file_submit($form, &$form_state) { * * @param $element * The FAPI element whose values are being saved. - * @param array $form_state - * An associative array containing the current state of the form. + * @param \Drupal\Core\Form\FormStateInterface $form_state + * The current state of the form. * * @return * An array of file entities for each file that was saved, keyed by its file * ID, or FALSE if no files were saved. */ -function file_managed_file_save_upload($element, array &$form_state) { +function file_managed_file_save_upload($element, FormStateInterface $form_state) { $upload_name = implode('_', $element['#parents']); $file_upload = \Drupal::request()->files->get("files[$upload_name]", NULL, TRUE); if (empty($file_upload)) { diff --git a/core/modules/file/src/Plugin/Field/FieldType/FileFieldItemList.php b/core/modules/file/src/Plugin/Field/FieldType/FileFieldItemList.php index 43dbefa9dacb0040fbbcacbba8e6ba4f95e66d24..f8ee03c84eead7d7d76abdf020bc9df72989e62c 100644 --- a/core/modules/file/src/Plugin/Field/FieldType/FileFieldItemList.php +++ b/core/modules/file/src/Plugin/Field/FieldType/FileFieldItemList.php @@ -8,6 +8,7 @@ namespace Drupal\file\Plugin\Field\FieldType; use Drupal\Core\Field\EntityReferenceFieldItemList; +use Drupal\Core\Form\FormStateInterface; /** * Represents a configurable entity file field. @@ -17,7 +18,7 @@ class FileFieldItemList extends EntityReferenceFieldItemList { /** * {@inheritdoc} */ - public function defaultValuesForm(array &$form, array &$form_state) { } + public function defaultValuesForm(array &$form, FormStateInterface $form_state) { } /** * {@inheritdoc} diff --git a/core/modules/file/src/Plugin/Field/FieldType/FileItem.php b/core/modules/file/src/Plugin/Field/FieldType/FileItem.php index a56448a457f9ed2751404d45561beb03cf1219cc..9f80a6ff612c877b8a07bcd2afe5e9138a84103b 100644 --- a/core/modules/file/src/Plugin/Field/FieldType/FileItem.php +++ b/core/modules/file/src/Plugin/Field/FieldType/FileItem.php @@ -10,6 +10,7 @@ use Drupal\Component\Utility\Bytes; use Drupal\Core\Field\FieldStorageDefinitionInterface; use Drupal\Core\Field\Plugin\Field\FieldType\EntityReferenceItem; +use Drupal\Core\Form\FormStateInterface; use Drupal\Core\TypedData\DataDefinition; /** @@ -106,7 +107,7 @@ public static function propertyDefinitions(FieldStorageDefinitionInterface $fiel /** * {@inheritdoc} */ - public function settingsForm(array &$form, array &$form_state, $has_data) { + public function settingsForm(array &$form, FormStateInterface $form_state, $has_data) { $element = array(); $element['#attached']['library'][] = 'file/drupal.file'; @@ -148,7 +149,7 @@ public function settingsForm(array &$form, array &$form_state, $has_data) { /** * {@inheritdoc} */ - public function instanceSettingsForm(array $form, array &$form_state) { + public function instanceSettingsForm(array $form, FormStateInterface $form_state) { $element = array(); $settings = $this->getSettings(); @@ -208,7 +209,7 @@ public function instanceSettingsForm(array $form, array &$form_state) { * This function is assigned as an #element_validate callback in * instanceSettingsForm(). */ - public static function validateDirectory($element, &$form_state) { + public static function validateDirectory($element, FormStateInterface $form_state) { // Strip slashes from the beginning and end of $element['file_directory']. $value = trim($element['#value'], '\\/'); form_set_value($element, $value, $form_state); @@ -224,7 +225,7 @@ public static function validateDirectory($element, &$form_state) { * Commas are allowed by the end-user, but ultimately the value will be stored * as a space-separated list for compatibility with file_validate_extensions(). */ - public static function validateExtensions($element, &$form_state) { + public static function validateExtensions($element, FormStateInterface $form_state) { if (!empty($element['#value'])) { $extensions = preg_replace('/([, ]+\.?)/', ' ', trim(strtolower($element['#value']))); $extensions = array_filter(explode(' ', $extensions)); @@ -247,7 +248,7 @@ public static function validateExtensions($element, &$form_state) { * This function is assigned as an #element_validate callback in * instanceSettingsForm(). */ - public static function validateMaxFilesize($element, &$form_state) { + public static function validateMaxFilesize($element, FormStateInterface $form_state) { if (!empty($element['#value']) && !is_numeric(Bytes::toInt($element['#value']))) { form_error($element, $form_state, t('The "!name" option must contain a valid value. You may either leave the text field empty or enter a string like "512" (bytes), "80 KB" (kilobytes) or "50 MB" (megabytes).', array('!name' => t($element['title'])))); } diff --git a/core/modules/file/src/Plugin/Field/FieldWidget/FileWidget.php b/core/modules/file/src/Plugin/Field/FieldWidget/FileWidget.php index 5f71e9a38cd37b0d7113c80a379f1ff4b21d7589..9a03fe41d78fd25780dce6e8943e53962ffa9f5b 100644 --- a/core/modules/file/src/Plugin/Field/FieldWidget/FileWidget.php +++ b/core/modules/file/src/Plugin/Field/FieldWidget/FileWidget.php @@ -12,6 +12,7 @@ use Drupal\Core\Field\FieldItemListInterface; use Drupal\Core\Field\FieldStorageDefinitionInterface; use Drupal\Core\Field\WidgetBase; +use Drupal\Core\Form\FormStateInterface; use Drupal\Core\Render\Element; /** @@ -39,7 +40,7 @@ public static function defaultSettings() { /** * {@inheritdoc} */ - public function settingsForm(array $form, array &$form_state) { + public function settingsForm(array $form, FormStateInterface $form_state) { $element['progress_indicator'] = array( '#type' => 'radios', '#title' => t('Progress indicator'), @@ -69,7 +70,7 @@ public function settingsSummary() { * * Special handling for draggable multiple widgets and 'add more' button. */ - protected function formMultipleElements(FieldItemListInterface $items, array &$form, array &$form_state) { + protected function formMultipleElements(FieldItemListInterface $items, array &$form, FormStateInterface $form_state) { $field_name = $this->fieldDefinition->getName(); $parents = $form['#parents']; @@ -186,7 +187,7 @@ protected function formMultipleElements(FieldItemListInterface $items, array &$f /** * {@inheritdoc} */ - public function formElement(FieldItemListInterface $items, $delta, array $element, array &$form, array &$form_state) { + public function formElement(FieldItemListInterface $items, $delta, array $element, array &$form, FormStateInterface $form_state) { $field_settings = $this->getFieldSettings(); // The field settings include defaults for the field type. However, this @@ -256,7 +257,7 @@ public function formElement(FieldItemListInterface $items, $delta, array $elemen /** * {@inheritdoc} */ - public function massageFormValues(array $values, array $form, array &$form_state) { + public function massageFormValues(array $values, array $form, FormStateInterface $form_state) { // Since file upload widget now supports uploads of more than one file at a // time it always returns an array of fids. We have to translate this to a // single fid, as field expects single value. @@ -306,7 +307,7 @@ public static function value($element, $input = FALSE, $form_state) { * * This validator is used only when cardinality not set to 1 or unlimited. */ - public static function validateMultipleCount($element, &$form_state, $form) { + public static function validateMultipleCount($element, FormStateInterface $form_state, $form) { $parents = $element['#parents']; $values = NestedArray::getValue($form_state['values'], $parents); @@ -341,7 +342,7 @@ public static function validateMultipleCount($element, &$form_state, $form) { * * This method is assigned as a #process callback in formElement() method. */ - public static function process($element, &$form_state, $form) { + public static function process($element, FormStateInterface $form_state, $form) { $item = $element['#value']; $item['fids'] = $element['fids']['#value']; @@ -419,7 +420,7 @@ public static function process($element, &$form_state, $form) { * This method on is assigned as a #process callback in formMultipleElements() * method. */ - public static function processMultiple($element, &$form_state, $form) { + public static function processMultiple($element, FormStateInterface $form_state, $form) { $element_children = Element::children($element, TRUE); $count = count($element_children); @@ -484,7 +485,7 @@ protected static function getDescriptionFromElement($element) { * * @see file_managed_file_submit() */ - public static function submit($form, &$form_state) { + public static function submit($form, FormStateInterface $form_state) { // During the form rebuild, formElement() will create field item widget // elements using re-indexed deltas, so clear out $form_state['input'] to // avoid a mismatch between old and new deltas. The rebuilt elements will diff --git a/core/modules/file/src/Plugin/views/field/Extension.php b/core/modules/file/src/Plugin/views/field/Extension.php index 1272e2fe915cb51e844d527459e1b528835d24f3..ba53c816989f4bd671262f4c69a02ff6703f5923 100644 --- a/core/modules/file/src/Plugin/views/field/Extension.php +++ b/core/modules/file/src/Plugin/views/field/Extension.php @@ -7,6 +7,7 @@ namespace Drupal\file\Plugin\views\field; +use Drupal\Core\Form\FormStateInterface; use Drupal\views\Plugin\views\field\FieldPluginBase; use Drupal\views\ResultRow; @@ -31,7 +32,7 @@ protected function defineOptions() { /** * {@inheritdoc} */ - public function buildOptionsForm(&$form, &$form_state) { + public function buildOptionsForm(&$form, FormStateInterface $form_state) { parent::buildOptionsForm($form, $form_state); $form['extension_detect_tar'] = array( '#type' => 'checkbox', diff --git a/core/modules/file/src/Plugin/views/field/File.php b/core/modules/file/src/Plugin/views/field/File.php index 0ce77e8f2bf169c3449e5790b7b0505844fe48a0..135ff7f28e876e6ad0a6b4f8ae190376375514b1 100644 --- a/core/modules/file/src/Plugin/views/field/File.php +++ b/core/modules/file/src/Plugin/views/field/File.php @@ -7,6 +7,7 @@ namespace Drupal\file\Plugin\views\field; +use Drupal\Core\Form\FormStateInterface; use Drupal\views\ResultRow; use Drupal\views\ViewExecutable; use Drupal\views\Plugin\views\display\DisplayPluginBase; @@ -41,7 +42,7 @@ protected function defineOptions() { /** * Provide link to file option */ - public function buildOptionsForm(&$form, &$form_state) { + public function buildOptionsForm(&$form, FormStateInterface $form_state) { $form['link_to_file'] = array( '#title' => t('Link this field to download the file'), '#description' => t("Enable to override this field's links."), diff --git a/core/modules/file/src/Plugin/views/field/FileMime.php b/core/modules/file/src/Plugin/views/field/FileMime.php index fd1c35531b4a6c352d0feefcea61ad3b2f92f31a..5576e34d7d963524e8ee13b94f3ef9486aa44200 100644 --- a/core/modules/file/src/Plugin/views/field/FileMime.php +++ b/core/modules/file/src/Plugin/views/field/FileMime.php @@ -7,6 +7,7 @@ namespace Drupal\file\Plugin\views\field; +use Drupal\Core\Form\FormStateInterface; use Drupal\views\ResultRow; /** @@ -24,7 +25,7 @@ protected function defineOptions() { return $options; } - public function buildOptionsForm(&$form, &$form_state) { + public function buildOptionsForm(&$form, FormStateInterface $form_state) { $form['filemime_image'] = array( '#title' => t('Display an icon representing the file type, instead of the MIME text (such as "image/jpeg")'), '#type' => 'checkbox', diff --git a/core/modules/file/src/Plugin/views/field/Uri.php b/core/modules/file/src/Plugin/views/field/Uri.php index 04497b17c294061932f00e243b58ed4bf4522b07..2d2c481f9ec7abe7f186e505f0721397dcab02c7 100644 --- a/core/modules/file/src/Plugin/views/field/Uri.php +++ b/core/modules/file/src/Plugin/views/field/Uri.php @@ -7,6 +7,7 @@ namespace Drupal\file\Plugin\views\field; +use Drupal\Core\Form\FormStateInterface; use Drupal\views\ResultRow; /** @@ -22,7 +23,7 @@ protected function defineOptions() { return $options; } - public function buildOptionsForm(&$form, &$form_state) { + public function buildOptionsForm(&$form, FormStateInterface $form_state) { $form['file_download_path'] = array( '#title' => t('Display download path instead of file storage URI'), '#description' => t('This will provide the full download URL rather than the internal filestream address.'), diff --git a/core/modules/file/tests/file_module_test/src/Form/FileModuleTestForm.php b/core/modules/file/tests/file_module_test/src/Form/FileModuleTestForm.php index 84b2760bd3cdadc88df46b421b7abaf859d84db1..19264ccac01dedf11ce4f47cab627d373edceeda 100644 --- a/core/modules/file/tests/file_module_test/src/Form/FileModuleTestForm.php +++ b/core/modules/file/tests/file_module_test/src/Form/FileModuleTestForm.php @@ -8,6 +8,7 @@ namespace Drupal\file_module_test\Form; use Drupal\Core\Form\FormBase; +use Drupal\Core\Form\FormStateInterface; /** * Form controller for file_module_test module. @@ -26,8 +27,8 @@ public function getFormId() { * * @param array $form * An associative array containing the structure of the form. - * @param array $form_state - * An associative array containing the current state of the form. + * @param \Drupal\Core\Form\FormStateInterface $form_state + * The current state of the form. * @param bool $tree * (optional) If the form should use #tree. Defaults to TRUE. * @param bool $extended @@ -37,7 +38,7 @@ public function getFormId() { * @param array $default_fids * (optional) Any default file IDs to use. */ - public function buildForm(array $form, array &$form_state, $tree = TRUE, $extended = TRUE, $multiple = FALSE, $default_fids = NULL) { + public function buildForm(array $form, FormStateInterface $form_state, $tree = TRUE, $extended = TRUE, $multiple = FALSE, $default_fids = NULL) { $form['#tree'] = (bool) $tree; $form['nested']['file'] = array( @@ -70,7 +71,7 @@ public function buildForm(array $form, array &$form_state, $tree = TRUE, $extend /** * {@inheritdoc} */ - public function submitForm(array &$form, array &$form_state) { + public function submitForm(array &$form, FormStateInterface $form_state) { if ($form['#tree']) { $uploads = $form_state['values']['nested']['file']; } diff --git a/core/modules/file/tests/file_test/src/Form/FileTestForm.php b/core/modules/file/tests/file_test/src/Form/FileTestForm.php index f2d6dc2316d73902cf21bfce78ded1f51a4fc91b..68ebf611f644073d6256fe9ab0f20ae182fd4e76 100644 --- a/core/modules/file/tests/file_test/src/Form/FileTestForm.php +++ b/core/modules/file/tests/file_test/src/Form/FileTestForm.php @@ -7,6 +7,7 @@ namespace Drupal\file_test\Form; use Drupal\Core\Form\FormInterface; +use Drupal\Core\Form\FormStateInterface; /** * File test form class. @@ -23,7 +24,7 @@ public function getFormId() { /** * {@inheritdoc} */ - public function buildForm(array $form, array &$form_state) { + public function buildForm(array $form, FormStateInterface $form_state) { $form['file_test_upload'] = array( '#type' => 'file', '#title' => t('Upload a file'), @@ -72,12 +73,12 @@ public function buildForm(array $form, array &$form_state) { /** * {@inheritdoc} */ - public function validateForm(array &$form, array &$form_state) {} + public function validateForm(array &$form, FormStateInterface $form_state) {} /** * {@inheritdoc} */ - public function submitForm(array &$form, array &$form_state) { + public function submitForm(array &$form, FormStateInterface $form_state) { // Process the upload and perform validation. Note: we're using the // form value for the $replace parameter. if (!empty($form_state['values']['file_subdir'])) { diff --git a/core/modules/filter/src/FilterFormatAddForm.php b/core/modules/filter/src/FilterFormatAddForm.php index 5a0e83ef50574143511674ad261a93c6eee0782a..8c6ad4ab0f804617dc789dad04d67282ca4b1efe 100644 --- a/core/modules/filter/src/FilterFormatAddForm.php +++ b/core/modules/filter/src/FilterFormatAddForm.php @@ -7,6 +7,8 @@ namespace Drupal\filter; +use Drupal\Core\Form\FormStateInterface; + /** * Provides a form for adding a filter format. */ @@ -15,14 +17,14 @@ class FilterFormatAddForm extends FilterFormatFormBase { /** * {@inheritdoc} */ - public function form(array $form, array &$form_state) { + public function form(array $form, FormStateInterface $form_state) { return parent::form($form, $form_state); } /** * {@inheritdoc} */ - public function submit(array $form, array &$form_state) { + public function submit(array $form, FormStateInterface $form_state) { parent::submit($form, $form_state); drupal_set_message($this->t('Added text format %format.', array('%format' => $this->entity->label()))); return $this->entity; diff --git a/core/modules/filter/src/FilterFormatEditForm.php b/core/modules/filter/src/FilterFormatEditForm.php index a1448a078fbe2ac9e0966b13dcea1eaff0145f3b..ab437ace291c46b6521accb67bbcf8f21eb93bc3 100644 --- a/core/modules/filter/src/FilterFormatEditForm.php +++ b/core/modules/filter/src/FilterFormatEditForm.php @@ -7,6 +7,7 @@ namespace Drupal\filter; +use Drupal\Core\Form\FormStateInterface; use Symfony\Component\HttpKernel\Exception\NotFoundHttpException; /** @@ -17,7 +18,7 @@ class FilterFormatEditForm extends FilterFormatFormBase { /** * {@inheritdoc} */ - public function form(array $form, array &$form_state) { + public function form(array $form, FormStateInterface $form_state) { if (!$this->entity->status()) { throw new NotFoundHttpException(); } @@ -31,7 +32,7 @@ public function form(array $form, array &$form_state) { /** * {@inheritdoc} */ - public function submit(array $form, array &$form_state) { + public function submit(array $form, FormStateInterface $form_state) { parent::submit($form, $form_state); drupal_set_message($this->t('The text format %format has been updated.', array('%format' => $this->entity->label()))); return $this->entity; diff --git a/core/modules/filter/src/FilterFormatFormBase.php b/core/modules/filter/src/FilterFormatFormBase.php index 7a23b937cd6485768003e789ea3c44066f105fde..fce0b93e2bb842bf3618f3f005ceb606fafde27f 100644 --- a/core/modules/filter/src/FilterFormatFormBase.php +++ b/core/modules/filter/src/FilterFormatFormBase.php @@ -10,6 +10,7 @@ use Drupal\Core\Config\ConfigFactoryInterface; use Drupal\Core\Entity\EntityForm; use Drupal\Core\Entity\Query\QueryFactory; +use Drupal\Core\Form\FormStateInterface; use Drupal\filter\Plugin\Filter\FilterNull; use Symfony\Component\DependencyInjection\ContainerInterface; @@ -47,7 +48,7 @@ public static function create(ContainerInterface $container) { /** * {@inheritdoc} */ - public function form(array $form, array &$form_state) { + public function form(array $form, FormStateInterface $form_state) { $format = $this->entity; $is_fallback = ($format->id() == $this->config('filter.settings')->get('fallback_format')); @@ -209,7 +210,7 @@ public function exists($format_id) { /** * {@inheritdoc} */ - public function validate(array $form, array &$form_state) { + public function validate(array $form, FormStateInterface $form_state) { parent::validate($form, $form_state); // @todo Move trimming upstream. @@ -233,7 +234,7 @@ public function validate(array $form, array &$form_state) { /** * {@inheritdoc} */ - public function submit(array $form, array &$form_state) { + public function submit(array $form, FormStateInterface $form_state) { parent::submit($form, $form_state); // Add the submitted form values to the text format, and save it. @@ -265,7 +266,7 @@ public function submit(array $form, array &$form_state) { /** * {@inheritdoc} */ - protected function actions(array $form, array &$form_state) { + protected function actions(array $form, FormStateInterface $form_state) { $actions = parent::actions($form, $form_state); $actions['submit']['#value'] = $this->t('Save configuration'); return $actions; diff --git a/core/modules/filter/src/FilterFormatListBuilder.php b/core/modules/filter/src/FilterFormatListBuilder.php index 4f1a5cb147b49fb3c08a0895ba86a8cc3f6997ae..0003cfafdbd40ad414e61fa01b6bdf08c1604b7c 100644 --- a/core/modules/filter/src/FilterFormatListBuilder.php +++ b/core/modules/filter/src/FilterFormatListBuilder.php @@ -13,6 +13,7 @@ use Drupal\Core\Entity\EntityInterface; use Drupal\Core\Entity\EntityStorageInterface; use Drupal\Core\Entity\EntityTypeInterface; +use Drupal\Core\Form\FormStateInterface; use Symfony\Component\DependencyInjection\ContainerInterface; /** @@ -136,15 +137,16 @@ public function getDefaultOperations(EntityInterface $entity) { /** * {@inheritdoc} */ - public function buildForm(array $form, array &$form_state) { + public function buildForm(array $form, FormStateInterface $form_state) { $form = parent::buildForm($form, $form_state); $form['actions']['submit']['#value'] = $this->t('Save changes'); return $form; } + /** * {@inheritdoc} */ - public function submitForm(array &$form, array &$form_state) { + public function submitForm(array &$form, FormStateInterface $form_state) { parent::submitForm($form, $form_state); filter_formats_reset(); diff --git a/core/modules/filter/src/Form/FilterDisableForm.php b/core/modules/filter/src/Form/FilterDisableForm.php index af661592bb5b75a7fea329908281329a5dca54f3..a6b7b88b38a676cfc07b0b806f30abe1c3ccc0c5 100644 --- a/core/modules/filter/src/Form/FilterDisableForm.php +++ b/core/modules/filter/src/Form/FilterDisableForm.php @@ -8,6 +8,7 @@ namespace Drupal\filter\Form; use Drupal\Core\Entity\EntityConfirmFormBase; +use Drupal\Core\Form\FormStateInterface; use Drupal\Core\Url; /** @@ -46,7 +47,7 @@ public function getDescription() { /** * {@inheritdoc} */ - public function submit(array $form, array &$form_state) { + public function submit(array $form, FormStateInterface $form_state) { $this->entity->disable()->save(); drupal_set_message($this->t('Disabled text format %format.', array('%format' => $this->entity->label()))); diff --git a/core/modules/filter/src/Plugin/Filter/FilterHtml.php b/core/modules/filter/src/Plugin/Filter/FilterHtml.php index 6549168a0874f9b83c0b33be33882ed0cba44906..b76933ec5b0375acec5e42ca22ecd08b50dd09e4 100644 --- a/core/modules/filter/src/Plugin/Filter/FilterHtml.php +++ b/core/modules/filter/src/Plugin/Filter/FilterHtml.php @@ -8,6 +8,7 @@ namespace Drupal\filter\Plugin\Filter; use Drupal\Component\Utility\String; +use Drupal\Core\Form\FormStateInterface; use Drupal\filter\FilterProcessResult; use Drupal\filter\Plugin\FilterBase; @@ -31,7 +32,7 @@ class FilterHtml extends FilterBase { /** * {@inheritdoc} */ - public function settingsForm(array $form, array &$form_state) { + public function settingsForm(array $form, FormStateInterface $form_state) { $form['allowed_html'] = array( '#type' => 'textfield', '#title' => $this->t('Allowed HTML tags'), diff --git a/core/modules/filter/src/Plugin/Filter/FilterUrl.php b/core/modules/filter/src/Plugin/Filter/FilterUrl.php index d717f2c4a67854b0277f0a6571f335606c57ca35..a915052ae85f72dfd4f33e1b09dc4c8928c86e67 100644 --- a/core/modules/filter/src/Plugin/Filter/FilterUrl.php +++ b/core/modules/filter/src/Plugin/Filter/FilterUrl.php @@ -7,6 +7,7 @@ namespace Drupal\filter\Plugin\Filter; +use Drupal\Core\Form\FormStateInterface; use Drupal\filter\FilterProcessResult; use Drupal\filter\Plugin\FilterBase; @@ -27,7 +28,7 @@ class FilterUrl extends FilterBase { /** * {@inheritdoc} */ - public function settingsForm(array $form, array &$form_state) { + public function settingsForm(array $form, FormStateInterface $form_state) { $form['filter_url_length'] = array( '#type' => 'number', '#title' => $this->t('Maximum link text length'), diff --git a/core/modules/filter/src/Plugin/FilterBase.php b/core/modules/filter/src/Plugin/FilterBase.php index 5314ad7655a178987fb1e3f547057f1d4598a9dd..de9613f8b8b8cb38b03a6a86d5011d59bddfce59 100644 --- a/core/modules/filter/src/Plugin/FilterBase.php +++ b/core/modules/filter/src/Plugin/FilterBase.php @@ -7,6 +7,7 @@ namespace Drupal\filter\Plugin; +use Drupal\Core\Form\FormStateInterface; use Drupal\Core\Plugin\PluginBase; /** @@ -146,7 +147,7 @@ public function getDescription() { /** * {@inheritdoc} */ - public function settingsForm(array $form, array &$form_state) { + public function settingsForm(array $form, FormStateInterface $form_state) { // Implementations should work with and return $form. Returning an empty // array here allows the text format administration form to identify whether // the filter plugin has any settings form elements. diff --git a/core/modules/filter/src/Plugin/FilterInterface.php b/core/modules/filter/src/Plugin/FilterInterface.php index dbbc490e4e5b6a6c442c21974243c2b2b97d65e1..aa2438b62b0c795628d8e195e14a6a1322a95392 100644 --- a/core/modules/filter/src/Plugin/FilterInterface.php +++ b/core/modules/filter/src/Plugin/FilterInterface.php @@ -9,6 +9,7 @@ use Drupal\Component\Plugin\PluginInspectionInterface; use Drupal\Component\Plugin\ConfigurablePluginInterface; +use Drupal\Core\Form\FormStateInterface; /** * Defines the interface for text processing filter plugins. @@ -132,14 +133,14 @@ public function getDescription(); * * @param array $form * A minimally prepopulated form array. - * @param array $form_state + * @param \Drupal\Core\Form\FormStateInterface $form_state * The state of the (entire) configuration form. * * @return array * The $form array with additional form elements for the settings of this * filter. The submitted form values should match $this->settings. */ - public function settingsForm(array $form, array &$form_state); + public function settingsForm(array $form, FormStateInterface $form_state); /** * Prepares the text for processing. diff --git a/core/modules/filter/tests/filter_test/src/Form/FilterTestFormatForm.php b/core/modules/filter/tests/filter_test/src/Form/FilterTestFormatForm.php index be8cd123138313fe9e8faacf3aa6cff821572a0f..8f90746cc4b813e9e5aa8a328d99b192143eea03 100644 --- a/core/modules/filter/tests/filter_test/src/Form/FilterTestFormatForm.php +++ b/core/modules/filter/tests/filter_test/src/Form/FilterTestFormatForm.php @@ -7,6 +7,7 @@ namespace Drupal\filter_test\Form; use Drupal\Core\Form\FormBase; +use Drupal\Core\Form\FormStateInterface; /** * Shows a test form for testing the 'text_format' form element. @@ -23,7 +24,7 @@ public function getFormId() { /** * {@inheritdoc} */ - public function buildForm(array $form, array &$form_state) { + public function buildForm(array $form, FormStateInterface $form_state) { // This ensures that the parent array key makes it into the HTML ID of the // form elements. $form['#tree'] = TRUE; @@ -109,7 +110,7 @@ public function buildForm(array $form, array &$form_state) { /** * {@inheritdoc} */ - public function submitForm(array &$form, array &$form_state) { + public function submitForm(array &$form, FormStateInterface $form_state) { } } diff --git a/core/modules/forum/forum.module b/core/modules/forum/forum.module index 32443a9705efc6d586aad25a97c894e0cbcba5a2..425b597bbfa74d4a8bb00bcc9e1676639aeb2a42 100644 --- a/core/modules/forum/forum.module +++ b/core/modules/forum/forum.module @@ -10,6 +10,7 @@ use Drupal\Component\Utility\Xss; use Drupal\Core\Entity\EntityInterface; use Drupal\Component\Utility\String; +use Drupal\Core\Form\FormStateInterface; use Drupal\Core\Routing\RouteMatchInterface; /** @@ -198,7 +199,7 @@ function forum_uri($forum) { * Checks in particular that the node is assigned only a "leaf" term in the * forum taxonomy. */ -function forum_node_validate(EntityInterface $node, $form, &$form_state) { +function forum_node_validate(EntityInterface $node, $form, FormStateInterface $form_state) { if (\Drupal::service('forum_manager')->checkNodeType($node)) { // vocabulary is selected, not a "container" term. if (!$node->taxonomy_forums->isEmpty()) { @@ -384,7 +385,7 @@ function forum_comment_delete(CommentInterface $comment) { /** * Implements hook_form_BASE_FORM_ID_alter(). */ -function forum_form_taxonomy_vocabulary_form_alter(&$form, &$form_state, $form_id) { +function forum_form_taxonomy_vocabulary_form_alter(&$form, FormStateInterface $form_state, $form_id) { $vid = \Drupal::config('forum.settings')->get('vocabulary'); $vocabulary = $form_state['controller']->getEntity(); if ($vid == $vocabulary->id()) { @@ -406,7 +407,7 @@ function forum_form_taxonomy_vocabulary_form_alter(&$form, &$form_state, $form_i /** * Implements hook_form_FORM_ID_alter() for taxonomy_term_form(). */ -function forum_form_taxonomy_term_form_alter(&$form, &$form_state, $form_id) { +function forum_form_taxonomy_term_form_alter(&$form, FormStateInterface $form_state, $form_id) { $vid = \Drupal::config('forum.settings')->get('vocabulary'); if (isset($form['vid']['#value']) && $form['vid']['#value'] == $vid) { // Hide multiple parents select from forum terms. @@ -417,7 +418,7 @@ function forum_form_taxonomy_term_form_alter(&$form, &$form_state, $form_id) { /** * Implements hook_form_BASE_FORM_ID_alter() for node_form(). */ -function forum_form_node_form_alter(&$form, &$form_state, $form_id) { +function forum_form_node_form_alter(&$form, FormStateInterface $form_state, $form_id) { $node = $form_state['controller']->getEntity(); if (isset($node->taxonomy_forums) && !$node->isNew()) { $forum_terms = $node->taxonomy_forums; diff --git a/core/modules/forum/src/Form/ContainerForm.php b/core/modules/forum/src/Form/ContainerForm.php index 1918bd080e1393354ac63169e2193b5ebeb5f109..e167d74e0833e6562bb96cac9045129241fbfade 100644 --- a/core/modules/forum/src/Form/ContainerForm.php +++ b/core/modules/forum/src/Form/ContainerForm.php @@ -7,6 +7,8 @@ namespace Drupal\forum\Form; +use Drupal\Core\Form\FormStateInterface; + /** * Base form for container term edit forms. */ @@ -22,7 +24,7 @@ class ContainerForm extends ForumForm { /** * {@inheritdoc} */ - public function form(array $form, array &$form_state) { + public function form(array $form, FormStateInterface $form_state) { $taxonomy_term = $this->entity; // Build the bulk of the form from the parent forum form. $form = parent::form($form, $form_state, $taxonomy_term); @@ -40,7 +42,7 @@ public function form(array $form, array &$form_state) { /** * {@inheritdoc} */ - public function save(array $form, array &$form_state) { + public function save(array $form, FormStateInterface $form_state) { $is_new = $this->entity->isNew(); $this->entity->forum_container = TRUE; $term = parent::save($form, $form_state); diff --git a/core/modules/forum/src/Form/DeleteForm.php b/core/modules/forum/src/Form/DeleteForm.php index 6071fb8de37bfcbd32ac2ae15b3986995ce3aa0c..94cdf1126ce77171b14508ebac856efd7402f4d3 100644 --- a/core/modules/forum/src/Form/DeleteForm.php +++ b/core/modules/forum/src/Form/DeleteForm.php @@ -8,6 +8,7 @@ namespace Drupal\forum\Form; use Drupal\Core\Form\ConfirmFormBase; +use Drupal\Core\Form\FormStateInterface; use Drupal\Core\Url; use Drupal\taxonomy\TermInterface; @@ -54,7 +55,7 @@ public function getConfirmText() { /** * {@inheritdoc} */ - public function buildForm(array $form, array &$form_state, TermInterface $taxonomy_term = NULL) { + public function buildForm(array $form, FormStateInterface $form_state, TermInterface $taxonomy_term = NULL) { $this->taxonomyTerm = $taxonomy_term; return parent::buildForm($form, $form_state); @@ -63,7 +64,7 @@ public function buildForm(array $form, array &$form_state, TermInterface $taxono /** * {@inheritdoc} */ - public function submitForm(array &$form, array &$form_state) { + public function submitForm(array &$form, FormStateInterface $form_state) { $this->taxonomyTerm->delete(); drupal_set_message($this->t('The forum %label and all sub-forums have been deleted.', array('%label' => $this->taxonomyTerm->label()))); watchdog('forum', 'forum: deleted %label and all its sub-forums.', array('%label' => $this->taxonomyTerm->label()), WATCHDOG_NOTICE); diff --git a/core/modules/forum/src/Form/ForumForm.php b/core/modules/forum/src/Form/ForumForm.php index fc20134ac856afa6879a6e838e180892c06c4a36..300738058b413cce79ea05b6aa1cd17c18b88c04 100644 --- a/core/modules/forum/src/Form/ForumForm.php +++ b/core/modules/forum/src/Form/ForumForm.php @@ -7,6 +7,7 @@ namespace Drupal\forum\Form; +use Drupal\Core\Form\FormStateInterface; use Drupal\taxonomy\TermForm; /** @@ -31,7 +32,7 @@ class ForumForm extends TermForm { /** * {@inheritdoc} */ - public function form(array $form, array &$form_state) { + public function form(array $form, FormStateInterface $form_state) { $taxonomy_term = $this->entity; // Build the bulk of the form from the parent taxonomy term form. $form = parent::form($form, $form_state, $taxonomy_term); @@ -61,7 +62,7 @@ public function form(array $form, array &$form_state) { /** * {@inheritdoc} */ - public function buildEntity(array $form, array &$form_state) { + public function buildEntity(array $form, FormStateInterface $form_state) { $term = parent::buildEntity($form, $form_state); // Assign parents from forum parent select field. @@ -73,7 +74,7 @@ public function buildEntity(array $form, array &$form_state) { /** * {@inheritdoc} */ - public function save(array $form, array &$form_state) { + public function save(array $form, FormStateInterface $form_state) { $term = $this->entity; $term_storage = $this->entityManager->getStorage('taxonomy_term'); $status = $term_storage->save($term); @@ -98,7 +99,7 @@ public function save(array $form, array &$form_state) { /** * {@inheritdoc} */ - protected function actions(array $form, array &$form_state) { + protected function actions(array $form, FormStateInterface $form_state) { $actions = parent::actions($form, $form_state); if (!$this->entity->isNew() && $this->entity->hasLinkTemplate('forum-delete-form')) { diff --git a/core/modules/forum/src/Form/Overview.php b/core/modules/forum/src/Form/Overview.php index 98c3febf99e605ab1ae9c8e409ac6608d7fc4716..98688ab03a5f16d83bbcb0a206031d562d9d607c 100644 --- a/core/modules/forum/src/Form/Overview.php +++ b/core/modules/forum/src/Form/Overview.php @@ -8,6 +8,7 @@ namespace Drupal\forum\Form; use Drupal\Core\Entity\EntityManagerInterface; +use Drupal\Core\Form\FormStateInterface; use Drupal\Core\Render\Element; use Drupal\taxonomy\Form\OverviewTerms; use Drupal\Core\Config\ConfigFactoryInterface; @@ -60,7 +61,7 @@ public function getFormId() { /** * {@inheritdoc} */ - public function buildForm(array $form, array &$form_state) { + public function buildForm(array $form, FormStateInterface $form_state) { $forum_config = $this->config('forum.settings'); $vid = $forum_config->get('vocabulary'); $vocabulary = $this->entityManager->getStorage('taxonomy_vocabulary')->load($vid); diff --git a/core/modules/forum/src/ForumSettingsForm.php b/core/modules/forum/src/ForumSettingsForm.php index dbe486f15bf0b39ecf90ad0db0b2e64e4456b704..51b42a38a90295dc1f4ac904a1d183f0668c0d76 100644 --- a/core/modules/forum/src/ForumSettingsForm.php +++ b/core/modules/forum/src/ForumSettingsForm.php @@ -8,6 +8,7 @@ namespace Drupal\forum; use Drupal\Core\Form\ConfigFormBase; +use Drupal\Core\Form\FormStateInterface; /** * Configure forum settings for this site. @@ -24,7 +25,7 @@ public function getFormId() { /** * {@inheritdoc} */ - public function buildForm(array $form, array &$form_state) { + public function buildForm(array $form, FormStateInterface $form_state) { $config = $this->config('forum.settings'); $options = array(5, 10, 15, 20, 25, 30, 35, 40, 50, 60, 80, 100, 150, 200, 250, 300, 350, 400, 500); @@ -63,7 +64,7 @@ public function buildForm(array $form, array &$form_state) { /** * {@inheritdoc} */ - public function submitForm(array &$form, array &$form_state) { + public function submitForm(array &$form, FormStateInterface $form_state) { $this->config('forum.settings') ->set('topics.hot_threshold', $form_state['values']['forum_hot_topic']) ->set('topics.page_limit', $form_state['values']['forum_per_page']) diff --git a/core/modules/forum/src/Plugin/Block/ForumBlockBase.php b/core/modules/forum/src/Plugin/Block/ForumBlockBase.php index 6a5b4922d4cf241eb506d0560eb5ba97c2cf23fc..b9bab0217160d635bd2aa5c087460d9b0a225667 100644 --- a/core/modules/forum/src/Plugin/Block/ForumBlockBase.php +++ b/core/modules/forum/src/Plugin/Block/ForumBlockBase.php @@ -8,6 +8,7 @@ namespace Drupal\forum\Plugin\Block; use Drupal\block\BlockBase; +use Drupal\Core\Form\FormStateInterface; use Drupal\Core\Session\AccountInterface; use Drupal\Core\Cache\Cache; @@ -61,9 +62,9 @@ protected function blockAccess(AccountInterface $account) { } /** - * Overrides \Drupal\block\BlockBase::blockForm(). + * {@inheritdoc} */ - public function blockForm($form, &$form_state) { + public function blockForm($form, FormStateInterface $form_state) { $range = range(2, 20); $form['block_count'] = array( '#type' => 'select', @@ -75,9 +76,9 @@ public function blockForm($form, &$form_state) { } /** - * Overrides \Drupal\block\BlockBase::blockSubmit(). + * {@inheritdoc} */ - public function blockSubmit($form, &$form_state) { + public function blockSubmit($form, FormStateInterface $form_state) { $this->configuration['block_count'] = $form_state['values']['block_count']; } diff --git a/core/modules/history/src/Plugin/views/field/HistoryUserTimestamp.php b/core/modules/history/src/Plugin/views/field/HistoryUserTimestamp.php index ca9a27644aca2e104e585dd0b2536b25138e9a96..4a7d0c1417a98809163339a14ab52e891572adfc 100644 --- a/core/modules/history/src/Plugin/views/field/HistoryUserTimestamp.php +++ b/core/modules/history/src/Plugin/views/field/HistoryUserTimestamp.php @@ -7,6 +7,7 @@ namespace Drupal\history\Plugin\views\field; +use Drupal\Core\Form\FormStateInterface; use Drupal\views\ResultRow; use Drupal\views\ViewExecutable; use Drupal\views\Plugin\views\display\DisplayPluginBase; @@ -54,7 +55,7 @@ protected function defineOptions() { return $options; } - public function buildOptionsForm(&$form, &$form_state) { + public function buildOptionsForm(&$form, FormStateInterface $form_state) { parent::buildOptionsForm($form, $form_state); if (\Drupal::moduleHandler()->moduleExists('comment')) { $form['comments'] = array( diff --git a/core/modules/history/src/Plugin/views/filter/HistoryUserTimestamp.php b/core/modules/history/src/Plugin/views/filter/HistoryUserTimestamp.php index 0648fecca02f2a2e6f3b968ea36b3d932e96d6df..70866c80395f3e03587889a7b2c2b85f68ce494f 100644 --- a/core/modules/history/src/Plugin/views/filter/HistoryUserTimestamp.php +++ b/core/modules/history/src/Plugin/views/filter/HistoryUserTimestamp.php @@ -7,6 +7,7 @@ namespace Drupal\history\Plugin\views\filter; +use Drupal\Core\Form\FormStateInterface; use Drupal\views\Plugin\views\filter\FilterPluginBase; /** @@ -31,7 +32,7 @@ public function usesGroupBy() { return FALSE; } - public function buildExposeForm(&$form, &$form_state) { + public function buildExposeForm(&$form, FormStateInterface $form_state) { parent::buildExposeForm($form, $form_state); // @todo There are better ways of excluding required and multiple (object flags) unset($form['expose']['required']); @@ -39,7 +40,7 @@ public function buildExposeForm(&$form, &$form_state) { unset($form['expose']['remember']); } - protected function valueForm(&$form, &$form_state) { + protected function valueForm(&$form, FormStateInterface $form_state) { // Only present a checkbox for the exposed filter itself. There's no way // to tell the difference between not checked and the default value, so // specifying the default value via the views UI is meaningless. diff --git a/core/modules/image/src/ConfigurableImageEffectBase.php b/core/modules/image/src/ConfigurableImageEffectBase.php index ce421642bdd6df0472d3166881820238e9cc4cf8..7b391b523c910c1916d317a11a2c5913e4c783dc 100644 --- a/core/modules/image/src/ConfigurableImageEffectBase.php +++ b/core/modules/image/src/ConfigurableImageEffectBase.php @@ -7,6 +7,8 @@ namespace Drupal\image; +use Drupal\Core\Form\FormStateInterface; + /** * Provides a base class for configurable image effects. */ @@ -15,13 +17,13 @@ abstract class ConfigurableImageEffectBase extends ImageEffectBase implements Co /** * {@inheritdoc} */ - public function validateConfigurationForm(array &$form, array &$form_state) { + public function validateConfigurationForm(array &$form, FormStateInterface $form_state) { } /** * {@inheritdoc} */ - public function submitConfigurationForm(array &$form, array &$form_state) { + public function submitConfigurationForm(array &$form, FormStateInterface $form_state) { } } diff --git a/core/modules/image/src/Form/ImageEffectAddForm.php b/core/modules/image/src/Form/ImageEffectAddForm.php index 1efeab1872304a7ec5196ba18ea4c28a5f661048..e491d0791433860166e869a11586f8925768b822 100644 --- a/core/modules/image/src/Form/ImageEffectAddForm.php +++ b/core/modules/image/src/Form/ImageEffectAddForm.php @@ -8,6 +8,7 @@ namespace Drupal\image\Form; use Drupal\Core\DependencyInjection\ContainerInjectionInterface; +use Drupal\Core\Form\FormStateInterface; use Drupal\image\ImageEffectManager; use Drupal\image\ImageStyleInterface; use Symfony\Component\DependencyInjection\ContainerInterface; @@ -46,7 +47,7 @@ public static function create(ContainerInterface $container) { /** * {@inheritdoc} */ - public function buildForm(array $form, array &$form_state, ImageStyleInterface $image_style = NULL, $image_effect = NULL) { + public function buildForm(array $form, FormStateInterface $form_state, ImageStyleInterface $image_style = NULL, $image_effect = NULL) { $form = parent::buildForm($form, $form_state, $image_style, $image_effect); $form['#title'] = $this->t('Add %label effect', array('%label' => $this->imageEffect->label())); diff --git a/core/modules/image/src/Form/ImageEffectDeleteForm.php b/core/modules/image/src/Form/ImageEffectDeleteForm.php index c925da81b3fb72a36a8b5f7a6bb4afa12d0eb5bb..761fd21096fd59357fda1ebd808b48cd24ebf7c4 100644 --- a/core/modules/image/src/Form/ImageEffectDeleteForm.php +++ b/core/modules/image/src/Form/ImageEffectDeleteForm.php @@ -8,6 +8,7 @@ namespace Drupal\image\Form; use Drupal\Core\Form\ConfirmFormBase; +use Drupal\Core\Form\FormStateInterface; use Drupal\image\ImageStyleInterface; /** @@ -60,7 +61,7 @@ public function getFormId() { /** * {@inheritdoc} */ - public function buildForm(array $form, array &$form_state, ImageStyleInterface $image_style = NULL, $image_effect = NULL) { + public function buildForm(array $form, FormStateInterface $form_state, ImageStyleInterface $image_style = NULL, $image_effect = NULL) { $this->imageStyle = $image_style; $this->imageEffect = $this->imageStyle->getEffect($image_effect); @@ -70,7 +71,7 @@ public function buildForm(array $form, array &$form_state, ImageStyleInterface $ /** * {@inheritdoc} */ - public function submitForm(array &$form, array &$form_state) { + public function submitForm(array &$form, FormStateInterface $form_state) { $this->imageStyle->deleteImageEffect($this->imageEffect); drupal_set_message($this->t('The image effect %name has been deleted.', array('%name' => $this->imageEffect->label()))); $form_state['redirect_route'] = $this->imageStyle->urlInfo('edit-form'); diff --git a/core/modules/image/src/Form/ImageEffectEditForm.php b/core/modules/image/src/Form/ImageEffectEditForm.php index f949e6c825c7e5a5a8365c7c18fbe3eee74650f0..1e2ba85ca0d2fd4d73b9fa4a353d3d11f4626330 100644 --- a/core/modules/image/src/Form/ImageEffectEditForm.php +++ b/core/modules/image/src/Form/ImageEffectEditForm.php @@ -7,6 +7,7 @@ namespace Drupal\image\Form; +use Drupal\Core\Form\FormStateInterface; use Drupal\image\ImageStyleInterface; /** @@ -17,7 +18,7 @@ class ImageEffectEditForm extends ImageEffectFormBase { /** * {@inheritdoc} */ - public function buildForm(array $form, array &$form_state, ImageStyleInterface $image_style = NULL, $image_effect = NULL) { + public function buildForm(array $form, FormStateInterface $form_state, ImageStyleInterface $image_style = NULL, $image_effect = NULL) { $form = parent::buildForm($form, $form_state, $image_style, $image_effect); $form['#title'] = $this->t('Edit %label effect', array('%label' => $this->imageEffect->label())); diff --git a/core/modules/image/src/Form/ImageEffectFormBase.php b/core/modules/image/src/Form/ImageEffectFormBase.php index 6cc8d1d0a215805a250034148eefbc532c23aa85..6f3268ef88c8d6fdb9cae76fd4bc84ac122d933e 100644 --- a/core/modules/image/src/Form/ImageEffectFormBase.php +++ b/core/modules/image/src/Form/ImageEffectFormBase.php @@ -8,6 +8,8 @@ namespace Drupal\image\Form; use Drupal\Core\Form\FormBase; +use Drupal\Core\Form\FormState; +use Drupal\Core\Form\FormStateInterface; use Drupal\image\ConfigurableImageEffectInterface; use Drupal\image\ImageStyleInterface; use Drupal\Component\Plugin\Exception\PluginNotFoundException; @@ -53,7 +55,7 @@ public function getFormId() { * * @throws \Symfony\Component\HttpKernel\Exception\NotFoundHttpException */ - public function buildForm(array $form, array &$form_state, ImageStyleInterface $image_style = NULL, $image_effect = NULL) { + public function buildForm(array $form, FormStateInterface $form_state, ImageStyleInterface $image_style = NULL, $image_effect = NULL) { $this->imageStyle = $image_style; try { $this->imageEffect = $this->prepareImageEffect($image_effect); @@ -101,27 +103,32 @@ public function buildForm(array $form, array &$form_state, ImageStyleInterface $ /** * {@inheritdoc} */ - public function validateForm(array &$form, array &$form_state) { + public function validateForm(array &$form, FormStateInterface $form_state) { // The image effect configuration is stored in the 'data' key in the form, // pass that through for validation. - $effect_data = array( - 'values' => &$form_state['values']['data'] - ); + $effect_data = new FormState(array( + 'values' => $form_state['values']['data'], + )); $this->imageEffect->validateConfigurationForm($form, $effect_data); + // Update the original form values. + $form_state['values']['data'] = $effect_data['values']; } /** * {@inheritdoc} */ - public function submitForm(array &$form, array &$form_state) { + public function submitForm(array &$form, FormStateInterface $form_state) { form_state_values_clean($form_state); // The image effect configuration is stored in the 'data' key in the form, // pass that through for submission. - $effect_data = array( - 'values' => &$form_state['values']['data'] - ); + $effect_data = new FormState(array( + 'values' => $form_state['values']['data'], + )); $this->imageEffect->submitConfigurationForm($form, $effect_data); + // Update the original form values. + $form_state['values']['data'] = $effect_data['values']; + $this->imageEffect->setWeight($form_state['values']['weight']); if (!$this->imageEffect->getUuid()) { $this->imageStyle->addImageEffect($this->imageEffect->getConfiguration()); diff --git a/core/modules/image/src/Form/ImageStyleAddForm.php b/core/modules/image/src/Form/ImageStyleAddForm.php index 64c2a37dc99116acb07acc02477473846a15c652..7d34a1d9c4fbfd2f69e7a8a38b99b003288f2f60 100644 --- a/core/modules/image/src/Form/ImageStyleAddForm.php +++ b/core/modules/image/src/Form/ImageStyleAddForm.php @@ -7,6 +7,8 @@ namespace Drupal\image\Form; +use Drupal\Core\Form\FormStateInterface; + /** * Controller for image style addition forms. */ @@ -15,7 +17,7 @@ class ImageStyleAddForm extends ImageStyleFormBase { /** * {@inheritdoc} */ - public function save(array $form, array &$form_state) { + public function save(array $form, FormStateInterface $form_state) { parent::save($form, $form_state); drupal_set_message($this->t('Style %name was created.', array('%name' => $this->entity->label()))); } @@ -23,7 +25,7 @@ public function save(array $form, array &$form_state) { /** * {@inheritdoc} */ - public function actions(array $form, array &$form_state) { + public function actions(array $form, FormStateInterface $form_state) { $actions = parent::actions($form, $form_state); $actions['submit']['#value'] = $this->t('Create new style'); diff --git a/core/modules/image/src/Form/ImageStyleDeleteForm.php b/core/modules/image/src/Form/ImageStyleDeleteForm.php index 20f393b7b3ab6d42a0dd3d848a92cd8b58b85513..41ca653fd28cc4ae49dc83d3a7ad35cf00d9fc3b 100644 --- a/core/modules/image/src/Form/ImageStyleDeleteForm.php +++ b/core/modules/image/src/Form/ImageStyleDeleteForm.php @@ -8,6 +8,7 @@ namespace Drupal\image\Form; use Drupal\Core\Entity\EntityConfirmFormBase; +use Drupal\Core\Form\FormStateInterface; use Drupal\Core\Url; /** @@ -46,7 +47,7 @@ public function getDescription() { /** * {@inheritdoc} */ - public function form(array $form, array &$form_state) { + public function form(array $form, FormStateInterface $form_state) { $replacement_styles = array_diff_key(image_style_options(), array($this->entity->id() => '')); $form['replacement'] = array( '#title' => $this->t('Replacement style'), @@ -61,7 +62,7 @@ public function form(array $form, array &$form_state) { /** * {@inheritdoc} */ - public function submit(array $form, array &$form_state) { + public function submit(array $form, FormStateInterface $form_state) { $this->entity->set('replacementID', $form_state['values']['replacement']); $this->entity->delete(); drupal_set_message($this->t('Style %name was deleted.', array('%name' => $this->entity->label()))); diff --git a/core/modules/image/src/Form/ImageStyleEditForm.php b/core/modules/image/src/Form/ImageStyleEditForm.php index 8b27119cadea2443078fe51bcad67915177c8a48..f861ef1a411720016ddc8aaa23259b4eda760fd6 100644 --- a/core/modules/image/src/Form/ImageStyleEditForm.php +++ b/core/modules/image/src/Form/ImageStyleEditForm.php @@ -9,6 +9,7 @@ use Drupal\Core\Entity\EntityInterface; use Drupal\Core\Entity\EntityStorageInterface; +use Drupal\Core\Form\FormStateInterface; use Drupal\image\ConfigurableImageEffectInterface; use Drupal\image\ImageEffectManager; use Drupal\Component\Utility\String; @@ -52,7 +53,7 @@ public static function create(ContainerInterface $container) { /** * {@inheritdoc} */ - public function form(array $form, array &$form_state) { + public function form(array $form, FormStateInterface $form_state) { $form['#title'] = $this->t('Edit style %name', array('%name' => $this->entity->label())); $form['#tree'] = TRUE; $form['#attached']['css'][drupal_get_path('module', 'image') . '/css/image.admin.css'] = array(); @@ -155,7 +156,7 @@ public function form(array $form, array &$form_state) { /** * Validate handler for image effect. */ - public function effectValidate($form, &$form_state) { + public function effectValidate($form, FormStateInterface $form_state) { if (!$form_state['values']['new']) { $this->setFormError('new', $form_state, $this->t('Select an effect to add.')); } @@ -164,7 +165,7 @@ public function effectValidate($form, &$form_state) { /** * Submit handler for image effect. */ - public function effectSave($form, &$form_state) { + public function effectSave($form, FormStateInterface $form_state) { // Update image effect weights. if (!empty($form_state['values']['effects'])) { @@ -214,7 +215,7 @@ public function effectSave($form, &$form_state) { /** * {@inheritdoc} */ - public function save(array $form, array &$form_state) { + public function save(array $form, FormStateInterface $form_state) { // Update image effect weights. if (!empty($form_state['values']['effects'])) { @@ -228,7 +229,7 @@ public function save(array $form, array &$form_state) { /** * {@inheritdoc} */ - public function actions(array $form, array &$form_state) { + public function actions(array $form, FormStateInterface $form_state) { $actions = parent::actions($form, $form_state); $actions['submit']['#value'] = $this->t('Update style'); @@ -253,7 +254,7 @@ protected function updateEffectWeights(array $effects) { /** * {@inheritdoc} */ - protected function copyFormValuesToEntity(EntityInterface $entity, array $form, array &$form_state) { + protected function copyFormValuesToEntity(EntityInterface $entity, array $form, FormStateInterface $form_state) { foreach ($form_state['values'] as $key => $value) { // Do not copy effects here, see self::updateEffectWeights(). if ($key != 'effects') { diff --git a/core/modules/image/src/Form/ImageStyleFlushForm.php b/core/modules/image/src/Form/ImageStyleFlushForm.php index 9839a8a9857c667f411ce547357c99b7470a95a3..5212ba03f027c4e128d368bbdb4d3b9c2138fc8f 100644 --- a/core/modules/image/src/Form/ImageStyleFlushForm.php +++ b/core/modules/image/src/Form/ImageStyleFlushForm.php @@ -8,6 +8,7 @@ namespace Drupal\image\Form; use Drupal\Core\Entity\EntityConfirmFormBase; +use Drupal\Core\Form\FormStateInterface; use Drupal\Core\Url; /** @@ -46,7 +47,7 @@ public function getCancelUrl() { /** * {@inheritdoc} */ - public function submit(array $form, array &$form_state) { + public function submit(array $form, FormStateInterface $form_state) { $this->entity->flush(); drupal_set_message($this->t('The image style %name has been flushed.', array('%name' => $this->entity->label()))); $form_state['redirect_route'] = $this->getCancelUrl(); diff --git a/core/modules/image/src/Form/ImageStyleFormBase.php b/core/modules/image/src/Form/ImageStyleFormBase.php index efac805628ff472bbdc16db978b9c80bc99741a5..ad4ce5ccc271e1940f726163ecfdfc68db60821f 100644 --- a/core/modules/image/src/Form/ImageStyleFormBase.php +++ b/core/modules/image/src/Form/ImageStyleFormBase.php @@ -9,6 +9,7 @@ use Drupal\Core\Entity\EntityForm; use Drupal\Core\Entity\EntityStorageInterface; +use Drupal\Core\Form\FormStateInterface; use Symfony\Component\DependencyInjection\ContainerInterface; /** @@ -52,7 +53,7 @@ public static function create(ContainerInterface $container) { /** * {@inheritdoc} */ - public function form(array $form, array &$form_state) { + public function form(array $form, FormStateInterface $form_state) { $form['label'] = array( '#type' => 'textfield', @@ -75,7 +76,7 @@ public function form(array $form, array &$form_state) { /** * {@inheritdoc} */ - public function save(array $form, array &$form_state) { + public function save(array $form, FormStateInterface $form_state) { $this->entity->save(); $form_state['redirect_route'] = $this->entity->urlInfo('edit-form'); } diff --git a/core/modules/image/src/Plugin/Field/FieldFormatter/ImageFormatter.php b/core/modules/image/src/Plugin/Field/FieldFormatter/ImageFormatter.php index c14ab917de680b1d3b06670daf752b5ae3ade2de..069178df434b2251ea8fb90fb83bba9b35d7c14b 100644 --- a/core/modules/image/src/Plugin/Field/FieldFormatter/ImageFormatter.php +++ b/core/modules/image/src/Plugin/Field/FieldFormatter/ImageFormatter.php @@ -8,6 +8,7 @@ namespace Drupal\image\Plugin\Field\FieldFormatter; use Drupal\Core\Field\FieldItemListInterface; +use Drupal\Core\Form\FormStateInterface; /** * Plugin implementation of the 'image' formatter. @@ -35,7 +36,7 @@ public static function defaultSettings() { /** * {@inheritdoc} */ - public function settingsForm(array $form, array &$form_state) { + public function settingsForm(array $form, FormStateInterface $form_state) { $image_styles = image_style_options(FALSE); $element['image_style'] = array( '#title' => t('Image style'), diff --git a/core/modules/image/src/Plugin/Field/FieldType/ImageItem.php b/core/modules/image/src/Plugin/Field/FieldType/ImageItem.php index c2e8737d5ef8e475d621e85d9764ad2122699cd0..d1489c80137632ebae85b335841f2eced9787221 100644 --- a/core/modules/image/src/Plugin/Field/FieldType/ImageItem.php +++ b/core/modules/image/src/Plugin/Field/FieldType/ImageItem.php @@ -8,6 +8,7 @@ namespace Drupal\image\Plugin\Field\FieldType; use Drupal\Core\Field\FieldStorageDefinitionInterface; +use Drupal\Core\Form\FormStateInterface; use Drupal\Core\TypedData\DataDefinition; use Drupal\file\Plugin\Field\FieldType\FileItem; @@ -152,7 +153,7 @@ public static function propertyDefinitions(FieldStorageDefinitionInterface $fiel /** * {@inheritdoc} */ - public function settingsForm(array &$form, array &$form_state, $has_data) { + public function settingsForm(array &$form, FormStateInterface $form_state, $has_data) { $element = array(); // We need the field-level 'default_image' setting, and $this->getSettings() @@ -182,7 +183,7 @@ public function settingsForm(array &$form, array &$form_state, $has_data) { /** * {@inheritdoc} */ - public function instanceSettingsForm(array $form, array &$form_state) { + public function instanceSettingsForm(array $form, FormStateInterface $form_state) { // Get base form from FileItem::instanceSettingsForm(). $element = parent::instanceSettingsForm($form, $form_state); @@ -313,7 +314,7 @@ public function preSave() { /** * Element validate function for resolution fields. */ - public static function validateResolution($element, &$form_state) { + public static function validateResolution($element, FormStateInterface $form_state) { if (!empty($element['x']['#value']) || !empty($element['y']['#value'])) { foreach (array('x', 'y') as $dimension) { if (!$element[$dimension]['#value']) { @@ -383,10 +384,10 @@ protected function defaultImageForm(array &$element, array $settings) { * * @param array $element * The form element to process. - * @param array $form_state + * @param \Drupal\Core\Form\FormStateInterface $form_state * The form state. */ - public static function validateDefaultImageForm(array &$element, array &$form_state) { + public static function validateDefaultImageForm(array &$element, FormStateInterface $form_state) { // Consolidate the array value of this field to a single FID as #extended // for default image is not TRUE and this is a single value. if (isset($element['fids']['#value'][0])) { diff --git a/core/modules/image/src/Plugin/Field/FieldWidget/ImageWidget.php b/core/modules/image/src/Plugin/Field/FieldWidget/ImageWidget.php index 0ba9e7e8cb2a168a290583e75a8d8f1520cf0bf5..c38ccba8c7511cb8493c2d9284931212b5752385 100644 --- a/core/modules/image/src/Plugin/Field/FieldWidget/ImageWidget.php +++ b/core/modules/image/src/Plugin/Field/FieldWidget/ImageWidget.php @@ -9,6 +9,7 @@ use Drupal\Core\Field\FieldItemListInterface; use Drupal\Component\Utility\NestedArray; +use Drupal\Core\Form\FormStateInterface; use Drupal\file\Plugin\Field\FieldWidget\FileWidget; /** @@ -37,7 +38,7 @@ public static function defaultSettings() { /** * {@inheritdoc} */ - public function settingsForm(array $form, array &$form_state) { + public function settingsForm(array $form, FormStateInterface $form_state) { $element = parent::settingsForm($form, $form_state); $element['preview_image_style'] = array( @@ -82,7 +83,7 @@ public function settingsSummary() { * * Special handling for draggable multiple widgets and 'add more' button. */ - protected function formMultipleElements(FieldItemListInterface $items, array &$form, array &$form_state) { + protected function formMultipleElements(FieldItemListInterface $items, array &$form, FormStateInterface $form_state) { $elements = parent::formMultipleElements($items, $form, $form_state); $cardinality = $this->fieldDefinition->getFieldStorageDefinition()->getCardinality(); @@ -109,7 +110,7 @@ protected function formMultipleElements(FieldItemListInterface $items, array &$f /** * {@inheritdoc} */ - public function formElement(FieldItemListInterface $items, $delta, array $element, array &$form, array &$form_state) { + public function formElement(FieldItemListInterface $items, $delta, array $element, array &$form, FormStateInterface $form_state) { $element = parent::formElement($items, $delta, $element, $form, $form_state); $field_settings = $this->getFieldSettings(); @@ -144,7 +145,7 @@ public function formElement(FieldItemListInterface $items, $delta, array $elemen * * This method is assigned as a #process callback in formElement() method. */ - public static function process($element, &$form_state, $form) { + public static function process($element, FormStateInterface $form_state, $form) { $item = $element['#value']; $item['fids'] = $element['fids']['#value']; @@ -227,7 +228,7 @@ public static function process($element, &$form_state, $form) { * This is separated in a validate function instead of a #required flag to * avoid being validated on the process callback. */ - public static function validateRequiredFields($element, &$form_state) { + public static function validateRequiredFields($element, FormStateInterface $form_state) { // Only do validation if the function is triggered from other places than // the image process form. if (!in_array('file_managed_file_submit', $form_state['triggering_element']['#submit'])) { diff --git a/core/modules/image/src/Plugin/ImageEffect/CropImageEffect.php b/core/modules/image/src/Plugin/ImageEffect/CropImageEffect.php index 42f65611bf86a479d721087b8c679bd063018b3e..0edac982749d6a1ffa86ef28e621c2719a91b1a4 100644 --- a/core/modules/image/src/Plugin/ImageEffect/CropImageEffect.php +++ b/core/modules/image/src/Plugin/ImageEffect/CropImageEffect.php @@ -7,6 +7,7 @@ namespace Drupal\image\Plugin\ImageEffect; +use Drupal\Core\Form\FormStateInterface; use Drupal\Core\Image\ImageInterface; /** @@ -59,7 +60,7 @@ public function defaultConfiguration() { /** * {@inheritdoc} */ - public function buildConfigurationForm(array $form, array &$form_state) { + public function buildConfigurationForm(array $form, FormStateInterface $form_state) { $form = parent::buildConfigurationForm($form, $form_state); $form['anchor'] = array( '#type' => 'radios', diff --git a/core/modules/image/src/Plugin/ImageEffect/ResizeImageEffect.php b/core/modules/image/src/Plugin/ImageEffect/ResizeImageEffect.php index f7d495d654ec7f90d526a7e78b23950741c052ab..15f00805bfd28b9328d7e926af38a24b885e1807 100644 --- a/core/modules/image/src/Plugin/ImageEffect/ResizeImageEffect.php +++ b/core/modules/image/src/Plugin/ImageEffect/ResizeImageEffect.php @@ -7,6 +7,7 @@ namespace Drupal\image\Plugin\ImageEffect; +use Drupal\Core\Form\FormStateInterface; use Drupal\Core\Image\ImageInterface; use Drupal\image\ConfigurableImageEffectBase; @@ -67,7 +68,7 @@ public function defaultConfiguration() { /** * {@inheritdoc} */ - public function buildConfigurationForm(array $form, array &$form_state) { + public function buildConfigurationForm(array $form, FormStateInterface $form_state) { $form['width'] = array( '#type' => 'number', '#title' => t('Width'), @@ -90,7 +91,7 @@ public function buildConfigurationForm(array $form, array &$form_state) { /** * {@inheritdoc} */ - public function submitConfigurationForm(array &$form, array &$form_state) { + public function submitConfigurationForm(array &$form, FormStateInterface $form_state) { parent::submitConfigurationForm($form, $form_state); $this->configuration['height'] = $form_state['values']['height']; diff --git a/core/modules/image/src/Plugin/ImageEffect/RotateImageEffect.php b/core/modules/image/src/Plugin/ImageEffect/RotateImageEffect.php index 49529cd995fe6f9b811f0d1fa536c0d9300ea4f1..7f29aaff1180c2cff0a0930c81af13312ef6bf18 100644 --- a/core/modules/image/src/Plugin/ImageEffect/RotateImageEffect.php +++ b/core/modules/image/src/Plugin/ImageEffect/RotateImageEffect.php @@ -7,6 +7,7 @@ namespace Drupal\image\Plugin\ImageEffect; +use Drupal\Core\Form\FormStateInterface; use Drupal\Core\Image\ImageInterface; use Drupal\Core\Utility\Color; use Drupal\image\ConfigurableImageEffectBase; @@ -97,7 +98,7 @@ public function defaultConfiguration() { /** * {@inheritdoc} */ - public function buildConfigurationForm(array $form, array &$form_state) { + public function buildConfigurationForm(array $form, FormStateInterface $form_state) { $form['degrees'] = array( '#type' => 'number', '#default_value' => $this->configuration['degrees'], @@ -126,7 +127,7 @@ public function buildConfigurationForm(array $form, array &$form_state) { /** * {@inheritdoc} */ - public function validateConfigurationForm(array &$form, array &$form_state) { + public function validateConfigurationForm(array &$form, FormStateInterface $form_state) { if (!Color::validateHex($form_state['values']['bgcolor'])) { form_set_error('bgcolor', $form_state, $this->t('Background color must be a hexadecimal color value.')); } @@ -135,7 +136,7 @@ public function validateConfigurationForm(array &$form, array &$form_state) { /** * {@inheritdoc} */ - public function submitConfigurationForm(array &$form, array &$form_state) { + public function submitConfigurationForm(array &$form, FormStateInterface $form_state) { parent::submitConfigurationForm($form, $form_state); $this->configuration['degrees'] = $form_state['values']['degrees']; diff --git a/core/modules/image/src/Plugin/ImageEffect/ScaleImageEffect.php b/core/modules/image/src/Plugin/ImageEffect/ScaleImageEffect.php index e1d8ec57cf90cabcfe98a4d9139b952b1b14e426..a5dae9a7cd35a1aec2367c08985d585f5e92381c 100644 --- a/core/modules/image/src/Plugin/ImageEffect/ScaleImageEffect.php +++ b/core/modules/image/src/Plugin/ImageEffect/ScaleImageEffect.php @@ -8,6 +8,7 @@ namespace Drupal\image\Plugin\ImageEffect; use Drupal\Component\Utility\Image; +use Drupal\Core\Form\FormStateInterface; use Drupal\Core\Image\ImageInterface; /** @@ -66,7 +67,7 @@ public function defaultConfiguration() { /** * {@inheritdoc} */ - public function buildConfigurationForm(array $form, array &$form_state) { + public function buildConfigurationForm(array $form, FormStateInterface $form_state) { $form = parent::buildConfigurationForm($form, $form_state); $form['width']['#required'] = FALSE; $form['height']['#required'] = FALSE; @@ -82,7 +83,7 @@ public function buildConfigurationForm(array $form, array &$form_state) { /** * {@inheritdoc} */ - public function validateConfigurationForm(array &$form, array &$form_state) { + public function validateConfigurationForm(array &$form, FormStateInterface $form_state) { parent::validateConfigurationForm($form, $form_state); if (empty($form_state['values']['width']) && empty($form_state['values']['height'])) { form_set_error('data', $form_state, $this->t('Width and height can not both be blank.')); @@ -92,7 +93,7 @@ public function validateConfigurationForm(array &$form, array &$form_state) { /** * {@inheritdoc} */ - public function submitConfigurationForm(array &$form, array &$form_state) { + public function submitConfigurationForm(array &$form, FormStateInterface $form_state) { parent::submitConfigurationForm($form, $form_state); $this->configuration['upscale'] = $form_state['values']['upscale']; diff --git a/core/modules/language/language.module b/core/modules/language/language.module index 5ac331bf1c3edf47ad3943ed6451af218bb7e721..0909511d957985f2894bcd321298e0703cee8c74 100644 --- a/core/modules/language/language.module +++ b/core/modules/language/language.module @@ -5,6 +5,7 @@ * Add language handling functionality to Drupal. */ +use Drupal\Core\Form\FormStateInterface; use Drupal\Core\PhpStorage\PhpStorageFactory; use Drupal\Core\Language\LanguageInterface; use Drupal\Core\Routing\RouteMatchInterface; @@ -214,7 +215,7 @@ function language_configuration_element_default_options() { /** * Process handler for the language_configuration form element. */ -function language_configuration_element_process($element, &$form_state, &$form) { +function language_configuration_element_process($element, FormStateInterface $form_state, &$form) { $options = isset($element['#options']) ? $element['#options'] : array(); // Avoid validation failure since we are moving the '#options' key in the // nested 'language' select element. @@ -265,7 +266,7 @@ function language_configuration_element_process($element, &$form_state, &$form) /** * Submit handler for the forms that have a language_configuration element. */ -function language_configuration_element_submit(&$form, &$form_state) { +function language_configuration_element_submit(&$form, FormStateInterface $form_state) { // Iterate through all the language_configuration elements and save their // values. if (isset($form_state['language'])) { @@ -650,7 +651,7 @@ function language_set_browser_drupal_langcode_mappings($mappings) { * * @see language_system_regional_settings_form_submit() */ -function language_form_system_regional_settings_alter(&$form, &$form_state) { +function language_form_system_regional_settings_alter(&$form, FormStateInterface $form_state) { $languages = \Drupal::languageManager()->getLanguages(); $default = \Drupal::languageManager()->getDefaultLanguage(); foreach ($languages as $key => $language) { @@ -673,7 +674,7 @@ function language_form_system_regional_settings_alter(&$form, &$form_state) { * * @see language_form_system_regional_settings_alter() */ -function language_system_regional_settings_form_submit($form, &$form_state) { +function language_system_regional_settings_form_submit($form, FormStateInterface $form_state) { $languages = \Drupal::languageManager()->getLanguages(); $language = $languages[$form_state['values']['site_default_language']]; $language->default = TRUE; diff --git a/core/modules/language/src/Form/ContentLanguageSettingsForm.php b/core/modules/language/src/Form/ContentLanguageSettingsForm.php index 4738a1871dda2f87951ee0e33b673338f6a85de8..47c136e8e958e4336c5a95ef86bd60b1579de238 100644 --- a/core/modules/language/src/Form/ContentLanguageSettingsForm.php +++ b/core/modules/language/src/Form/ContentLanguageSettingsForm.php @@ -10,6 +10,7 @@ use Drupal\Core\Config\ConfigFactoryInterface; use Drupal\Core\Entity\EntityManagerInterface; use Drupal\Core\Form\ConfigFormBase; +use Drupal\Core\Form\FormStateInterface; use Symfony\Component\DependencyInjection\ContainerInterface; /** @@ -58,7 +59,7 @@ public function getFormId() { /** * {@inheritdoc} */ - public function buildForm(array $form, array &$form_state) { + public function buildForm(array $form, FormStateInterface $form_state) { $entity_types = $this->entityManager->getDefinitions(); $labels = array(); $default = array(); @@ -146,7 +147,7 @@ public function buildForm(array $form, array &$form_state) { /** * {@inheritdoc} */ - public function submitForm(array &$form, array &$form_state) { + public function submitForm(array &$form, FormStateInterface $form_state) { $config = $this->config('language.settings'); foreach ($form_state['values']['settings'] as $entity_type => $entity_settings) { foreach ($entity_settings as $bundle => $bundle_settings) { diff --git a/core/modules/language/src/Form/LanguageAddForm.php b/core/modules/language/src/Form/LanguageAddForm.php index 3eb0bc613ce89a1328f1d4e8759d9ce38f8e7d66..692cae9bd5a952ccfe4429ff23dbd6076e5ed793 100644 --- a/core/modules/language/src/Form/LanguageAddForm.php +++ b/core/modules/language/src/Form/LanguageAddForm.php @@ -7,6 +7,7 @@ namespace Drupal\language\Form; +use Drupal\Core\Form\FormStateInterface; use Drupal\language\Form\LanguageFormBase; use Drupal\Core\Language\Language; @@ -26,7 +27,7 @@ public function getFormId() { /** * {@inheritdoc} */ - public function form(array $form, array &$form_state) { + public function form(array $form, FormStateInterface $form_state) { $form['#title'] = $this->t('Add language'); $predefined_languages = $this->languageManager->getStandardLanguageListWithoutConfigured(); @@ -81,7 +82,7 @@ public function form(array $form, array &$form_state) { /** * {@inheritdoc} */ - public function submitForm(array &$form, array &$form_state) { + public function submitForm(array &$form, FormStateInterface $form_state) { $langcode = $form_state['values']['predefined_langcode']; if ($langcode == 'custom') { $langcode = $form_state['values']['langcode']; @@ -109,7 +110,7 @@ public function submitForm(array &$form, array &$form_state) { /** * {@inheritdoc} */ - public function actions(array $form, array &$form_state) { + public function actions(array $form, FormStateInterface $form_state) { // No actions needed. return array(); } @@ -117,7 +118,7 @@ public function actions(array $form, array &$form_state) { /** * Validates the language addition form on custom language button. */ - public function validateCustom(array $form, array &$form_state) { + public function validateCustom(array $form, FormStateInterface $form_state) { if ($form_state['values']['predefined_langcode'] == 'custom') { $langcode = $form_state['values']['langcode']; // Reuse the editing form validation routine if we add a custom language. @@ -135,7 +136,7 @@ public function validateCustom(array $form, array &$form_state) { /** * Element specific validator for the Add language button. */ - public function validatePredefined($form, &$form_state) { + public function validatePredefined($form, FormStateInterface $form_state) { $langcode = $form_state['values']['predefined_langcode']; if ($langcode == 'custom') { $this->setFormError('predefined_langcode', $form_state, $this->t('Fill in the language details and save the language with Add custom language.')); diff --git a/core/modules/language/src/Form/LanguageDeleteForm.php b/core/modules/language/src/Form/LanguageDeleteForm.php index 8ef8aec68813448af17e934be2eef2bed0802bd7..db158e00a0d4175f1709a24e6e4ae0183388ef63 100644 --- a/core/modules/language/src/Form/LanguageDeleteForm.php +++ b/core/modules/language/src/Form/LanguageDeleteForm.php @@ -8,6 +8,7 @@ namespace Drupal\language\Form; use Drupal\Core\Entity\EntityConfirmFormBase; +use Drupal\Core\Form\FormStateInterface; use Drupal\Core\Routing\UrlGeneratorInterface; use Drupal\Core\Url; use Symfony\Component\DependencyInjection\ContainerInterface; @@ -84,7 +85,7 @@ public function getFormId() { /** * {@inheritdoc} */ - public function buildForm(array $form, array &$form_state) { + public function buildForm(array $form, FormStateInterface $form_state) { $langcode = $this->entity->id(); // Warn and redirect user when attempting to delete the default language. @@ -105,7 +106,7 @@ public function buildForm(array $form, array &$form_state) { /** * {@inheritdoc} */ - public function submit(array $form, array &$form_state) { + public function submit(array $form, FormStateInterface $form_state) { // @todo This should be replaced with $this->entity->delete() when the // additional logic in language_delete() is ported. $success = language_delete($this->entity->id()); diff --git a/core/modules/language/src/Form/LanguageEditForm.php b/core/modules/language/src/Form/LanguageEditForm.php index 2dacdc2785b5d61626bb94bbfa1e34521e1dec9c..f5d7498e174e5f18c607cac08f7b378ea1524c48 100644 --- a/core/modules/language/src/Form/LanguageEditForm.php +++ b/core/modules/language/src/Form/LanguageEditForm.php @@ -7,6 +7,7 @@ namespace Drupal\language\Form; +use Drupal\Core\Form\FormStateInterface; use Drupal\language\Form\LanguageFormBase; /** @@ -25,7 +26,7 @@ public function getFormId() { /** * {@inheritdoc} */ - public function form(array $form, array &$form_state) { + public function form(array $form, FormStateInterface $form_state) { $this->commonForm($form); return parent::form($form, $form_state); } @@ -33,7 +34,7 @@ public function form(array $form, array &$form_state) { /** * {@inheritdoc} */ - public function actions(array $form, array &$form_state) { + public function actions(array $form, FormStateInterface $form_state) { $actions['submit'] = array( '#type' => 'submit', '#value' => $this->t('Save language'), @@ -46,7 +47,7 @@ public function actions(array $form, array &$form_state) { /** * {@inheritdoc} */ - public function submitForm(array &$form, array &$form_state) { + public function submitForm(array &$form, FormStateInterface $form_state) { // Prepare a language object for saving. $languages = language_list(); $langcode = $form_state['values']['langcode']; diff --git a/core/modules/language/src/Form/LanguageFormBase.php b/core/modules/language/src/Form/LanguageFormBase.php index 583787abc631a920e8ac6380ea3557df4c9af581..880a017e986ba2a411e2cd3cd36f61a389c8243b 100644 --- a/core/modules/language/src/Form/LanguageFormBase.php +++ b/core/modules/language/src/Form/LanguageFormBase.php @@ -9,6 +9,7 @@ use Drupal\Component\Utility\String; use Drupal\Core\Entity\EntityForm; +use Drupal\Core\Form\FormStateInterface; use Drupal\Core\Language\LanguageInterface; use Drupal\language\ConfigurableLanguageManagerInterface; use Symfony\Component\DependencyInjection\ContainerInterface; @@ -96,7 +97,7 @@ public function commonForm(array &$form) { /** * Validates the language editing element. */ - public function validateCommon(array $form, array &$form_state) { + public function validateCommon(array $form, FormStateInterface $form_state) { // Ensure sane field values for langcode and name. if (!isset($form['langcode_view']) && preg_match('@[^a-zA-Z_-]@', $form_state['values']['langcode'])) { $this->setFormError('langcode', $form_state, $this->t('%field may only contain characters a-z, underscores, or hyphens.', array('%field' => $form['langcode']['#title']))); diff --git a/core/modules/language/src/Form/NegotiationBrowserDeleteForm.php b/core/modules/language/src/Form/NegotiationBrowserDeleteForm.php index 3fa4a864243debc21537344183e537e31c237c7c..43fd8b49310b7fa6fbc6dd63407a415e5adb1338 100644 --- a/core/modules/language/src/Form/NegotiationBrowserDeleteForm.php +++ b/core/modules/language/src/Form/NegotiationBrowserDeleteForm.php @@ -8,6 +8,7 @@ namespace Drupal\language\Form; use Drupal\Core\Form\ConfirmFormBase; +use Drupal\Core\Form\FormStateInterface; use Drupal\Core\Url; use Symfony\Component\HttpFoundation\Request; @@ -47,7 +48,7 @@ public function getFormId() { /** * {@inheritdoc} */ - public function buildForm(array $form, array &$form_state, $browser_langcode = NULL) { + public function buildForm(array $form, FormStateInterface $form_state, $browser_langcode = NULL) { $this->browserLangcode = $browser_langcode; $form = parent::buildForm($form, $form_state); @@ -58,7 +59,7 @@ public function buildForm(array $form, array &$form_state, $browser_langcode = N /** * {@inheritdoc} */ - public function submitForm(array &$form, array &$form_state) { + public function submitForm(array &$form, FormStateInterface $form_state) { $mappings = language_get_browser_drupal_langcode_mappings(); if (array_key_exists($this->browserLangcode, $mappings)) { diff --git a/core/modules/language/src/Form/NegotiationBrowserForm.php b/core/modules/language/src/Form/NegotiationBrowserForm.php index f82e54a90e8e5c7e7b4bc88f921b789dc6ae6736..9d1177bd769e4c10658f41b98a931deee3a10b31 100644 --- a/core/modules/language/src/Form/NegotiationBrowserForm.php +++ b/core/modules/language/src/Form/NegotiationBrowserForm.php @@ -9,6 +9,7 @@ use Drupal\Core\Config\ConfigFactoryInterface; use Drupal\Core\Form\ConfigFormBase; +use Drupal\Core\Form\FormStateInterface; use Drupal\language\ConfigurableLanguageManagerInterface; use Symfony\Component\DependencyInjection\ContainerInterface; @@ -55,7 +56,7 @@ public function getFormId() { /** * {@inheritdoc} */ - public function buildForm(array $form, array &$form_state) { + public function buildForm(array $form, FormStateInterface $form_state) { $form = array(); // Initialize a language list to the ones available, including English. @@ -128,7 +129,7 @@ public function buildForm(array $form, array &$form_state) { /** * {@inheritdoc} */ - public function validateForm(array &$form, array &$form_state) { + public function validateForm(array &$form, FormStateInterface $form_state) { // Array to check if all browser language codes are unique. $unique_values = array(); @@ -167,7 +168,7 @@ public function validateForm(array &$form, array &$form_state) { /** * {@inheritdoc} */ - public function submitForm(array &$form, array &$form_state) { + public function submitForm(array &$form, FormStateInterface $form_state) { $mappings = $form_state['mappings']; if (!empty($mappings)) { $config = $this->config('language.mappings'); diff --git a/core/modules/language/src/Form/NegotiationConfigureForm.php b/core/modules/language/src/Form/NegotiationConfigureForm.php index a6d241f32b63d6014d3c2c3624768e24e3668413..afc39aa1b61fd4732d9f6dababac2a3de209f38c 100644 --- a/core/modules/language/src/Form/NegotiationConfigureForm.php +++ b/core/modules/language/src/Form/NegotiationConfigureForm.php @@ -14,6 +14,7 @@ use Drupal\Core\Config\ConfigFactoryInterface; use Drupal\Core\Extension\ModuleHandlerInterface; use Drupal\Core\Form\FormBase; +use Drupal\Core\Form\FormStateInterface; use Drupal\language\ConfigurableLanguageManagerInterface; use Drupal\language\LanguageNegotiatorInterface; use Drupal\language\Plugin\LanguageNegotiation\LanguageNegotiationSelected; @@ -93,7 +94,7 @@ public function getFormID() { /** * {@inheritdoc} */ - public function buildForm(array $form, array &$form_state) { + public function buildForm(array $form, FormStateInterface $form_state) { $configurable = $this->languageTypes->get('configurable'); $form = array( @@ -127,7 +128,7 @@ public function buildForm(array $form, array &$form_state) { /** * {@inheritdoc} */ - public function submitForm(array &$form, array &$form_state) { + public function submitForm(array &$form, FormStateInterface $form_state) { $configurable_types = $form['#language_types']; $stored_values = $this->languageTypes->get('configurable'); diff --git a/core/modules/language/src/Form/NegotiationSelectedForm.php b/core/modules/language/src/Form/NegotiationSelectedForm.php index 47d61eb23c2aaf25ddf74c8569ad126349858907..f88daa81f604c6ff41f0922612b4c516a240db47 100644 --- a/core/modules/language/src/Form/NegotiationSelectedForm.php +++ b/core/modules/language/src/Form/NegotiationSelectedForm.php @@ -7,6 +7,7 @@ namespace Drupal\language\Form; +use Drupal\Core\Form\FormStateInterface; use Drupal\Core\Language\LanguageInterface; use Drupal\Core\Form\ConfigFormBase; @@ -23,9 +24,9 @@ public function getFormId() { } /** - * Implements \Drupal\Core\Form\FormInterface::buildForm(). + * {@inheritdoc} */ - public function buildForm(array $form, array &$form_state) { + public function buildForm(array $form, FormStateInterface $form_state) { $config = $this->config('language.negotiation'); $form['selected_langcode'] = array( '#type' => 'language_select', @@ -38,9 +39,9 @@ public function buildForm(array $form, array &$form_state) { } /** - * Implements \Drupal\Core\Form\FormInterface::submitForm(). + * {@inheritdoc} */ - public function submitForm(array &$form, array &$form_state) { + public function submitForm(array &$form, FormStateInterface $form_state) { $this->config('language.negotiation') ->set('selected_langcode', $form_state['values']['selected_langcode']) ->save(); diff --git a/core/modules/language/src/Form/NegotiationSessionForm.php b/core/modules/language/src/Form/NegotiationSessionForm.php index 13936af8d77018b974c8c04d451c5400dc7c72ba..ef4cb3dbf0cbfc13a0265574df1082704a117566 100644 --- a/core/modules/language/src/Form/NegotiationSessionForm.php +++ b/core/modules/language/src/Form/NegotiationSessionForm.php @@ -8,6 +8,7 @@ namespace Drupal\language\Form; use Drupal\Core\Form\ConfigFormBase; +use Drupal\Core\Form\FormStateInterface; /** * Configure the session language negotiation method for this site. @@ -22,9 +23,9 @@ public function getFormId() { } /** - * Implements \Drupal\Core\Form\FormInterface::buildForm(). + * {@inheritdoc} */ - public function buildForm(array $form, array &$form_state) { + public function buildForm(array $form, FormStateInterface $form_state) { $config = $this->config('language.negotiation'); $form['language_negotiation_session_param'] = array( '#title' => t('Request/session parameter'), @@ -39,9 +40,9 @@ public function buildForm(array $form, array &$form_state) { } /** - * Implements \Drupal\Core\Form\FormInterface::submitForm(). + * {@inheritdoc} */ - public function submitForm(array &$form, array &$form_state) { + public function submitForm(array &$form, FormStateInterface $form_state) { $this->config('language.settings') ->set('session.parameter', $form_state['values']['language_negotiation_session_param']) ->save(); diff --git a/core/modules/language/src/Form/NegotiationUrlForm.php b/core/modules/language/src/Form/NegotiationUrlForm.php index d8c24905b8271691f27520e5049fe8142c943263..96cbbb8a2cc3b5fc9b7b1c53b8604584ca859a85 100644 --- a/core/modules/language/src/Form/NegotiationUrlForm.php +++ b/core/modules/language/src/Form/NegotiationUrlForm.php @@ -8,6 +8,7 @@ namespace Drupal\language\Form; use Drupal\Core\Form\ConfigFormBase; +use Drupal\Core\Form\FormStateInterface; use Drupal\language\Plugin\LanguageNegotiation\LanguageNegotiationUrl; /** @@ -23,9 +24,9 @@ public function getFormId() { } /** - * Implements \Drupal\Core\Form\FormInterface::buildForm(). + * {@inheritdoc} */ - public function buildForm(array $form, array &$form_state) { + public function buildForm(array $form, FormStateInterface $form_state) { global $base_url; $config = $this->config('language.negotiation'); @@ -96,7 +97,7 @@ public function buildForm(array $form, array &$form_state) { /** * Implements \Drupal\Core\Form\FormInterface::validateForm(). */ - public function validateForm(array &$form, array &$form_state) { + public function validateForm(array &$form, FormStateInterface $form_state) { $languages = language_list(); // Count repeated values for uniqueness check. @@ -158,9 +159,9 @@ public function validateForm(array &$form, array &$form_state) { } /** - * Implements \Drupal\Core\Form\FormInterface::submitForm(). + * {@inheritdoc} */ - public function submitForm(array &$form, array &$form_state) { + public function submitForm(array &$form, FormStateInterface $form_state) { // Save selected format (prefix or domain). $this->config('language.negotiation') ->set('url.source', $form_state['values']['language_negotiation_url_part']) diff --git a/core/modules/language/src/LanguageListBuilder.php b/core/modules/language/src/LanguageListBuilder.php index c5bd66a30f6af7bdc3fdea9113c42d40efb70eee..3c28810dd46676b5f73d2741631f89c487cde672 100644 --- a/core/modules/language/src/LanguageListBuilder.php +++ b/core/modules/language/src/LanguageListBuilder.php @@ -9,6 +9,7 @@ use Drupal\Core\Config\Entity\DraggableListBuilder; use Drupal\Core\Entity\EntityInterface; +use Drupal\Core\Form\FormStateInterface; /** * Defines a class to build a listing of language entities. @@ -75,7 +76,7 @@ public function buildRow(EntityInterface $entity) { /** * {@inheritdoc} */ - public function buildForm(array $form, array &$form_state) { + public function buildForm(array $form, FormStateInterface $form_state) { $form = parent::buildForm($form, $form_state); $form[$this->entitiesKey]['#languages'] = $this->entities; $form['actions']['submit']['#value'] = t('Save configuration'); @@ -85,7 +86,7 @@ public function buildForm(array $form, array &$form_state) { /** * {@inheritdoc} */ - public function submitForm(array &$form, array &$form_state) { + public function submitForm(array &$form, FormStateInterface $form_state) { parent::submitForm($form, $form_state); $language_manager = \Drupal::languageManager(); diff --git a/core/modules/language/src/Plugin/Condition/Language.php b/core/modules/language/src/Plugin/Condition/Language.php index 46a99cb11b822178762089cd642a4a86a70b9667..3ae2b09a751c6210aaa484360181d6e9c84fd096 100644 --- a/core/modules/language/src/Plugin/Condition/Language.php +++ b/core/modules/language/src/Plugin/Condition/Language.php @@ -8,6 +8,7 @@ namespace Drupal\language\Plugin\Condition; use Drupal\Core\Condition\ConditionPluginBase; +use Drupal\Core\Form\FormStateInterface; use Drupal\Core\Language\LanguageInterface; /** @@ -27,7 +28,7 @@ class Language extends ConditionPluginBase { /** * {@inheritdoc} */ - public function buildConfigurationForm(array $form, array &$form_state) { + public function buildConfigurationForm(array $form, FormStateInterface $form_state) { if (\Drupal::languageManager()->isMultilingual()) { // Fetch languages. $languages = language_list(LanguageInterface::STATE_ALL); @@ -55,7 +56,7 @@ public function buildConfigurationForm(array $form, array &$form_state) { /** * {@inheritdoc} */ - public function submitConfigurationForm(array &$form, array &$form_state) { + public function submitConfigurationForm(array &$form, FormStateInterface $form_state) { $this->configuration['langcodes'] = array_filter($form_state['values']['langcodes']); parent::submitConfigurationForm($form, $form_state); } diff --git a/core/modules/language/tests/language_elements_test/src/Form/LanguageConfigurationElement.php b/core/modules/language/tests/language_elements_test/src/Form/LanguageConfigurationElement.php index a213d5cd95c8002f0e809c32da9e09d91069955c..f9a0e1bb743d0c847dde0ba78a9c7d920eacf02d 100644 --- a/core/modules/language/tests/language_elements_test/src/Form/LanguageConfigurationElement.php +++ b/core/modules/language/tests/language_elements_test/src/Form/LanguageConfigurationElement.php @@ -7,6 +7,7 @@ namespace Drupal\language_elements_test\Form; use Drupal\Core\Form\FormBase; +use Drupal\Core\Form\FormStateInterface; /** * A form containing a language configuration element. @@ -23,7 +24,7 @@ public function getFormID() { /** * {@inheritdoc} */ - public function buildForm(array $form, array &$form_state) { + public function buildForm(array $form, FormStateInterface $form_state) { $conf = language_get_default_configuration('some_custom_type', 'some_bundle'); $form['lang_configuration'] = array( @@ -46,6 +47,6 @@ public function buildForm(array $form, array &$form_state) { /** * {@inheritdoc} */ - public function submitForm(array &$form, array &$form_state) { + public function submitForm(array &$form, FormStateInterface $form_state) { } } diff --git a/core/modules/language/tests/language_elements_test/src/Form/LanguageConfigurationElementTest.php b/core/modules/language/tests/language_elements_test/src/Form/LanguageConfigurationElementTest.php index bf531497187e3afe83463b7844ca4d8c75d55911..130c069e9aba2506234f2cd13a2a842cc8827a8c 100644 --- a/core/modules/language/tests/language_elements_test/src/Form/LanguageConfigurationElementTest.php +++ b/core/modules/language/tests/language_elements_test/src/Form/LanguageConfigurationElementTest.php @@ -7,6 +7,7 @@ namespace Drupal\language_elements_test\Form; use Drupal\Core\Form\FormBase; +use Drupal\Core\Form\FormStateInterface; /** * A form containing a language select element. @@ -23,7 +24,7 @@ public function getFormID() { /** * {@inheritdoc} */ - public function buildForm(array $form, array &$form_state) { + public function buildForm(array $form, FormStateInterface $form_state) { $form['langcode'] = array( '#title' => t('Language select'), '#type' => 'language_select', @@ -35,6 +36,6 @@ public function buildForm(array $form, array &$form_state) { /** * {@inheritdoc} */ - public function submitForm(array &$form, array &$form_state) { + public function submitForm(array &$form, FormStateInterface $form_state) { } } diff --git a/core/modules/link/src/Plugin/Field/FieldFormatter/LinkFormatter.php b/core/modules/link/src/Plugin/Field/FieldFormatter/LinkFormatter.php index 37df04984fa73fa874109121450dc4afff2876a1..0c08d66f53347f2945ee4bc678078ec48cd311f6 100644 --- a/core/modules/link/src/Plugin/Field/FieldFormatter/LinkFormatter.php +++ b/core/modules/link/src/Plugin/Field/FieldFormatter/LinkFormatter.php @@ -10,6 +10,7 @@ use Drupal\Component\Utility\String; use Drupal\Core\Field\FieldItemListInterface; use Drupal\Core\Field\FormatterBase; +use Drupal\Core\Form\FormStateInterface; use Drupal\Core\Url; use Drupal\link\LinkItemInterface; @@ -42,7 +43,7 @@ public static function defaultSettings() { /** * {@inheritdoc} */ - public function settingsForm(array $form, array &$form_state) { + public function settingsForm(array $form, FormStateInterface $form_state) { $elements = parent::settingsForm($form, $form_state); $elements['trim_length'] = array( diff --git a/core/modules/link/src/Plugin/Field/FieldType/LinkItem.php b/core/modules/link/src/Plugin/Field/FieldType/LinkItem.php index 850c19e58864da0ccd685819786792d8abe27084..f8639bb6f127bfc654dffe6089b8a80079c5d159 100644 --- a/core/modules/link/src/Plugin/Field/FieldType/LinkItem.php +++ b/core/modules/link/src/Plugin/Field/FieldType/LinkItem.php @@ -9,6 +9,7 @@ use Drupal\Core\Field\FieldItemBase; use Drupal\Core\Field\FieldStorageDefinitionInterface; +use Drupal\Core\Form\FormStateInterface; use Drupal\Core\TypedData\DataDefinition; use Drupal\Core\TypedData\MapDataDefinition; use Drupal\link\LinkItemInterface; @@ -104,7 +105,7 @@ public static function schema(FieldStorageDefinitionInterface $field_definition) /** * {@inheritdoc} */ - public function instanceSettingsForm(array $form, array &$form_state) { + public function instanceSettingsForm(array $form, FormStateInterface $form_state) { $element = array(); $element['link_type'] = array( diff --git a/core/modules/link/src/Plugin/Field/FieldWidget/LinkWidget.php b/core/modules/link/src/Plugin/Field/FieldWidget/LinkWidget.php index 27072ee2cd8e685ac0e4c682a14027af18d87cf8..568f64cbbf0a4478da2c5bea0744003a32b17fa2 100644 --- a/core/modules/link/src/Plugin/Field/FieldWidget/LinkWidget.php +++ b/core/modules/link/src/Plugin/Field/FieldWidget/LinkWidget.php @@ -10,6 +10,7 @@ use Drupal\Component\Utility\UrlHelper; use Drupal\Core\Field\FieldItemListInterface; use Drupal\Core\Field\WidgetBase; +use Drupal\Core\Form\FormStateInterface; use Drupal\Core\ParamConverter\ParamNotConvertedException; use Drupal\Core\Routing\MatchingRouteNotFoundException; use Drupal\Core\Url; @@ -42,7 +43,7 @@ public static function defaultSettings() { /** * {@inheritdoc} */ - public function formElement(FieldItemListInterface $items, $delta, array $element, array &$form, array &$form_state) { + public function formElement(FieldItemListInterface $items, $delta, array $element, array &$form, FormStateInterface $form_state) { $default_url_value = NULL; if (isset($items[$delta]->url)) { @@ -138,7 +139,7 @@ protected function supportsExternalLinks() { /** * {@inheritdoc} */ - public function settingsForm(array $form, array &$form_state) { + public function settingsForm(array $form, FormStateInterface $form_state) { $elements = parent::settingsForm($form, $form_state); $elements['placeholder_url'] = array( @@ -190,7 +191,7 @@ public function settingsSummary() { * * Conditionally requires the link title if a URL value was filled in. */ - public function validateTitle(&$element, &$form_state, $form) { + public function validateTitle(&$element, FormStateInterface $form_state, $form) { if ($element['url']['#value'] !== '' && $element['title']['#value'] === '') { $element['title']['#required'] = TRUE; \Drupal::formBuilder()->setError($element['title'], $form_state, $this->t('!name field is required.', array('!name' => $element['title']['#title']))); @@ -200,7 +201,7 @@ public function validateTitle(&$element, &$form_state, $form) { /** * {@inheritdoc} */ - public function massageFormValues(array $values, array $form, array &$form_state) { + public function massageFormValues(array $values, array $form, FormStateInterface $form_state) { foreach ($values as &$value) { if (!empty($value['url'])) { try { diff --git a/core/modules/locale/locale.module b/core/modules/locale/locale.module index 0728d0762f6fead89f7406a4f8cda68847d0e86a..7f40bf4a3509e6fcf7b19bfd0153ac4be191af32 100644 --- a/core/modules/locale/locale.module +++ b/core/modules/locale/locale.module @@ -14,6 +14,7 @@ use Drupal\Component\Utility\UrlHelper; use Drupal\Component\Utility\Xss; use Drupal\Core\Cache\Cache; +use Drupal\Core\Form\FormStateInterface; use Drupal\Core\Language\Language; use Drupal\Core\Routing\RouteMatchInterface; use Drupal\Core\StringTranslation\TranslationWrapper; @@ -647,7 +648,7 @@ function locale_library_alter(array &$library, $name) { /** * Implements hook_form_FORM_ID_alter() for language_admin_overview_form(). */ -function locale_form_language_admin_overview_form_alter(&$form, &$form_state) { +function locale_form_language_admin_overview_form_alter(&$form, FormStateInterface $form_state) { $languages = $form['languages']['#languages']; $total_strings = \Drupal::service('locale.storage')->countStrings(); @@ -700,7 +701,7 @@ function locale_form_language_admin_overview_form_alter(&$form, &$form_state) { /** * Implements hook_form_FORM_ID_alter() for language_admin_add_form(). */ -function locale_form_language_admin_add_form_alter(&$form, &$form_state) { +function locale_form_language_admin_add_form_alter(&$form, FormStateInterface $form_state) { $form['predefined_submit']['#submit'][] = 'locale_form_language_admin_add_form_alter_submit'; $form['custom_language']['submit']['#submit'][] = 'locale_form_language_admin_add_form_alter_submit'; } @@ -736,7 +737,7 @@ function locale_form_language_admin_add_form_alter_submit($form, $form_state) { /** * Implements hook_form_FORM_ID_alter() for language_admin_edit_form(). */ -function locale_form_language_admin_edit_form_alter(&$form, &$form_state) { +function locale_form_language_admin_edit_form_alter(&$form, FormStateInterface $form_state) { if ($form['langcode']['#type'] == 'value' && $form['langcode']['#value'] == 'en') { $form['locale_translate_english'] = array( '#title' => t('Enable interface translation to English'), diff --git a/core/modules/locale/src/Form/ExportForm.php b/core/modules/locale/src/Form/ExportForm.php index ea4a153fe03968285fe64cd6e4dc6293595b803d..5177c694d862bc5f59bad75d07ce5bac11ae741c 100644 --- a/core/modules/locale/src/Form/ExportForm.php +++ b/core/modules/locale/src/Form/ExportForm.php @@ -9,6 +9,7 @@ use Drupal\Component\Gettext\PoStreamWriter; use Drupal\Core\Form\FormBase; +use Drupal\Core\Form\FormStateInterface; use Drupal\Core\Language\LanguageInterface; use Drupal\Core\Language\LanguageManagerInterface; use Drupal\locale\PoDatabaseReader; @@ -56,7 +57,7 @@ public function getFormID() { /** * {@inheritdoc} */ - public function buildForm(array $form, array &$form_state) { + public function buildForm(array $form, FormStateInterface $form_state) { $languages = $this->languageManager->getLanguages(); $language_options = array(); foreach ($languages as $langcode => $language) { @@ -127,7 +128,7 @@ public function buildForm(array $form, array &$form_state) { /** * {@inheritdoc} */ - public function submitForm(array &$form, array &$form_state) { + public function submitForm(array &$form, FormStateInterface $form_state) { // If template is required, language code is not given. if ($form_state['values']['langcode'] != LanguageInterface::LANGCODE_SYSTEM) { $language = $this->languageManager->getLanguage($form_state['values']['langcode']); diff --git a/core/modules/locale/src/Form/ImportForm.php b/core/modules/locale/src/Form/ImportForm.php index 544dc36f287de67a16987016c5f2e7b0d8989fda..d74328e978afc700787b881dd15ad93290739c13 100644 --- a/core/modules/locale/src/Form/ImportForm.php +++ b/core/modules/locale/src/Form/ImportForm.php @@ -9,6 +9,7 @@ use Drupal\Core\Form\FormBase; use Drupal\Core\Extension\ModuleHandlerInterface; +use Drupal\Core\Form\FormStateInterface; use Drupal\Core\Language\Language; use Drupal\language\ConfigurableLanguageManagerInterface; use Symfony\Component\DependencyInjection\ContainerInterface; @@ -71,7 +72,7 @@ public function getFormID() { /** * Form constructor for the translation import screen. */ - public function buildForm(array $form, array &$form_state) { + public function buildForm(array $form, FormStateInterface $form_state) { $languages = $this->languageManager->getLanguages(); // Initialize a language list to the ones available, including English if we @@ -157,7 +158,7 @@ public function buildForm(array $form, array &$form_state) { /** * {@inheritdoc} */ - public function validateForm(array &$form, array &$form_state) { + public function validateForm(array &$form, FormStateInterface $form_state) { $this->file = file_save_upload('file', $form['file']['#upload_validators'], 'translations://', 0); // Ensure we have the file uploaded. @@ -169,7 +170,7 @@ public function validateForm(array &$form, array &$form_state) { /** * {@inheritdoc} */ - public function submitForm(array &$form, array &$form_state) { + public function submitForm(array &$form, FormStateInterface $form_state) { // Add language, if not yet supported. $language = $this->languageManager->getLanguage($form_state['values']['langcode']); if (empty($language)) { diff --git a/core/modules/locale/src/Form/LocaleSettingsForm.php b/core/modules/locale/src/Form/LocaleSettingsForm.php index e1b13d07016005b61c20cc8d4f44d21e73851b40..3846aafe3ec58c6e5db7f94b8a7ffb042849c9e3 100644 --- a/core/modules/locale/src/Form/LocaleSettingsForm.php +++ b/core/modules/locale/src/Form/LocaleSettingsForm.php @@ -7,6 +7,7 @@ namespace Drupal\locale\Form; use Drupal\Core\Form\ConfigFormBase; +use Drupal\Core\Form\FormStateInterface; /** * Configure locale settings for this site. @@ -21,9 +22,9 @@ public function getFormId() { } /** - * Implements \Drupal\Core\Form\FormInterface::buildForm(). + * {@inheritdoc} */ - public function buildForm(array $form, array &$form_state) { + public function buildForm(array $form, FormStateInterface $form_state) { $config = $this->config('locale.settings'); $form['update_interval_days'] = array( @@ -83,7 +84,7 @@ public function buildForm(array $form, array &$form_state) { /** * Implements \Drupal\Core\Form\FormInterface::validateForm(). */ - public function validateForm(array &$form, array &$form_state) { + public function validateForm(array &$form, FormStateInterface $form_state) { parent::validateForm($form, $form_state); if (empty($form['#translation_directory']) && $form_state['values']['use_source'] == LOCALE_TRANSLATION_USE_SOURCE_LOCAL) { @@ -92,9 +93,9 @@ public function validateForm(array &$form, array &$form_state) { } /** - * Implements \Drupal\Core\Form\FormInterface::submitForm(). + * {@inheritdoc} */ - public function submitForm(array &$form, array &$form_state) { + public function submitForm(array &$form, FormStateInterface $form_state) { $values = $form_state['values']; $config = $this->config('locale.settings'); diff --git a/core/modules/locale/src/Form/TranslateEditForm.php b/core/modules/locale/src/Form/TranslateEditForm.php index c01accbffd6d8914093f096d5918b88576f2394a..6c582d3d38afe385e1b0388b9dfca7e00f741947 100644 --- a/core/modules/locale/src/Form/TranslateEditForm.php +++ b/core/modules/locale/src/Form/TranslateEditForm.php @@ -8,6 +8,7 @@ namespace Drupal\locale\Form; use Drupal\Component\Utility\String; +use Drupal\Core\Form\FormStateInterface; use Drupal\Core\Render\Element; use Drupal\locale\SourceString; @@ -26,7 +27,7 @@ public function getFormId() { /** * {@inheritdoc} */ - public function buildForm(array $form, array &$form_state) { + public function buildForm(array $form, FormStateInterface $form_state) { $filter_values = $this->translateFilterValues(); $langcode = $filter_values['langcode']; @@ -158,7 +159,7 @@ public function buildForm(array $form, array &$form_state) { /** * {@inheritdoc} */ - public function validateForm(array &$form, array &$form_state) { + public function validateForm(array &$form, FormStateInterface $form_state) { $langcode = $form_state['values']['langcode']; foreach ($form_state['values']['strings'] as $lid => $translations) { foreach ($translations['translations'] as $key => $value) { @@ -174,7 +175,7 @@ public function validateForm(array &$form, array &$form_state) { /** * {@inheritdoc} */ - public function submitForm(array &$form, array &$form_state) { + public function submitForm(array &$form, FormStateInterface $form_state) { $langcode = $form_state['values']['langcode']; $updated = array(); diff --git a/core/modules/locale/src/Form/TranslateFilterForm.php b/core/modules/locale/src/Form/TranslateFilterForm.php index 213935abbb55d853200c53ddf5313dcb1df546c8..a9be9f5b0d95dd89c2bd7a40031afec804ffd52f 100644 --- a/core/modules/locale/src/Form/TranslateFilterForm.php +++ b/core/modules/locale/src/Form/TranslateFilterForm.php @@ -7,6 +7,8 @@ namespace Drupal\locale\Form; +use Drupal\Core\Form\FormStateInterface; + /** * Provides a filtered translation edit form. */ @@ -22,7 +24,7 @@ public function getFormId() { /** * {@inheritdoc} */ - public function buildForm(array $form, array &$form_state) { + public function buildForm(array $form, FormStateInterface $form_state) { $filters = $this->translateFilters(); $filter_values = $this->translateFilterValues(); @@ -82,7 +84,7 @@ public function buildForm(array $form, array &$form_state) { /** * {@inheritdoc} */ - public function submitForm(array &$form, array &$form_state) { + public function submitForm(array &$form, FormStateInterface $form_state) { $filters = $this->translateFilters(); foreach ($filters as $name => $filter) { if (isset($form_state['values'][$name])) { @@ -95,7 +97,7 @@ public function submitForm(array &$form, array &$form_state) { /** * Provides a submit handler for the reset button. */ - public function resetForm(array &$form, array &$form_state) { + public function resetForm(array &$form, FormStateInterface $form_state) { $_SESSION['locale_translate_filter'] = array(); $form_state['redirect_route']['route_name'] = 'locale.translate_page'; } diff --git a/core/modules/locale/src/Form/TranslationStatusForm.php b/core/modules/locale/src/Form/TranslationStatusForm.php index a1c7e3496c77b8ec12e6a28ecd0439db0e86a9fc..b09658f71f06fe49d74e3fc75ad19205c1411016 100644 --- a/core/modules/locale/src/Form/TranslationStatusForm.php +++ b/core/modules/locale/src/Form/TranslationStatusForm.php @@ -10,6 +10,7 @@ use Drupal\Component\Utility\String; use Drupal\Core\Extension\ModuleHandlerInterface; use Drupal\Core\Form\FormBase; +use Drupal\Core\Form\FormStateInterface; use Drupal\Core\State\StateInterface; use Symfony\Component\DependencyInjection\ContainerInterface; @@ -67,7 +68,7 @@ public function getFormID() { * * @ingroup forms */ - public function buildForm(array $form, array &$form_state) { + public function buildForm(array $form, FormStateInterface $form_state) { $languages = locale_translatable_language_list(); $status = locale_translation_get_status(); $options = array(); @@ -264,7 +265,7 @@ protected function createInfoString($project_info) { /** * {@inheritdoc} */ - public function validateForm(array &$form, array &$form_state) { + public function validateForm(array &$form, FormStateInterface $form_state) { // Check if a language has been selected. 'tableselect' doesn't. if (!array_filter($form_state['values']['langcodes'])) { $this->setFormError('', $this->t('Select a language to update.')); @@ -274,7 +275,7 @@ public function validateForm(array &$form, array &$form_state) { /** * {@inheritdoc} */ - public function submitForm(array &$form, array &$form_state) { + public function submitForm(array &$form, FormStateInterface $form_state) { $this->moduleHandler->loadInclude('locale', 'fetch.inc'); $langcodes = array_filter($form_state['values']['langcodes']); $projects = array_filter($form_state['values']['projects_update']); diff --git a/core/modules/menu_link_content/src/Form/MenuLinkContentDeleteForm.php b/core/modules/menu_link_content/src/Form/MenuLinkContentDeleteForm.php index 4951cfbc563f47cf8cb6359e8cd35e6a82546265..7d79bd5ea8976d728d3a72f8470453f323807ed4 100644 --- a/core/modules/menu_link_content/src/Form/MenuLinkContentDeleteForm.php +++ b/core/modules/menu_link_content/src/Form/MenuLinkContentDeleteForm.php @@ -9,6 +9,7 @@ use Drupal\Core\Entity\ContentEntityConfirmFormBase; use Drupal\Core\Entity\EntityManagerInterface; +use Drupal\Core\Form\FormStateInterface; use Drupal\Core\Logger\LoggerChannelFactoryInterface; use Drupal\Core\Url; use Symfony\Component\DependencyInjection\ContainerInterface; @@ -65,7 +66,7 @@ public function getCancelUrl() { /** * {@inheritdoc} */ - public function submit(array $form, array &$form_state) { + public function submit(array $form, FormStateInterface $form_state) { $t_args = array('%title' => $this->entity->getTitle()); $this->entity->delete(); drupal_set_message($this->t('The menu link %title has been deleted.', $t_args)); diff --git a/core/modules/menu_link_content/src/Form/MenuLinkContentForm.php b/core/modules/menu_link_content/src/Form/MenuLinkContentForm.php index 7b5d6ef96f2af2ee3be5aae51159c68b019dd560..727d8b24b2599e40643c5cdc97322b1d96e40c31 100644 --- a/core/modules/menu_link_content/src/Form/MenuLinkContentForm.php +++ b/core/modules/menu_link_content/src/Form/MenuLinkContentForm.php @@ -12,6 +12,7 @@ use Drupal\Core\Entity\ContentEntityForm; use Drupal\Core\Entity\EntityManagerInterface; use Drupal\Core\Extension\ModuleHandlerInterface; +use Drupal\Core\Form\FormStateInterface; use Drupal\Core\Language\Language; use Drupal\Core\Language\LanguageManagerInterface; use Drupal\Core\Menu\Form\MenuLinkFormInterface; @@ -143,7 +144,7 @@ public function setMenuLinkInstance(MenuLinkInterface $menu_link) { /** * {@inheritdoc} */ - public function buildConfigurationForm(array $form, array &$form_state) { + public function buildConfigurationForm(array $form, FormStateInterface $form_state) { $this->setOperation('default'); $this->init($form_state); @@ -153,14 +154,14 @@ public function buildConfigurationForm(array $form, array &$form_state) { /** * {@inheritdoc} */ - public function validateConfigurationForm(array &$form, array &$form_state) { + public function validateConfigurationForm(array &$form, FormStateInterface $form_state) { $this->doValidate($form, $form_state); } /** * {@inheritdoc} */ - public function submitConfigurationForm(array &$form, array &$form_state) { + public function submitConfigurationForm(array &$form, FormStateInterface $form_state) { // Remove button and internal Form API values from submitted values. parent::submit($form, $form_state); $this->save($form, $form_state); @@ -209,7 +210,7 @@ protected function extractUrl($url) { /** * {@inheritdoc} */ - public function extractFormValues(array &$form, array &$form_state) { + public function extractFormValues(array &$form, FormStateInterface $form_state) { $new_definition = array(); $new_definition['expanded'] = !empty($form_state['values']['expanded']['value']) ? 1 : 0; $new_definition['hidden'] = empty($form_state['values']['enabled']) ? 1 : 0; @@ -240,7 +241,7 @@ public function extractFormValues(array &$form, array &$form_state) { /** * {@inheritdoc} */ - public function form(array $form, array &$form_state) { + public function form(array $form, FormStateInterface $form_state) { $form = parent::form($form, $form_state); // We always show the internal path here. @@ -314,7 +315,7 @@ public function form(array $form, array &$form_state) { /** * {@inheritdoc} */ - protected function actions(array $form, array &$form_state) { + protected function actions(array $form, FormStateInterface $form_state) { $element = parent::actions($form, $form_state); $element['submit']['#button_type'] = 'primary'; $element['delete']['#access'] = $this->entity->access('delete'); @@ -325,7 +326,7 @@ protected function actions(array $form, array &$form_state) { /** * {@inheritdoc} */ - public function validate(array $form, array &$form_state) { + public function validate(array $form, FormStateInterface $form_state) { $this->doValidate($form, $form_state); parent::validate($form, $form_state); @@ -334,7 +335,7 @@ public function validate(array $form, array &$form_state) { /** * {@inheritdoc} */ - public function buildEntity(array $form, array &$form_state) { + public function buildEntity(array $form, FormStateInterface $form_state) { /** @var \Drupal\menu_link_content\Entity\MenuLinkContentInterface $entity */ $entity = parent::buildEntity($form, $form_state); $new_definition = $this->extractFormValues($form, $form_state); @@ -355,7 +356,7 @@ public function buildEntity(array $form, array &$form_state) { /** * {@inheritdoc} */ - public function save(array $form, array &$form_state) { + public function save(array $form, FormStateInterface $form_state) { // The entity is rebuilt in parent::submit(). $menu_link = $this->entity; $saved = $menu_link->save(); @@ -383,10 +384,10 @@ public function save(array $form, array &$form_state) { * * @param array $form * A nested array form elements comprising the form. - * @param array $form_state - * An associative array containing the current state of the form. + * @param \Drupal\Core\Form\FormStateInterface $form_state + * The current state of the form. */ - protected function doValidate(array $form, array &$form_state) { + protected function doValidate(array $form, FormStateInterface $form_state) { $extracted = $this->extractUrl($form_state['values']['url']); // If both URL and route_name are empty, the entered value is not valid. diff --git a/core/modules/menu_ui/menu_ui.module b/core/modules/menu_ui/menu_ui.module index 79cd051e5b61b64348928d31f4883f7620e2657f..8dbb4e2c1cddfde721e54fdb90acceecde74493b 100644 --- a/core/modules/menu_ui/menu_ui.module +++ b/core/modules/menu_ui/menu_ui.module @@ -11,6 +11,7 @@ use Drupal\Core\Entity\EntityInterface; use Drupal\block\BlockPluginInterface; use Drupal\Core\Menu\MenuLinkInterface; +use Drupal\Core\Form\FormStateInterface; use Drupal\Core\Render\Element; use Drupal\Core\Routing\RouteMatchInterface; use Drupal\menu_link_content\Entity\MenuLinkContent; @@ -245,7 +246,7 @@ function menu_ui_node_predelete(EntityInterface $node) { /** * Implements hook_node_prepare_form(). */ -function menu_ui_node_prepare_form(NodeInterface $node, $operation, array &$form_state) { +function menu_ui_node_prepare_form(NodeInterface $node, $operation, FormStateInterface $form_state) { if (empty($form_state['menu_link_definition'])) { // Prepare the node for the edit form so that $node->menu always exists. $node_type_config = \Drupal::config('menu.entity.node.' . $node->getType()); diff --git a/core/modules/menu_ui/src/Form/MenuDeleteForm.php b/core/modules/menu_ui/src/Form/MenuDeleteForm.php index 5c3cd961911171dce755a95101aa235f9564aef6..2332b40ec94b61d5bf18d1456e0bffdb0f7ecea7 100644 --- a/core/modules/menu_ui/src/Form/MenuDeleteForm.php +++ b/core/modules/menu_ui/src/Form/MenuDeleteForm.php @@ -10,6 +10,7 @@ use Drupal\Core\Database\Connection; use Drupal\Core\Entity\EntityConfirmFormBase; use Drupal\Core\Menu\MenuLinkManagerInterface; +use Drupal\Core\Form\FormStateInterface; use Drupal\Core\Url; use Symfony\Component\DependencyInjection\ContainerInterface; @@ -92,7 +93,7 @@ public function getConfirmText() { /** * {@inheritdoc} */ - public function submit(array $form, array &$form_state) { + public function submit(array $form, FormStateInterface $form_state) { $form_state['redirect_route'] = new Url('menu_ui.overview_page'); // Locked menus may not be deleted. diff --git a/core/modules/menu_ui/src/Form/MenuLinkEditForm.php b/core/modules/menu_ui/src/Form/MenuLinkEditForm.php index cbe096c05e729ae3acd49f2dca3de6183de863ff..ebd691f78dbdc9b2a996cc6b5356ff6a8bfb45bc 100644 --- a/core/modules/menu_ui/src/Form/MenuLinkEditForm.php +++ b/core/modules/menu_ui/src/Form/MenuLinkEditForm.php @@ -9,6 +9,7 @@ use Drupal\Core\DependencyInjection\ClassResolverInterface; use Drupal\Core\Form\FormBase; +use Drupal\Core\Form\FormStateInterface; use Drupal\Core\Menu\MenuLinkInterface; use Symfony\Component\DependencyInjection\ContainerInterface; @@ -60,7 +61,7 @@ public function getFormId() { * @param \Drupal\Core\Menu\MenuLinkInterface $menu_link_plugin * The plugin instance to use for this form. */ - public function buildForm(array $form, array &$form_state, MenuLinkInterface $menu_link_plugin = NULL) { + public function buildForm(array $form, FormStateInterface $form_state, MenuLinkInterface $menu_link_plugin = NULL) { $form['menu_link_id'] = array( '#type' => 'value', '#value' => $menu_link_plugin->getPluginId(), @@ -83,14 +84,14 @@ public function buildForm(array $form, array &$form_state, MenuLinkInterface $me /** * {@inheritdoc} */ - public function validateForm(array &$form, array &$form_state) { + public function validateForm(array &$form, FormStateInterface $form_state) { $form['#plugin_form']->validateConfigurationForm($form, $form_state); } /** * {@inheritdoc} */ - public function submitForm(array &$form, array &$form_state) { + public function submitForm(array &$form, FormStateInterface $form_state) { $link = $form['#plugin_form']->submitConfigurationForm($form, $form_state); drupal_set_message($this->t('The menu link has been saved.')); diff --git a/core/modules/menu_ui/src/Form/MenuLinkResetForm.php b/core/modules/menu_ui/src/Form/MenuLinkResetForm.php index 6bb22e1218b93a34f1c871e9617c19463b8d9bb5..09cfb87c40a297c662c233736177b74123e8d440 100644 --- a/core/modules/menu_ui/src/Form/MenuLinkResetForm.php +++ b/core/modules/menu_ui/src/Form/MenuLinkResetForm.php @@ -7,6 +7,7 @@ namespace Drupal\menu_ui\Form; +use Drupal\Core\Form\FormStateInterface; use Drupal\Core\Url; use Drupal\Core\Form\ConfirmFormBase; use Drupal\Core\Menu\MenuLinkManagerInterface; @@ -92,7 +93,7 @@ public function getConfirmText() { /** * {@inheritdoc} */ - public function buildForm(array $form, array &$form_state, MenuLinkInterface $menu_link_plugin = NULL) { + public function buildForm(array $form, FormStateInterface $form_state, MenuLinkInterface $menu_link_plugin = NULL) { $this->link = $menu_link_plugin; $form = parent::buildForm($form, $form_state); @@ -102,7 +103,7 @@ public function buildForm(array $form, array &$form_state, MenuLinkInterface $me /** * {@inheritdoc} */ - public function submitForm(array &$form, array &$form_state) { + public function submitForm(array &$form, FormStateInterface $form_state) { $this->link = $this->menuLinkManager->resetLink($this->link->getPluginId()); drupal_set_message($this->t('The menu link was reset to its default settings.')); $form_state['redirect_route'] = $this->getCancelUrl(); diff --git a/core/modules/menu_ui/src/MenuForm.php b/core/modules/menu_ui/src/MenuForm.php index 5e32eafce309298bbf035a2d816f5190085d74f4..d115736a4e9b5710adbe2c61887d0b0539fd559c 100644 --- a/core/modules/menu_ui/src/MenuForm.php +++ b/core/modules/menu_ui/src/MenuForm.php @@ -10,6 +10,7 @@ use Drupal\Component\Utility\NestedArray; use Drupal\Core\Entity\EntityForm; use Drupal\Core\Entity\Query\QueryFactory; +use Drupal\Core\Form\FormStateInterface; use Drupal\Core\Language\LanguageInterface; use Drupal\Core\Menu\MenuLinkManagerInterface; use Drupal\Core\Menu\MenuLinkTreeElement; @@ -94,7 +95,7 @@ public static function create(ContainerInterface $container) { /** * {@inheritdoc} */ - public function form(array $form, array &$form_state) { + public function form(array $form, FormStateInterface $form_state) { $menu = $this->entity; if ($this->operation == 'edit') { @@ -173,7 +174,7 @@ public function menuNameExists($value) { /** * {@inheritdoc} */ - public function save(array $form, array &$form_state) { + public function save(array $form, FormStateInterface $form_state) { $menu = $this->entity; if (!$menu->isNew() || $menu->isLocked()) { $this->submitOverviewForm($form, $form_state); @@ -208,12 +209,12 @@ public function save(array $form, array &$form_state) { * Forms integrating this section should call menu_overview_form_submit() from * their form submit handler. */ - protected function buildOverviewForm(array &$form, array &$form_state) { + protected function buildOverviewForm(array &$form, FormStateInterface $form_state) { // Ensure that menu_overview_form_submit() knows the parents of this form // section. $form['#tree'] = TRUE; $form['#theme'] = 'menu_overview_form'; - $form_state += array('menu_overview_form_parents' => array()); + $form_state->setIfNotExists('menu_overview_form_parents', array()); $form['#attached']['css'] = array(drupal_get_path('module', 'menu') . '/css/menu.admin.css'); @@ -350,7 +351,7 @@ protected function buildOverviewTreeForm($tree, $delta) { * This function takes great care in saving parent items first, then items * underneath them. Saving items in the incorrect order can break the tree. */ - protected function submitOverviewForm(array $complete_form, array &$form_state) { + protected function submitOverviewForm(array $complete_form, FormStateInterface $form_state) { // Form API supports constructing and validating self-contained sections // within forms, but does not allow to handle the form section's submission // equally separated yet. Therefore, we use a $form_state key to point to diff --git a/core/modules/menu_ui/src/MenuSettingsForm.php b/core/modules/menu_ui/src/MenuSettingsForm.php index 73bc7d7a015ac43d30df7082b23ac534abe85c91..77c3c157de329386e2c0a612ad6e541f43060f13 100644 --- a/core/modules/menu_ui/src/MenuSettingsForm.php +++ b/core/modules/menu_ui/src/MenuSettingsForm.php @@ -8,6 +8,7 @@ namespace Drupal\menu_ui; use Drupal\Core\Form\ConfigFormBase; +use Drupal\Core\Form\FormStateInterface; /** * Select the menus to be used for the main and secondary links for this site. @@ -22,9 +23,9 @@ public function getFormId() { } /** - * Implements \Drupal\Core\Form\FormInterface::buildForm(). + * {@inheritdoc} */ - public function buildForm(array $form, array &$form_state) { + public function buildForm(array $form, FormStateInterface $form_state) { $config = $this->config('menu_ui.settings'); $form['intro'] = array( '#type' => 'item', @@ -58,9 +59,9 @@ public function buildForm(array $form, array &$form_state) { } /** - * Implements \Drupal\Core\Form\FormInterface::submitForm(). + * {@inheritdoc} */ - public function submitForm(array &$form, array &$form_state) { + public function submitForm(array &$form, FormStateInterface $form_state) { $this->config('menu_ui.settings') ->set('main_links', $form_state['values']['menu_main_links_source']) ->set('secondary_links', $form_state['values']['menu_secondary_links_source']) diff --git a/core/modules/node/node.api.php b/core/modules/node/node.api.php index 56154d17816b7fe08e2df255343c50bbc721c2ec..9ac1c40b8f594c1edd3d0ae9496e0855b5f7e9fe 100644 --- a/core/modules/node/node.api.php +++ b/core/modules/node/node.api.php @@ -420,11 +420,11 @@ function hook_node_update_index(\Drupal\node\NodeInterface $node, $langcode) { * @param $form * The form being used to edit the node. * @param $form_state - * The form state array. + * The current state of the form. * * @ingroup entity_crud */ -function hook_node_validate(\Drupal\node\NodeInterface $node, $form, &$form_state) { +function hook_node_validate(\Drupal\node\NodeInterface $node, $form, \Drupal\Core\Form\FormStateInterface $form_state) { if (isset($node->end) && isset($node->start)) { if ($node->start > $node->end) { form_set_error('time', $form_state, t('An event may not end before it starts.')); @@ -447,11 +447,11 @@ function hook_node_validate(\Drupal\node\NodeInterface $node, $form, &$form_stat * @param $form * The form being used to edit the node. * @param $form_state - * The form state array. + * The current state of the form. * * @ingroup entity_crud */ -function hook_node_submit(\Drupal\node\NodeInterface $node, $form, &$form_state) { +function hook_node_submit(\Drupal\node\NodeInterface $node, $form, \Drupal\Core\Form\FormStateInterface $form_state) { // Decompose the selected menu parent option into 'menu_name' and 'parent', if // the form used the default parent selection widget. if (!empty($form_state['values']['menu']['parent'])) { diff --git a/core/modules/node/node.module b/core/modules/node/node.module index 1a27d145f2377e07338d662c7d4e7d7730c7b328..fdec8ba9fc63cba3dae3bcefad1c377d9967aba5 100644 --- a/core/modules/node/node.module +++ b/core/modules/node/node.module @@ -9,6 +9,7 @@ */ use Drupal\Component\Utility\Xss; +use Drupal\Core\Form\FormStateInterface; use Drupal\Core\Language\LanguageInterface; use Drupal\Core\Render\Element; use Drupal\Core\Routing\RouteMatchInterface; @@ -1053,7 +1054,7 @@ function node_view_multiple($nodes, $view_mode = 'teaser', $langcode = NULL) { * @see taxonomy_term_page() * @see node_form_system_site_information_settings_form_submit() */ -function node_form_system_site_information_settings_form_alter(&$form, &$form_state, $form_id) { +function node_form_system_site_information_settings_form_alter(&$form, FormStateInterface $form_state, $form_id) { $options = array(1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 15, 20, 25, 30); $form['front_page']['default_nodes_main'] = array( '#type' => 'select', @@ -1071,7 +1072,7 @@ function node_form_system_site_information_settings_form_alter(&$form, &$form_st * * @see node_form_system_site_information_settings_form_alter() */ -function node_form_system_site_information_settings_form_submit($form, &$form_state) { +function node_form_system_site_information_settings_form_submit($form, FormStateInterface $form_state) { \Drupal::config('node.settings') ->set('items_per_page', $form_state['values']['default_nodes_main']) ->save(); @@ -1084,7 +1085,7 @@ function node_form_system_site_information_settings_form_submit($form, &$form_st * * @see node_form_system_themes_admin_form_submit() */ -function node_form_system_themes_admin_form_alter(&$form, &$form_state, $form_id) { +function node_form_system_themes_admin_form_alter(&$form, FormStateInterface $form_state, $form_id) { $form['admin_theme']['use_admin_theme'] = array( '#type' => 'checkbox', '#title' => t('Use the administration theme when editing or creating content'), @@ -1098,7 +1099,7 @@ function node_form_system_themes_admin_form_alter(&$form, &$form_state, $form_id * * @see node_form_system_themes_admin_form_alter() */ -function node_form_system_themes_admin_form_submit($form, &$form_state) { +function node_form_system_themes_admin_form_submit($form, FormStateInterface $form_state) { \Drupal::config('node.settings') ->set('use_admin_theme', $form_state['values']['use_admin_theme']) ->save(); diff --git a/core/modules/node/node.pages.inc b/core/modules/node/node.pages.inc index 9757596de3c623b01c6476659c45d152c3754b6b..e848f3e56f3c6d05a00a292c6209344f61cf56d9 100644 --- a/core/modules/node/node.pages.inc +++ b/core/modules/node/node.pages.inc @@ -10,6 +10,7 @@ */ use Drupal\Component\Utility\Xss; +use Drupal\Core\Form\FormStateInterface; use Symfony\Component\HttpFoundation\RedirectResponse; use Drupal\node\NodeInterface; @@ -48,7 +49,7 @@ function template_preprocess_node_add_list(&$variables) { * * @see node_form_build_preview() */ -function node_preview(NodeInterface $node, array &$form_state) { +function node_preview(NodeInterface $node, FormStateInterface $form_state) { if ($node->access('create') || $node->access('update')) { $node->changed = REQUEST_TIME; diff --git a/core/modules/node/src/Form/DeleteMultiple.php b/core/modules/node/src/Form/DeleteMultiple.php index 4044098f1b8c9c041f87acdcc5af456eaeeb436c..a067ccb0693bf4d04d55d9566792c0dbbfdbdcb2 100644 --- a/core/modules/node/src/Form/DeleteMultiple.php +++ b/core/modules/node/src/Form/DeleteMultiple.php @@ -11,6 +11,7 @@ use Drupal\Core\Form\ConfirmFormBase; use Drupal\Core\Url; use Drupal\Component\Utility\String; +use Drupal\Core\Form\FormStateInterface; use Drupal\user\TempStoreFactory; use Symfony\Component\HttpFoundation\RedirectResponse; use Symfony\Component\DependencyInjection\ContainerInterface; @@ -95,7 +96,7 @@ public function getConfirmText() { /** * {@inheritdoc} */ - public function buildForm(array $form, array &$form_state) { + public function buildForm(array $form, FormStateInterface $form_state) { $this->nodes = $this->tempStoreFactory->get('node_multiple_delete_confirm')->get(\Drupal::currentUser()->id()); if (empty($this->nodes)) { return new RedirectResponse(url('admin/content', array('absolute' => TRUE))); @@ -115,7 +116,7 @@ public function buildForm(array $form, array &$form_state) { /** * {@inheritdoc} */ - public function submitForm(array &$form, array &$form_state) { + public function submitForm(array &$form, FormStateInterface $form_state) { if ($form_state['values']['confirm'] && !empty($this->nodes)) { $this->storage->delete($this->nodes); $this->tempStoreFactory->get('node_multiple_delete_confirm')->delete(\Drupal::currentUser()->id()); diff --git a/core/modules/node/src/Form/NodeDeleteForm.php b/core/modules/node/src/Form/NodeDeleteForm.php index 3b5a6156f83b7311aba175468902e56125b380a7..19faa67a5e5fca5c11108bdc694daa4088393f9f 100644 --- a/core/modules/node/src/Form/NodeDeleteForm.php +++ b/core/modules/node/src/Form/NodeDeleteForm.php @@ -9,6 +9,7 @@ use Drupal\Core\Entity\ContentEntityConfirmFormBase; use Drupal\Core\Entity\EntityManagerInterface; +use Drupal\Core\Form\FormStateInterface; use Drupal\Core\Routing\UrlGeneratorInterface; use Symfony\Component\DependencyInjection\ContainerInterface; @@ -71,7 +72,7 @@ public function getConfirmText() { /** * {@inheritdoc} */ - public function submit(array $form, array &$form_state) { + public function submit(array $form, FormStateInterface $form_state) { $this->entity->delete(); watchdog('content', '@type: deleted %title.', array('@type' => $this->entity->bundle(), '%title' => $this->entity->label())); $node_type_storage = $this->entityManager->getStorage('node_type'); diff --git a/core/modules/node/src/Form/NodeRevisionDeleteForm.php b/core/modules/node/src/Form/NodeRevisionDeleteForm.php index 3f240e4403f4a96b9cd1b17bb387db3fa800d744..0ab753dc0a46c7f459a900d341c2c14677e92c77 100644 --- a/core/modules/node/src/Form/NodeRevisionDeleteForm.php +++ b/core/modules/node/src/Form/NodeRevisionDeleteForm.php @@ -10,6 +10,7 @@ use Drupal\Core\Database\Connection; use Drupal\Core\Entity\EntityStorageInterface; use Drupal\Core\Form\ConfirmFormBase; +use Drupal\Core\Form\FormStateInterface; use Drupal\Core\Url; use Drupal\node\NodeInterface; use Symfony\Component\DependencyInjection\ContainerInterface; @@ -106,7 +107,7 @@ public function getConfirmText() { /** * {@inheritdoc} */ - public function buildForm(array $form, array &$form_state, $node_revision = NULL) { + public function buildForm(array $form, FormStateInterface $form_state, $node_revision = NULL) { $this->revision = $this->nodeStorage->loadRevision($node_revision); $form = parent::buildForm($form, $form_state); @@ -116,7 +117,7 @@ public function buildForm(array $form, array &$form_state, $node_revision = NULL /** * {@inheritdoc} */ - public function submitForm(array &$form, array &$form_state) { + public function submitForm(array &$form, FormStateInterface $form_state) { $this->nodeStorage->deleteRevision($this->revision->getRevisionId()); watchdog('content', '@type: deleted %title revision %revision.', array('@type' => $this->revision->bundle(), '%title' => $this->revision->label(), '%revision' => $this->revision->getRevisionId())); diff --git a/core/modules/node/src/Form/NodeRevisionRevertForm.php b/core/modules/node/src/Form/NodeRevisionRevertForm.php index a1e7c454a8cf960d11392942f65cff6de3b920e1..147036fab8c2e6da4f4b0d27cb21f0e72eba2b40 100644 --- a/core/modules/node/src/Form/NodeRevisionRevertForm.php +++ b/core/modules/node/src/Form/NodeRevisionRevertForm.php @@ -9,6 +9,7 @@ use Drupal\Core\Entity\EntityStorageInterface; use Drupal\Core\Form\ConfirmFormBase; +use Drupal\Core\Form\FormStateInterface; use Drupal\Core\Url; use Drupal\node\NodeInterface; use Symfony\Component\DependencyInjection\ContainerInterface; @@ -89,7 +90,7 @@ public function getDescription() { /** * {@inheritdoc} */ - public function buildForm(array $form, array &$form_state, $node_revision = NULL) { + public function buildForm(array $form, FormStateInterface $form_state, $node_revision = NULL) { $this->revision = $this->nodeStorage->loadRevision($node_revision); $form = parent::buildForm($form, $form_state); @@ -99,7 +100,7 @@ public function buildForm(array $form, array &$form_state, $node_revision = NULL /** * {@inheritdoc} */ - public function submitForm(array &$form, array &$form_state) { + public function submitForm(array &$form, FormStateInterface $form_state) { $this->revision->setNewRevision(); // Make this the new default revision for the node. $this->revision->isDefaultRevision(TRUE); diff --git a/core/modules/node/src/Form/NodeTypeDeleteConfirm.php b/core/modules/node/src/Form/NodeTypeDeleteConfirm.php index fdd71e8bdfa6675cb1fed6cd7046b7e3ff2a2d17..0c23ced81c57258009ba9e2e50daa457d70d9e85 100644 --- a/core/modules/node/src/Form/NodeTypeDeleteConfirm.php +++ b/core/modules/node/src/Form/NodeTypeDeleteConfirm.php @@ -9,6 +9,7 @@ use Drupal\Core\Entity\EntityConfirmFormBase; use Drupal\Core\Database\Connection; +use Drupal\Core\Form\FormStateInterface; use Drupal\Core\Url; use Symfony\Component\DependencyInjection\ContainerInterface; @@ -67,7 +68,7 @@ public function getConfirmText() { /** * {@inheritdoc} */ - public function buildForm(array $form, array &$form_state) { + public function buildForm(array $form, FormStateInterface $form_state) { $num_nodes = $this->database->query("SELECT COUNT(*) FROM {node} WHERE type = :type", array(':type' => $this->entity->id()))->fetchField(); if ($num_nodes) { $caption = '' . format_plural($num_nodes, '%type is used by 1 piece of content on your site. You can not remove this content type until you have removed all of the %type content.', '%type is used by @count pieces of content on your site. You may not remove %type until you have removed all of the %type content.', array('%type' => $this->entity->label())) . '
'; @@ -82,7 +83,7 @@ public function buildForm(array $form, array &$form_state) { /** * {@inheritdoc} */ - public function submit(array $form, array &$form_state) { + public function submit(array $form, FormStateInterface $form_state) { $this->entity->delete(); $t_args = array('%name' => $this->entity->label()); drupal_set_message(t('The content type %name has been deleted.', $t_args)); diff --git a/core/modules/node/src/Form/RebuildPermissionsForm.php b/core/modules/node/src/Form/RebuildPermissionsForm.php index 490c3d2149947bc13e4cd58680e2a8ba62a40913..9f8da72e943b7326d530c851e2cb412ed54749d0 100644 --- a/core/modules/node/src/Form/RebuildPermissionsForm.php +++ b/core/modules/node/src/Form/RebuildPermissionsForm.php @@ -8,6 +8,7 @@ namespace Drupal\node\Form; use Drupal\Core\Form\ConfirmFormBase; +use Drupal\Core\Form\FormStateInterface; use Drupal\Core\Url; class RebuildPermissionsForm extends ConfirmFormBase { @@ -50,7 +51,7 @@ public function getDescription() { /** * {@inheritdoc} */ - public function submitForm(array &$form, array &$form_state) { + public function submitForm(array &$form, FormStateInterface $form_state) { node_access_rebuild(TRUE); $form_state['redirect_route'] = $this->getCancelUrl(); } diff --git a/core/modules/node/src/NodeForm.php b/core/modules/node/src/NodeForm.php index 69d91a5d7766c5d9e9b2bca936e8a6deed30f1ef..bf4b869fb81bc2b82325b4deb9fb12368e9c4e1d 100644 --- a/core/modules/node/src/NodeForm.php +++ b/core/modules/node/src/NodeForm.php @@ -10,6 +10,7 @@ use Drupal\Component\Utility\NestedArray; use Drupal\Core\Datetime\DrupalDateTime; use Drupal\Core\Entity\ContentEntityForm; +use Drupal\Core\Form\FormStateInterface; use Drupal\Core\Language\LanguageInterface; use Drupal\Component\Utility\String; @@ -43,9 +44,9 @@ protected function prepareEntity() { } /** - * Overrides Drupal\Core\Entity\EntityForm::form(). + * {@inheritdoc} */ - public function form(array $form, array &$form_state) { + public function form(array $form, FormStateInterface $form_state) { /** @var \Drupal\node\NodeInterface $node */ $node = $this->entity; @@ -209,9 +210,9 @@ public function form(array $form, array &$form_state) { } /** - * Overrides Drupal\Core\Entity\EntityForm::actions(). + * {@inheritdoc} */ - protected function actions(array $form, array &$form_state) { + protected function actions(array $form, FormStateInterface $form_state) { $element = parent::actions($form, $form_state); $node = $this->entity; $preview_mode = $this->settings['preview']; @@ -290,9 +291,9 @@ protected function actions(array $form, array &$form_state) { } /** - * Overrides Drupal\Core\Entity\EntityForm::validate(). + * {@inheritdoc} */ - public function validate(array $form, array &$form_state) { + public function validate(array $form, FormStateInterface $form_state) { $node = $this->buildEntity($form, $form_state); if ($node->id() && (node_last_changed($node->id(), $this->getFormLangcode($form_state)) > $node->getChangedTime())) { @@ -331,10 +332,8 @@ public function validate(array $form, array &$form_state) { * This function can be called by a "Next" button of a wizard to update the * form state's entity with the current step's values before proceeding to the * next step. - * - * Overrides Drupal\Core\Entity\EntityForm::submit(). */ - public function submit(array $form, array &$form_state) { + public function submit(array $form, FormStateInterface $form_state) { // Build the node object from the submitted values. $node = parent::submit($form, $form_state); @@ -364,9 +363,9 @@ public function submit(array $form, array &$form_state) { * @param $form * An associative array containing the structure of the form. * @param $form_state - * A reference to a keyed array containing the current state of the form. + * The current state of the form. */ - public function preview(array $form, array &$form_state) { + public function preview(array $form, FormStateInterface $form_state) { // @todo Remove this: we should not have explicit includes in autoloaded // classes. module_load_include('inc', 'node', 'node.pages'); @@ -380,9 +379,9 @@ public function preview(array $form, array &$form_state) { * @param $form * An associative array containing the structure of the form. * @param $form_state - * A reference to a keyed array containing the current state of the form. + * The current state of the form. */ - public function publish(array $form, array &$form_state) { + public function publish(array $form, FormStateInterface $form_state) { $node = $this->entity; $node->setPublished(TRUE); return $node; @@ -394,9 +393,9 @@ public function publish(array $form, array &$form_state) { * @param $form * An associative array containing the structure of the form. * @param $form_state - * A reference to a keyed array containing the current state of the form. + * The current state of the form. */ - public function unpublish(array $form, array &$form_state) { + public function unpublish(array $form, FormStateInterface $form_state) { $node = $this->entity; $node->setPublished(FALSE); return $node; @@ -405,7 +404,7 @@ public function unpublish(array $form, array &$form_state) { /** * {@inheritdoc} */ - public function buildEntity(array $form, array &$form_state) { + public function buildEntity(array $form, FormStateInterface $form_state) { /** @var \Drupal\node\NodeInterface $entity */ $entity = parent::buildEntity($form, $form_state); // A user might assign the node author by entering a user name in the node @@ -426,11 +425,10 @@ public function buildEntity(array $form, array &$form_state) { return $entity; } - /** - * Overrides Drupal\Core\Entity\EntityForm::save(). + * {@inheritdoc} */ - public function save(array $form, array &$form_state) { + public function save(array $form, FormStateInterface $form_state) { $node = $this->entity; $insert = $node->isNew(); $node->save(); diff --git a/core/modules/node/src/NodeTranslationHandler.php b/core/modules/node/src/NodeTranslationHandler.php index 21ab7e082508a68156ad94bc56a30dfdf5a10e90..02afb6c26bb643f401a37003dfbb1c8bcd6a8c1e 100644 --- a/core/modules/node/src/NodeTranslationHandler.php +++ b/core/modules/node/src/NodeTranslationHandler.php @@ -9,6 +9,7 @@ use Drupal\Core\Entity\EntityInterface; use Drupal\content_translation\ContentTranslationHandler; +use Drupal\Core\Form\FormStateInterface; /** * Defines the translation handler for nodes. @@ -18,7 +19,7 @@ class NodeTranslationHandler extends ContentTranslationHandler { /** * {@inheritdoc} */ - public function entityFormAlter(array &$form, array &$form_state, EntityInterface $entity) { + public function entityFormAlter(array &$form, FormStateInterface $form_state, EntityInterface $entity) { parent::entityFormAlter($form, $form_state, $entity); // Move the translation fieldset to a vertical tab. @@ -73,7 +74,7 @@ protected function entityFormTitle(EntityInterface $entity) { /** * {@inheritdoc} */ - public function entityFormEntityBuild($entity_type, EntityInterface $entity, array $form, array &$form_state) { + public function entityFormEntityBuild($entity_type, EntityInterface $entity, array $form, FormStateInterface $form_state) { if (isset($form_state['values']['content_translation'])) { $form_controller = content_translation_form_controller($form_state); $translation = &$form_state['values']['content_translation']; diff --git a/core/modules/node/src/NodeTypeForm.php b/core/modules/node/src/NodeTypeForm.php index ec00d507ff45b5e71fc6f0578288749de38d226f..f8cf92791751829113b4a37246a220f822fdb49b 100644 --- a/core/modules/node/src/NodeTypeForm.php +++ b/core/modules/node/src/NodeTypeForm.php @@ -10,6 +10,7 @@ use Drupal\Core\Entity\EntityForm; use Drupal\Component\Utility\String; use Drupal\Core\Entity\EntityTypeInterface; +use Drupal\Core\Form\FormStateInterface; /** * Form controller for node type forms. @@ -19,7 +20,7 @@ class NodeTypeForm extends EntityForm { /** * {@inheritdoc} */ - public function form(array $form, array &$form_state) { + public function form(array $form, FormStateInterface $form_state) { $form = parent::form($form, $form_state); $type = $this->entity; @@ -152,7 +153,7 @@ public function form(array $form, array &$form_state) { /** * {@inheritdoc} */ - protected function actions(array $form, array &$form_state) { + protected function actions(array $form, FormStateInterface $form_state) { $actions = parent::actions($form, $form_state); $actions['submit']['#value'] = t('Save content type'); $actions['delete']['#value'] = t('Delete content type'); @@ -162,7 +163,7 @@ protected function actions(array $form, array &$form_state) { /** * {@inheritdoc} */ - public function validate(array $form, array &$form_state) { + public function validate(array $form, FormStateInterface $form_state) { parent::validate($form, $form_state); $id = trim($form_state['values']['type']); @@ -175,7 +176,7 @@ public function validate(array $form, array &$form_state) { /** * {@inheritdoc} */ - public function save(array $form, array &$form_state) { + public function save(array $form, FormStateInterface $form_state) { $type = $this->entity; $type->type = trim($type->id()); $type->name = trim($type->name); diff --git a/core/modules/node/src/Plugin/Action/AssignOwnerNode.php b/core/modules/node/src/Plugin/Action/AssignOwnerNode.php index 7823ccb04ae0ebacf44b5ec6352c7725c1e0fe3f..b2ead476bd117dd741eab3d9850d21c62e8b9812 100644 --- a/core/modules/node/src/Plugin/Action/AssignOwnerNode.php +++ b/core/modules/node/src/Plugin/Action/AssignOwnerNode.php @@ -9,6 +9,7 @@ use Drupal\Core\Action\ConfigurableActionBase; use Drupal\Core\Database\Connection; +use Drupal\Core\Form\FormStateInterface; use Drupal\Core\Plugin\ContainerFactoryPluginInterface; use Symfony\Component\DependencyInjection\ContainerInterface; @@ -77,7 +78,7 @@ public function defaultConfiguration() { /** * {@inheritdoc} */ - public function buildConfigurationForm(array $form, array &$form_state) { + public function buildConfigurationForm(array $form, FormStateInterface $form_state) { $description = t('The username of the user to which you would like to assign ownership.'); $count = $this->connection->query("SELECT COUNT(*) FROM {users}")->fetchField(); $owner_name = ''; @@ -117,7 +118,7 @@ public function buildConfigurationForm(array $form, array &$form_state) { /** * {@inheritdoc} */ - public function validateConfigurationForm(array &$form, array &$form_state) { + public function validateConfigurationForm(array &$form, FormStateInterface $form_state) { $exists = (bool) $this->connection->queryRange('SELECT 1 FROM {users} WHERE name = :name', 0, 1, array(':name' => $form_state['values']['owner_name']))->fetchField(); if (!$exists) { form_set_error('owner_name', $form_state, t('Enter a valid username.')); @@ -127,7 +128,7 @@ public function validateConfigurationForm(array &$form, array &$form_state) { /** * {@inheritdoc} */ - public function submitConfigurationForm(array &$form, array &$form_state) { + public function submitConfigurationForm(array &$form, FormStateInterface $form_state) { $this->configuration['owner_uid'] = $this->connection->query('SELECT uid from {users} WHERE name = :name', array(':name' => $form_state['values']['owner_name']))->fetchField(); } diff --git a/core/modules/node/src/Plugin/Action/UnpublishByKeywordNode.php b/core/modules/node/src/Plugin/Action/UnpublishByKeywordNode.php index 6fb4674e3fe2280386a7716159a57b69a8b6fb5f..7dab8be862b0e3c5c327e568ff6015aa8a3bf5fc 100644 --- a/core/modules/node/src/Plugin/Action/UnpublishByKeywordNode.php +++ b/core/modules/node/src/Plugin/Action/UnpublishByKeywordNode.php @@ -9,6 +9,7 @@ use Drupal\Component\Utility\Tags; use Drupal\Core\Action\ConfigurableActionBase; +use Drupal\Core\Form\FormStateInterface; /** * Unpublishes a node containing certain keywords. @@ -47,7 +48,7 @@ public function defaultConfiguration() { /** * {@inheritdoc} */ - public function buildConfigurationForm(array $form, array &$form_state) { + public function buildConfigurationForm(array $form, FormStateInterface $form_state) { $form['keywords'] = array( '#title' => t('Keywords'), '#type' => 'textarea', @@ -60,7 +61,7 @@ public function buildConfigurationForm(array $form, array &$form_state) { /** * {@inheritdoc} */ - public function submitConfigurationForm(array &$form, array &$form_state) { + public function submitConfigurationForm(array &$form, FormStateInterface $form_state) { $this->configuration['keywords'] = Tags::explode($form_state['values']['keywords']); } diff --git a/core/modules/node/src/Plugin/Block/SyndicateBlock.php b/core/modules/node/src/Plugin/Block/SyndicateBlock.php index ace314a721cb9264771204e0ba165b826a180353..d0038fcc84e2b248dd58b554556328cb37166ed7 100644 --- a/core/modules/node/src/Plugin/Block/SyndicateBlock.php +++ b/core/modules/node/src/Plugin/Block/SyndicateBlock.php @@ -8,6 +8,7 @@ namespace Drupal\node\Plugin\Block; use Drupal\block\BlockBase; +use Drupal\Core\Form\FormStateInterface; use Drupal\Core\Session\AccountInterface; /** @@ -50,7 +51,7 @@ public function build() { /** * {@inheritdoc} */ - public function buildConfigurationForm(array $form, array &$form_state) { + public function buildConfigurationForm(array $form, FormStateInterface $form_state) { $form = parent::buildConfigurationForm($form, $form_state); // @see ::isCacheable() diff --git a/core/modules/node/src/Plugin/Condition/NodeType.php b/core/modules/node/src/Plugin/Condition/NodeType.php index 612d82dd9d9020ab9fdaa9e86191232342d5580c..9727bed8446fdd3ab6007fb727cbc2f47edd98ad 100644 --- a/core/modules/node/src/Plugin/Condition/NodeType.php +++ b/core/modules/node/src/Plugin/Condition/NodeType.php @@ -9,6 +9,7 @@ use Drupal\Core\Condition\ConditionPluginBase; use Drupal\Core\Entity\EntityStorageInterface; +use Drupal\Core\Form\FormStateInterface; use Drupal\Core\Plugin\ContainerFactoryPluginInterface; use Symfony\Component\DependencyInjection\ContainerInterface; @@ -68,7 +69,7 @@ public static function create(ContainerInterface $container, array $configuratio /** * {@inheritdoc} */ - public function buildConfigurationForm(array $form, array &$form_state) { + public function buildConfigurationForm(array $form, FormStateInterface $form_state) { $options = array(); $node_types = $this->entityStorage->loadMultiple(); foreach ($node_types as $type) { @@ -86,7 +87,7 @@ public function buildConfigurationForm(array $form, array &$form_state) { /** * {@inheritdoc} */ - public function submitConfigurationForm(array &$form, array &$form_state) { + public function submitConfigurationForm(array &$form, FormStateInterface $form_state) { $this->configuration['bundles'] = array_filter($form_state['values']['bundles']); parent::submitConfigurationForm($form, $form_state); } diff --git a/core/modules/node/src/Plugin/Search/NodeSearch.php b/core/modules/node/src/Plugin/Search/NodeSearch.php index f8e76a8edfc3e4a168f559d8a697a8d46dbcef36..45e34b82f2534375dc91cffafb01e19d61908f30 100644 --- a/core/modules/node/src/Plugin/Search/NodeSearch.php +++ b/core/modules/node/src/Plugin/Search/NodeSearch.php @@ -14,6 +14,7 @@ use Drupal\Core\Database\Query\SelectExtender; use Drupal\Core\Entity\EntityManagerInterface; use Drupal\Core\Extension\ModuleHandlerInterface; +use Drupal\Core\Form\FormStateInterface; use Drupal\Core\State\StateInterface; use Drupal\Core\Language\LanguageInterface; use Drupal\Core\Session\AccountInterface; @@ -398,7 +399,7 @@ public function indexStatus() { /** * {@inheritdoc} */ - public function searchFormAlter(array &$form, array &$form_state) { + public function searchFormAlter(array &$form, FormStateInterface $form_state) { // Add advanced search keyword-related boxes. $form['advanced'] = array( '#type' => 'details', @@ -560,7 +561,7 @@ public function defaultConfiguration() { /** * {@inheritdoc} */ - public function buildConfigurationForm(array $form, array &$form_state) { + public function buildConfigurationForm(array $form, FormStateInterface $form_state) { // Output form for defining rank factor weights. $form['content_ranking'] = array( '#type' => 'details', @@ -589,7 +590,7 @@ public function buildConfigurationForm(array $form, array &$form_state) { /** * {@inheritdoc} */ - public function submitConfigurationForm(array &$form, array &$form_state) { + public function submitConfigurationForm(array &$form, FormStateInterface $form_state) { foreach ($this->getRankings() as $var => $values) { if (!empty($form_state['values']["rankings_$var"])) { $this->configuration['rankings'][$var] = $form_state['values']["rankings_$var"]; diff --git a/core/modules/node/src/Plugin/views/field/Language.php b/core/modules/node/src/Plugin/views/field/Language.php index af705cbcb7dc250b85d1baab0b70b7cace34ccf9..9f7ff513b70449b39112ac4a1bfd32e9a3eb8b78 100644 --- a/core/modules/node/src/Plugin/views/field/Language.php +++ b/core/modules/node/src/Plugin/views/field/Language.php @@ -7,6 +7,7 @@ namespace Drupal\node\Plugin\views\field; +use Drupal\Core\Form\FormStateInterface; use Drupal\node\Plugin\views\field\Node; use Drupal\views\ResultRow; @@ -26,7 +27,7 @@ protected function defineOptions() { return $options; } - public function buildOptionsForm(&$form, &$form_state) { + public function buildOptionsForm(&$form, FormStateInterface $form_state) { parent::buildOptionsForm($form, $form_state); $form['native_language'] = array( '#title' => t('Native language'), diff --git a/core/modules/node/src/Plugin/views/field/Link.php b/core/modules/node/src/Plugin/views/field/Link.php index d2a89a4ef82f784eae9cad95283dea199898ae7c..b2767477875acc8712989723e78f9f6a3ef07adc 100644 --- a/core/modules/node/src/Plugin/views/field/Link.php +++ b/core/modules/node/src/Plugin/views/field/Link.php @@ -7,6 +7,7 @@ namespace Drupal\node\Plugin\views\field; +use Drupal\Core\Form\FormStateInterface; use Drupal\views\Plugin\views\field\FieldPluginBase; use Drupal\views\ResultRow; @@ -32,7 +33,7 @@ protected function defineOptions() { return $options; } - public function buildOptionsForm(&$form, &$form_state) { + public function buildOptionsForm(&$form, FormStateInterface $form_state) { $form['text'] = array( '#type' => 'textfield', '#title' => t('Text to display'), diff --git a/core/modules/node/src/Plugin/views/field/Node.php b/core/modules/node/src/Plugin/views/field/Node.php index b85cd024cdc1dd81ae02c52ff58e20f2d8f74767..ae74239df9243f00763e95e44156b31aa8de3134 100644 --- a/core/modules/node/src/Plugin/views/field/Node.php +++ b/core/modules/node/src/Plugin/views/field/Node.php @@ -7,6 +7,7 @@ namespace Drupal\node\Plugin\views\field; +use Drupal\Core\Form\FormStateInterface; use Drupal\views\ResultRow; use Drupal\views\ViewExecutable; use Drupal\views\Plugin\views\display\DisplayPluginBase; @@ -44,7 +45,7 @@ protected function defineOptions() { /** * Provide link to node option */ - public function buildOptionsForm(&$form, &$form_state) { + public function buildOptionsForm(&$form, FormStateInterface $form_state) { $form['link_to_node'] = array( '#title' => t('Link this field to the original piece of content'), '#description' => t("Enable to override this field's links."), diff --git a/core/modules/node/src/Plugin/views/field/Path.php b/core/modules/node/src/Plugin/views/field/Path.php index a08b7cddacfc95b68d0f6782b142c3f166cca242..53b5010c1c809b4d120265524cecbac0a604ca10 100644 --- a/core/modules/node/src/Plugin/views/field/Path.php +++ b/core/modules/node/src/Plugin/views/field/Path.php @@ -7,6 +7,7 @@ namespace Drupal\node\Plugin\views\field; +use Drupal\Core\Form\FormStateInterface; use Drupal\views\Plugin\views\field\FieldPluginBase; use Drupal\views\Plugin\views\display\DisplayPluginBase; use Drupal\views\ResultRow; @@ -37,7 +38,7 @@ protected function defineOptions() { return $options; } - public function buildOptionsForm(&$form, &$form_state) { + public function buildOptionsForm(&$form, FormStateInterface $form_state) { parent::buildOptionsForm($form, $form_state); $form['absolute'] = array( '#type' => 'checkbox', diff --git a/core/modules/node/src/Plugin/views/field/Revision.php b/core/modules/node/src/Plugin/views/field/Revision.php index db18760ffb7d5d0bb9e646c10f16a3380e734692..040c63f9fd51043ef028333873d8672c98ee1cea 100644 --- a/core/modules/node/src/Plugin/views/field/Revision.php +++ b/core/modules/node/src/Plugin/views/field/Revision.php @@ -7,6 +7,7 @@ namespace Drupal\node\Plugin\views\field; +use Drupal\Core\Form\FormStateInterface; use Drupal\views\ResultRow; use Drupal\views\ViewExecutable; use Drupal\views\Plugin\views\display\DisplayPluginBase; @@ -41,7 +42,7 @@ protected function defineOptions() { /** * Provide link to revision option. */ - public function buildOptionsForm(&$form, &$form_state) { + public function buildOptionsForm(&$form, FormStateInterface $form_state) { $form['link_to_node_revision'] = array( '#title' => t('Link this field to its content revision'), '#description' => t('This will override any other link you have set.'), diff --git a/core/modules/node/src/Plugin/views/field/Type.php b/core/modules/node/src/Plugin/views/field/Type.php index 9e1be577b6875528b6985e34b5e381bca433601e..4824227e9885d53d8fad08363f0ef4fd59e55355 100644 --- a/core/modules/node/src/Plugin/views/field/Type.php +++ b/core/modules/node/src/Plugin/views/field/Type.php @@ -7,6 +7,7 @@ namespace Drupal\node\Plugin\views\field; +use Drupal\Core\Form\FormStateInterface; use Drupal\node\Plugin\views\field\Node; use Drupal\views\ResultRow; @@ -29,7 +30,7 @@ protected function defineOptions() { /** * Provide machine_name option for to node type display. */ - public function buildOptionsForm(&$form, &$form_state) { + public function buildOptionsForm(&$form, FormStateInterface $form_state) { parent::buildOptionsForm($form, $form_state); $form['machine_name'] = array( diff --git a/core/modules/node/src/Plugin/views/filter/Access.php b/core/modules/node/src/Plugin/views/filter/Access.php index 524426fdc46f395850afdd1ed7faa8386f3cbf2b..8845ca8d2b3381d908f07b9aa7a343c8e14844f9 100644 --- a/core/modules/node/src/Plugin/views/filter/Access.php +++ b/core/modules/node/src/Plugin/views/filter/Access.php @@ -7,6 +7,7 @@ namespace Drupal\node\Plugin\views\filter; +use Drupal\Core\Form\FormStateInterface; use Drupal\views\Plugin\views\filter\FilterPluginBase; /** @@ -19,7 +20,7 @@ class Access extends FilterPluginBase { public function adminSummary() { } - protected function operatorForm(&$form, &$form_state) { } + protected function operatorForm(&$form, FormStateInterface $form_state) { } public function canExpose() { return FALSE; } diff --git a/core/modules/node/src/Plugin/views/filter/Status.php b/core/modules/node/src/Plugin/views/filter/Status.php index 08e63d965c0770baa5c00f39a677efe3d72ec065..35c818e68e8a8fa3b8b443c96794f80fb4fdd48e 100644 --- a/core/modules/node/src/Plugin/views/filter/Status.php +++ b/core/modules/node/src/Plugin/views/filter/Status.php @@ -7,6 +7,7 @@ namespace Drupal\node\Plugin\views\filter; +use Drupal\Core\Form\FormStateInterface; use Drupal\views\Plugin\views\filter\FilterPluginBase; /** @@ -20,7 +21,7 @@ class Status extends FilterPluginBase { public function adminSummary() { } - protected function operatorForm(&$form, &$form_state) { } + protected function operatorForm(&$form, FormStateInterface $form_state) { } public function canExpose() { return FALSE; } diff --git a/core/modules/node/src/Plugin/views/row/NodeRow.php b/core/modules/node/src/Plugin/views/row/NodeRow.php index de71343e2261c02ee992940224a62fd1abf9cc66..c79691fd39a975efece6be483c2ba23d7c11b26d 100644 --- a/core/modules/node/src/Plugin/views/row/NodeRow.php +++ b/core/modules/node/src/Plugin/views/row/NodeRow.php @@ -7,6 +7,7 @@ namespace Drupal\node\Plugin\views\row; +use Drupal\Core\Form\FormStateInterface; use Drupal\views\Plugin\views\row\EntityRow; /** @@ -38,7 +39,7 @@ protected function defineOptions() { /** * {@inheritdoc} */ - public function buildOptionsForm(&$form, &$form_state) { + public function buildOptionsForm(&$form, FormStateInterface $form_state) { parent::buildOptionsForm($form, $form_state); $form['links'] = array( diff --git a/core/modules/node/src/Plugin/views/row/Rss.php b/core/modules/node/src/Plugin/views/row/Rss.php index 4a7b01d8a92c977b2a6350e7d4eb1a166a4aae6b..9d3db7b16c1c84afd75e2cf3d26671a5828c5d01 100644 --- a/core/modules/node/src/Plugin/views/row/Rss.php +++ b/core/modules/node/src/Plugin/views/row/Rss.php @@ -9,6 +9,7 @@ use Drupal\Component\Utility\SafeMarkup; use Drupal\Component\Utility\String; +use Drupal\Core\Form\FormStateInterface; use Drupal\views\Plugin\views\row\RowPluginBase; /** @@ -44,7 +45,7 @@ protected function defineOptions() { return $options; } - public function buildOptionsForm(&$form, &$form_state) { + public function buildOptionsForm(&$form, FormStateInterface $form_state) { parent::buildOptionsForm($form, $form_state); $form['view_mode'] = array( diff --git a/core/modules/node/src/Plugin/views/wizard/Node.php b/core/modules/node/src/Plugin/views/wizard/Node.php index fc5aadbb9525b8f829ac567e0b0122a75cfc9bc7..377a6c673dc35327c77fe1b33a4d97677ed57962 100644 --- a/core/modules/node/src/Plugin/views/wizard/Node.php +++ b/core/modules/node/src/Plugin/views/wizard/Node.php @@ -7,6 +7,7 @@ namespace Drupal\node\Plugin\views\wizard; +use Drupal\Core\Form\FormStateInterface; use Drupal\views\Plugin\views\wizard\WizardPluginBase; /** @@ -86,12 +87,12 @@ protected function rowStyleOptions() { * * @param array $form * The full wizard form array. - * @param array $form_state + * @param \Drupal\Core\Form\FormStateInterface $form_state * The current state of the wizard form. * @param string $type * The display ID (e.g. 'page' or 'block'). */ - protected function buildFormStyle(array &$form, array &$form_state, $type) { + protected function buildFormStyle(array &$form, FormStateInterface $form_state, $type) { parent::buildFormStyle($form, $form_state, $type); $style_form =& $form['displays'][$type]['options']['style']; // Some style plugins don't support row plugins so stop here if that's the @@ -156,7 +157,7 @@ protected function defaultDisplayOptions() { /** * Overrides Drupal\views\Plugin\views\wizard\WizardPluginBase::defaultDisplayFiltersUser(). */ - protected function defaultDisplayFiltersUser(array $form, array &$form_state) { + protected function defaultDisplayFiltersUser(array $form, FormStateInterface $form_state) { $filters = parent::defaultDisplayFiltersUser($form, $form_state); if (!empty($form_state['values']['show']['tagged_with']['tids'])) { @@ -183,7 +184,7 @@ protected function defaultDisplayFiltersUser(array $form, array &$form_state) { /** * {@inheritdoc} */ - protected function pageDisplayOptions(array $form, array &$form_state) { + protected function pageDisplayOptions(array $form, FormStateInterface $form_state) { $display_options = parent::pageDisplayOptions($form, $form_state); $row_plugin = isset($form_state['values']['page']['style']['row_plugin']) ? $form_state['values']['page']['style']['row_plugin'] : NULL; $row_options = isset($form_state['values']['page']['style']['row_options']) ? $form_state['values']['page']['style']['row_options'] : array(); @@ -194,7 +195,7 @@ protected function pageDisplayOptions(array $form, array &$form_state) { /** * {@inheritdoc} */ - protected function blockDisplayOptions(array $form, array &$form_state) { + protected function blockDisplayOptions(array $form, FormStateInterface $form_state) { $display_options = parent::blockDisplayOptions($form, $form_state); $row_plugin = isset($form_state['values']['block']['style']['row_plugin']) ? $form_state['values']['block']['style']['row_plugin'] : NULL; $row_options = isset($form_state['values']['block']['style']['row_options']) ? $form_state['values']['block']['style']['row_options'] : array(); @@ -233,7 +234,7 @@ protected function display_options_row(&$display_options, $row_plugin, $row_opt * * Add some options for filter by taxonomy terms. */ - protected function buildFilters(&$form, &$form_state) { + protected function buildFilters(&$form, FormStateInterface $form_state) { parent::buildFilters($form, $form_state); $selected_bundle = static::getSelected($form_state, array('show', 'type'), 'all', $form['displays']['show']['type']); diff --git a/core/modules/options/src/Plugin/Field/FieldType/ListItemBase.php b/core/modules/options/src/Plugin/Field/FieldType/ListItemBase.php index ede945e2bec029c056abbb31696be3226a225827..43ef3cb9912f652589f875fad78f17488f3e5f26 100644 --- a/core/modules/options/src/Plugin/Field/FieldType/ListItemBase.php +++ b/core/modules/options/src/Plugin/Field/FieldType/ListItemBase.php @@ -8,6 +8,7 @@ namespace Drupal\options\Plugin\Field\FieldType; use Drupal\Core\Field\FieldItemBase; +use Drupal\Core\Form\FormStateInterface; use Drupal\Core\Form\OptGroup; use Drupal\Core\Session\AccountInterface; use Drupal\Core\TypedData\AllowedValuesInterface; @@ -72,7 +73,7 @@ public function isEmpty() { /** * {@inheritdoc} */ - public function settingsForm(array &$form, array &$form_state, $has_data) { + public function settingsForm(array &$form, FormStateInterface $form_state, $has_data) { $allowed_values = $this->getSetting('allowed_values'); $allowed_values_function = $this->getSetting('allowed_values_function'); @@ -117,11 +118,11 @@ abstract protected function allowedValuesDescription(); * An associative array containing the properties and children of the * generic form element. * @param $form_state - * The $form_state array for the form this element belongs to. + * The current state of the form for the form this element belongs to. * * @see form_process_pattern() */ - public static function validateAllowedValues($element, &$form_state) { + public static function validateAllowedValues($element, FormStateInterface $form_state) { $values = static::extractAllowedValues($element['#value'], $element['#field_has_data']); if (!is_array($values)) { diff --git a/core/modules/options/src/Plugin/Field/FieldWidget/ButtonsWidget.php b/core/modules/options/src/Plugin/Field/FieldWidget/ButtonsWidget.php index fa56329baea0c7ba20024a5665b7f9d09d01e4b0..aed9a29489587c9b2fc3c6b3ca0d15426a18604a 100644 --- a/core/modules/options/src/Plugin/Field/FieldWidget/ButtonsWidget.php +++ b/core/modules/options/src/Plugin/Field/FieldWidget/ButtonsWidget.php @@ -8,6 +8,7 @@ namespace Drupal\options\Plugin\Field\FieldWidget; use Drupal\Core\Field\FieldItemListInterface; +use Drupal\Core\Form\FormStateInterface; /** * Plugin implementation of the 'options_buttons' widget. @@ -29,7 +30,7 @@ class ButtonsWidget extends OptionsWidgetBase { /** * {@inheritdoc} */ - public function formElement(FieldItemListInterface $items, $delta, array $element, array &$form, array &$form_state) { + public function formElement(FieldItemListInterface $items, $delta, array $element, array &$form, FormStateInterface $form_state) { $element = parent::formElement($items, $delta, $element, $form, $form_state); $options = $this->getOptions($items[$delta]); diff --git a/core/modules/options/src/Plugin/Field/FieldWidget/OptionsWidgetBase.php b/core/modules/options/src/Plugin/Field/FieldWidget/OptionsWidgetBase.php index 01e7688f6249c34bef7b5b40c2ece7a6fa60451d..9f1e014bcc1ece1d6b1535610e2f7afeda60816d 100644 --- a/core/modules/options/src/Plugin/Field/FieldWidget/OptionsWidgetBase.php +++ b/core/modules/options/src/Plugin/Field/FieldWidget/OptionsWidgetBase.php @@ -11,6 +11,7 @@ use Drupal\Core\Field\FieldItemListInterface; use Drupal\Core\Field\FieldItemInterface; use Drupal\Core\Field\WidgetBase; +use Drupal\Core\Form\FormStateInterface; /** * Base class for the 'options_*' widgets. @@ -54,7 +55,7 @@ public function __construct($plugin_id, $plugin_definition, FieldDefinitionInter /** * {@inheritdoc} */ - public function formElement(FieldItemListInterface $items, $delta, array $element, array &$form, array &$form_state) { + public function formElement(FieldItemListInterface $items, $delta, array $element, array &$form, FormStateInterface $form_state) { // Prepare some properties for the child methods to build the actual form // element. $this->required = $element['#required']; @@ -75,10 +76,10 @@ public function formElement(FieldItemListInterface $items, $delta, array $elemen * * @param array $element * The form element. - * @param array $form_state + * @param \Drupal\Core\Form\FormStateInterface $form_state * The form state. */ - public static function validateElement(array $element, array &$form_state) { + public static function validateElement(array $element, FormStateInterface $form_state) { if ($element['#required'] && $element['#value'] == '_none') { \Drupal::formBuilder()->setError($element, $form_state, t('!name field is required.', array('!name' => $element['#title']))); } diff --git a/core/modules/options/src/Plugin/Field/FieldWidget/SelectWidget.php b/core/modules/options/src/Plugin/Field/FieldWidget/SelectWidget.php index 6d374405d5a1362995f6911088c673ae09b4e3c9..093e06c3c9b52cfa82d611a5571bcd52c885f281 100644 --- a/core/modules/options/src/Plugin/Field/FieldWidget/SelectWidget.php +++ b/core/modules/options/src/Plugin/Field/FieldWidget/SelectWidget.php @@ -8,6 +8,7 @@ namespace Drupal\options\Plugin\Field\FieldWidget; use Drupal\Core\Field\FieldItemListInterface; +use Drupal\Core\Form\FormStateInterface; use Drupal\options\Plugin\Field\FieldWidget\OptionsWidgetBase; /** @@ -29,7 +30,7 @@ class SelectWidget extends OptionsWidgetBase { /** * {@inheritdoc} */ - public function formElement(FieldItemListInterface $items, $delta, array $element, array &$form, array &$form_state) { + public function formElement(FieldItemListInterface $items, $delta, array $element, array &$form, FormStateInterface $form_state) { $element = parent::formElement($items, $delta, $element, $form, $form_state); $element += array( diff --git a/core/modules/path/src/Form/DeleteForm.php b/core/modules/path/src/Form/DeleteForm.php index c669a1fac2d4bed7c7526e4cb496110c712dec4f..b253490719cb773821a2c8ed45c700df7b1f8dc9 100644 --- a/core/modules/path/src/Form/DeleteForm.php +++ b/core/modules/path/src/Form/DeleteForm.php @@ -8,6 +8,7 @@ namespace Drupal\path\Form; use Drupal\Core\Form\ConfirmFormBase; +use Drupal\Core\Form\FormStateInterface; use Drupal\Core\Path\AliasStorageInterface; use Drupal\Core\Url; use Symfony\Component\DependencyInjection\ContainerInterface; @@ -72,9 +73,9 @@ public function getCancelUrl() { } /** - * Overrides \Drupal\Core\Form\ConfirmFormBase::buildForm(). + * {@inheritdoc} */ - public function buildForm(array $form, array &$form_state, $pid = NULL) { + public function buildForm(array $form, FormStateInterface $form_state, $pid = NULL) { $this->pathAlias = $this->aliasStorage->load(array('pid' => $pid)); $form = parent::buildForm($form, $form_state); @@ -83,9 +84,9 @@ public function buildForm(array $form, array &$form_state, $pid = NULL) { } /** - * Implements \Drupal\Core\Form\FormInterface::submitForm(). + * {@inheritdoc} */ - public function submitForm(array &$form, array &$form_state) { + public function submitForm(array &$form, FormStateInterface $form_state) { $this->aliasStorage->delete(array('pid' => $this->pathAlias['pid'])); $form_state['redirect'] = 'admin/config/search/path'; diff --git a/core/modules/path/src/Form/EditForm.php b/core/modules/path/src/Form/EditForm.php index 0c1a7ab0e6328d71340bd72d537f5a10ebf49a75..b5fd90efe465047627e4c900572612e7a3a00721 100644 --- a/core/modules/path/src/Form/EditForm.php +++ b/core/modules/path/src/Form/EditForm.php @@ -8,6 +8,7 @@ namespace Drupal\path\Form; use Drupal\Component\Utility\String; +use Drupal\Core\Form\FormStateInterface; use Drupal\Core\Url; /** @@ -32,7 +33,7 @@ protected function buildPath($pid) { /** * {@inheritdoc} */ - public function buildForm(array $form, array &$form_state, $pid = NULL) { + public function buildForm(array $form, FormStateInterface $form_state, $pid = NULL) { $form = parent::buildForm($form, $form_state, $pid); $form['#title'] = String::checkPlain($this->path['alias']); @@ -51,7 +52,7 @@ public function buildForm(array $form, array &$form_state, $pid = NULL) { /** * Submits the delete form. */ - public function deleteSubmit(array &$form, array &$form_state) { + public function deleteSubmit(array &$form, FormStateInterface $form_state) { $form_state['redirect_route'] = new Url('path.delete', array( 'pid' => $form_state['values']['pid'], )); diff --git a/core/modules/path/src/Form/PathFilterForm.php b/core/modules/path/src/Form/PathFilterForm.php index ce66c70a2a358917dfaef9771b0b88ee49f6e5ca..e8130f03b2df8684a5cb755c6d911f50a4f38f8b 100644 --- a/core/modules/path/src/Form/PathFilterForm.php +++ b/core/modules/path/src/Form/PathFilterForm.php @@ -8,6 +8,7 @@ namespace Drupal\path\Form; use Drupal\Core\Form\FormBase; +use Drupal\Core\Form\FormStateInterface; use Drupal\Core\Url; /** @@ -25,7 +26,7 @@ public function getFormId() { /** * {@inheritdoc} */ - public function buildForm(array $form, array &$form_state, $keys = NULL) { + public function buildForm(array $form, FormStateInterface $form_state, $keys = NULL) { $form['#attributes'] = array('class' => array('search-form')); $form['basic'] = array( '#type' => 'details', @@ -59,7 +60,7 @@ public function buildForm(array $form, array &$form_state, $keys = NULL) { /** * {@inheritdoc} */ - public function submitForm(array &$form, array &$form_state) { + public function submitForm(array &$form, FormStateInterface $form_state) { $form_state['redirect_route'] = new Url('path.admin_overview_filter', array( 'keys' => trim($form_state['values']['filter']), )); @@ -68,7 +69,7 @@ public function submitForm(array &$form, array &$form_state) { /** * Resets the filter selections. */ - public function resetForm(array &$form, array &$form_state) { + public function resetForm(array &$form, FormStateInterface $form_state) { $form_state['redirect_route'] = new Url('path.admin_overview'); } diff --git a/core/modules/path/src/Form/PathFormBase.php b/core/modules/path/src/Form/PathFormBase.php index a9e80c4938c65457d086c13fae981585028309c8..f4d7ffd21e813a0a695084fc31e32e53b56476fd 100644 --- a/core/modules/path/src/Form/PathFormBase.php +++ b/core/modules/path/src/Form/PathFormBase.php @@ -8,6 +8,7 @@ namespace Drupal\path\Form; use Drupal\Core\Form\FormBase; +use Drupal\Core\Form\FormStateInterface; use Drupal\Core\Language\LanguageInterface; use Drupal\Core\Path\AliasManagerInterface; use Drupal\Core\Path\AliasStorageInterface; @@ -74,7 +75,7 @@ abstract protected function buildPath($pid); /** * {@inheritdoc} */ - public function buildForm(array $form, array &$form_state, $pid = NULL) { + public function buildForm(array $form, FormStateInterface $form_state, $pid = NULL) { $this->path = $this->buildPath($pid); $form['source'] = array( '#type' => 'textfield', @@ -135,7 +136,7 @@ public function buildForm(array $form, array &$form_state, $pid = NULL) { /** * {@inheritdoc} */ - public function validateForm(array &$form, array &$form_state) { + public function validateForm(array &$form, FormStateInterface $form_state) { $source = &$form_state['values']['source']; $source = $this->aliasManager->getPathByAlias($source); $alias = $form_state['values']['alias']; @@ -154,7 +155,7 @@ public function validateForm(array &$form, array &$form_state) { /** * {@inheritdoc} */ - public function submitForm(array &$form, array &$form_state) { + public function submitForm(array &$form, FormStateInterface $form_state) { // Remove unnecessary values. form_state_values_clean($form_state); diff --git a/core/modules/path/src/Plugin/Field/FieldWidget/PathWidget.php b/core/modules/path/src/Plugin/Field/FieldWidget/PathWidget.php index d09002205677812e51c71da884d98d82d7abed2d..dc4d256e0fb655febfcb94af438cdf782c71fd64 100644 --- a/core/modules/path/src/Plugin/Field/FieldWidget/PathWidget.php +++ b/core/modules/path/src/Plugin/Field/FieldWidget/PathWidget.php @@ -9,6 +9,7 @@ use Drupal\Core\Field\FieldItemListInterface; use Drupal\Core\Field\WidgetBase; +use Drupal\Core\Form\FormStateInterface; use Drupal\Core\Language\LanguageInterface; use Symfony\Component\Validator\ConstraintViolationInterface; @@ -28,7 +29,7 @@ class PathWidget extends WidgetBase { /** * {@inheritdoc} */ - public function formElement(FieldItemListInterface $items, $delta, array $element, array &$form, array &$form_state) { + public function formElement(FieldItemListInterface $items, $delta, array $element, array &$form, FormStateInterface $form_state) { $entity = $items->getEntity(); $path = array(); if (!$entity->isNew()) { @@ -79,10 +80,10 @@ public function formElement(FieldItemListInterface $items, $delta, array $elemen * * @param array $element * The form element. - * @param array $form_state + * @param \Drupal\Core\Form\FormStateInterface $form_state * The form state. */ - public static function validateFormElement(array &$element, array &$form_state) { + public static function validateFormElement(array &$element, FormStateInterface $form_state) { // Trim the submitted value. $alias = trim($element['alias']['#value']); if (!empty($alias)) { @@ -100,7 +101,7 @@ public static function validateFormElement(array &$element, array &$form_state) /** * {@inheritdoc} */ - public function errorElement(array $element, ConstraintViolationInterface $violation, array $form, array &$form_state) { + public function errorElement(array $element, ConstraintViolationInterface $violation, array $form, FormStateInterface $form_state) { return $element['alias']; } diff --git a/core/modules/quickedit/src/Form/QuickEditFieldForm.php b/core/modules/quickedit/src/Form/QuickEditFieldForm.php index 38b82a5454e0d1ec7d5b3387ed6e11996a36b539..6ce51d82653a1c9457b5068edf7141af064340b6 100644 --- a/core/modules/quickedit/src/Form/QuickEditFieldForm.php +++ b/core/modules/quickedit/src/Form/QuickEditFieldForm.php @@ -13,6 +13,7 @@ use Drupal\Core\Entity\EntityChangedInterface; use Drupal\Core\Extension\ModuleHandlerInterface; use Drupal\Core\Form\FormBase; +use Drupal\Core\Form\FormStateInterface; use Drupal\Core\Render\Element; use Drupal\entity\Entity\EntityFormDisplay; use Drupal\user\TempStoreFactory; @@ -83,7 +84,7 @@ public function getFormId() { * * Builds a form for a single entity field. */ - public function buildForm(array $form, array &$form_state, EntityInterface $entity = NULL, $field_name = NULL) { + public function buildForm(array $form, FormStateInterface $form_state, EntityInterface $entity = NULL, $field_name = NULL) { if (!isset($form_state['entity'])) { $this->init($form_state, $entity, $field_name); } @@ -116,7 +117,7 @@ public function buildForm(array $form, array &$form_state, EntityInterface $enti /** * Initialize the form state and the entity before the first form build. */ - protected function init(array &$form_state, EntityInterface $entity, $field_name) { + protected function init(FormStateInterface $form_state, EntityInterface $entity, $field_name) { // @todo Rather than special-casing $node->revision, invoke prepareEdit() // once http://drupal.org/node/1863258 lands. if ($entity->getEntityTypeId() == 'node') { @@ -143,7 +144,7 @@ protected function init(array &$form_state, EntityInterface $entity, $field_name /** * {@inheritdoc} */ - public function validateForm(array &$form, array &$form_state) { + public function validateForm(array &$form, FormStateInterface $form_state) { $entity = $this->buildEntity($form, $form_state); $form_state['form_display']->validateFormValues($entity, $form, $form_state); @@ -164,7 +165,7 @@ public function validateForm(array &$form, array &$form_state) { * * Saves the entity with updated values for the edited field. */ - public function submitForm(array &$form, array &$form_state) { + public function submitForm(array &$form, FormStateInterface $form_state) { $form_state['entity'] = $this->buildEntity($form, $form_state); // Store entity in tempstore with its UUID as tempstore key. @@ -177,7 +178,7 @@ public function submitForm(array &$form, array &$form_state) { * Calling code may then validate the returned entity, and if valid, transfer * it back to the form state and save it. */ - protected function buildEntity(array $form, array &$form_state) { + protected function buildEntity(array $form, FormStateInterface $form_state) { /** @var $entity \Drupal\Core\Entity\EntityInterface */ $entity = clone $form_state['entity']; $field_name = $form_state['field_name']; @@ -203,10 +204,10 @@ protected function buildEntity(array $form, array &$form_state) { * * @param array &$form * A reference to an associative array containing the structure of the form. - * @param array &$form_state - * A reference to a keyed array containing the current state of the form. + * @param \Drupal\Core\Form\FormStateInterface $form_state + * The current state of the form. */ - protected function simplify(array &$form, array &$form_state) { + protected function simplify(array &$form, FormStateInterface $form_state) { $field_name = $form_state['field_name']; $widget_element =& $form[$field_name]['widget']; diff --git a/core/modules/quickedit/src/QuickEditController.php b/core/modules/quickedit/src/QuickEditController.php index 2c1c0938f54c8ba02c2d8d505328f0f96847190b..ad1751d323c842534b52905b452f2f2213a66b16 100644 --- a/core/modules/quickedit/src/QuickEditController.php +++ b/core/modules/quickedit/src/QuickEditController.php @@ -8,6 +8,7 @@ namespace Drupal\quickedit; use Drupal\Core\Controller\ControllerBase; +use Drupal\Core\Form\FormState; use Symfony\Component\DependencyInjection\ContainerInterface; use Symfony\Component\HttpFoundation\JsonResponse; use Symfony\Component\HttpFoundation\Request; @@ -177,13 +178,13 @@ public function fieldForm(EntityInterface $entity, $field_name, $langcode, $view $this->tempStoreFactory->get('quickedit')->set($entity->uuid(), $entity); } - $form_state = array( + $form_state = new FormState(array( 'langcode' => $langcode, 'no_redirect' => TRUE, 'build_info' => array( 'args' => array($entity, $field_name), ), - ); + )); $form = $this->formBuilder()->buildForm('Drupal\quickedit\Form\QuickEditFieldForm', $form_state); if (!empty($form_state['executed'])) { diff --git a/core/modules/responsive_image/src/Form/ResponsiveImageMappingDeleteForm.php b/core/modules/responsive_image/src/Form/ResponsiveImageMappingDeleteForm.php index bd30ea300f095dccb4f2041c14dd7e7191b1e1d4..e614e0ee6a30a261ac70ce8b057017ad4c011bac 100644 --- a/core/modules/responsive_image/src/Form/ResponsiveImageMappingDeleteForm.php +++ b/core/modules/responsive_image/src/Form/ResponsiveImageMappingDeleteForm.php @@ -8,6 +8,7 @@ namespace Drupal\responsive_image\Form; use Drupal\Core\Entity\EntityConfirmFormBase; +use Drupal\Core\Form\FormStateInterface; use Drupal\Core\Url; class ResponsiveImageMappingDeleteForm extends EntityConfirmFormBase { @@ -36,7 +37,7 @@ public function getConfirmText() { /** * {@inheritdoc} */ - public function submit(array $form, array &$form_state) { + public function submit(array $form, FormStateInterface $form_state) { $this->entity->delete(); drupal_set_message($this->t('Responsive image mapping %label has been deleted.', array('%label' => $this->entity->label()))); watchdog('responsive_image', 'Responsive image mapping %label has been deleted.', array('%label' => $this->entity->label()), WATCHDOG_NOTICE); diff --git a/core/modules/responsive_image/src/Plugin/Field/FieldFormatter/ResponsiveImageFormatter.php b/core/modules/responsive_image/src/Plugin/Field/FieldFormatter/ResponsiveImageFormatter.php index ad4723f41bb720baa5db99badcbd6ed86f905e8b..24a80d4f33e46d6ec8465f68f671799b19e8fad1 100644 --- a/core/modules/responsive_image/src/Plugin/Field/FieldFormatter/ResponsiveImageFormatter.php +++ b/core/modules/responsive_image/src/Plugin/Field/FieldFormatter/ResponsiveImageFormatter.php @@ -9,6 +9,7 @@ use Drupal\Component\Utility\NestedArray; use Drupal\Core\Field\FieldItemListInterface; +use Drupal\Core\Form\FormStateInterface; use Drupal\image\Plugin\Field\FieldFormatter\ImageFormatterBase; /** @@ -38,7 +39,7 @@ public static function defaultSettings() { /** * {@inheritdoc} */ - public function settingsForm(array $form, array &$form_state) { + public function settingsForm(array $form, FormStateInterface $form_state) { $responsive_image_options = array(); $responsive_image_mappings = entity_load_multiple('responsive_image_mapping'); if ($responsive_image_mappings && !empty($responsive_image_mappings)) { diff --git a/core/modules/responsive_image/src/ResponsiveImageMappingForm.php b/core/modules/responsive_image/src/ResponsiveImageMappingForm.php index 57779fdb6775b95651b54426020ac2b8c12eba0a..7a38d1231c19263ef00f1bb9c96eaac7c8a00d8e 100644 --- a/core/modules/responsive_image/src/ResponsiveImageMappingForm.php +++ b/core/modules/responsive_image/src/ResponsiveImageMappingForm.php @@ -9,6 +9,7 @@ use Drupal\Component\Utility\String; use Drupal\Core\Entity\EntityForm; +use Drupal\Core\Form\FormStateInterface; /** * Form controller for the responsive image edit/add forms. @@ -20,15 +21,15 @@ class ResponsiveImageMappingForm extends EntityForm { * * @param array $form * A nested array form elements comprising the form. - * @param array $form_state - * An associative array containing the current state of the form. + * @param \Drupal\Core\Form\FormStateInterface $form_state + * The current state of the form. * @param \Drupal\responsive_image\ResponsiveImageMappingInterface $responsive_image_mapping * The entity being edited. * * @return array * The array containing the complete form. */ - public function form(array $form, array &$form_state) { + public function form(array $form, FormStateInterface $form_state) { if ($this->operation == 'duplicate') { $form['#title'] = $this->t('Duplicate responsive image mapping @label', array('@label' => $this->entity->label())); $this->entity = $this->entity->createDuplicate(); @@ -96,7 +97,7 @@ public function form(array $form, array &$form_state) { /** * {@inheritdoc} */ - public function validate(array $form, array &$form_state) { + public function validate(array $form, FormStateInterface $form_state) { /** @var \Drupal\responsive_image\ResponsiveImageMappingInterface $responsive_image_mapping */ $responsive_image_mapping = $this->entity; @@ -119,7 +120,7 @@ public function validate(array $form, array &$form_state) { /** * Overrides Drupal\Core\Entity\EntityForm::save(). */ - public function save(array $form, array &$form_state) { + public function save(array $form, FormStateInterface $form_state) { /** @var \Drupal\responsive_image\ResponsiveImageMappingInterface $responsive_image_mapping */ $responsive_image_mapping = $this->entity; $responsive_image_mapping->save(); diff --git a/core/modules/rest/src/Plugin/views/row/DataFieldRow.php b/core/modules/rest/src/Plugin/views/row/DataFieldRow.php index b3896a15551bbead3b482970114061ec1ca8bedb..68668bab88e4c08da03549bc6f5dc6408c9872c1 100644 --- a/core/modules/rest/src/Plugin/views/row/DataFieldRow.php +++ b/core/modules/rest/src/Plugin/views/row/DataFieldRow.php @@ -7,6 +7,7 @@ namespace Drupal\rest\Plugin\views\row; +use Drupal\Core\Form\FormStateInterface; use Drupal\views\ViewExecutable; use Drupal\views\Plugin\views\display\DisplayPluginBase; use Drupal\views\Plugin\views\row\RowPluginBase; @@ -74,7 +75,7 @@ protected function defineOptions() { /** * Overrides \Drupal\views\Plugin\views\row\RowPluginBase::buildOptionsForm(). */ - public function buildOptionsForm(&$form, &$form_state) { + public function buildOptionsForm(&$form, FormStateInterface $form_state) { parent::buildOptionsForm($form, $form_state); $form['field_options'] = array( @@ -111,7 +112,7 @@ public function buildOptionsForm(&$form, &$form_state) { /** * Form element validation handler for \Drupal\rest\Plugin\views\row\DataFieldRow::buildOptionsForm(). */ - public function validateAliasName($element, &$form_state) { + public function validateAliasName($element, FormStateInterface $form_state) { if (preg_match('@[^A-Za-z0-9_-]+@', $element['#value'])) { form_error($element, $form_state, t('The machine-readable name must contain only letters, numbers, dashes and underscores.')); } @@ -120,7 +121,7 @@ public function validateAliasName($element, &$form_state) { /** * Overrides \Drupal\views\Plugin\views\row\RowPluginBase::validateOptionsForm(). */ - public function validateOptionsForm(&$form, &$form_state) { + public function validateOptionsForm(&$form, FormStateInterface $form_state) { // Collect an array of aliases to validate. $aliases = static::extractFromOptionsArray('alias', $form_state['values']['row_options']['field_options']); diff --git a/core/modules/rest/src/Plugin/views/style/Serializer.php b/core/modules/rest/src/Plugin/views/style/Serializer.php index 1403dc3ada9295af55b3436f0f8ea95adc92664a..66529634c2cc3d9e9bf8318fdde8184003da2f5c 100644 --- a/core/modules/rest/src/Plugin/views/style/Serializer.php +++ b/core/modules/rest/src/Plugin/views/style/Serializer.php @@ -7,6 +7,7 @@ namespace Drupal\rest\Plugin\views\style; +use Drupal\Core\Form\FormStateInterface; use Drupal\views\ViewExecutable; use Drupal\views\Plugin\views\display\DisplayPluginBase; use Drupal\views\Plugin\views\style\StylePluginBase; @@ -88,7 +89,7 @@ protected function defineOptions() { /** * {@inheritdoc} */ - public function buildOptionsForm(&$form, &$form_state) { + public function buildOptionsForm(&$form, FormStateInterface $form_state) { parent::buildOptionsForm($form, $form_state); $form['formats'] = array( @@ -103,7 +104,7 @@ public function buildOptionsForm(&$form, &$form_state) { /** * {@inheritdoc} */ - public function submitOptionsForm(&$form, &$form_state) { + public function submitOptionsForm(&$form, FormStateInterface $form_state) { parent::submitOptionsForm($form, $form_state); $form_state['values']['style_options']['formats'] = array_filter($form_state['values']['style_options']['formats']); diff --git a/core/modules/search/search.module b/core/modules/search/search.module index 59646f959c9ae24f96d9271b36d9c2f98c4aa31e..be8da8aa3374cf028e2757a5fcdea0597fe02f34 100644 --- a/core/modules/search/search.module +++ b/core/modules/search/search.module @@ -8,6 +8,7 @@ use Drupal\Component\Utility\SafeMarkup; use Drupal\Component\Utility\String; use Drupal\Component\Utility\Unicode; +use Drupal\Core\Form\FormStateInterface; use Drupal\Core\Routing\RouteMatchInterface; /** @@ -831,7 +832,7 @@ function search_module_preinstall() { * * @see \Drupal\search\Form\SearchBlockForm */ -function search_form_search_block_form_alter(&$form, &$form_state) { +function search_form_search_block_form_alter(&$form, FormStateInterface $form_state) { $form['form_build_id']['#access'] = FALSE; $form['form_token']['#access'] = FALSE; $form['form_id']['#access'] = FALSE; diff --git a/core/modules/search/src/Form/ReindexConfirm.php b/core/modules/search/src/Form/ReindexConfirm.php index e83e8c022414033b0ddb3bb5e0b7d077765968b2..06c457b7fa4cf15460d71b6437d32f66f6fd2663 100644 --- a/core/modules/search/src/Form/ReindexConfirm.php +++ b/core/modules/search/src/Form/ReindexConfirm.php @@ -8,6 +8,7 @@ namespace Drupal\search\Form; use Drupal\Core\Form\ConfirmFormBase; +use Drupal\Core\Form\FormStateInterface; use Drupal\Core\Url; /** @@ -58,9 +59,9 @@ public function getCancelUrl() { } /** - * Implements \Drupal\Core\Form\FormInterface::submitForm(). + * {@inheritdoc} */ - public function submitForm(array &$form, array &$form_state) { + public function submitForm(array &$form, FormStateInterface $form_state) { if ($form['confirm']) { search_reindex(); drupal_set_message($this->t('The index will be rebuilt.')); diff --git a/core/modules/search/src/Form/SearchBlockForm.php b/core/modules/search/src/Form/SearchBlockForm.php index dafe3122f5baf045b372b86d690e65b7049ad2b9..e154863022e10b0edb53d73b3974c1aa63556096 100644 --- a/core/modules/search/src/Form/SearchBlockForm.php +++ b/core/modules/search/src/Form/SearchBlockForm.php @@ -8,6 +8,7 @@ namespace Drupal\search\Form; use Drupal\Core\Form\FormBase; +use Drupal\Core\Form\FormStateInterface; use Drupal\search\SearchPageRepositoryInterface; use Symfony\Component\DependencyInjection\ContainerInterface; @@ -52,7 +53,7 @@ public function getFormId() { /** * {@inheritdoc} */ - public function buildForm(array $form, array &$form_state) { + public function buildForm(array $form, FormStateInterface $form_state) { // Set up the form to submit using GET to the correct search page. $entity_id = $this->searchPageRepository->getDefaultSearchPage(); if (!$entity_id) { @@ -90,7 +91,7 @@ public function buildForm(array $form, array &$form_state) { /** * {@inheritdoc} */ - public function submitForm(array &$form, array &$form_state) { + public function submitForm(array &$form, FormStateInterface $form_state) { // This form submits to the search page, so processing happens there. } } diff --git a/core/modules/search/src/Form/SearchPageAddForm.php b/core/modules/search/src/Form/SearchPageAddForm.php index c8f3f68b888ee27e884494942c68b38a450be6b4..0550f744fe7f0b034835e8f3c2f9e187632bc26a 100644 --- a/core/modules/search/src/Form/SearchPageAddForm.php +++ b/core/modules/search/src/Form/SearchPageAddForm.php @@ -7,6 +7,8 @@ namespace Drupal\search\Form; +use Drupal\Core\Form\FormStateInterface; + /** * Provides a form for adding a search page. */ @@ -15,7 +17,7 @@ class SearchPageAddForm extends SearchPageFormBase { /** * {@inheritdoc} */ - public function buildForm(array $form, array &$form_state, $search_plugin_id = NULL) { + public function buildForm(array $form, FormStateInterface $form_state, $search_plugin_id = NULL) { $this->entity->setPlugin($search_plugin_id); $definition = $this->entity->getPlugin()->getPluginDefinition(); $this->entity->set('label', $definition['title']); @@ -25,7 +27,7 @@ public function buildForm(array $form, array &$form_state, $search_plugin_id = N /** * {@inheritdoc} */ - protected function actions(array $form, array &$form_state) { + protected function actions(array $form, FormStateInterface $form_state) { $actions = parent::actions($form, $form_state); $actions['submit']['#value'] = $this->t('Add search page'); return $actions; @@ -34,7 +36,7 @@ protected function actions(array $form, array &$form_state) { /** * {@inheritdoc} */ - public function save(array $form, array &$form_state) { + public function save(array $form, FormStateInterface $form_state) { // If there is no default search page, make the added search the default. if (!$this->searchPageRepository->getDefaultSearchPage()) { $this->searchPageRepository->setDefaultSearchPage($this->entity); diff --git a/core/modules/search/src/Form/SearchPageDeleteForm.php b/core/modules/search/src/Form/SearchPageDeleteForm.php index 572764919ba0acceb59ea75ea5dacd75e5870f0e..a78d1c20db1cf08281e55e9bd785234026044e8f 100644 --- a/core/modules/search/src/Form/SearchPageDeleteForm.php +++ b/core/modules/search/src/Form/SearchPageDeleteForm.php @@ -8,6 +8,7 @@ namespace Drupal\search\Form; use Drupal\Core\Entity\EntityConfirmFormBase; +use Drupal\Core\Form\FormStateInterface; use Drupal\Core\Url; /** @@ -39,7 +40,7 @@ public function getConfirmText() { /** * {@inheritdoc} */ - public function submit(array $form, array &$form_state) { + public function submit(array $form, FormStateInterface $form_state) { $this->entity->delete(); $form_state['redirect_route'] = $this->getCancelUrl(); drupal_set_message($this->t('The %label search page has been deleted.', array('%label' => $this->entity->label()))); diff --git a/core/modules/search/src/Form/SearchPageEditForm.php b/core/modules/search/src/Form/SearchPageEditForm.php index dc3de86146817cd2732de3eb78b8ccf7112c9b10..7ff92608e4e874b7176dc4d3afd2d82425233a53 100644 --- a/core/modules/search/src/Form/SearchPageEditForm.php +++ b/core/modules/search/src/Form/SearchPageEditForm.php @@ -7,6 +7,8 @@ namespace Drupal\search\Form; +use Drupal\Core\Form\FormStateInterface; + /** * Provides a form for editing a search page. */ @@ -15,7 +17,7 @@ class SearchPageEditForm extends SearchPageFormBase { /** * {@inheritdoc} */ - protected function actions(array $form, array &$form_state) { + protected function actions(array $form, FormStateInterface $form_state) { $actions = parent::actions($form, $form_state); $actions['submit']['#value'] = $this->t('Save search page'); return $actions; @@ -24,7 +26,7 @@ protected function actions(array $form, array &$form_state) { /** * {@inheritdoc} */ - public function save(array $form, array &$form_state) { + public function save(array $form, FormStateInterface $form_state) { parent::save($form, $form_state); drupal_set_message($this->t('The %label search page has been updated.', array('%label' => $this->entity->label()))); diff --git a/core/modules/search/src/Form/SearchPageForm.php b/core/modules/search/src/Form/SearchPageForm.php index 1dac382c5467d8d41531bc1b6b9859c307be8e12..8e585db70aaa40671ce0f9110ce939a47959791e 100644 --- a/core/modules/search/src/Form/SearchPageForm.php +++ b/core/modules/search/src/Form/SearchPageForm.php @@ -8,6 +8,7 @@ namespace Drupal\search\Form; use Drupal\Core\Entity\EntityForm; +use Drupal\Core\Form\FormStateInterface; /** * Provides a search form for site wide search. @@ -37,7 +38,7 @@ public function getFormID() { /** * {@inheritdoc} */ - public function form(array $form, array &$form_state) { + public function form(array $form, FormStateInterface $form_state) { $plugin = $this->entity->getPlugin(); $form_state['search_page_id'] = $this->entity->id(); @@ -74,7 +75,7 @@ public function form(array $form, array &$form_state) { /** * {@inheritdoc} */ - protected function actions(array $form, array &$form_state) { + protected function actions(array $form, FormStateInterface $form_state) { // The submit button is added in the form directly. return array(); } @@ -82,7 +83,7 @@ protected function actions(array $form, array &$form_state) { /** * {@inheritdoc} */ - public function submitForm(array &$form, array &$form_state) { + public function submitForm(array &$form, FormStateInterface $form_state) { // Redirect to the search page with keywords in the GET parameters. // Plugins with additional search parameters will need to provide their // own form submit handler to replace this, so they can put their values diff --git a/core/modules/search/src/Form/SearchPageFormBase.php b/core/modules/search/src/Form/SearchPageFormBase.php index 45e5cd4033b8ba8d32ec2e536b05d9bf31ffcaae..97cd2fc784e21d74be0d17120dc1b3d77915edf4 100644 --- a/core/modules/search/src/Form/SearchPageFormBase.php +++ b/core/modules/search/src/Form/SearchPageFormBase.php @@ -9,6 +9,7 @@ use Drupal\Core\Entity\EntityForm; use Drupal\Core\Entity\Query\QueryFactory; +use Drupal\Core\Form\FormStateInterface; use Drupal\Core\Plugin\PluginFormInterface; use Drupal\search\SearchPageRepositoryInterface; use Symfony\Component\DependencyInjection\ContainerInterface; @@ -79,7 +80,7 @@ public function getBaseFormID() { /** * {@inheritdoc} */ - public function buildForm(array $form, array &$form_state) { + public function buildForm(array $form, FormStateInterface $form_state) { $this->plugin = $this->entity->getPlugin(); return parent::buildForm($form, $form_state); } @@ -87,7 +88,7 @@ public function buildForm(array $form, array &$form_state) { /** * {@inheritdoc} */ - public function form(array $form, array &$form_state) { + public function form(array $form, FormStateInterface $form_state) { $form['label'] = array( '#type' => 'textfield', '#title' => $this->t('Label'), @@ -143,7 +144,7 @@ public function exists($id) { /** * {@inheritdoc} */ - public function validate(array $form, array &$form_state) { + public function validate(array $form, FormStateInterface $form_state) { parent::validate($form, $form_state); // Ensure each path is unique. @@ -163,7 +164,7 @@ public function validate(array $form, array &$form_state) { /** * {@inheritdoc} */ - public function submit(array $form, array &$form_state) { + public function submit(array $form, FormStateInterface $form_state) { parent::submit($form, $form_state); if ($this->plugin instanceof PluginFormInterface) { @@ -175,7 +176,7 @@ public function submit(array $form, array &$form_state) { /** * {@inheritdoc} */ - public function save(array $form, array &$form_state) { + public function save(array $form, FormStateInterface $form_state) { $this->entity->save(); $form_state['redirect_route']['route_name'] = 'search.settings'; diff --git a/core/modules/search/src/Plugin/ConfigurableSearchPluginBase.php b/core/modules/search/src/Plugin/ConfigurableSearchPluginBase.php index 8dcc9a45da73a3a5cc2335b8bea6d39eeaece824..d5de0c4be9b402f3ca3b0ea0074573f3fa1dd1c3 100644 --- a/core/modules/search/src/Plugin/ConfigurableSearchPluginBase.php +++ b/core/modules/search/src/Plugin/ConfigurableSearchPluginBase.php @@ -8,6 +8,7 @@ namespace Drupal\search\Plugin; use Drupal\Component\Utility\NestedArray; +use Drupal\Core\Form\FormStateInterface; /** * Provides a base implementation for a configurable Search plugin. @@ -54,7 +55,7 @@ public function setConfiguration(array $configuration) { /** * {@inheritdoc} */ - public function validateConfigurationForm(array &$form, array &$form_state) { + public function validateConfigurationForm(array &$form, FormStateInterface $form_state) { } /** diff --git a/core/modules/search/src/Plugin/SearchInterface.php b/core/modules/search/src/Plugin/SearchInterface.php index 144c0ab5785dbb7aece137dcb5fd05c4879d626a..34c9d4f640810a30e429a29309f5f7203361646d 100644 --- a/core/modules/search/src/Plugin/SearchInterface.php +++ b/core/modules/search/src/Plugin/SearchInterface.php @@ -8,6 +8,7 @@ namespace Drupal\search\Plugin; use Drupal\Component\Plugin\PluginInspectionInterface; +use Drupal\Core\Form\FormStateInterface; /** * Defines a common interface for all SearchPlugin objects. @@ -91,14 +92,14 @@ public function buildResults(); * * @param array $form * Nested array of form elements that comprise the form. - * @param array $form_state - * A keyed array containing the current state of the form. The arguments - * that \Drupal::formBuilder()->getForm() was originally called with are + * @param \Drupal\Core\Form\FormStateInterface $form_state + * The current state of the form. The arguments that + * \Drupal::formBuilder()->getForm() was originally called with are * available in the array $form_state['build_info']['args']. * * @see SearchInterface::buildSearchUrlQuery() */ - public function searchFormAlter(array &$form, array &$form_state); + public function searchFormAlter(array &$form, FormStateInterface $form_state); /** * Builds the URL GET query parameters array for search. @@ -108,7 +109,7 @@ public function searchFormAlter(array &$form, array &$form_state); * method to add form elements to the search form will need to override this * method to gather the form input and add it to the GET query parameters. * - * @param array $form_state + * @param \Drupal\Core\Form\FormStateInterface $form_state * The form state, with submitted form information. * * @return array diff --git a/core/modules/search/src/Plugin/SearchPluginBase.php b/core/modules/search/src/Plugin/SearchPluginBase.php index e13a3077b3950d6d81ad2a37ae4eee388b6807e2..9a553ccee3022362edef17ef308df24d83d1d1c8 100644 --- a/core/modules/search/src/Plugin/SearchPluginBase.php +++ b/core/modules/search/src/Plugin/SearchPluginBase.php @@ -7,6 +7,7 @@ namespace Drupal\search\Plugin; +use Drupal\Core\Form\FormStateInterface; use Drupal\Core\Plugin\PluginBase; use Drupal\Core\Plugin\ContainerFactoryPluginInterface; use Symfony\Component\DependencyInjection\ContainerInterface; @@ -104,7 +105,7 @@ public function buildResults() { /** * {@inheritdoc} */ - public function searchFormAlter(array &$form, array &$form_state) { + public function searchFormAlter(array &$form, FormStateInterface $form_state) { // Empty default implementation. } diff --git a/core/modules/search/src/Plugin/views/filter/Search.php b/core/modules/search/src/Plugin/views/filter/Search.php index ef69c7deb10dd81c0650eb94489b3a420ab13096..e885ce946188929c039f8c3b829aa646dd538250 100644 --- a/core/modules/search/src/Plugin/views/filter/Search.php +++ b/core/modules/search/src/Plugin/views/filter/Search.php @@ -7,6 +7,7 @@ namespace Drupal\search\Plugin\views\filter; +use Drupal\Core\Form\FormStateInterface; use Drupal\views\Plugin\views\filter\FilterPluginBase; use Drupal\views\Plugin\views\display\DisplayPluginBase; use Drupal\views\ViewExecutable; @@ -70,7 +71,7 @@ protected function defineOptions() { /** * {@inheritdoc} */ - protected function operatorForm(&$form, &$form_state) { + protected function operatorForm(&$form, FormStateInterface $form_state) { $form['operator'] = array( '#type' => 'radios', '#title' => t('On empty input'), @@ -85,7 +86,7 @@ protected function operatorForm(&$form, &$form_state) { /** * {@inheritdoc} */ - protected function valueForm(&$form, &$form_state) { + protected function valueForm(&$form, FormStateInterface $form_state) { $form['value'] = array( '#type' => 'textfield', '#size' => 15, @@ -98,7 +99,7 @@ protected function valueForm(&$form, &$form_state) { /** * {@inheritdoc} */ - public function validateExposed(&$form, &$form_state) { + public function validateExposed(&$form, FormStateInterface $form_state) { if (!isset($this->options['expose']['identifier'])) { return; } diff --git a/core/modules/search/src/Plugin/views/row/SearchRow.php b/core/modules/search/src/Plugin/views/row/SearchRow.php index 8c0709f71511c1c5d14ebfac0fccf3aae1b4531d..c93efdad94f3879d501081fcd0f86a29cbdf73b4 100644 --- a/core/modules/search/src/Plugin/views/row/SearchRow.php +++ b/core/modules/search/src/Plugin/views/row/SearchRow.php @@ -7,6 +7,7 @@ namespace Drupal\search\Plugin\views\row; +use Drupal\Core\Form\FormStateInterface; use Drupal\views\Plugin\views\row\RowPluginBase; /** @@ -34,7 +35,7 @@ protected function defineOptions() { /** * {@inheritdoc} */ - public function buildOptionsForm(&$form, &$form_state) { + public function buildOptionsForm(&$form, FormStateInterface $form_state) { $form['score'] = array( '#type' => 'checkbox', '#title' => t('Display score'), diff --git a/core/modules/search/src/SearchPageListBuilder.php b/core/modules/search/src/SearchPageListBuilder.php index d6a837a580f9652586cce288c3056c876c93cd54..ac40476b39403fcd081b38855881cbbebf75c689 100644 --- a/core/modules/search/src/SearchPageListBuilder.php +++ b/core/modules/search/src/SearchPageListBuilder.php @@ -13,6 +13,7 @@ use Drupal\Core\Entity\EntityStorageInterface; use Drupal\Core\Entity\EntityTypeInterface; use Drupal\Core\Form\FormInterface; +use Drupal\Core\Form\FormStateInterface; use Symfony\Component\DependencyInjection\ContainerInterface; /** @@ -152,7 +153,7 @@ public function buildRow(EntityInterface $entity) { /** * {@inheritdoc} */ - public function buildForm(array $form, array &$form_state) { + public function buildForm(array $form, FormStateInterface $form_state) { $form = parent::buildForm($form, $form_state); $old_state = $this->configFactory->getOverrideState(); $search_settings = $this->configFactory->setOverrideState(FALSE)->get('search.settings'); @@ -318,13 +319,13 @@ public function getDefaultOperations(EntityInterface $entity) { /** * {@inheritdoc} */ - public function validateForm(array &$form, array &$form_state) { + public function validateForm(array &$form, FormStateInterface $form_state) { } /** * {@inheritdoc} */ - public function submitForm(array &$form, array &$form_state) { + public function submitForm(array &$form, FormStateInterface $form_state) { parent::submitForm($form, $form_state); $search_settings = $this->configFactory->get('search.settings'); @@ -348,7 +349,7 @@ public function submitForm(array &$form, array &$form_state) { * Form submission handler for the reindex button on the search admin settings * form. */ - public function searchAdminReindexSubmit(array &$form, array &$form_state) { + public function searchAdminReindexSubmit(array &$form, FormStateInterface $form_state) { // Send the user to the confirmation page. $form_state['redirect_route']['route_name'] = 'search.reindex_confirm'; } @@ -356,7 +357,7 @@ public function searchAdminReindexSubmit(array &$form, array &$form_state) { /** * Form validation handler for adding a new search page. */ - public function validateAddSearchPage(array &$form, array &$form_state) { + public function validateAddSearchPage(array &$form, FormStateInterface $form_state) { if (empty($form_state['values']['search_type'])) { $this->formBuilder()->setErrorByName('search_type', $form_state, $this->t('You must select the new search page type.')); } @@ -365,7 +366,7 @@ public function validateAddSearchPage(array &$form, array &$form_state) { /** * Form submission handler for adding a new search page. */ - public function submitAddSearchPage(array &$form, array &$form_state) { + public function submitAddSearchPage(array &$form, FormStateInterface $form_state) { $form_state['redirect_route'] = array( 'route_name' => 'search.add_type', 'route_parameters' => array( diff --git a/core/modules/search/tests/modules/search_embedded_form/src/Form/SearchEmbeddedForm.php b/core/modules/search/tests/modules/search_embedded_form/src/Form/SearchEmbeddedForm.php index d0d690d6b5a92e54929af77473ad2e7044ac9189..3bb04e04696291769bc24862f579be3db1ff9322 100644 --- a/core/modules/search/tests/modules/search_embedded_form/src/Form/SearchEmbeddedForm.php +++ b/core/modules/search/tests/modules/search_embedded_form/src/Form/SearchEmbeddedForm.php @@ -8,6 +8,7 @@ namespace Drupal\search_embedded_form\Form; use Drupal\Core\Form\FormBase; +use Drupal\Core\Form\FormStateInterface; /** * Form controller for search_embedded_form form. @@ -24,7 +25,7 @@ public function getFormID() { /** * {@inheritdoc} */ - public function buildForm(array $form, array &$form_state) { + public function buildForm(array $form, FormStateInterface $form_state) { $count = \Drupal::state()->get('search_embedded_form.submit_count'); $form['name'] = array( @@ -48,7 +49,7 @@ public function buildForm(array $form, array &$form_state) { /** * {@inheritdoc} */ - public function submitForm(array &$form, array &$form_state) { + public function submitForm(array &$form, FormStateInterface $form_state) { $state = \Drupal::state(); $submit_count = (int) $state->get('search_embedded_form.submit_count'); $state->set('search_embedded_form.submit_count', $submit_count + 1); diff --git a/core/modules/search/tests/modules/search_extra_type/src/Plugin/Search/SearchExtraTypeSearch.php b/core/modules/search/tests/modules/search_extra_type/src/Plugin/Search/SearchExtraTypeSearch.php index 32cfb776c436461635a386a7d0226af15693a5d0..2c3401030c8f7d3ba8593419f5d8551e3fdc7be7 100644 --- a/core/modules/search/tests/modules/search_extra_type/src/Plugin/Search/SearchExtraTypeSearch.php +++ b/core/modules/search/tests/modules/search_extra_type/src/Plugin/Search/SearchExtraTypeSearch.php @@ -8,6 +8,7 @@ namespace Drupal\search_extra_type\Plugin\Search; use Drupal\Component\Utility\SafeMarkup; +use Drupal\Core\Form\FormStateInterface; use Drupal\search\Plugin\ConfigurableSearchPluginBase; /** @@ -89,7 +90,7 @@ public function buildResults() { /** * {@inheritdoc} */ - public function buildConfigurationForm(array $form, array &$form_state) { + public function buildConfigurationForm(array $form, FormStateInterface $form_state) { // Output form for defining rank factor weights. $form['extra_type_settings'] = array( '#type' => 'fieldset', @@ -112,7 +113,7 @@ public function buildConfigurationForm(array $form, array &$form_state) { /** * {@inheritdoc} */ - public function submitConfigurationForm(array &$form, array &$form_state) { + public function submitConfigurationForm(array &$form, FormStateInterface $form_state) { $this->configuration['boost'] = $form_state['values']['extra_type_settings']['boost']; } diff --git a/core/modules/shortcut/src/Form/SetCustomize.php b/core/modules/shortcut/src/Form/SetCustomize.php index a306f505a33fdb7abfdb07bd88ff493b9fb65410..d6afd909caae5d8b8e93c73c18aaadd3b73a1eb3 100644 --- a/core/modules/shortcut/src/Form/SetCustomize.php +++ b/core/modules/shortcut/src/Form/SetCustomize.php @@ -9,6 +9,7 @@ use Drupal\Core\Entity\EntityForm; use Drupal\Core\Entity\EntityManagerInterface; +use Drupal\Core\Form\FormStateInterface; use Drupal\Core\Render\Element; use Symfony\Component\DependencyInjection\ContainerInterface; @@ -27,7 +28,7 @@ class SetCustomize extends EntityForm { /** * {@inheritdoc} */ - public function form(array $form, array &$form_state) { + public function form(array $form, FormStateInterface $form_state) { $form = parent::form($form, $form_state); $form['shortcuts'] = array( '#tree' => TRUE, @@ -82,7 +83,7 @@ public function form(array $form, array &$form_state) { /** * {@inheritdoc} */ - protected function actions(array $form, array &$form_state) { + protected function actions(array $form, FormStateInterface $form_state) { // Only includes a Save action for the entity, no direct Delete button. return array( 'submit' => array( @@ -99,7 +100,7 @@ protected function actions(array $form, array &$form_state) { /** * {@inheritdoc} */ - public function save(array $form, array &$form_state) { + public function save(array $form, FormStateInterface $form_state) { foreach ($this->entity->getShortcuts() as $shortcut) { $shortcut->setWeight($form_state['values']['shortcuts']['links'][$shortcut->id()]['weight']); $shortcut->save(); diff --git a/core/modules/shortcut/src/Form/ShortcutDeleteForm.php b/core/modules/shortcut/src/Form/ShortcutDeleteForm.php index bef1c00b729a65e2e058f9563a8400b524e6f993..0256017dd50e239d9e7d81f4740575e21671a48d 100644 --- a/core/modules/shortcut/src/Form/ShortcutDeleteForm.php +++ b/core/modules/shortcut/src/Form/ShortcutDeleteForm.php @@ -8,6 +8,7 @@ namespace Drupal\shortcut\Form; use Drupal\Core\Entity\ContentEntityConfirmFormBase; +use Drupal\Core\Form\FormStateInterface; use Drupal\Core\Url; /** @@ -48,7 +49,7 @@ public function getConfirmText() { /** * {@inheritdoc} */ - public function submit(array $form, array &$form_state) { + public function submit(array $form, FormStateInterface $form_state) { $this->entity->delete(); $form_state['redirect_route'] = $this->getCancelUrl(); drupal_set_message($this->t('The shortcut %title has been deleted.', array('%title' => $this->entity->title->value))); diff --git a/core/modules/shortcut/src/Form/ShortcutSetDeleteForm.php b/core/modules/shortcut/src/Form/ShortcutSetDeleteForm.php index 14f20f2271655d63c31da7d646f0f6303f65590c..f7e28ac1b4ed7f65b5335184f16d5ac45d1cf65b 100644 --- a/core/modules/shortcut/src/Form/ShortcutSetDeleteForm.php +++ b/core/modules/shortcut/src/Form/ShortcutSetDeleteForm.php @@ -8,6 +8,7 @@ namespace Drupal\shortcut\Form; use Drupal\Core\Entity\EntityConfirmFormBase; +use Drupal\Core\Form\FormStateInterface; use Drupal\Core\Url; use Drupal\shortcut\ShortcutSetStorageInterface; use Symfony\Component\DependencyInjection\ContainerInterface; @@ -74,7 +75,7 @@ public function getConfirmText() { /** * {@inheritdoc} */ - public function buildForm(array $form, array &$form_state) { + public function buildForm(array $form, FormStateInterface $form_state) { // Find out how many users are directly assigned to this shortcut set, and // make a message. $number = $this->storage->countAssignedUsers($this->entity); @@ -101,7 +102,7 @@ public function buildForm(array $form, array &$form_state) { /** * {@inheritdoc} */ - public function submit(array $form, array &$form_state) { + public function submit(array $form, FormStateInterface $form_state) { $this->entity->delete(); $form_state['redirect_route'] = new Url('shortcut.set_admin'); drupal_set_message(t('The shortcut set %title has been deleted.', array('%title' => $this->entity->label()))); diff --git a/core/modules/shortcut/src/Form/SwitchShortcutSet.php b/core/modules/shortcut/src/Form/SwitchShortcutSet.php index ec3180c8c7ee2b5561df74d30d94248745e977ed..a66a890573bb60b8c8db291f321d1ca10d6d593c 100644 --- a/core/modules/shortcut/src/Form/SwitchShortcutSet.php +++ b/core/modules/shortcut/src/Form/SwitchShortcutSet.php @@ -10,6 +10,7 @@ use Drupal\Component\Utility\String; use Drupal\Core\Access\AccessInterface; use Drupal\Core\Form\FormBase; +use Drupal\Core\Form\FormStateInterface; use Drupal\Core\Routing\RouteMatchInterface; use Drupal\shortcut\Entity\ShortcutSet; use Drupal\shortcut\ShortcutSetStorageInterface; @@ -75,7 +76,7 @@ public function getFormID() { /** * {@inheritdoc} */ - public function buildForm(array $form, array &$form_state, UserInterface $user = NULL) { + public function buildForm(array $form, FormStateInterface $form_state, UserInterface $user = NULL) { $account = $this->currentUser(); $this->user = $user; @@ -169,7 +170,7 @@ public function exists($id) { /** * {@inheritdoc} */ - public function validateForm(array &$form, array &$form_state) { + public function validateForm(array &$form, FormStateInterface $form_state) { if ($form_state['values']['set'] == 'new') { // Check to prevent creating a shortcut set with an empty title. if (trim($form_state['values']['label']) == '') { @@ -185,7 +186,7 @@ public function validateForm(array &$form, array &$form_state) { /** * {@inheritdoc} */ - public function submitForm(array &$form, array &$form_state) { + public function submitForm(array &$form, FormStateInterface $form_state) { $account = $this->currentUser(); $account_is_user = $this->user->id() == $account->id(); diff --git a/core/modules/shortcut/src/ShortcutForm.php b/core/modules/shortcut/src/ShortcutForm.php index 33c169a5f2e0ea4ff4fc50e4b1818a49d12716fd..e36fd793086492f104b1b443829154b041f43b61 100644 --- a/core/modules/shortcut/src/ShortcutForm.php +++ b/core/modules/shortcut/src/ShortcutForm.php @@ -8,6 +8,7 @@ namespace Drupal\shortcut; use Drupal\Core\Entity\ContentEntityForm; +use Drupal\Core\Form\FormStateInterface; use Drupal\Core\Language\LanguageInterface; /** @@ -25,7 +26,7 @@ class ShortcutForm extends ContentEntityForm { /** * {@inheritdoc} */ - public function form(array $form, array &$form_state) { + public function form(array $form, FormStateInterface $form_state) { $form = parent::form($form, $form_state); $form['path'] = array( @@ -50,7 +51,7 @@ public function form(array $form, array &$form_state) { /** * {@inheritdoc} */ - public function buildEntity(array $form, array &$form_state) { + public function buildEntity(array $form, FormStateInterface $form_state) { $entity = parent::buildEntity($form, $form_state); // Set the computed 'path' value so it can used in the preSave() method to @@ -63,7 +64,7 @@ public function buildEntity(array $form, array &$form_state) { /** * {@inheritdoc} */ - public function validate(array $form, array &$form_state) { + public function validate(array $form, FormStateInterface $form_state) { if (!shortcut_valid_link($form_state['values']['path'])) { $this->setFormError('path', $form_state, $this->t('The shortcut must correspond to a valid path on the site.')); } @@ -74,7 +75,7 @@ public function validate(array $form, array &$form_state) { /** * {@inheritdoc} */ - public function save(array $form, array &$form_state) { + public function save(array $form, FormStateInterface $form_state) { $entity = $this->entity; $entity->save(); diff --git a/core/modules/shortcut/src/ShortcutSetForm.php b/core/modules/shortcut/src/ShortcutSetForm.php index 2b50ed2eee0f91257509c374584d5d708e8142eb..be485699b123cb9b5c5a31a747d2776c2bf94675 100644 --- a/core/modules/shortcut/src/ShortcutSetForm.php +++ b/core/modules/shortcut/src/ShortcutSetForm.php @@ -8,6 +8,7 @@ namespace Drupal\shortcut; use Drupal\Core\Entity\EntityForm; +use Drupal\Core\Form\FormStateInterface; /** * Form controller for the shortcut set entity edit forms. @@ -17,7 +18,7 @@ class ShortcutSetForm extends EntityForm { /** * {@inheritdoc} */ - public function form(array $form, array &$form_state) { + public function form(array $form, FormStateInterface $form_state) { $form = parent::form($form, $form_state); $entity = $this->entity; @@ -50,7 +51,7 @@ public function form(array $form, array &$form_state) { /** * {@inheritdoc} */ - public function validate(array $form, array &$form_state) { + public function validate(array $form, FormStateInterface $form_state) { parent::validate($form, $form_state); $entity = $this->entity; // Check to prevent a duplicate title. @@ -62,7 +63,7 @@ public function validate(array $form, array &$form_state) { /** * {@inheritdoc} */ - public function save(array $form, array &$form_state) { + public function save(array $form, FormStateInterface $form_state) { $entity = $this->entity; $is_new = !$entity->getOriginalId(); $entity->save(); diff --git a/core/modules/simpletest/src/Form/SimpletestResultsForm.php b/core/modules/simpletest/src/Form/SimpletestResultsForm.php index e2b49608ff1f90767aab6a82c8364f1b036d3936..f9e48d3603c38f673ca24270d7d319311ad0b2ca 100644 --- a/core/modules/simpletest/src/Form/SimpletestResultsForm.php +++ b/core/modules/simpletest/src/Form/SimpletestResultsForm.php @@ -10,6 +10,8 @@ use Drupal\Component\Utility\SafeMarkup; use Drupal\Core\Database\Connection; use Drupal\Core\Form\FormBase; +use Drupal\Core\Form\FormState; +use Drupal\Core\Form\FormStateInterface; use Drupal\simpletest\TestDiscovery; use Symfony\Component\DependencyInjection\ContainerInterface; use Symfony\Component\HttpFoundation\RedirectResponse; @@ -103,7 +105,7 @@ public function getFormId() { /** * {@inheritdoc} */ - public function buildForm(array $form, array &$form_state, $test_id = NULL) { + public function buildForm(array $form, FormStateInterface $form_state, $test_id = NULL) { $this->buildStatusImageMap(); // Make sure there are test results to display and a re-run is not being // performed. @@ -249,7 +251,7 @@ public function buildForm(array $form, array &$form_state, $test_id = NULL) { /** * {@inheritdoc} */ - public function submitForm(array &$form, array &$form_state) { + public function submitForm(array &$form, FormStateInterface $form_state) { $pass = $form_state['values']['filter_pass'] ? explode(',', $form_state['values']['filter_pass']) : array(); $fail = $form_state['values']['filter_fail'] ? explode(',', $form_state['values']['filter_fail']) : array(); @@ -269,7 +271,7 @@ public function submitForm(array &$form, array &$form_state) { } $form_execute = array(); - $form_state_execute = array('values' => array()); + $form_state_execute = new FormState(array('values' => array())); foreach ($classes as $class) { $form_state_execute['values']['tests'][$class] = $class; } diff --git a/core/modules/simpletest/src/Form/SimpletestSettingsForm.php b/core/modules/simpletest/src/Form/SimpletestSettingsForm.php index 563b05da0cb814d6c17915dd3ef6c8ebb5dc51a4..2b1e71d4135ca0629db2f5167e008b545c7409a7 100644 --- a/core/modules/simpletest/src/Form/SimpletestSettingsForm.php +++ b/core/modules/simpletest/src/Form/SimpletestSettingsForm.php @@ -8,6 +8,7 @@ namespace Drupal\simpletest\Form; use Drupal\Core\Form\ConfigFormBase; +use Drupal\Core\Form\FormStateInterface; /** * Configure simpletest settings for this site. @@ -24,7 +25,7 @@ public function getFormId() { /** * {@inheritdoc} */ - public function buildForm(array $form, array &$form_state) { + public function buildForm(array $form, FormStateInterface $form_state) { $config = $this->config('simpletest.settings'); $form['general'] = array( '#type' => 'details', @@ -86,7 +87,7 @@ public function buildForm(array $form, array &$form_state) { /** * {@inheritdoc} */ - public function validateForm(array &$form, array &$form_state) { + public function validateForm(array &$form, FormStateInterface $form_state) { $config = $this->config('simpletest.settings'); // If a username was provided but a password wasn't, preserve the existing // password. @@ -106,7 +107,7 @@ public function validateForm(array &$form, array &$form_state) { /** * {@inheritdoc} */ - public function submitForm(array &$form, array &$form_state) { + public function submitForm(array &$form, FormStateInterface $form_state) { $this->config('simpletest.settings') ->set('clear_results', $form_state['values']['simpletest_clear_results']) ->set('verbose', $form_state['values']['simpletest_verbose']) diff --git a/core/modules/simpletest/src/Form/SimpletestTestForm.php b/core/modules/simpletest/src/Form/SimpletestTestForm.php index ab9b55e5ecd47914f1ed9ebd10d19279b58d7eee..bb56b69124f77c7354ff65db9dd56ff9fca45f21 100644 --- a/core/modules/simpletest/src/Form/SimpletestTestForm.php +++ b/core/modules/simpletest/src/Form/SimpletestTestForm.php @@ -10,6 +10,7 @@ use Drupal\Component\Utility\SortArray; use Drupal\Component\Utility\String; use Drupal\Core\Form\FormBase; +use Drupal\Core\Form\FormStateInterface; /** * List tests arranged in groups that can be selected and run. @@ -26,7 +27,7 @@ public function getFormId() { /** * {@inheritdoc} */ - public function buildForm(array $form, array &$form_state) { + public function buildForm(array $form, FormStateInterface $form_state) { $form['actions'] = array('#type' => 'actions'); $form['actions']['submit'] = array( '#type' => 'submit', @@ -183,7 +184,7 @@ public function buildForm(array $form, array &$form_state) { /** * {@inheritdoc} */ - public function submitForm(array &$form, array &$form_state) { + public function submitForm(array &$form, FormStateInterface $form_state) { // Test discovery does not run upon form submission. simpletest_classloader_register(); diff --git a/core/modules/statistics/src/Plugin/Block/StatisticsPopularBlock.php b/core/modules/statistics/src/Plugin/Block/StatisticsPopularBlock.php index 3bdacacae32bf120522de3571881847574218231..62745b75683d0898704f3ff18e18267c09714a93 100644 --- a/core/modules/statistics/src/Plugin/Block/StatisticsPopularBlock.php +++ b/core/modules/statistics/src/Plugin/Block/StatisticsPopularBlock.php @@ -8,6 +8,7 @@ namespace Drupal\statistics\Plugin\Block; use Drupal\block\BlockBase; +use Drupal\Core\Form\FormStateInterface; use Drupal\Core\Session\AccountInterface; /** @@ -75,9 +76,9 @@ protected function blockAccess(AccountInterface $account) { } /** - * Overrides \Drupal\block\BlockBase::blockForm(). + * {@inheritdoc} */ - public function blockForm($form, &$form_state) { + public function blockForm($form, FormStateInterface $form_state) { // Popular content block settings. $numbers = array(1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 15, 20, 25, 30, 40); $numbers = array('0' => t('Disabled')) + array_combine($numbers, $numbers); @@ -106,9 +107,9 @@ public function blockForm($form, &$form_state) { } /** - * Overrides \Drupal\block\BlockBase::blockSubmit(). + * {@inheritdoc} */ - public function blockSubmit($form, &$form_state) { + public function blockSubmit($form, FormStateInterface $form_state) { $this->configuration['top_day_num'] = $form_state['values']['statistics_block_top_day_num']; $this->configuration['top_all_num'] = $form_state['values']['statistics_block_top_all_num']; $this->configuration['top_last_num'] = $form_state['values']['statistics_block_top_last_num']; diff --git a/core/modules/statistics/src/StatisticsSettingsForm.php b/core/modules/statistics/src/StatisticsSettingsForm.php index c0025908def0c30cc6885aa1256c537cf3a5c318..cac15a19135d62e8f88fe23d50e14e9fc1e1f14e 100644 --- a/core/modules/statistics/src/StatisticsSettingsForm.php +++ b/core/modules/statistics/src/StatisticsSettingsForm.php @@ -9,6 +9,7 @@ use Drupal\Core\Extension\ModuleHandlerInterface; use Drupal\Core\Form\ConfigFormBase; use Drupal\Core\Config\ConfigFactoryInterface; +use Drupal\Core\Form\FormStateInterface; use Symfony\Component\DependencyInjection\ContainerInterface; /** @@ -55,9 +56,9 @@ public function getFormId() { } /** - * Implements \Drupal\Core\Form\FormInterface::buildForm(). + * {@inheritdoc} */ - public function buildForm(array $form, array &$form_state) { + public function buildForm(array $form, FormStateInterface $form_state) { $config = $this->config('statistics.settings'); // Content counter settings. @@ -77,9 +78,9 @@ public function buildForm(array $form, array &$form_state) { } /** - * Implements \Drupal\Core\Form\FormInterface::submitForm(). + * {@inheritdoc} */ - public function submitForm(array &$form, array &$form_state) { + public function submitForm(array &$form, FormStateInterface $form_state) { $this->config('statistics.settings') ->set('count_content_views', $form_state['values']['statistics_count_content_views']) ->save(); diff --git a/core/modules/syslog/syslog.module b/core/modules/syslog/syslog.module index 4165fab68030d2fa3962e75d0887467553e01d5f..baee84f0053148ecb55fad912abb30f0dfd4b4d4 100644 --- a/core/modules/syslog/syslog.module +++ b/core/modules/syslog/syslog.module @@ -5,6 +5,7 @@ * Redirects logging messages to syslog. */ +use Drupal\Core\Form\FormStateInterface; use Drupal\Core\Routing\RouteMatchInterface; /** @@ -30,7 +31,7 @@ function syslog_help($route_name, RouteMatchInterface $route_match) { /** * Implements hook_form_FORM_ID_alter(). */ -function syslog_form_system_logging_settings_alter(&$form, &$form_state) { +function syslog_form_system_logging_settings_alter(&$form, FormStateInterface $form_state) { $config = \Drupal::config('syslog.settings'); $help = \Drupal::moduleHandler()->moduleExists('help') ? ' ' . l(t('More information'), 'admin/help/syslog') . '.' : NULL; $form['syslog_identity'] = array( @@ -63,7 +64,7 @@ function syslog_form_system_logging_settings_alter(&$form, &$form_state) { * * @see syslog_form_system_logging_settings_alter() */ -function syslog_logging_settings_submit($form, &$form_state) { +function syslog_logging_settings_submit($form, FormStateInterface $form_state) { \Drupal::config('syslog.settings') ->set('identity', $form_state['values']['syslog_identity']) ->set('facility', $form_state['values']['syslog_facility']) diff --git a/core/modules/system/core.api.php b/core/modules/system/core.api.php index 45b46917bfa2b9bf9c7fb44b757b1e7dc3c6b400..03a711c360b976ea581db2f01de8008be7909d0c 100644 --- a/core/modules/system/core.api.php +++ b/core/modules/system/core.api.php @@ -1267,7 +1267,7 @@ * return 'example_form'; * } * - * public function buildForm(array $form, array &$form_state) { + * public function buildForm(array $form, FormStateInterface $form_state) { * // Create a $form API array. * $form['phone_number'] = array( * '#type' => 'tel', @@ -1276,11 +1276,11 @@ * return $form; * } * - * public function validateForm(array &$form, array &$form_state) { + * public function validateForm(array &$form, FormStateInterface $form_state) { * // Validate submitted form data. * } * - * public function submitForm(array &$form, array &$form_state) { + * public function submitForm(array &$form, FormStateInterface $form_state) { * // Handle submitted form data. * } * } @@ -1305,7 +1305,7 @@ * $extra = '612-123-4567'; * $form = \Drupal::formBuilder()->getForm('Drupal\mymodule\Form\ExampleForm', $extra); * ... - * public function buildForm(array $form, array &$form_state, $extra = NULL) + * public function buildForm(array $form, FormStateInterface $form_state, $extra = NULL) * $form['phone_number'] = array( * '#type' => 'tel', * '#title' => $this->t('Your phone number'), diff --git a/core/modules/system/entity.api.php b/core/modules/system/entity.api.php index 34ca4403e990f4a4cac6571221c9be2c88d7228c..41d82171aa003035b88458f73a26b719386ca0d1 100644 --- a/core/modules/system/entity.api.php +++ b/core/modules/system/entity.api.php @@ -1539,15 +1539,15 @@ function hook_entity_display_build_alter(&$build, $context) { * The entity that is about to be shown on the form. * @param $operation * The current operation. - * @param array $form_state - * An associative array containing the current state of the form. + * @param \Drupal\Core\Form\FormStateInterface $form_state + * The current state of the form. * * @see \Drupal\Core\Entity\EntityForm::prepareEntity() * @see hook_ENTITY_TYPE_prepare_form() * * @ingroup entity_crud */ -function hook_entity_prepare_form(\Drupal\Core\Entity\EntityInterface $entity, $operation, array &$form_state) { +function hook_entity_prepare_form(\Drupal\Core\Entity\EntityInterface $entity, $operation, \Drupal\Core\Form\FormStateInterface $form_state) { if ($operation == 'edit') { $entity->label->value = 'Altered label'; $form_state['mymodule']['label_altered'] = TRUE; @@ -1565,15 +1565,15 @@ function hook_entity_prepare_form(\Drupal\Core\Entity\EntityInterface $entity, $ * The entity that is about to be shown on the form. * @param $operation * The current operation. - * @param array $form_state - * An associative array containing the current state of the form. + * @param \Drupal\Core\Form\FormStateInterface $form_state + * The current state of the form. * * @see \Drupal\Core\Entity\EntityForm::prepareEntity() * @see hook_entity_prepare_form() * * @ingroup entity_crud */ -function hook_ENTITY_TYPE_prepare_form(\Drupal\Core\Entity\EntityInterface $entity, $operation, array &$form_state) { +function hook_ENTITY_TYPE_prepare_form(\Drupal\Core\Entity\EntityInterface $entity, $operation, \Drupal\Core\Form\FormStateInterface $form_state) { if ($operation == 'edit') { $entity->label->value = 'Altered label'; $form_state['mymodule']['label_altered'] = TRUE; diff --git a/core/modules/system/src/Controller/FormAjaxController.php b/core/modules/system/src/Controller/FormAjaxController.php index bc43c4906355aee8ad1c82f7fbd30a9e9fa9c8dd..be4c98d155e0a009195bf0b85a6cb9db80562fc7 100644 --- a/core/modules/system/src/Controller/FormAjaxController.php +++ b/core/modules/system/src/Controller/FormAjaxController.php @@ -7,6 +7,7 @@ namespace Drupal\system\Controller; +use Drupal\Core\Form\FormState; use Symfony\Component\HttpFoundation\Request; use Symfony\Component\HttpKernel\Exception\BadRequestHttpException; use Symfony\Component\HttpKernel\Exception\HttpException; @@ -70,7 +71,7 @@ public function content(Request $request) { * @throws Symfony\Component\HttpKernel\Exception\HttpExceptionInterface */ protected function getForm(Request $request) { - $form_state = \Drupal::formBuilder()->getFormStateDefaults(); + $form_state = new FormState(); $form_build_id = $request->request->get('form_build_id'); // Get the form from the cache. diff --git a/core/modules/system/src/Form/CronForm.php b/core/modules/system/src/Form/CronForm.php index b7e44230abfdaf2f15225c552962b38c072b411d..1ae69a1fa6dc29a2be2cb795a242c4ecf545c42a 100644 --- a/core/modules/system/src/Form/CronForm.php +++ b/core/modules/system/src/Form/CronForm.php @@ -10,6 +10,7 @@ use Drupal\Core\Config\ConfigFactoryInterface; use Drupal\Core\CronInterface; use Drupal\Core\Datetime\Date as DateFormatter; +use Drupal\Core\Form\FormStateInterface; use Drupal\Core\State\StateInterface; use Drupal\Core\Form\ConfigFormBase; use Symfony\Component\DependencyInjection\ContainerInterface; @@ -82,7 +83,7 @@ public function getFormId() { /** * {@inheritdoc} */ - public function buildForm(array $form, array &$form_state) { + public function buildForm(array $form, FormStateInterface $form_state) { $config = $this->config('system.cron'); $form['description'] = array( @@ -123,7 +124,7 @@ public function buildForm(array $form, array &$form_state) { /** * {@inheritdoc} */ - public function submitForm(array &$form, array &$form_state) { + public function submitForm(array &$form, FormStateInterface $form_state) { $this->config('system.cron') ->set('threshold.autorun', $form_state['values']['cron_safe_threshold']) ->save(); @@ -134,7 +135,7 @@ public function submitForm(array &$form, array &$form_state) { /** * Runs cron and reloads the page. */ - public function submitCron(array &$form, array &$form_state) { + public function submitCron(array &$form, FormStateInterface $form_state) { // Run cron manually from Cron form. if ($this->cron->run()) { drupal_set_message(t('Cron run successfully.')); diff --git a/core/modules/system/src/Form/DateFormatAddForm.php b/core/modules/system/src/Form/DateFormatAddForm.php index b9289a22d932ffeca8366e3823ac6ecea2c967bd..22333e7b3c8d25ec27d09aad7253fa55e450e10b 100644 --- a/core/modules/system/src/Form/DateFormatAddForm.php +++ b/core/modules/system/src/Form/DateFormatAddForm.php @@ -7,6 +7,8 @@ namespace Drupal\system\Form; +use Drupal\Core\Form\FormStateInterface; + /** * Provides a form for adding a date format. */ @@ -15,7 +17,7 @@ class DateFormatAddForm extends DateFormatFormBase { /** * {@inheritdoc} */ - protected function actions(array $form, array &$form_state) { + protected function actions(array $form, FormStateInterface $form_state) { $actions = parent::actions($form, $form_state); $actions['submit']['#value'] = t('Add format'); return $actions; @@ -24,7 +26,7 @@ protected function actions(array $form, array &$form_state) { /** * {@inheritdoc} */ - public function submit(array $form, array &$form_state) { + public function submit(array $form, FormStateInterface $form_state) { parent::submit($form, $form_state); drupal_set_message(t('Custom date format added.')); } diff --git a/core/modules/system/src/Form/DateFormatDeleteForm.php b/core/modules/system/src/Form/DateFormatDeleteForm.php index 805bcce8e64fc98153b2f4c563445c1f59776124..7ba8f7d0ff3db1c72c70a74ba5f658130215212a 100644 --- a/core/modules/system/src/Form/DateFormatDeleteForm.php +++ b/core/modules/system/src/Form/DateFormatDeleteForm.php @@ -9,6 +9,7 @@ use Drupal\Core\Datetime\Date as DateFormatter; use Drupal\Core\Entity\EntityConfirmFormBase; +use Drupal\Core\Form\FormStateInterface; use Drupal\Core\Url; use Symfony\Component\DependencyInjection\ContainerInterface; @@ -70,7 +71,7 @@ public function getCancelUrl() { /** * {@inheritdoc} */ - public function submit(array $form, array &$form_state) { + public function submit(array $form, FormStateInterface $form_state) { $this->entity->delete(); drupal_set_message(t('Removed date format %format.', array('%format' => $this->entity->label()))); diff --git a/core/modules/system/src/Form/DateFormatEditForm.php b/core/modules/system/src/Form/DateFormatEditForm.php index c6a8eb0b7043b7fd2795de58900408e3e83f3c0e..84fda1cbc83654ffff015884b0ada02219399ac2 100644 --- a/core/modules/system/src/Form/DateFormatEditForm.php +++ b/core/modules/system/src/Form/DateFormatEditForm.php @@ -7,6 +7,8 @@ namespace Drupal\system\Form; +use Drupal\Core\Form\FormStateInterface; + /** * Provides a form for editing a date format. */ @@ -15,7 +17,7 @@ class DateFormatEditForm extends DateFormatFormBase { /** * {@inheritdoc} */ - public function form(array $form, array &$form_state) { + public function form(array $form, FormStateInterface $form_state) { $form = parent::form($form, $form_state); $now = t('Displayed as %date', array('%date' => $this->dateFormatter->format(REQUEST_TIME, $this->entity->id()))); @@ -28,7 +30,7 @@ public function form(array $form, array &$form_state) { /** * {@inheritdoc} */ - protected function actions(array $form, array &$form_state) { + protected function actions(array $form, FormStateInterface $form_state) { $actions = parent::actions($form, $form_state); $actions['submit']['#value'] = t('Save format'); unset($actions['delete']); @@ -38,7 +40,7 @@ protected function actions(array $form, array &$form_state) { /** * {@inheritdoc} */ - public function submit(array $form, array &$form_state) { + public function submit(array $form, FormStateInterface $form_state) { parent::submit($form, $form_state); drupal_set_message(t('Custom date format updated.')); } diff --git a/core/modules/system/src/Form/DateFormatFormBase.php b/core/modules/system/src/Form/DateFormatFormBase.php index 3370fc1ffe765a79c1e095eb883b5880db7ee7d0..edb26416701fdb8c35c813bada1a6189f3460102 100644 --- a/core/modules/system/src/Form/DateFormatFormBase.php +++ b/core/modules/system/src/Form/DateFormatFormBase.php @@ -11,6 +11,7 @@ use Drupal\Core\Ajax\ReplaceCommand; use Drupal\Core\Config\Entity\ConfigEntityStorageInterface; use Drupal\Core\Datetime\Date as DateFormatter; +use Drupal\Core\Form\FormStateInterface; use Drupal\Core\Language\LanguageInterface; use Symfony\Component\DependencyInjection\ContainerInterface; use Drupal\Core\Datetime\DrupalDateTime; @@ -67,13 +68,11 @@ public static function create(ContainerInterface $container) { * The entity ID. * @param array $element * The form element. - * @param array $form_state - * The form state. * * @return bool * TRUE if this format already exists, FALSE otherwise. */ - public function exists($entity_id, array $element, array $form_state) { + public function exists($entity_id, array $element) { return (bool) $this->dateFormatStorage ->getQuery() ->condition('id', $element['#field_prefix'] . $entity_id) @@ -85,13 +84,13 @@ public function exists($entity_id, array $element, array $form_state) { * * @param array $form * An associative array containing the structure of the form. - * @param array $form_state - * An associative array containing the current state of the form. + * @param \Drupal\Core\Form\FormStateInterface $form_state + * The current state of the form. * * @return \Drupal\Core\Ajax\AjaxResponse * An AJAX Response to update the date-time value of the date format. */ - public static function dateTimeLookup(array $form, array $form_state) { + public static function dateTimeLookup(array $form, FormStateInterface $form_state) { $format = ''; if (!empty($form_state['values']['date_format_pattern'])) { $format = t('Displayed as %date_format', array('%date_format' => \Drupal::service('date')->format(REQUEST_TIME, 'custom', $form_state['values']['date_format_pattern']))); @@ -107,7 +106,7 @@ public static function dateTimeLookup(array $form, array $form_state) { /** * {@inheritdoc} */ - public function form(array $form, array &$form_state) { + public function form(array $form, FormStateInterface $form_state) { $form['label'] = array( '#type' => 'textfield', '#title' => 'Name', @@ -156,7 +155,7 @@ public function form(array $form, array &$form_state) { /** * {@inheritdoc} */ - public function validate(array $form, array &$form_state) { + public function validate(array $form, FormStateInterface $form_state) { parent::validate($form, $form_state); // The machine name field should already check to see if the requested @@ -174,7 +173,7 @@ public function validate(array $form, array &$form_state) { /** * {@inheritdoc} */ - public function submit(array $form, array &$form_state) { + public function submit(array $form, FormStateInterface $form_state) { $form_state['redirect_route']['route_name'] = 'system.date_format_list'; $form_state['values']['pattern'] = trim($form_state['values']['date_format_pattern']); diff --git a/core/modules/system/src/Form/FileSystemForm.php b/core/modules/system/src/Form/FileSystemForm.php index d7b1ad58be635a644a0fa54e6eb88e1bffbb6a2c..d2429e5acf738cb334030a6604987bfd6e67d8f0 100644 --- a/core/modules/system/src/Form/FileSystemForm.php +++ b/core/modules/system/src/Form/FileSystemForm.php @@ -10,6 +10,7 @@ use Drupal\Component\Utility\String; use Drupal\Core\Config\ConfigFactoryInterface; use Drupal\Core\Datetime\Date as DateFormatter; +use Drupal\Core\Form\FormStateInterface; use Drupal\Core\StreamWrapper\PublicStream; use Drupal\Core\Form\ConfigFormBase; use Symfony\Component\DependencyInjection\ContainerInterface; @@ -59,7 +60,7 @@ public function getFormId() { /** * {@inheritdoc} */ - public function buildForm(array $form, array &$form_state) { + public function buildForm(array $form, FormStateInterface $form_state) { $config = $this->config('system.file'); $form['file_public_path'] = array( '#type' => 'item', @@ -119,7 +120,7 @@ public function buildForm(array $form, array &$form_state) { /** * {@inheritdoc} */ - public function submitForm(array &$form, array &$form_state) { + public function submitForm(array &$form, FormStateInterface $form_state) { $config = $this->config('system.file') ->set('path.private', $form_state['values']['file_private_path']) ->set('path.temporary', $form_state['values']['file_temporary_path']) diff --git a/core/modules/system/src/Form/ImageToolkitForm.php b/core/modules/system/src/Form/ImageToolkitForm.php index be00cd88a50b64935eee60b9f9c27892f710ea7c..15378db645b8f55ec9da725e0585a0e1bd86fd63 100644 --- a/core/modules/system/src/Form/ImageToolkitForm.php +++ b/core/modules/system/src/Form/ImageToolkitForm.php @@ -9,6 +9,7 @@ use Drupal\Core\Config\ConfigFactoryInterface; use Drupal\Core\Form\ConfigFormBase; +use Drupal\Core\Form\FormStateInterface; use Drupal\Core\ImageToolkit\ImageToolkitManager; use Symfony\Component\DependencyInjection\ContainerInterface; @@ -60,7 +61,7 @@ public function getFormId() { /** * {@inheritdoc} */ - public function buildForm(array $form, array &$form_state) { + public function buildForm(array $form, FormStateInterface $form_state) { $current_toolkit = $this->config('system.image')->get('toolkit'); $form['image_toolkit'] = array( @@ -95,7 +96,7 @@ public function buildForm(array $form, array &$form_state) { /** * {@inheritdoc} */ - public function submitForm(array &$form, array &$form_state) { + public function submitForm(array &$form, FormStateInterface $form_state) { $this->config('system.image') ->set('toolkit', $form_state['values']['image_toolkit']) ->save(); diff --git a/core/modules/system/src/Form/LoggingForm.php b/core/modules/system/src/Form/LoggingForm.php index f52fc6aba052892ae456fb245142dea76fef37f4..ddb7e3ce35d077d300fe659ced53e0ce2f29864d 100644 --- a/core/modules/system/src/Form/LoggingForm.php +++ b/core/modules/system/src/Form/LoggingForm.php @@ -8,6 +8,7 @@ namespace Drupal\system\Form; use Drupal\Core\Form\ConfigFormBase; +use Drupal\Core\Form\FormStateInterface; /** * Configure logging settings for this site. @@ -24,7 +25,7 @@ public function getFormId() { /** * {@inheritdoc} */ - public function buildForm(array $form, array &$form_state) { + public function buildForm(array $form, FormStateInterface $form_state) { $config = $this->config('system.logging'); $form['error_level'] = array( '#type' => 'radios', @@ -45,7 +46,7 @@ public function buildForm(array $form, array &$form_state) { /** * {@inheritdoc} */ - public function submitForm(array &$form, array &$form_state) { + public function submitForm(array &$form, FormStateInterface $form_state) { $this->config('system.logging') ->set('error_level', $form_state['values']['error_level']) ->save(); diff --git a/core/modules/system/src/Form/ModulesListConfirmForm.php b/core/modules/system/src/Form/ModulesListConfirmForm.php index fd671eedfa22da7727ae4d1e85b3b7d5c2eae7fc..412c4ba0c5c9f2d7eea118a286e58cb2b90fdc9f 100644 --- a/core/modules/system/src/Form/ModulesListConfirmForm.php +++ b/core/modules/system/src/Form/ModulesListConfirmForm.php @@ -9,6 +9,7 @@ use Drupal\Core\Extension\ModuleHandlerInterface; use Drupal\Core\Form\ConfirmFormBase; +use Drupal\Core\Form\FormStateInterface; use Drupal\Core\KeyValueStore\KeyValueStoreExpirableInterface; use Drupal\Core\Url; use Symfony\Component\DependencyInjection\ContainerInterface; @@ -101,7 +102,7 @@ public function getFormId() { /** * {@inheritdoc} */ - public function buildForm(array $form, array &$form_state) { + public function buildForm(array $form, FormStateInterface $form_state) { $account = $this->currentUser()->id(); $this->modules = $this->keyValueExpirable->get($account); @@ -131,7 +132,7 @@ public function buildForm(array $form, array &$form_state) { /** * {@inheritdoc} */ - public function submitForm(array &$form, array &$form_state) { + public function submitForm(array &$form, FormStateInterface $form_state) { // Remove the key value store entry. $account = $this->currentUser()->id(); $this->keyValueExpirable->delete($account); diff --git a/core/modules/system/src/Form/ModulesListForm.php b/core/modules/system/src/Form/ModulesListForm.php index 2c5dd06b6365f9d4c23ad1bdd3ca8c4db5b52e4b..b12c4d2dda53d43c765afd0aa21dec6148c79ac1 100644 --- a/core/modules/system/src/Form/ModulesListForm.php +++ b/core/modules/system/src/Form/ModulesListForm.php @@ -15,6 +15,7 @@ use Drupal\Core\Extension\Extension; use Drupal\Core\Extension\ModuleHandlerInterface; use Drupal\Core\Form\FormBase; +use Drupal\Core\Form\FormStateInterface; use Drupal\Core\KeyValueStore\KeyValueStoreExpirableInterface; use Drupal\Core\Menu\MenuLinkManagerInterface; use Drupal\Core\Render\Element; @@ -151,7 +152,7 @@ public function getFormId() { /** * {@inheritdoc} */ - public function buildForm(array $form, array &$form_state) { + public function buildForm(array $form, FormStateInterface $form_state) { require_once DRUPAL_ROOT . '/core/includes/install.inc'; $distribution = String::checkPlain(drupal_install_profile_distribution_name()); @@ -408,13 +409,13 @@ protected function buildRow(array $modules, Extension $module, $distribution) { /** * Helper function for building a list of modules to install. * - * @param array $form_state - * The form state array. + * @param \Drupal\Core\Form\FormStateInterface $form_state + * The current state of the form. * * @return array * An array of modules to install and their dependencies. */ - protected function buildModuleList(array $form_state) { + protected function buildModuleList($form_state) { $packages = $form_state['values']['modules']; // Build a list of modules to install. @@ -472,7 +473,7 @@ protected function buildModuleList(array $form_state) { /** * {@inheritdoc} */ - public function submitForm(array &$form, array &$form_state) { + public function submitForm(array &$form, FormStateInterface $form_state) { // Retrieve a list of modules to install and their dependencies. $modules = $this->buildModuleList($form_state); diff --git a/core/modules/system/src/Form/ModulesUninstallConfirmForm.php b/core/modules/system/src/Form/ModulesUninstallConfirmForm.php index 1825d5322bdbe2946ff46b615d8b2e775c3fc65f..02c1dbe9ed6ce403fac0bbede587c854efa5eba3 100644 --- a/core/modules/system/src/Form/ModulesUninstallConfirmForm.php +++ b/core/modules/system/src/Form/ModulesUninstallConfirmForm.php @@ -10,6 +10,7 @@ use Drupal\Core\Config\ConfigManagerInterface; use Drupal\Core\Entity\EntityManagerInterface; use Drupal\Core\Form\ConfirmFormBase; +use Drupal\Core\Form\FormStateInterface; use Drupal\Core\Url; use Symfony\Component\HttpFoundation\RedirectResponse; use Symfony\Component\DependencyInjection\ContainerInterface; @@ -125,7 +126,7 @@ public function getFormId() { /** * {@inheritdoc} */ - public function buildForm(array $form, array &$form_state) { + public function buildForm(array $form, FormStateInterface $form_state) { // Retrieve the list of modules from the key value store. $account = $this->currentUser()->id(); $this->modules = $this->keyValueExpirable->get($account); @@ -191,7 +192,7 @@ public function buildForm(array $form, array &$form_state) { /** * {@inheritdoc} */ - public function submitForm(array &$form, array &$form_state) { + public function submitForm(array &$form, FormStateInterface $form_state) { // Clear the key value store entry. $account = $this->currentUser()->id(); $this->keyValueExpirable->delete($account); diff --git a/core/modules/system/src/Form/ModulesUninstallForm.php b/core/modules/system/src/Form/ModulesUninstallForm.php index 7438e48765d33add278cb4ef94db847e64d1d331..b1ec48c70794ebceefdef1154e3a7fbfd7dc1238 100644 --- a/core/modules/system/src/Form/ModulesUninstallForm.php +++ b/core/modules/system/src/Form/ModulesUninstallForm.php @@ -9,6 +9,7 @@ use Drupal\Core\Extension\ModuleHandlerInterface; use Drupal\Core\Form\FormBase; +use Drupal\Core\Form\FormStateInterface; use Drupal\Core\KeyValueStore\KeyValueStoreExpirableInterface; use Symfony\Component\DependencyInjection\ContainerInterface; @@ -64,7 +65,7 @@ public function getFormId() { /** * {@inheritdoc} */ - public function buildForm(array $form, array &$form_state) { + public function buildForm(array $form, FormStateInterface $form_state) { // Make sure the install API is available. include_once DRUPAL_ROOT . '/core/includes/install.inc'; @@ -148,7 +149,7 @@ public function buildForm(array $form, array &$form_state) { /** * {@inheritdoc} */ - public function validateForm(array &$form, array &$form_state) { + public function validateForm(array &$form, FormStateInterface $form_state) { // Form submitted, but no modules selected. if (!array_filter($form_state['values']['uninstall'])) { drupal_set_message($this->t('No modules selected.'), 'error'); @@ -159,7 +160,7 @@ public function validateForm(array &$form, array &$form_state) { /** * {@inheritdoc} */ - public function submitForm(array &$form, array &$form_state) { + public function submitForm(array &$form, FormStateInterface $form_state) { // Save all the values in an expirable key value store. $modules = $form_state['values']['uninstall']; $uninstall = array_keys(array_filter($modules)); diff --git a/core/modules/system/src/Form/PerformanceForm.php b/core/modules/system/src/Form/PerformanceForm.php index 2431e78a86eedecbe5375a920a0633ddf54471e8..d208cc3cf9b1cdc7027dd3ddb93a71c8d3e494cc 100644 --- a/core/modules/system/src/Form/PerformanceForm.php +++ b/core/modules/system/src/Form/PerformanceForm.php @@ -11,6 +11,7 @@ use Drupal\Core\Config\ConfigFactoryInterface; use Drupal\Core\Cache\CacheBackendInterface; use Drupal\Core\Datetime\Date as DateFormatter; +use Drupal\Core\Form\FormStateInterface; use Symfony\Component\DependencyInjection\ContainerInterface; /** @@ -69,7 +70,7 @@ public function getFormId() { /** * {@inheritdoc} */ - public function buildForm(array $form, array &$form_state) { + public function buildForm(array $form, FormStateInterface $form_state) { $form['#attached']['library'][] = 'system/drupal.system'; $config = $this->config('system.performance'); @@ -155,7 +156,7 @@ public function buildForm(array $form, array &$form_state) { /** * {@inheritdoc} */ - public function submitForm(array &$form, array &$form_state) { + public function submitForm(array &$form, FormStateInterface $form_state) { drupal_clear_css_cache(); drupal_clear_js_cache(); // This form allows page compression settings to be changed, which can @@ -177,7 +178,7 @@ public function submitForm(array &$form, array &$form_state) { /** * Clears the caches. */ - public function submitCacheClear(array &$form, array &$form_state) { + public function submitCacheClear(array &$form, FormStateInterface $form_state) { drupal_flush_all_caches(); drupal_set_message(t('Caches cleared.')); } diff --git a/core/modules/system/src/Form/RegionalForm.php b/core/modules/system/src/Form/RegionalForm.php index d3618597fd79e69fa5a68dcd636d304ac8e0a316..7ac2159b4d310b37844f5444ebf8b812585967ee 100644 --- a/core/modules/system/src/Form/RegionalForm.php +++ b/core/modules/system/src/Form/RegionalForm.php @@ -8,6 +8,7 @@ namespace Drupal\system\Form; use Drupal\Core\Config\ConfigFactoryInterface; +use Drupal\Core\Form\FormStateInterface; use Drupal\Core\Locale\CountryManagerInterface; use Drupal\Core\Form\ConfigFormBase; use Symfony\Component\DependencyInjection\ContainerInterface; @@ -57,7 +58,7 @@ public function getFormId() { /** * {@inheritdoc} */ - public function buildForm(array $form, array &$form_state) { + public function buildForm(array $form, FormStateInterface $form_state) { $countries = $this->countryManager->getList(); $system_date = $this->config('system.date'); @@ -141,7 +142,7 @@ public function buildForm(array $form, array &$form_state) { /** * {@inheritdoc} */ - public function submitForm(array &$form, array &$form_state) { + public function submitForm(array &$form, FormStateInterface $form_state) { $this->config('system.date') ->set('country.default', $form_state['values']['site_default_country']) ->set('first_day', $form_state['values']['date_first_day']) diff --git a/core/modules/system/src/Form/RssFeedsForm.php b/core/modules/system/src/Form/RssFeedsForm.php index e487fceafe7b471bd4d8eec90ae25724d46e97e5..5ba8e6d588ff2688ccd0767f7bf511819d5d9ae3 100644 --- a/core/modules/system/src/Form/RssFeedsForm.php +++ b/core/modules/system/src/Form/RssFeedsForm.php @@ -8,6 +8,7 @@ namespace Drupal\system\Form; use Drupal\Core\Form\ConfigFormBase; +use Drupal\Core\Form\FormStateInterface; /** * Configure RSS settings for this site. @@ -24,7 +25,7 @@ public function getFormId() { /** * {@inheritdoc} */ - public function buildForm(array $form, array &$form_state) { + public function buildForm(array $form, FormStateInterface $form_state) { $rss_config = $this->config('system.rss'); $form['feed_description'] = array( '#type' => 'textarea', @@ -58,7 +59,7 @@ public function buildForm(array $form, array &$form_state) { /** * {@inheritdoc} */ - public function submitForm(array &$form, array &$form_state) { + public function submitForm(array &$form, FormStateInterface $form_state) { $this->config('system.rss') ->set('channel.description', $form_state['values']['feed_description']) ->set('items.limit', $form_state['values']['feed_default_items']) diff --git a/core/modules/system/src/Form/SiteInformationForm.php b/core/modules/system/src/Form/SiteInformationForm.php index c2b9c675ca770b000e9e3def543c1ad812e61e75..46b9013f2b399b9336cdb08772540b36a836d2c8 100644 --- a/core/modules/system/src/Form/SiteInformationForm.php +++ b/core/modules/system/src/Form/SiteInformationForm.php @@ -8,6 +8,7 @@ namespace Drupal\system\Form; use Drupal\Core\Config\ConfigFactoryInterface; +use Drupal\Core\Form\FormStateInterface; use Drupal\Core\Path\AliasManagerInterface; use Drupal\Core\Form\ConfigFormBase; use Symfony\Component\DependencyInjection\ContainerInterface; @@ -58,7 +59,7 @@ public function getFormId() { /** * {@inheritdoc} */ - public function buildForm(array $form, array &$form_state) { + public function buildForm(array $form, FormStateInterface $form_state) { $site_config = $this->config('system.site'); $site_mail = $site_config->get('mail'); if (empty($site_mail)) { @@ -131,7 +132,7 @@ public function buildForm(array $form, array &$form_state) { /** * {@inheritdoc} */ - public function validateForm(array &$form, array &$form_state) { + public function validateForm(array &$form, FormStateInterface $form_state) { // Check for empty front page path. if (empty($form_state['values']['site_frontpage'])) { // Set to default "user". @@ -167,7 +168,7 @@ public function validateForm(array &$form, array &$form_state) { /** * {@inheritdoc} */ - public function submitForm(array &$form, array &$form_state) { + public function submitForm(array &$form, FormStateInterface $form_state) { $this->config('system.site') ->set('name', $form_state['values']['site_name']) ->set('mail', $form_state['values']['site_mail']) diff --git a/core/modules/system/src/Form/SiteMaintenanceModeForm.php b/core/modules/system/src/Form/SiteMaintenanceModeForm.php index 7de4e6187f200a364992eaa2005a33cfe944730c..1ee0aa69a7f97888b9c2c3532271a1a1b6fc9bc2 100644 --- a/core/modules/system/src/Form/SiteMaintenanceModeForm.php +++ b/core/modules/system/src/Form/SiteMaintenanceModeForm.php @@ -8,6 +8,7 @@ namespace Drupal\system\Form; use Drupal\Core\Config\ConfigFactoryInterface; +use Drupal\Core\Form\FormStateInterface; use Drupal\Core\State\StateInterface; use Drupal\Core\Form\ConfigFormBase; use Symfony\Component\DependencyInjection\ContainerInterface; @@ -56,7 +57,7 @@ public function getFormId() { /** * {@inheritdoc} */ - public function buildForm(array $form, array &$form_state) { + public function buildForm(array $form, FormStateInterface $form_state) { $config = $this->config('system.maintenance'); $form['maintenance_mode'] = array( '#type' => 'checkbox', @@ -76,7 +77,7 @@ public function buildForm(array $form, array &$form_state) { /** * {@inheritdoc} */ - public function submitForm(array &$form, array &$form_state) { + public function submitForm(array &$form, FormStateInterface $form_state) { $this->config('system.maintenance') ->set('message', $form_state['values']['maintenance_mode_message']) ->save(); diff --git a/core/modules/system/src/Form/ThemeAdminForm.php b/core/modules/system/src/Form/ThemeAdminForm.php index d83604716084970487f0b36514e4ddf8b2d811a6..627c2b33c5b35fd98f873f7c130109598718b86d 100644 --- a/core/modules/system/src/Form/ThemeAdminForm.php +++ b/core/modules/system/src/Form/ThemeAdminForm.php @@ -7,6 +7,7 @@ namespace Drupal\system\Form; use Drupal\Core\Form\FormBase; +use Drupal\Core\Form\FormStateInterface; /** * Form to select the administration theme. @@ -23,7 +24,7 @@ public function getFormID() { /** * {@inheritdoc} */ - public function buildForm(array $form, array &$form_state, array $theme_options = NULL) { + public function buildForm(array $form, FormStateInterface $form_state, array $theme_options = NULL) { // Administration theme settings. $form['admin_theme'] = array( '#type' => 'details', @@ -48,7 +49,7 @@ public function buildForm(array $form, array &$form_state, array $theme_options /** * {@inheritdoc} */ - public function submitForm(array &$form, array &$form_state) { + public function submitForm(array &$form, FormStateInterface $form_state) { drupal_set_message($this->t('The configuration options have been saved.')); $this->config('system.theme')->set('admin', $form_state['values']['admin_theme'])->save(); } diff --git a/core/modules/system/src/Form/ThemeSettingsForm.php b/core/modules/system/src/Form/ThemeSettingsForm.php index 7752960b616a8144fa5d4cc5412f9fbd42459423..9d398d93bddc851ffdad8b5d7851c4bcb96287e0 100644 --- a/core/modules/system/src/Form/ThemeSettingsForm.php +++ b/core/modules/system/src/Form/ThemeSettingsForm.php @@ -7,6 +7,7 @@ namespace Drupal\system\Form; +use Drupal\Core\Form\FormStateInterface; use Drupal\Core\Render\Element; use Drupal\Core\StreamWrapper\PublicStream; use Symfony\Component\DependencyInjection\ContainerInterface; @@ -65,7 +66,7 @@ public function getFormId() { * @param string $theme * The theme name. */ - public function buildForm(array $form, array &$form_state, $theme = '') { + public function buildForm(array $form, FormStateInterface $form_state, $theme = '') { $form = parent::buildForm($form, $form_state); $themes = list_themes(); @@ -316,7 +317,7 @@ public function buildForm(array $form, array &$form_state, $theme = '') { /** * {@inheritdoc} */ - public function validateForm(array &$form, array &$form_state) { + public function validateForm(array &$form, FormStateInterface $form_state) { parent::validateForm($form, $form_state); if ($this->moduleHandler->moduleExists('file')) { @@ -373,7 +374,7 @@ public function validateForm(array &$form, array &$form_state) { /** * {@inheritdoc} */ - public function submitForm(array &$form, array &$form_state) { + public function submitForm(array &$form, FormStateInterface $form_state) { parent::submitForm($form, $form_state); $config = $this->config($form_state['values']['config_key']); diff --git a/core/modules/system/src/Plugin/Block/SystemBrandingBlock.php b/core/modules/system/src/Plugin/Block/SystemBrandingBlock.php index 13e1b7fe53492541708cc18eb8efc2dc377ae396..0cecf2b84c01a0d75e98ee54b01896e0ccd7d4b6 100644 --- a/core/modules/system/src/Plugin/Block/SystemBrandingBlock.php +++ b/core/modules/system/src/Plugin/Block/SystemBrandingBlock.php @@ -10,6 +10,7 @@ use Drupal\Component\Utility\NestedArray; use Drupal\block\BlockBase; use Drupal\Core\Config\ConfigFactoryInterface; +use Drupal\Core\Form\FormStateInterface; use Drupal\Core\Plugin\ContainerFactoryPluginInterface; use Drupal\Core\Routing\UrlGeneratorInterface; use Drupal\Core\Session\AccountInterface; @@ -105,7 +106,7 @@ public function defaultConfiguration() { /** * {@inheritdoc} */ - public function blockForm($form, &$form_state) { + public function blockForm($form, FormStateInterface $form_state) { // Get the theme. $theme = $form_state['block_theme']; @@ -173,7 +174,7 @@ public function blockForm($form, &$form_state) { /** * {@inheritdoc} */ - public function blockSubmit($form, &$form_state) { + public function blockSubmit($form, FormStateInterface $form_state) { $this->configuration['use_site_logo'] = $form_state['values']['block_branding']['use_site_logo']; $this->configuration['use_site_name'] = $form_state['values']['block_branding']['use_site_name']; $this->configuration['use_site_slogan'] = $form_state['values']['block_branding']['use_site_slogan']; diff --git a/core/modules/system/src/Plugin/Block/SystemMainBlock.php b/core/modules/system/src/Plugin/Block/SystemMainBlock.php index 666b5157f0c103d37c88326d3ba20c8cf1300774..e251cad9cd049874c57725ad29582448689cdead 100644 --- a/core/modules/system/src/Plugin/Block/SystemMainBlock.php +++ b/core/modules/system/src/Plugin/Block/SystemMainBlock.php @@ -8,6 +8,7 @@ namespace Drupal\system\Plugin\Block; use Drupal\block\BlockBase; +use Drupal\Core\Form\FormStateInterface; /** * Provides a 'Main page content' block. @@ -31,7 +32,7 @@ public function build() { /** * {@inheritdoc} */ - public function buildConfigurationForm(array $form, array &$form_state) { + public function buildConfigurationForm(array $form, FormStateInterface $form_state) { $form = parent::buildConfigurationForm($form, $form_state); // The main content block is never cacheable, because it may be dynamic. diff --git a/core/modules/system/src/Plugin/Block/SystemPoweredByBlock.php b/core/modules/system/src/Plugin/Block/SystemPoweredByBlock.php index 2b4ffaaab883faa7036feaa94f43b75753ba5617..980d5b3059b2006fca37b027da5d98c0c13ba4f2 100644 --- a/core/modules/system/src/Plugin/Block/SystemPoweredByBlock.php +++ b/core/modules/system/src/Plugin/Block/SystemPoweredByBlock.php @@ -9,6 +9,7 @@ use Drupal\block\BlockBase; use Drupal\Core\Cache\Cache; +use Drupal\Core\Form\FormStateInterface; /** * Provides a 'Powered by Drupal' block. @@ -27,11 +28,10 @@ public function build() { return array('#markup' => '' . t('Powered by Drupal', array('@poweredby' => 'https://drupal.org')) . ''); } - /** * {@inheritdoc} */ - public function buildConfigurationForm(array $form, array &$form_state) { + public function buildConfigurationForm(array $form, FormStateInterface $form_state) { $form = parent::buildConfigurationForm($form, $form_state); // The 'Powered by Drupal' block is permanently cacheable, because its diff --git a/core/modules/system/src/Plugin/Condition/CurrentThemeCondition.php b/core/modules/system/src/Plugin/Condition/CurrentThemeCondition.php index 874bcd6f345c0ca536854d6f514b81e60d85106c..1ccd1f9c0de88ad39eef65c5ab9af93f0fb6a051 100644 --- a/core/modules/system/src/Plugin/Condition/CurrentThemeCondition.php +++ b/core/modules/system/src/Plugin/Condition/CurrentThemeCondition.php @@ -9,6 +9,7 @@ use Drupal\Core\Condition\ConditionPluginBase; use Drupal\Core\Extension\ThemeHandlerInterface; +use Drupal\Core\Form\FormStateInterface; use Drupal\Core\Plugin\ContainerFactoryPluginInterface; use Drupal\Core\Routing\RouteMatchInterface; use Drupal\Core\Theme\ThemeNegotiatorInterface; @@ -92,7 +93,7 @@ public function defaultConfiguration() { /** * {@inheritdoc} */ - public function buildConfigurationForm(array $form, array &$form_state) { + public function buildConfigurationForm(array $form, FormStateInterface $form_state) { $form['theme'] = array( '#type' => 'select', '#title' => $this->t('Theme'), @@ -107,7 +108,7 @@ public function buildConfigurationForm(array $form, array &$form_state) { /** * {@inheritdoc} */ - public function submitConfigurationForm(array &$form, array &$form_state) { + public function submitConfigurationForm(array &$form, FormStateInterface $form_state) { $this->configuration['theme'] = $form_state['values']['theme']; parent::submitConfigurationForm($form, $form_state); } diff --git a/core/modules/system/src/Plugin/Condition/RequestPath.php b/core/modules/system/src/Plugin/Condition/RequestPath.php index 1dab54ff47cf06f2aa439669464fd541536eb904..c6314d573b72487c1b460205f9368396b7fa17d0 100644 --- a/core/modules/system/src/Plugin/Condition/RequestPath.php +++ b/core/modules/system/src/Plugin/Condition/RequestPath.php @@ -9,6 +9,7 @@ use Drupal\Component\Utility\Unicode; use Drupal\Core\Condition\ConditionPluginBase; +use Drupal\Core\Form\FormStateInterface; use Drupal\Core\Path\AliasManagerInterface; use Drupal\Core\Path\PathMatcherInterface; use Drupal\Core\Plugin\ContainerFactoryPluginInterface; @@ -93,7 +94,7 @@ public function defaultConfiguration() { /** * {@inheritdoc} */ - public function buildConfigurationForm(array $form, array &$form_state) { + public function buildConfigurationForm(array $form, FormStateInterface $form_state) { $form['pages'] = array( '#type' => 'textarea', '#title' => $this->t('Pages'), @@ -110,7 +111,7 @@ public function buildConfigurationForm(array $form, array &$form_state) { /** * {@inheritdoc} */ - public function submitConfigurationForm(array &$form, array &$form_state) { + public function submitConfigurationForm(array &$form, FormStateInterface $form_state) { $this->configuration['pages'] = $form_state['values']['pages']; parent::submitConfigurationForm($form, $form_state); } diff --git a/core/modules/system/src/Plugin/ImageToolkit/GDToolkit.php b/core/modules/system/src/Plugin/ImageToolkit/GDToolkit.php index c1a29a6150be49c84d7a194e8a50989312350afb..3cbdbd9e8ac247d2ec26ffc963732b6437b2c280 100644 --- a/core/modules/system/src/Plugin/ImageToolkit/GDToolkit.php +++ b/core/modules/system/src/Plugin/ImageToolkit/GDToolkit.php @@ -8,6 +8,7 @@ namespace Drupal\system\Plugin\ImageToolkit; use Drupal\Component\Utility\Unicode; +use Drupal\Core\Form\FormStateInterface; use Drupal\Core\ImageToolkit\ImageToolkitBase; /** @@ -76,7 +77,7 @@ public function settingsForm() { /** * {@inheritdoc} */ - public function settingsFormSubmit($form, &$form_state) { + public function settingsFormSubmit($form, FormStateInterface $form_state) { \Drupal::config('system.image.gd') ->set('jpeg_quality', $form_state['values']['gd']['image_jpeg_quality']) ->save(); diff --git a/core/modules/system/src/Plugin/views/field/BulkForm.php b/core/modules/system/src/Plugin/views/field/BulkForm.php index fc9898df65bc86aa8c44540d0a44910c3bb769e3..9cf68363e0d78e02b825ff84370230bcde070d6b 100644 --- a/core/modules/system/src/Plugin/views/field/BulkForm.php +++ b/core/modules/system/src/Plugin/views/field/BulkForm.php @@ -8,6 +8,7 @@ namespace Drupal\system\Plugin\views\field; use Drupal\Core\Entity\EntityStorageInterface; +use Drupal\Core\Form\FormStateInterface; use Drupal\views\Plugin\views\display\DisplayPluginBase; use Drupal\views\Plugin\views\field\FieldPluginBase; use Drupal\views\Plugin\views\style\Table; @@ -92,7 +93,7 @@ protected function defineOptions() { /** * {@inheritdoc} */ - public function buildOptionsForm(&$form, &$form_state) { + public function buildOptionsForm(&$form, FormStateInterface $form_state) { $form['action_title'] = array( '#type' => 'textfield', '#title' => t('Action title'), @@ -122,7 +123,7 @@ public function buildOptionsForm(&$form, &$form_state) { /** * {@inheritdoc} */ - public function validateOptionsForm(&$form, &$form_state) { + public function validateOptionsForm(&$form, FormStateInterface $form_state) { parent::validateOptionsForm($form, $form_state); $form_state['values']['options']['selected_actions'] = array_filter($form_state['values']['options']['selected_actions']); @@ -157,10 +158,10 @@ public function preRender(&$values) { * * @param array $form * An associative array containing the structure of the form. - * @param array $form_state - * An associative array containing the current state of the form. + * @param \Drupal\Core\Form\FormStateInterface $form_state + * The current state of the form. */ - public function viewsForm(&$form, &$form_state) { + public function viewsForm(&$form, FormStateInterface $form_state) { // Add the tableselect javascript. $form['#attached']['library'][] = 'core/drupal.tableselect'; @@ -245,10 +246,10 @@ protected function getBulkOptions($filtered = TRUE) { * * @param array $form * An associative array containing the structure of the form. - * @param array $form_state - * An associative array containing the current state of the form. + * @param \Drupal\Core\Form\FormStateInterface $form_state + * The current state of the form. */ - public function viewsFormSubmit(&$form, &$form_state) { + public function viewsFormSubmit(&$form, FormStateInterface $form_state) { if ($form_state['step'] == 'views_form_views_form') { // Filter only selected checkboxes. $selected = array_filter($form_state['values'][$this->options['id']]); @@ -289,7 +290,7 @@ protected function emptySelectedMessage() { /** * {@inheritdoc} */ - public function viewsFormValidate(&$form, &$form_state) { + public function viewsFormValidate(&$form, FormStateInterface $form_state) { $selected = array_filter($form_state['values'][$this->options['id']]); if (empty($selected)) { form_set_error('', $form_state, $this->emptySelectedMessage()); diff --git a/core/modules/system/src/Tests/Form/ElementsTableSelectTest.php b/core/modules/system/src/Tests/Form/ElementsTableSelectTest.php index b0ce2f87a8780548278f119dad35e1de0ddecce0..0ca830a928b5a8b41bb0e771196a69fd07f502b7 100644 --- a/core/modules/system/src/Tests/Form/ElementsTableSelectTest.php +++ b/core/modules/system/src/Tests/Form/ElementsTableSelectTest.php @@ -7,6 +7,7 @@ namespace Drupal\system\Tests\Form; +use Drupal\Core\Form\FormState; use Drupal\simpletest\WebTestBase; /** @@ -207,7 +208,7 @@ function testMultipleFalseOptionchecker() { */ private function formSubmitHelper($form, $edit) { $form_id = $this->randomName(); - $form_state = \Drupal::formBuilder()->getFormStateDefaults(); + $form_state = new FormState(); $form['op'] = array('#type' => 'submit', '#value' => t('Submit')); // The form token CSRF protection should not interfere with this test, so we diff --git a/core/modules/system/src/Tests/Form/FormCacheTest.php b/core/modules/system/src/Tests/Form/FormCacheTest.php index b33c749f0f022a990b093e81b4cae1049d9e50c4..f8056bae6f2c81c0197663ca5ed5421a6a8ad4d7 100644 --- a/core/modules/system/src/Tests/Form/FormCacheTest.php +++ b/core/modules/system/src/Tests/Form/FormCacheTest.php @@ -7,6 +7,7 @@ namespace Drupal\system\Tests\Form; +use Drupal\Core\Form\FormState; use Drupal\Core\Session\UserSession; use Drupal\simpletest\DrupalUnitTestBase; @@ -32,7 +33,7 @@ public function setUp() { $this->form = array( '#property' => $this->randomName(), ); - $this->form_state = \Drupal::formBuilder()->getFormStateDefaults(); + $this->form_state = new FormState(); $this->form_state['example'] = $this->randomName(); } @@ -43,7 +44,7 @@ function testCacheToken() { \Drupal::currentUser()->setAccount(new UserSession(array('uid' => 1))); form_set_cache($this->form_build_id, $this->form, $this->form_state); - $cached_form_state = \Drupal::formBuilder()->getFormStateDefaults(); + $cached_form_state = new FormState(); $cached_form = form_get_cache($this->form_build_id, $cached_form_state); $this->assertEqual($this->form['#property'], $cached_form['#property']); $this->assertTrue(!empty($cached_form['#cache_token']), 'Form has a cache token'); @@ -53,14 +54,14 @@ function testCacheToken() { // Change the private key. (We cannot change the session ID because this // will break the parent site test runner batch.) \Drupal::state()->set('system.private_key', 'invalid'); - $cached_form_state = \Drupal::formBuilder()->getFormStateDefaults(); + $cached_form_state = new FormState(); $cached_form = form_get_cache($this->form_build_id, $cached_form_state); $this->assertFalse($cached_form, 'No form returned from cache'); $this->assertTrue(empty($cached_form_state['example'])); // Test that loading the cache with a different form_id fails. $wrong_form_build_id = $this->randomName(9); - $cached_form_state = \Drupal::formBuilder()->getFormStateDefaults(); + $cached_form_state = new FormState(); $this->assertFalse(form_get_cache($wrong_form_build_id, $cached_form_state), 'No form returned from cache'); $this->assertTrue(empty($cached_form_state['example']), 'Cached form state was not loaded'); } @@ -74,7 +75,7 @@ function testNoCacheToken() { $this->form_state['example'] = $this->randomName(); form_set_cache($this->form_build_id, $this->form, $this->form_state); - $cached_form_state = \Drupal::formBuilder()->getFormStateDefaults(); + $cached_form_state = new FormState(); $cached_form = form_get_cache($this->form_build_id, $cached_form_state); $this->assertEqual($this->form['#property'], $cached_form['#property']); $this->assertTrue(empty($cached_form['#cache_token']), 'Form has no cache token'); diff --git a/core/modules/system/src/Tests/Form/FormDefaultHandlersTest.php b/core/modules/system/src/Tests/Form/FormDefaultHandlersTest.php index 9c980a6cc928b2f9cef780091e6d7ee7b89cc675..7fa6a7c2df963e460d0de625920ab09aeee64342 100644 --- a/core/modules/system/src/Tests/Form/FormDefaultHandlersTest.php +++ b/core/modules/system/src/Tests/Form/FormDefaultHandlersTest.php @@ -8,6 +8,8 @@ namespace Drupal\system\Tests\Form; use Drupal\Core\Form\FormInterface; +use Drupal\Core\Form\FormState; +use Drupal\Core\Form\FormStateInterface; use Drupal\simpletest\KernelTestBase; /** @@ -34,7 +36,7 @@ public function getFormId() { /** * {@inheritdoc} */ - public function buildForm(array $form, array &$form_state) { + public function buildForm(array $form, FormStateInterface $form_state) { $form['#validate'][] = array($this, 'customValidateForm'); $form['#submit'][] = array($this, 'customSubmitForm'); $form['submit'] = array('#type' => 'submit', '#value' => 'Save'); @@ -44,28 +46,28 @@ public function buildForm(array $form, array &$form_state) { /** * {@inheritdoc} */ - public function customValidateForm(array &$form, array &$form_state) { + public function customValidateForm(array &$form, FormStateInterface $form_state) { $form_state['test_handlers']['validate'][] = __FUNCTION__; } /** * {@inheritdoc} */ - public function validateForm(array &$form, array &$form_state) { + public function validateForm(array &$form, FormStateInterface $form_state) { $form_state['test_handlers']['validate'][] = __FUNCTION__; } /** * {@inheritdoc} */ - public function customSubmitForm(array &$form, array &$form_state) { + public function customSubmitForm(array &$form, FormStateInterface $form_state) { $form_state['test_handlers']['submit'][] = __FUNCTION__; } /** * {@inheritdoc} */ - public function submitForm(array &$form, array &$form_state) { + public function submitForm(array &$form, FormStateInterface $form_state) { $form_state['test_handlers']['submit'][] = __FUNCTION__; } @@ -73,7 +75,7 @@ public function submitForm(array &$form, array &$form_state) { * Tests that default handlers are added even if custom are specified. */ function testDefaultAndCustomHandlers() { - $form_state['values'] = array(); + $form_state = new FormState(array('values' => array())); $form_builder = $this->container->get('form_builder'); $form_builder->submitForm($this, $form_state); diff --git a/core/modules/system/src/Tests/Form/FormTest.php b/core/modules/system/src/Tests/Form/FormTest.php index 2b4850e6867fcc2379ca04e646c22c15f78f911a..12d78ea3db54bd9ed202086d3afb18708ca574df 100644 --- a/core/modules/system/src/Tests/Form/FormTest.php +++ b/core/modules/system/src/Tests/Form/FormTest.php @@ -9,6 +9,7 @@ use Drupal\Component\Serialization\Json; use Drupal\Component\Utility\String; +use Drupal\Core\Form\FormState; use Drupal\Core\Render\Element; use Drupal\form_test\Form\FormTestDisabledElementsForm; use Drupal\simpletest\WebTestBase; @@ -102,7 +103,7 @@ function testRequiredFields() { foreach (array(TRUE, FALSE) as $required) { $form_id = $this->randomName(); $form = array(); - $form_state = \Drupal::formBuilder()->getFormStateDefaults(); + $form_state = new FormState(); $form['op'] = array('#type' => 'submit', '#value' => t('Submit')); $element = $data['element']['#title']; $form[$element] = $data['element']; @@ -482,7 +483,7 @@ function testColorValidation() { */ function testDisabledElements() { // Get the raw form in its original state. - $form_state = array(); + $form_state = new FormState(); $form = (new FormTestDisabledElementsForm())->buildForm(array(), $form_state); // Build a submission that tries to hijack the form by submitting input for diff --git a/core/modules/system/src/Tests/Form/ProgrammaticTest.php b/core/modules/system/src/Tests/Form/ProgrammaticTest.php index a5c40718741df6debcbfff1532adfbadecf60eb4..2eba5ead24d473595f5963e59aade50c1e2ddeaf 100644 --- a/core/modules/system/src/Tests/Form/ProgrammaticTest.php +++ b/core/modules/system/src/Tests/Form/ProgrammaticTest.php @@ -7,6 +7,7 @@ namespace Drupal\system\Tests\Form; +use Drupal\Core\Form\FormState; use Drupal\simpletest\WebTestBase; /** @@ -71,7 +72,7 @@ function testSubmissionWorkflow() { */ private function submitForm($values, $valid_input) { // Programmatically submit the given values. - $form_state = array('values' => $values); + $form_state = new FormState(array('values' => $values)); \Drupal::formBuilder()->submitForm('\Drupal\form_test\Form\FormTestProgrammaticForm', $form_state); // Check that the form returns an error when expected, and vice versa. @@ -98,6 +99,7 @@ private function submitForm($values, $valid_input) { * Test the programmed_bypass_access_check flag. */ public function testProgrammaticAccessBypass() { + $form_state = new FormState(); $form_state['values'] = array( 'textfield' => 'dummy value', 'field_restricted' => 'dummy value' diff --git a/core/modules/system/src/Tests/Form/StubForm.php b/core/modules/system/src/Tests/Form/StubForm.php index 225371b565819740d1891c876d67cf2a0cd84f5d..c3898df5636b957c92098d84344d71308ab998a0 100644 --- a/core/modules/system/src/Tests/Form/StubForm.php +++ b/core/modules/system/src/Tests/Form/StubForm.php @@ -8,6 +8,7 @@ namespace Drupal\system\Tests\Form; use Drupal\Core\Form\FormBase; +use Drupal\Core\Form\FormStateInterface; /** * Provides a stub form for testing purposes. @@ -51,14 +52,14 @@ public function getFormId() { /** * {@inheritdoc} */ - public function buildForm(array $form, array &$form_state) { + public function buildForm(array $form, FormStateInterface $form_state) { return $this->form; } /** * {@inheritdoc} */ - public function submitForm(array &$form, array &$form_state) { + public function submitForm(array &$form, FormStateInterface $form_state) { } } diff --git a/core/modules/system/src/Tests/Form/TriggeringElementProgrammedUnitTest.php b/core/modules/system/src/Tests/Form/TriggeringElementProgrammedUnitTest.php index 3e6f41357362f5d217995b308f765877e7060b07..2d040de9aefc8753ed881b66d3ba27b9ddcf7be9 100644 --- a/core/modules/system/src/Tests/Form/TriggeringElementProgrammedUnitTest.php +++ b/core/modules/system/src/Tests/Form/TriggeringElementProgrammedUnitTest.php @@ -9,6 +9,8 @@ use Drupal\Component\Utility\String; use Drupal\Core\Form\FormInterface; +use Drupal\Core\Form\FormState; +use Drupal\Core\Form\FormStateInterface; use Drupal\simpletest\DrupalUnitTestBase; /** @@ -30,7 +32,7 @@ public function getFormId() { /** * {@inheritdoc} */ - public function buildForm(array $form, array &$form_state) { + public function buildForm(array $form, FormStateInterface $form_state) { $form['one'] = array( '#type' => 'textfield', '#title' => 'One', @@ -57,7 +59,7 @@ public function buildForm(array $form, array &$form_state) { /** * {@inheritdoc} */ - public function validateForm(array &$form, array &$form_state) { + public function validateForm(array &$form, FormStateInterface $form_state) { // Verify that the only submit button was recognized as triggering_element. $this->assertEqual($form['actions']['submit']['#array_parents'], $form_state['triggering_element']['#array_parents']); } @@ -65,7 +67,7 @@ public function validateForm(array &$form, array &$form_state) { /** * {@inheritdoc} */ - public function submitForm(array &$form, array &$form_state) { + public function submitForm(array &$form, FormStateInterface $form_state) { } /** @@ -73,6 +75,7 @@ public function submitForm(array &$form, array &$form_state) { */ function testLimitValidationErrors() { // Programmatically submit the form. + $form_state = new FormState(); $form_state['values'] = array(); $form_state['values']['section'] = 'one'; $form_builder = $this->container->get('form_builder'); diff --git a/core/modules/system/src/Tests/System/SystemConfigFormTestBase.php b/core/modules/system/src/Tests/System/SystemConfigFormTestBase.php index b923daf474a53a3b2babceac5d7a209431189a8e..cabd863159199e0cb3e100cb73f1546a2d8ec437 100644 --- a/core/modules/system/src/Tests/System/SystemConfigFormTestBase.php +++ b/core/modules/system/src/Tests/System/SystemConfigFormTestBase.php @@ -7,6 +7,7 @@ namespace Drupal\system\Tests\System; +use Drupal\Core\Form\FormState; use Drupal\simpletest\WebTestBase; /** @@ -47,11 +48,12 @@ abstract class SystemConfigFormTestBase extends WebTestBase { */ public function testConfigForm() { // Programmatically submit the given values. + $values = array(); foreach ($this->values as $form_key => $data) { $values[$form_key] = $data['#value']; } - $form_state = array('values' => $values); - drupal_form_submit($this->form, $form_state); + $form_state = new FormState(array('values' => $values)); + \Drupal::formBuilder()->submitForm($this->form, $form_state); // Check that the form returns an error when expected, and vice versa. $errors = form_get_errors($form_state); diff --git a/core/modules/system/system.api.php b/core/modules/system/system.api.php index d78942e945f684b104b89c7b16b238d28987da04..ee83508d45c695c3e150249193bcda41dfee0933 100644 --- a/core/modules/system/system.api.php +++ b/core/modules/system/system.api.php @@ -692,9 +692,9 @@ function hook_page_alter(&$page) { * @param $form * Nested array of form elements that comprise the form. * @param $form_state - * A keyed array containing the current state of the form. The arguments - * that \Drupal::formBuilder()->getForm() was originally called with are - * available in the array $form_state['build_info']['args']. + * The current state of the form. The arguments that + * \Drupal::formBuilder()->getForm() was originally called with are available + * in the array $form_state['build_info']['args']. * @param $form_id * String representing the name of the form itself. Typically this is the * name of the function that generated the form. @@ -703,7 +703,7 @@ function hook_page_alter(&$page) { * @see hook_form_FORM_ID_alter() * @see forms_api_reference.html */ -function hook_form_alter(&$form, &$form_state, $form_id) { +function hook_form_alter(&$form, \Drupal\Core\Form\FormStateInterface $form_state, $form_id) { if (isset($form['type']) && $form['type']['#value'] . '_node_settings' == $form_id) { $upload_enabled_types = \Drupal::config('mymodule.settings')->get('upload_enabled_types'); $form['workflow']['upload_' . $form['type']['#value']] = array( @@ -731,9 +731,9 @@ function hook_form_alter(&$form, &$form_state, $form_id) { * @param $form * Nested array of form elements that comprise the form. * @param $form_state - * A keyed array containing the current state of the form. The arguments - * that \Drupal::formBuilder()->getForm() was originally called with are - * available in the array $form_state['build_info']['args']. + * The current state of the form. The arguments that + * \Drupal::formBuilder()->getForm() was originally called with are available + * in the array $form_state['build_info']['args']. * @param $form_id * String representing the name of the form itself. Typically this is the * name of the function that generated the form. @@ -743,7 +743,7 @@ function hook_form_alter(&$form, &$form_state, $form_id) { * @see \Drupal\Core\Form\FormBuilderInterface::prepareForm() * @see forms_api_reference.html */ -function hook_form_FORM_ID_alter(&$form, &$form_state, $form_id) { +function hook_form_FORM_ID_alter(&$form, \Drupal\Core\Form\FormStateInterface $form_state, $form_id) { // Modification for the form with the given form ID goes here. For example, if // FORM_ID is "user_register_form" this code would run only on the user // registration form. @@ -779,7 +779,7 @@ function hook_form_FORM_ID_alter(&$form, &$form_state, $form_id) { * @param $form * Nested array of form elements that comprise the form. * @param $form_state - * A keyed array containing the current state of the form. + * The current state of the form. * @param $form_id * String representing the name of the form itself. Typically this is the * name of the function that generated the form. @@ -788,7 +788,7 @@ function hook_form_FORM_ID_alter(&$form, &$form_state, $form_id) { * @see hook_form_FORM_ID_alter() * @see \Drupal\Core\Form\FormBuilderInterface::prepareForm() */ -function hook_form_BASE_FORM_ID_alter(&$form, &$form_state, $form_id) { +function hook_form_BASE_FORM_ID_alter(&$form, \Drupal\Core\Form\FormStateInterface $form_state, $form_id) { // Modification for the form with the given BASE_FORM_ID goes here. For // example, if BASE_FORM_ID is "node_form", this code would run on every // node form, regardless of node type. diff --git a/core/modules/system/system.module b/core/modules/system/system.module index 8bbb5e77eb59e77e18a0d30235a7eac53ed23b0d..f421e6bce48a63e20f55c7ee32b4cd6fff6eac3f 100644 --- a/core/modules/system/system.module +++ b/core/modules/system/system.module @@ -8,6 +8,7 @@ use Drupal\Core\Cache\Cache; use Drupal\Core\Extension\Extension; use Drupal\Core\Extension\ExtensionDiscovery; +use Drupal\Core\Form\FormStateInterface; use Drupal\Core\Routing\RouteMatchInterface; use Drupal\Core\StringTranslation\TranslationWrapper; use Drupal\Core\Language\LanguageInterface; @@ -991,7 +992,7 @@ function system_page_build(&$page) { /** * Implements hook_form_FORM_ID_alter(). */ -function system_form_user_form_alter(&$form, &$form_state) { +function system_form_user_form_alter(&$form, FormStateInterface $form_state) { if (\Drupal::config('system.date')->get('timezone.user.configurable')) { system_user_timezone($form, $form_state); } @@ -1000,7 +1001,7 @@ function system_form_user_form_alter(&$form, &$form_state) { /** * Implements hook_form_FORM_ID_alter(). */ -function system_form_user_register_form_alter(&$form, &$form_state) { +function system_form_user_register_form_alter(&$form, FormStateInterface $form_state) { $config = \Drupal::config('system.date'); if ($config->get('timezone.user.configurable') && $config->get('timezone.user.default') == DRUPAL_USER_TIMEZONE_SELECT) { system_user_timezone($form, $form_state); @@ -1031,7 +1032,7 @@ function system_user_login($account) { /** * Add the time zone field to the user edit and register forms. */ -function system_user_timezone(&$form, &$form_state) { +function system_user_timezone(&$form, FormStateInterface $form_state) { $user = \Drupal::currentUser(); $account = $form_state['controller']->getEntity(); diff --git a/core/modules/system/tests/modules/ajax_forms_test/ajax_forms_test.module b/core/modules/system/tests/modules/ajax_forms_test/ajax_forms_test.module index 3a605c5a4bd039e2f73b974b9e6f0e363fda4fdd..8f8719a7152b2cc892fd6cd8c0355fc0b2cd6132 100644 --- a/core/modules/system/tests/modules/ajax_forms_test/ajax_forms_test.module +++ b/core/modules/system/tests/modules/ajax_forms_test/ajax_forms_test.module @@ -7,6 +7,7 @@ use Drupal\Core\Ajax; use Drupal\Core\Ajax\AjaxResponse; +use Drupal\Core\Form\FormStateInterface; /** * Ajax form callback: Selects 'after'. @@ -206,6 +207,6 @@ function ajax_forms_test_validation_number_form_callback($form, $form_state) { /** * AJAX form callback: Selects for the ajax_forms_test_lazy_load_form() form. */ -function ajax_forms_test_lazy_load_form_ajax($form, &$form_state) { +function ajax_forms_test_lazy_load_form_ajax($form, FormStateInterface $form_state) { return array('#markup' => 'new content'); } diff --git a/core/modules/system/tests/modules/ajax_forms_test/src/Form/AjaxFormsTestCommandsForm.php b/core/modules/system/tests/modules/ajax_forms_test/src/Form/AjaxFormsTestCommandsForm.php index 474b6ea540fe332f82e8366a89bec0d17d8fcaf8..46525e72082e21aab577daedb03e616f92ff7056 100644 --- a/core/modules/system/tests/modules/ajax_forms_test/src/Form/AjaxFormsTestCommandsForm.php +++ b/core/modules/system/tests/modules/ajax_forms_test/src/Form/AjaxFormsTestCommandsForm.php @@ -8,6 +8,7 @@ namespace Drupal\ajax_forms_test\Form; use Drupal\Core\Form\FormBase; +use Drupal\Core\Form\FormStateInterface; /** * Form constructor for the Ajax Command display form. @@ -24,7 +25,7 @@ public function getFormId() { /** * {@inheritdoc}. */ - public function buildForm(array $form, array &$form_state) { + public function buildForm(array $form, FormStateInterface $form_state) { $form = array(); // Shows the 'after' command with a callback generating commands. @@ -216,7 +217,7 @@ public function buildForm(array $form, array &$form_state) { /** * {@inheritdoc}. */ - public function submitForm(array &$form, array &$form_state) { + public function submitForm(array &$form, FormStateInterface $form_state) { } } diff --git a/core/modules/system/tests/modules/ajax_forms_test/src/Form/AjaxFormsTestLazyLoadForm.php b/core/modules/system/tests/modules/ajax_forms_test/src/Form/AjaxFormsTestLazyLoadForm.php index d5761fe564196b1f65d9859bbdfbfbbcf8789a80..762c30606cd08c8b690d7ccdd4caf78e400c015c 100644 --- a/core/modules/system/tests/modules/ajax_forms_test/src/Form/AjaxFormsTestLazyLoadForm.php +++ b/core/modules/system/tests/modules/ajax_forms_test/src/Form/AjaxFormsTestLazyLoadForm.php @@ -8,6 +8,7 @@ namespace Drupal\ajax_forms_test\Form; use Drupal\Core\Form\FormBase; +use Drupal\Core\Form\FormStateInterface; /** * Form builder: Builds a form that triggers a simple AJAX callback. @@ -24,7 +25,7 @@ public function getFormId() { /** * {@inheritdoc} */ - public function buildForm(array $form, array &$form_state) { + public function buildForm(array $form, FormStateInterface $form_state) { // We attach a JavaScript setting, so that one of the generated AJAX // commands will be a settings command. We can then check the settings // command to ensure that the 'currentPath' setting is not part @@ -54,7 +55,7 @@ public function buildForm(array $form, array &$form_state) { /** * {@inheritdoc} */ - public function submitForm(array &$form, array &$form_state) { + public function submitForm(array &$form, FormStateInterface $form_state) { if ($form_state['values']['add_files']) { $path = drupal_get_path('module', 'system'); $attached = array( diff --git a/core/modules/system/tests/modules/ajax_forms_test/src/Form/AjaxFormsTestSimpleForm.php b/core/modules/system/tests/modules/ajax_forms_test/src/Form/AjaxFormsTestSimpleForm.php index a2a4cf8562fd3ba2603185c75598417d1109457e..225664de7728390ac847d942f094283df91cd222 100644 --- a/core/modules/system/tests/modules/ajax_forms_test/src/Form/AjaxFormsTestSimpleForm.php +++ b/core/modules/system/tests/modules/ajax_forms_test/src/Form/AjaxFormsTestSimpleForm.php @@ -9,6 +9,7 @@ use Drupal\Core\Form\FormBase; use Drupal\ajax_forms_test\Callbacks; +use Drupal\Core\Form\FormStateInterface; /** * Form builder: Builds a form that triggers a simple AJAX callback. @@ -25,7 +26,7 @@ public function getFormId() { /** * {@inheritdoc} */ - public function buildForm(array $form, array &$form_state) { + public function buildForm(array $form, FormStateInterface $form_state) { $object = new Callbacks(); $form = array(); @@ -77,7 +78,7 @@ public function buildForm(array $form, array &$form_state) { /** * {@inheritdoc} */ - public function submitForm(array &$form, array &$form_state) { + public function submitForm(array &$form, FormStateInterface $form_state) { } } diff --git a/core/modules/system/tests/modules/ajax_forms_test/src/Form/AjaxFormsTestValidationForm.php b/core/modules/system/tests/modules/ajax_forms_test/src/Form/AjaxFormsTestValidationForm.php index 35322794353cd327af1ca6efc002423384e81119..bf7064e78210ebac815f8e803865ebbf556a0867 100644 --- a/core/modules/system/tests/modules/ajax_forms_test/src/Form/AjaxFormsTestValidationForm.php +++ b/core/modules/system/tests/modules/ajax_forms_test/src/Form/AjaxFormsTestValidationForm.php @@ -8,6 +8,7 @@ namespace Drupal\ajax_forms_test\Form; use Drupal\Core\Form\FormBase; +use Drupal\Core\Form\FormStateInterface; /** * Form builder: Builds a form that triggers a simple AJAX callback. @@ -24,7 +25,7 @@ public function getFormId() { /** * {@inheritdoc} */ - public function buildForm(array $form, array &$form_state) { + public function buildForm(array $form, FormStateInterface $form_state) { $form['drivertext'] = array( '#title' => $this->t('AJAX-enabled textfield.'), '#description' => $this->t("When this one AJAX-triggers and the spare required field is empty, you should not get an error."), @@ -68,7 +69,7 @@ public function buildForm(array $form, array &$form_state) { /** * {@inheritdoc} */ - public function submitForm(array &$form, array &$form_state) { + public function submitForm(array &$form, FormStateInterface $form_state) { drupal_set_message($this->t("Validation form submitted")); } diff --git a/core/modules/system/tests/modules/ajax_test/src/Form/AjaxTestDialogForm.php b/core/modules/system/tests/modules/ajax_test/src/Form/AjaxTestDialogForm.php index 9d598d8adc358010014888b3fcbb8f01910c491a..5f118172014624c2390d83e51840ea6222060ff2 100644 --- a/core/modules/system/tests/modules/ajax_test/src/Form/AjaxTestDialogForm.php +++ b/core/modules/system/tests/modules/ajax_test/src/Form/AjaxTestDialogForm.php @@ -13,6 +13,7 @@ use Drupal\Core\Ajax\AjaxResponse; use Drupal\Core\Ajax\OpenModalDialogCommand; use Drupal\Core\Ajax\OpenDialogCommand; +use Drupal\Core\Form\FormStateInterface; /** * Dummy form for testing DialogController with _form routes. @@ -29,7 +30,7 @@ public function getFormId() { /** * {@inheritdoc} */ - public function buildForm(array $form, array &$form_state) { + public function buildForm(array $form, FormStateInterface $form_state) { // In order to use WebTestBase::drupalPostAjaxForm() to POST from a link, we need // to have a dummy field we can set in WebTestBase::drupalPostForm() else it won't // submit anything. @@ -59,14 +60,14 @@ public function buildForm(array $form, array &$form_state) { /** * {@inheritdoc} */ - public function validateForm(array &$form, array &$form_state) { + public function validateForm(array &$form, FormStateInterface $form_state) { } /** * {@inheritdoc} */ - public function submitForm(array &$form, array &$form_state) { + public function submitForm(array &$form, FormStateInterface $form_state) { $form_state['redirect'] = 'ajax-test/dialog-contents'; } @@ -74,14 +75,14 @@ public function submitForm(array &$form, array &$form_state) { /** * AJAX callback handler for AjaxTestDialogForm. */ - public function modal(&$form, &$form_state) { + public function modal(&$form, FormStateInterface $form_state) { return $this->dialog(TRUE); } /** * AJAX callback handler for AjaxTestDialogForm. */ - public function nonModal(&$form, &$form_state) { + public function nonModal(&$form, FormStateInterface $form_state) { return $this->dialog(FALSE); } diff --git a/core/modules/system/tests/modules/ajax_test/src/Form/AjaxTestForm.php b/core/modules/system/tests/modules/ajax_test/src/Form/AjaxTestForm.php index 462f6710e9e7dc19921a98643c6c847409b03cae..423731628349137c01b8a19e07af270697fe9a35 100644 --- a/core/modules/system/tests/modules/ajax_test/src/Form/AjaxTestForm.php +++ b/core/modules/system/tests/modules/ajax_test/src/Form/AjaxTestForm.php @@ -8,6 +8,7 @@ namespace Drupal\ajax_test\Form; use Drupal\Core\Form\FormInterface; +use Drupal\Core\Form\FormStateInterface; /** * Dummy form for testing DialogController with _form routes. @@ -24,7 +25,7 @@ public function getFormId() { /** * {@inheritdoc} */ - public function buildForm(array $form, array &$form_state) { + public function buildForm(array $form, FormStateInterface $form_state) { $form['#action'] = url('ajax-test/dialog'); @@ -43,11 +44,11 @@ public function buildForm(array $form, array &$form_state) { /** * {@inheritdoc} */ - public function submitForm(array &$form, array &$form_state) {} + public function submitForm(array &$form, FormStateInterface $form_state) {} /** * {@inheritdoc} */ - public function validateForm(array &$form, array &$form_state) {} + public function validateForm(array &$form, FormStateInterface $form_state) {} } diff --git a/core/modules/system/tests/modules/batch_test/batch_test.module b/core/modules/system/tests/modules/batch_test/batch_test.module index 5438acfc54c677d09bfcbf9109846e552f767562..9290ef8b9de998af20b59ed8fe0820d90bd46e46 100644 --- a/core/modules/system/tests/modules/batch_test/batch_test.module +++ b/core/modules/system/tests/modules/batch_test/batch_test.module @@ -5,10 +5,13 @@ * Helper module for the Batch API tests. */ +use Drupal\Core\Form\FormState; + /** * Batch operation: Submits form_test_mock_form() using drupal_form_submit(). */ function _batch_test_nested_drupal_form_submit_callback($value) { + $state = new FormState(); $state['values']['test_value'] = $value; \Drupal::formBuilder()->submitForm('Drupal\batch_test\Form\BatchTestMockForm', $state); } diff --git a/core/modules/system/tests/modules/batch_test/src/Controller/BatchTestController.php b/core/modules/system/tests/modules/batch_test/src/Controller/BatchTestController.php index 9afb0e90b1b2e58c2383cdf794180854f44378a5..fcd9b010f53ac5abfc33193cb871131a5f17a841 100644 --- a/core/modules/system/tests/modules/batch_test/src/Controller/BatchTestController.php +++ b/core/modules/system/tests/modules/batch_test/src/Controller/BatchTestController.php @@ -6,6 +6,7 @@ namespace Drupal\batch_test\Controller; +use Drupal\Core\Form\FormState; /** * Controller routines for batch tests. @@ -84,9 +85,9 @@ public function testNoForm() { * Render array containing markup. */ function testProgrammatic($value = 1) { - $form_state = array( + $form_state = new FormState(array( 'values' => array('value' => $value) - ); + )); \Drupal::formBuilder()->submitForm('Drupal\batch_test\Form\BatchTestChainedForm', $form_state); return array( 'success' => array( diff --git a/core/modules/system/tests/modules/batch_test/src/Form/BatchTestChainedForm.php b/core/modules/system/tests/modules/batch_test/src/Form/BatchTestChainedForm.php index c6603deee9ee7a69aa5f7cbecd6139fb545dfb9c..ae6430ed0a74a02c5a292ac254075e2284d2f5e2 100644 --- a/core/modules/system/tests/modules/batch_test/src/Form/BatchTestChainedForm.php +++ b/core/modules/system/tests/modules/batch_test/src/Form/BatchTestChainedForm.php @@ -8,6 +8,7 @@ namespace Drupal\batch_test\Form; use Drupal\Core\Form\FormBase; +use Drupal\Core\Form\FormStateInterface; use Drupal\Core\Url; /** @@ -25,7 +26,7 @@ public function getFormId() { /** * {@inheritdoc} */ - public function buildForm(array $form, array &$form_state) { + public function buildForm(array $form, FormStateInterface $form_state) { // This value is used to test that $form_state persists through batched // submit handlers. $form['value'] = array( @@ -49,13 +50,13 @@ public function buildForm(array $form, array &$form_state) { /** * {@inheritdoc} */ - public function submitForm(array &$form, array &$form_state) { + public function submitForm(array &$form, FormStateInterface $form_state) { } /** * Form submission handler #1 for batch_test_chained_form */ - public static function batchTestChainedFormSubmit1($form, &$form_state) { + public static function batchTestChainedFormSubmit1($form, FormStateInterface $form_state) { batch_test_stack(NULL, TRUE); batch_test_stack('submit handler 1'); @@ -70,7 +71,7 @@ public static function batchTestChainedFormSubmit1($form, &$form_state) { /** * Form submission handler #2 for batch_test_chained_form */ - public static function batchTestChainedFormSubmit2($form, &$form_state) { + public static function batchTestChainedFormSubmit2($form, FormStateInterface $form_state) { batch_test_stack('submit handler 2'); batch_test_stack('value = ' . $form_state['values']['value']); @@ -83,7 +84,7 @@ public static function batchTestChainedFormSubmit2($form, &$form_state) { /** * Form submission handler #3 for batch_test_chained_form */ - public static function batchTestChainedFormSubmit3($form, &$form_state) { + public static function batchTestChainedFormSubmit3($form, FormStateInterface $form_state) { batch_test_stack('submit handler 3'); batch_test_stack('value = ' . $form_state['values']['value']); @@ -95,7 +96,7 @@ public static function batchTestChainedFormSubmit3($form, &$form_state) { /** * Form submission handler #4 for batch_test_chained_form */ - public static function batchTestChainedFormSubmit4($form, &$form_state) { + public static function batchTestChainedFormSubmit4($form, FormStateInterface $form_state) { batch_test_stack('submit handler 4'); batch_test_stack('value = ' . $form_state['values']['value']); diff --git a/core/modules/system/tests/modules/batch_test/src/Form/BatchTestMockForm.php b/core/modules/system/tests/modules/batch_test/src/Form/BatchTestMockForm.php index 6372c208a39623c50e1de9d1221212fb0a45fe17..f72fc29e500469268a39766bc6e767e69f30d3a8 100644 --- a/core/modules/system/tests/modules/batch_test/src/Form/BatchTestMockForm.php +++ b/core/modules/system/tests/modules/batch_test/src/Form/BatchTestMockForm.php @@ -8,6 +8,7 @@ namespace Drupal\batch_test\Form; use Drupal\Core\Form\FormBase; +use Drupal\Core\Form\FormStateInterface; /** * Generate form of id batch_test_mock_form. @@ -24,7 +25,7 @@ public function getFormId() { /** * {@inheritdoc} */ - public function buildForm(array $form, array &$form_state) { + public function buildForm(array $form, FormStateInterface $form_state) { $form['test_value'] = array( '#title' => t('Test value'), '#type' => 'textfield', @@ -40,7 +41,7 @@ public function buildForm(array $form, array &$form_state) { /** * {@inheritdoc} */ - public function submitForm(array &$form, array &$form_state) { + public function submitForm(array &$form, FormStateInterface $form_state) { batch_test_stack('mock form submitted with value = ' . $form_state['values']['test_value']); } diff --git a/core/modules/system/tests/modules/batch_test/src/Form/BatchTestMultiStepForm.php b/core/modules/system/tests/modules/batch_test/src/Form/BatchTestMultiStepForm.php index 4ce90a4ecc28c8e506a55df954c17a7285676004..3743cac67d2d0f5bba9d4be2161c83a718d8b280 100644 --- a/core/modules/system/tests/modules/batch_test/src/Form/BatchTestMultiStepForm.php +++ b/core/modules/system/tests/modules/batch_test/src/Form/BatchTestMultiStepForm.php @@ -8,6 +8,7 @@ namespace Drupal\batch_test\Form; use Drupal\Core\Form\FormBase; +use Drupal\Core\Form\FormStateInterface; use Drupal\Core\Url; /** @@ -25,7 +26,7 @@ public function getFormId() { /** * {@inheritdoc} */ - public function buildForm(array $form, array &$form_state) { + public function buildForm(array $form, FormStateInterface $form_state) { if (empty($form_state['storage']['step'])) { $form_state['storage']['step'] = 1; } @@ -44,7 +45,7 @@ public function buildForm(array $form, array &$form_state) { /** * {@inheritdoc} */ - public function submitForm(array &$form, array &$form_state) { + public function submitForm(array &$form, FormStateInterface $form_state) { batch_test_stack(NULL, TRUE); switch ($form_state['storage']['step']) { diff --git a/core/modules/system/tests/modules/batch_test/src/Form/BatchTestSimpleForm.php b/core/modules/system/tests/modules/batch_test/src/Form/BatchTestSimpleForm.php index 3c3933941770d1f0c27d21f5a737c6c64c6a4700..6bfa1c9752ec07bd5b3ea640f2e9b636511ff51e 100644 --- a/core/modules/system/tests/modules/batch_test/src/Form/BatchTestSimpleForm.php +++ b/core/modules/system/tests/modules/batch_test/src/Form/BatchTestSimpleForm.php @@ -8,6 +8,7 @@ namespace Drupal\batch_test\Form; use Drupal\Core\Form\FormBase; +use Drupal\Core\Form\FormStateInterface; use Drupal\Core\Url; /** @@ -25,7 +26,7 @@ public function getFormId() { /** * {@inheritdoc} */ - public function buildForm(array $form, array &$form_state) { + public function buildForm(array $form, FormStateInterface $form_state) { $form['batch'] = array( '#type' => 'select', '#title' => 'Choose batch', @@ -48,7 +49,7 @@ public function buildForm(array $form, array &$form_state) { /** * {@inheritdoc} */ - public function submitForm(array &$form, array &$form_state) { + public function submitForm(array &$form, FormStateInterface $form_state) { batch_test_stack(NULL, TRUE); $function = '_batch_test_' . $form_state['values']['batch']; diff --git a/core/modules/system/tests/modules/condition_test/src/FormController.php b/core/modules/system/tests/modules/condition_test/src/FormController.php index d713bb769034c75c31b6d9c9c61dc66b25b1853e..1f137555296266a14ac27d67f078503a783cc2b0 100644 --- a/core/modules/system/tests/modules/condition_test/src/FormController.php +++ b/core/modules/system/tests/modules/condition_test/src/FormController.php @@ -9,6 +9,7 @@ use Drupal\Core\Form\FormInterface; use Drupal\Core\Condition\ConditionManager; +use Drupal\Core\Form\FormStateInterface; /** * Routing controller class for condition_test testing of condition forms. @@ -38,9 +39,9 @@ public function __construct() { } /** - * Implements \Drupal\Core\Form\FormInterface::buildForm(). + * {@inheritdoc} */ - public function buildForm(array $form, array &$form_state) { + public function buildForm(array $form, FormStateInterface $form_state) { $form = $this->condition->buildConfigurationForm($form, $form_state); $form['actions']['submit'] = array( '#type' => 'submit', @@ -51,15 +52,16 @@ public function buildForm(array $form, array &$form_state) { /** * Implements \Drupal\Core\Form\FormInterface::validateForm(). + * */ - public function validateForm(array &$form, array &$form_state) { + public function validateForm(array &$form, FormStateInterface $form_state) { $this->condition->validateConfigurationForm($form, $form_state); } /** - * Implements \Drupal\Core\Form\FormInterface::submitForm(). + * {@inheritdoc} */ - public function submitForm(array &$form, array &$form_state) { + public function submitForm(array &$form, FormStateInterface $form_state) { $this->condition->submitConfigurationForm($form, $form_state); $config = $this->condition->getConfig(); $bundles = implode(' and ', $config['bundles']); diff --git a/core/modules/system/tests/modules/database_test/src/Form/DatabaseTestForm.php b/core/modules/system/tests/modules/database_test/src/Form/DatabaseTestForm.php index 12e7311d3a42fac9ef7d0049246031512ed5863c..712ac979b83059125b58d7ae52d81abb6f25f9a8 100644 --- a/core/modules/system/tests/modules/database_test/src/Form/DatabaseTestForm.php +++ b/core/modules/system/tests/modules/database_test/src/Form/DatabaseTestForm.php @@ -9,6 +9,7 @@ use Drupal\Component\Utility\String; use Drupal\Core\Form\FormBase; +use Drupal\Core\Form\FormStateInterface; /** * Form controller for database_test module. @@ -25,7 +26,7 @@ public function getFormId() { /** * {@inheritdoc} */ - public function buildForm(array $form, array &$form_state) { + public function buildForm(array $form, FormStateInterface $form_state) { $header = array( 'username' => array('data' => t('Username'), 'field' => 'u.name'), 'status' => array('data' => t('Status'), 'field' => 'u.status'), @@ -72,7 +73,7 @@ public function buildForm(array $form, array &$form_state) { /** * {@inheritdoc} */ - public function submitForm(array &$form, array &$form_state) { + public function submitForm(array &$form, FormStateInterface $form_state) { } } diff --git a/core/modules/system/tests/modules/entity_test/entity_test.module b/core/modules/system/tests/modules/entity_test/entity_test.module index 864e302164db22e94f0c080947b452900973459f..6b293d1410e47f0bed8d39c7eea00b2ce1dc5f84 100644 --- a/core/modules/system/tests/modules/entity_test/entity_test.module +++ b/core/modules/system/tests/modules/entity_test/entity_test.module @@ -10,6 +10,7 @@ use Drupal\Core\Entity\EntityTypeInterface; use Drupal\Core\Field\FieldDefinitionInterface; use Drupal\Core\Field\FieldItemListInterface; +use Drupal\Core\Form\FormStateInterface; use Drupal\Core\Session\AccountInterface; use Drupal\entity\Entity\EntityFormDisplay; @@ -242,7 +243,7 @@ function entity_test_permission() { /** * Implements hook_form_BASE_FORM_ID_alter(). */ -function entity_test_form_node_form_alter(&$form, &$form_state, $form_id) { +function entity_test_form_node_form_alter(&$form, FormStateInterface $form_state, $form_id) { $langcode = $form_state['controller']->getFormLangcode($form_state); \Drupal::state()->set('entity_test.form_langcode', $langcode); } diff --git a/core/modules/system/tests/modules/entity_test/src/EntityTestDeleteForm.php b/core/modules/system/tests/modules/entity_test/src/EntityTestDeleteForm.php index f9b0c4d94c6f5bab4feced343823b2334afb9fdf..76fea6960fd2e93b49ce5cc453378e70cb83026f 100644 --- a/core/modules/system/tests/modules/entity_test/src/EntityTestDeleteForm.php +++ b/core/modules/system/tests/modules/entity_test/src/EntityTestDeleteForm.php @@ -8,6 +8,7 @@ namespace Drupal\entity_test; use Drupal\Core\Entity\ContentEntityConfirmFormBase; +use Drupal\Core\Form\FormStateInterface; use Drupal\Core\Url; /** @@ -33,7 +34,7 @@ public function getQuestion() { /** * {@inheritdoc} */ - public function submit(array $form, array &$form_state) { + public function submit(array $form, FormStateInterface $form_state) { parent::submit($form, $form_state); $entity = $this->entity; $entity->delete(); diff --git a/core/modules/system/tests/modules/entity_test/src/EntityTestForm.php b/core/modules/system/tests/modules/entity_test/src/EntityTestForm.php index 2ca9d0da3203a013d7d23bcdb06c822b17ee23fa..ed56b501e779c58071771dc066062641129a2890 100644 --- a/core/modules/system/tests/modules/entity_test/src/EntityTestForm.php +++ b/core/modules/system/tests/modules/entity_test/src/EntityTestForm.php @@ -7,6 +7,7 @@ namespace Drupal\entity_test; use Drupal\Core\Entity\ContentEntityForm; +use Drupal\Core\Form\FormStateInterface; use Drupal\Core\Language\LanguageInterface; /** @@ -15,9 +16,9 @@ class EntityTestForm extends ContentEntityForm { /** - * Overrides Drupal\Core\Entity\EntityForm::form(). + * {@inheritdoc} */ - public function form(array $form, array &$form_state) { + public function form(array $form, FormStateInterface $form_state) { $form = parent::form($form, $form_state); $entity = $this->entity; @@ -61,9 +62,9 @@ public function form(array $form, array &$form_state) { } /** - * Overrides \Drupal\Core\Entity\EntityForm::submit(). + * {@inheritdoc} */ - public function submit(array $form, array &$form_state) { + public function submit(array $form, FormStateInterface $form_state) { // Build the entity object from the submitted values. $entity = parent::submit($form, $form_state); @@ -76,9 +77,9 @@ public function submit(array $form, array &$form_state) { } /** - * Overrides Drupal\Core\Entity\EntityForm::save(). + * {@inheritdoc} */ - public function save(array $form, array &$form_state) { + public function save(array $form, FormStateInterface $form_state) { $entity = $this->entity; $is_new = $entity->isNew(); $entity->save(); diff --git a/core/modules/system/tests/modules/form_test/form_test.module b/core/modules/system/tests/modules/form_test/form_test.module index 08fdb2edd92481a3173aae8cda4c3c82848691ff..ad38397d93e5c5c77a5a5caae6243dc8801db75d 100644 --- a/core/modules/system/tests/modules/form_test/form_test.module +++ b/core/modules/system/tests/modules/form_test/form_test.module @@ -5,6 +5,8 @@ * Helper module for the form API tests. */ +use Drupal\Core\Form\FormStateInterface; + /** * Implements hook_permission(). */ @@ -23,14 +25,14 @@ function form_test_permission() { /** * Implements hook_form_FORM_ID_alter() on behalf of block.module. */ -function block_form_form_test_alter_form_alter(&$form, &$form_state) { +function block_form_form_test_alter_form_alter(&$form, FormStateInterface $form_state) { drupal_set_message('block_form_form_test_alter_form_alter() executed.'); } /** * Implements hook_form_alter(). */ -function form_test_form_alter(&$form, &$form_state, $form_id) { +function form_test_form_alter(&$form, FormStateInterface $form_state, $form_id) { if ($form_id == 'form_test_alter_form') { drupal_set_message('form_test_form_alter() executed.'); } @@ -39,14 +41,14 @@ function form_test_form_alter(&$form, &$form_state, $form_id) { /** * Implements hook_form_FORM_ID_alter(). */ -function form_test_form_form_test_alter_form_alter(&$form, &$form_state) { +function form_test_form_form_test_alter_form_alter(&$form, FormStateInterface $form_state) { drupal_set_message('form_test_form_form_test_alter_form_alter() executed.'); } /** * Implements hook_form_FORM_ID_alter() on behalf of system.module. */ -function system_form_form_test_alter_form_alter(&$form, &$form_state) { +function system_form_form_test_alter_form_alter(&$form, FormStateInterface $form_state) { drupal_set_message('system_form_form_test_alter_form_alter() executed.'); } @@ -93,7 +95,7 @@ function _form_test_tableselect_get_data() { * * @see form_test_state_persist() */ -function form_test_form_form_test_state_persist_alter(&$form, &$form_state) { +function form_test_form_form_test_state_persist_alter(&$form, FormStateInterface $form_state) { // Simulate a form alter implementation inserting form elements that enable // caching of the form, e.g. elements having #ajax. if (\Drupal::request()->get('cache')) { @@ -104,7 +106,7 @@ function form_test_form_form_test_state_persist_alter(&$form, &$form_state) { /** * Implements hook_form_FORM_ID_alter() for the registration form. */ -function form_test_form_user_register_form_alter(&$form, &$form_state) { +function form_test_form_user_register_form_alter(&$form, FormStateInterface $form_state) { $form['test_rebuild'] = array( '#type' => 'submit', '#value' => t('Rebuild'), @@ -115,7 +117,7 @@ function form_test_form_user_register_form_alter(&$form, &$form_state) { /** * Submit callback that just lets the form rebuild. */ -function form_test_user_register_form_rebuild($form, &$form_state) { +function form_test_user_register_form_rebuild($form, FormStateInterface $form_state) { drupal_set_message('Form rebuilt.'); $form_state['rebuild'] = TRUE; } diff --git a/core/modules/system/tests/modules/form_test/src/Callbacks.php b/core/modules/system/tests/modules/form_test/src/Callbacks.php index 08d970dc69a56ebf20f0fa61c53b5b189eace691..73fd437f09a244ca0071482697ae3e673154d858 100644 --- a/core/modules/system/tests/modules/form_test/src/Callbacks.php +++ b/core/modules/system/tests/modules/form_test/src/Callbacks.php @@ -7,6 +7,8 @@ namespace Drupal\form_test; +use Drupal\Core\Form\FormStateInterface; + /** * Simple class for testing methods as Form API callbacks. */ @@ -15,7 +17,7 @@ class Callbacks { /** * Form element validation handler for 'name' in form_test_validate_form(). */ - public function validateName(&$element, &$form_state) { + public function validateName(&$element, FormStateInterface $form_state) { $triggered = FALSE; if ($form_state['values']['name'] == 'element_validate') { // Alter the form element. diff --git a/core/modules/system/tests/modules/form_test/src/ConfirmFormTestForm.php b/core/modules/system/tests/modules/form_test/src/ConfirmFormTestForm.php index b1d69bc836b8a229b49009f32a03398875dcfd90..d650455e401cf92b6dfc783d502be7d3825f1ffa 100644 --- a/core/modules/system/tests/modules/form_test/src/ConfirmFormTestForm.php +++ b/core/modules/system/tests/modules/form_test/src/ConfirmFormTestForm.php @@ -8,6 +8,7 @@ namespace Drupal\form_test; use Drupal\Core\Form\ConfirmFormBase; +use Drupal\Core\Form\FormStateInterface; use Drupal\Core\Url; /** @@ -60,7 +61,7 @@ public function getCancelText() { /** * {@inheritdoc} */ - public function buildForm(array $form, array &$form_state) { + public function buildForm(array $form, FormStateInterface $form_state) { $form['element'] = array('#markup' => 'The ConfirmFormTestForm::buildForm() method was used for this form.
'); return parent::buildForm($form, $form_state); @@ -69,7 +70,7 @@ public function buildForm(array $form, array &$form_state) { /** * {@inheritdoc} */ - public function submitForm(array &$form, array &$form_state) { + public function submitForm(array &$form, FormStateInterface $form_state) { drupal_set_message($this->t('The ConfirmFormTestForm::submitForm() method was used for this form.')); $form_state['redirect_route']['route_name'] = 'This is a one-time login for %user_name and will expire on %expiration_date.
Click on this button to log in to the site and change your password.
', array('%user_name' => $user->getUsername(), '%expiration_date' => $expiration_date))); } @@ -98,7 +99,7 @@ public function buildForm(array $form, array &$form_state, AccountInterface $use /** * {@inheritdoc} */ - public function submitForm(array &$form, array &$form_state) { + public function submitForm(array &$form, FormStateInterface $form_state) { /** @var $user \Drupal\user\UserInterface */ $user = $form_state['values']['user']; user_login_finalize($user); diff --git a/core/modules/user/src/Form/UserPermissionsForm.php b/core/modules/user/src/Form/UserPermissionsForm.php index bd4e473835b015298f1a8d5752bb8366f9680fd8..8e5ac1d4f704f36dc3622cb2cb18e9c9a5d8829b 100644 --- a/core/modules/user/src/Form/UserPermissionsForm.php +++ b/core/modules/user/src/Form/UserPermissionsForm.php @@ -10,6 +10,7 @@ use Drupal\Component\Utility\String; use Drupal\Core\Extension\ModuleHandlerInterface; use Drupal\Core\Form\FormBase; +use Drupal\Core\Form\FormStateInterface; use Drupal\user\RoleStorageInterface; use Symfony\Component\DependencyInjection\ContainerInterface; @@ -75,7 +76,7 @@ protected function getRoles() { /** * {@inheritdoc} */ - public function buildForm(array $form, array &$form_state) { + public function buildForm(array $form, FormStateInterface $form_state) { $role_names = array(); $role_permissions = array(); foreach ($this->getRoles() as $role_name => $role) { @@ -184,7 +185,7 @@ public function buildForm(array $form, array &$form_state) { /** * {@inheritdoc} */ - function submitForm(array &$form, array &$form_state) { + function submitForm(array &$form, FormStateInterface $form_state) { foreach ($form_state['values']['role_names'] as $role_name => $name) { user_role_change_permissions($role_name, $form_state['values'][$role_name]); } diff --git a/core/modules/user/src/Form/UserPermissionsRoleSpecificForm.php b/core/modules/user/src/Form/UserPermissionsRoleSpecificForm.php index 6345a064d4f155cf34257195f93d29581ac3ae33..3da670d8c6a8a4693497b7551fc518f6840210b6 100644 --- a/core/modules/user/src/Form/UserPermissionsRoleSpecificForm.php +++ b/core/modules/user/src/Form/UserPermissionsRoleSpecificForm.php @@ -7,6 +7,7 @@ namespace Drupal\user\Form; +use Drupal\Core\Form\FormStateInterface; use Drupal\user\RoleInterface; /** @@ -34,7 +35,7 @@ protected function getRoles() { * @param string $role_id * The user role ID used for this form. */ - public function buildForm(array $form, array &$form_state, RoleInterface $user_role = NULL) { + public function buildForm(array $form, FormStateInterface $form_state, RoleInterface $user_role = NULL) { $this->userRole = $user_role; return parent::buildForm($form, $form_state); } diff --git a/core/modules/user/src/Form/UserRoleDelete.php b/core/modules/user/src/Form/UserRoleDelete.php index 9ac6ad0cb695d2e69c7c909df92169d3cc294426..428817072b57f9fc6f587a1cacef12f578f4d4c1 100644 --- a/core/modules/user/src/Form/UserRoleDelete.php +++ b/core/modules/user/src/Form/UserRoleDelete.php @@ -8,6 +8,7 @@ namespace Drupal\user\Form; use Drupal\Core\Entity\EntityConfirmFormBase; +use Drupal\Core\Form\FormStateInterface; use Drupal\Core\Url; /** @@ -39,7 +40,7 @@ public function getConfirmText() { /** * {@inheritdoc} */ - public function submit(array $form, array &$form_state) { + public function submit(array $form, FormStateInterface $form_state) { $this->entity->delete(); watchdog('user', 'Role %name has been deleted.', array('%name' => $this->entity->label())); drupal_set_message($this->t('Role %name has been deleted.', array('%name' => $this->entity->label()))); diff --git a/core/modules/user/src/Plugin/Action/ChangeUserRoleBase.php b/core/modules/user/src/Plugin/Action/ChangeUserRoleBase.php index f844743c6c8f7579d22f2b667ca87da0417e07cd..c6fb44afd7630bff7a3d6ec561fabc245cd50a50 100644 --- a/core/modules/user/src/Plugin/Action/ChangeUserRoleBase.php +++ b/core/modules/user/src/Plugin/Action/ChangeUserRoleBase.php @@ -10,6 +10,7 @@ use Drupal\Core\Action\ConfigurableActionBase; use Drupal\Core\Entity\DependencyTrait; use Drupal\Core\Entity\EntityTypeInterface; +use Drupal\Core\Form\FormStateInterface; use Drupal\Core\Plugin\ContainerFactoryPluginInterface; use Symfony\Component\DependencyInjection\ContainerInterface; @@ -59,7 +60,7 @@ public function defaultConfiguration() { /** * {@inheritdoc} */ - public function buildConfigurationForm(array $form, array &$form_state) { + public function buildConfigurationForm(array $form, FormStateInterface $form_state) { $roles = user_role_names(TRUE); unset($roles[DRUPAL_AUTHENTICATED_RID]); $form['rid'] = array( @@ -75,7 +76,7 @@ public function buildConfigurationForm(array $form, array &$form_state) { /** * {@inheritdoc} */ - public function submitConfigurationForm(array &$form, array &$form_state) { + public function submitConfigurationForm(array &$form, FormStateInterface $form_state) { $this->configuration['rid'] = $form_state['values']['rid']; } diff --git a/core/modules/user/src/Plugin/Condition/UserRole.php b/core/modules/user/src/Plugin/Condition/UserRole.php index 872b18a7b1d8f9f780702c0c32e812f0c95daadc..5400d4ecd7ebed35d52ff224b0919ee2f5a48d84 100644 --- a/core/modules/user/src/Plugin/Condition/UserRole.php +++ b/core/modules/user/src/Plugin/Condition/UserRole.php @@ -8,6 +8,7 @@ namespace Drupal\user\Plugin\Condition; use Drupal\Core\Condition\ConditionPluginBase; +use Drupal\Core\Form\FormStateInterface; use Drupal\Core\Plugin\Context\ContextDefinition; /** @@ -27,7 +28,7 @@ class UserRole extends ConditionPluginBase { /** * {@inheritdoc} */ - public function buildConfigurationForm(array $form, array &$form_state) { + public function buildConfigurationForm(array $form, FormStateInterface $form_state) { $form['roles'] = array( '#type' => 'checkboxes', '#title' => $this->t('When the user has the following roles'), @@ -50,7 +51,7 @@ public function defaultConfiguration() { /** * {@inheritdoc} */ - public function submitConfigurationForm(array &$form, array &$form_state) { + public function submitConfigurationForm(array &$form, FormStateInterface $form_state) { $this->configuration['roles'] = array_filter($form_state['values']['roles']); parent::submitConfigurationForm($form, $form_state); } diff --git a/core/modules/user/src/Plugin/views/access/Permission.php b/core/modules/user/src/Plugin/views/access/Permission.php index 77979134e16c9183bb806f1ca20f1a7e6c66cea2..bc5a5fa0d0d7ebf55bc1e99e391d70e4e29d9557 100644 --- a/core/modules/user/src/Plugin/views/access/Permission.php +++ b/core/modules/user/src/Plugin/views/access/Permission.php @@ -7,6 +7,7 @@ namespace Drupal\user\Plugin\views\access; +use Drupal\Core\Form\FormStateInterface; use Drupal\Core\Session\AccountInterface; use Drupal\views\Plugin\views\access\AccessPluginBase; use Symfony\Component\Routing\Route; @@ -60,7 +61,7 @@ protected function defineOptions() { return $options; } - public function buildOptionsForm(&$form, &$form_state) { + public function buildOptionsForm(&$form, FormStateInterface $form_state) { parent::buildOptionsForm($form, $form_state); $perms = array(); $module_info = system_get_info('module'); diff --git a/core/modules/user/src/Plugin/views/access/Role.php b/core/modules/user/src/Plugin/views/access/Role.php index 496c9d791f129264ec209a9e9241763fbe025d3b..c63a5a46d5c3df50520054c501d510dfa907fd1f 100644 --- a/core/modules/user/src/Plugin/views/access/Role.php +++ b/core/modules/user/src/Plugin/views/access/Role.php @@ -8,6 +8,7 @@ namespace Drupal\user\Plugin\views\access; use Drupal\Component\Utility\String; +use Drupal\Core\Form\FormStateInterface; use Drupal\views\Plugin\views\access\AccessPluginBase; use Symfony\Component\Routing\Route; use Drupal\Core\Session\AccountInterface; @@ -69,7 +70,7 @@ protected function defineOptions() { return $options; } - public function buildOptionsForm(&$form, &$form_state) { + public function buildOptionsForm(&$form, FormStateInterface $form_state) { parent::buildOptionsForm($form, $form_state); $form['role'] = array( '#type' => 'checkboxes', @@ -80,13 +81,13 @@ public function buildOptionsForm(&$form, &$form_state) { ); } - public function validateOptionsForm(&$form, &$form_state) { + public function validateOptionsForm(&$form, FormStateInterface $form_state) { if (!array_filter($form_state['values']['access_options']['role'])) { form_error($form['role'], $form_state, t('You must select at least one role if type is "by role"')); } } - public function submitOptionsForm(&$form, &$form_state) { + public function submitOptionsForm(&$form, FormStateInterface $form_state) { // I hate checkboxes. $form_state['values']['access_options']['role'] = array_filter($form_state['values']['access_options']['role']); } diff --git a/core/modules/user/src/Plugin/views/argument_default/User.php b/core/modules/user/src/Plugin/views/argument_default/User.php index fad874384767693ad1af1f295165aba9bf0092cf..d218e065f52fd9b39e0d2f0d521b18bd94bbcf5a 100644 --- a/core/modules/user/src/Plugin/views/argument_default/User.php +++ b/core/modules/user/src/Plugin/views/argument_default/User.php @@ -7,6 +7,7 @@ namespace Drupal\user\Plugin\views\argument_default; +use Drupal\Core\Form\FormStateInterface; use Drupal\views\Plugin\views\argument_default\ArgumentDefaultPluginBase; use Symfony\Component\DependencyInjection\ContainerInterface; use Symfony\Component\HttpFoundation\Request; @@ -36,7 +37,7 @@ protected function defineOptions() { /** * {@inheritdoc} */ - public function buildOptionsForm(&$form, &$form_state) { + public function buildOptionsForm(&$form, FormStateInterface $form_state) { $form['user'] = array( '#type' => 'checkbox', '#title' => t('Also look for a node and use the node author'), diff --git a/core/modules/user/src/Plugin/views/argument_validator/User.php b/core/modules/user/src/Plugin/views/argument_validator/User.php index 25d23b2f6f66160bcc3f3796f8d3100da3ea1614..c6acd8656c288d13c49ad2f89d9841d75f178e7b 100644 --- a/core/modules/user/src/Plugin/views/argument_validator/User.php +++ b/core/modules/user/src/Plugin/views/argument_validator/User.php @@ -10,6 +10,7 @@ use Drupal\Core\Entity\EntityInterface; use Drupal\Core\Entity\EntityManagerInterface; use Drupal\views\Plugin\views\argument\ArgumentPluginBase; +use Drupal\Core\Form\FormStateInterface; use Drupal\views\Plugin\views\argument_validator\Entity; /** @@ -51,7 +52,7 @@ protected function defineOptions() { /** * {@inheritdoc} */ - public function buildOptionsForm(&$form, &$form_state) { + public function buildOptionsForm(&$form, FormStateInterface $form_state) { parent::buildOptionsForm($form, $form_state); $sanitized_id = ArgumentPluginBase::encodeValidatorId($this->definition['id']); @@ -78,7 +79,7 @@ public function buildOptionsForm(&$form, &$form_state) { /** * {@inheritdoc} */ - public function submitOptionsForm(&$form, &$form_state, &$options = array()) { + public function submitOptionsForm(&$form, FormStateInterface $form_state, &$options = array()) { // filter trash out of the options so we don't store giant unnecessary arrays $options['roles'] = array_filter($options['roles']); } diff --git a/core/modules/user/src/Plugin/views/argument_validator/UserName.php b/core/modules/user/src/Plugin/views/argument_validator/UserName.php index daf50b3cff03c4de89193acb981f70e17b50c7e3..057389b7de6c1d7f4994f57bd9374fd82907202f 100644 --- a/core/modules/user/src/Plugin/views/argument_validator/UserName.php +++ b/core/modules/user/src/Plugin/views/argument_validator/UserName.php @@ -7,6 +7,8 @@ namespace Drupal\user\Plugin\views\argument_validator; +use Drupal\Core\Form\FormStateInterface; + /** * Validates whether a user name is valid. * @@ -21,7 +23,7 @@ class UserName extends User { /** * {@inheritdoc} */ - public function buildOptionsForm(&$form, &$form_state) { + public function buildOptionsForm(&$form, FormStateInterface $form_state) { parent::buildOptionsForm($form, $form_state); $entity_type = $this->entityManager->getDefinition('user'); diff --git a/core/modules/user/src/Plugin/views/field/Link.php b/core/modules/user/src/Plugin/views/field/Link.php index 1300de5cddf3a16f8bdd67a3318cc701e1581b6c..40ff364ed1ccee2c4935dbbf2441fb0ba073c365 100644 --- a/core/modules/user/src/Plugin/views/field/Link.php +++ b/core/modules/user/src/Plugin/views/field/Link.php @@ -7,6 +7,7 @@ namespace Drupal\user\Plugin\views\field; +use Drupal\Core\Form\FormStateInterface; use Drupal\Core\Session\AccountInterface; use Drupal\views\Plugin\views\field\FieldPluginBase; use Drupal\views\Plugin\views\display\DisplayPluginBase; @@ -45,7 +46,7 @@ protected function defineOptions() { return $options; } - public function buildOptionsForm(&$form, &$form_state) { + public function buildOptionsForm(&$form, FormStateInterface $form_state) { $form['text'] = array( '#type' => 'textfield', '#title' => t('Text to display'), diff --git a/core/modules/user/src/Plugin/views/field/Mail.php b/core/modules/user/src/Plugin/views/field/Mail.php index 290852642e969f092c6baa5a9e350fb07b47c461..ad26317ceaf386e3a49069447f859ad1363f1d3b 100644 --- a/core/modules/user/src/Plugin/views/field/Mail.php +++ b/core/modules/user/src/Plugin/views/field/Mail.php @@ -7,6 +7,7 @@ namespace Drupal\user\Plugin\views\field; +use Drupal\Core\Form\FormStateInterface; use Drupal\views\ResultRow; /** @@ -24,7 +25,7 @@ protected function defineOptions() { return $options; } - public function buildOptionsForm(&$form, &$form_state) { + public function buildOptionsForm(&$form, FormStateInterface $form_state) { parent::buildOptionsForm($form, $form_state); $form['link_to_user'] = array( '#title' => t('Link this field'), diff --git a/core/modules/user/src/Plugin/views/field/Name.php b/core/modules/user/src/Plugin/views/field/Name.php index fa924d748cd23db5e9e88020c909916939c5c4d6..5396bc601943798d7cee29d486f42c5adc23baa9 100644 --- a/core/modules/user/src/Plugin/views/field/Name.php +++ b/core/modules/user/src/Plugin/views/field/Name.php @@ -8,6 +8,7 @@ namespace Drupal\user\Plugin\views\field; use Drupal\Component\Utility\String; +use Drupal\Core\Form\FormStateInterface; use Drupal\user\Plugin\views\field\User; use Drupal\views\Plugin\views\display\DisplayPluginBase; use Drupal\views\ResultRow; @@ -48,7 +49,7 @@ protected function defineOptions() { /** * {@inheritdoc} */ - public function buildOptionsForm(&$form, &$form_state) { + public function buildOptionsForm(&$form, FormStateInterface $form_state) { parent::buildOptionsForm($form, $form_state); $form['format_username'] = array( diff --git a/core/modules/user/src/Plugin/views/field/User.php b/core/modules/user/src/Plugin/views/field/User.php index ef04e9c852d4f6aba4e7a57395e20ad9a97d6f23..d49c7e1fea97919c1231ebb3adb4ff5117fe13e3 100644 --- a/core/modules/user/src/Plugin/views/field/User.php +++ b/core/modules/user/src/Plugin/views/field/User.php @@ -7,6 +7,7 @@ namespace Drupal\user\Plugin\views\field; +use Drupal\Core\Form\FormStateInterface; use Drupal\views\Plugin\views\field\FieldPluginBase; use Drupal\views\Plugin\views\display\DisplayPluginBase; use Drupal\views\ResultRow; @@ -41,7 +42,7 @@ protected function defineOptions() { /** * Provide link to node option */ - public function buildOptionsForm(&$form, &$form_state) { + public function buildOptionsForm(&$form, FormStateInterface $form_state) { $form['link_to_user'] = array( '#title' => t('Link this field to its user'), '#description' => t("Enable to override this field's links."), diff --git a/core/modules/user/src/Plugin/views/field/UserBulkForm.php b/core/modules/user/src/Plugin/views/field/UserBulkForm.php index 3811eaecd5548c1569fec92c9e8529280ce1ba54..943cd9bdab77e05619d0f55ebca42a2cd40627ea 100644 --- a/core/modules/user/src/Plugin/views/field/UserBulkForm.php +++ b/core/modules/user/src/Plugin/views/field/UserBulkForm.php @@ -8,6 +8,7 @@ namespace Drupal\user\Plugin\views\field; use Drupal\Core\Entity\EntityManagerInterface; +use Drupal\Core\Form\FormStateInterface; use Drupal\system\Plugin\views\field\BulkForm; use Drupal\user\UserInterface; @@ -23,7 +24,7 @@ class UserBulkForm extends BulkForm { * * Provide a more useful title to improve the accessibility. */ - public function viewsForm(&$form, &$form_state) { + public function viewsForm(&$form, FormStateInterface $form_state) { parent::viewsForm($form, $form_state); if (!empty($this->view->result)) { diff --git a/core/modules/user/src/Plugin/views/field/UserData.php b/core/modules/user/src/Plugin/views/field/UserData.php index b58c3fce389506cf2ef6dfd9aa0dcaefb84787c1..cb9f35b8998dadfcc9ecafdbe5357b1569164fe5 100644 --- a/core/modules/user/src/Plugin/views/field/UserData.php +++ b/core/modules/user/src/Plugin/views/field/UserData.php @@ -7,6 +7,7 @@ namespace Drupal\user\Plugin\views\field; +use Drupal\Core\Form\FormStateInterface; use Drupal\views\Plugin\views\display\DisplayPluginBase; use Drupal\views\Plugin\views\field\FieldPluginBase; use Drupal\views\ResultRow; @@ -63,7 +64,7 @@ protected function defineOptions() { /** * Overrides \Drupal\views\Plugin\views\field\FieldPluginBase::defineOptions(). */ - public function buildOptionsForm(&$form, &$form_state) { + public function buildOptionsForm(&$form, FormStateInterface $form_state) { parent::buildOptionsForm($form, $form_state); $modules = system_get_info('module'); diff --git a/core/modules/user/src/Plugin/views/filter/Name.php b/core/modules/user/src/Plugin/views/filter/Name.php index 0d1b5fc66292a8f1e62abb619600a71aa7e8cb7a..8bdb0016f8f18d08cf87c2578384409219ad06ce 100644 --- a/core/modules/user/src/Plugin/views/filter/Name.php +++ b/core/modules/user/src/Plugin/views/filter/Name.php @@ -8,6 +8,7 @@ namespace Drupal\user\Plugin\views\filter; use Drupal\Component\Utility\Tags; +use Drupal\Core\Form\FormStateInterface; use Drupal\views\Plugin\views\filter\InOperator; /** @@ -21,7 +22,7 @@ class Name extends InOperator { protected $alwaysMultiple = TRUE; - protected function valueForm(&$form, &$form_state) { + protected function valueForm(&$form, FormStateInterface $form_state) { $values = array(); if ($this->value) { $result = entity_load_multiple_by_properties('user', array('uid' => $this->value)); @@ -50,7 +51,7 @@ protected function valueForm(&$form, &$form_state) { } } - protected function valueValidate($form, &$form_state) { + protected function valueValidate($form, FormStateInterface $form_state) { $values = Tags::explode($form_state['values']['options']['value']); $uids = $this->validate_user_strings($form['value'], $form_state, $values); @@ -72,7 +73,7 @@ public function acceptExposedInput($input) { return $rc; } - public function validateExposed(&$form, &$form_state) { + public function validateExposed(&$form, FormStateInterface $form_state) { if (empty($this->options['exposed'])) { return; } @@ -108,7 +109,7 @@ public function validateExposed(&$form, &$form_state) { * or the exposed filter, this is abstracted out a bit so it can * handle the multiple input sources. */ - function validate_user_strings(&$form, array &$form_state, $values) { + function validate_user_strings(&$form, FormStateInterface $form_state, $values) { $uids = array(); $placeholders = array(); $args = array(); @@ -140,7 +141,7 @@ function validate_user_strings(&$form, array &$form_state, $values) { return $uids; } - protected function valueSubmit($form, &$form_state) { + protected function valueSubmit($form, FormStateInterface $form_state) { // prevent array filter from removing our anonymous user. } diff --git a/core/modules/user/src/ProfileForm.php b/core/modules/user/src/ProfileForm.php index fbe7665f5e12a0c45437dcd26b2ac9842c20bb65..c7c74c5b8b38203d57be8ba96bea1261ee9460ed 100644 --- a/core/modules/user/src/ProfileForm.php +++ b/core/modules/user/src/ProfileForm.php @@ -9,6 +9,7 @@ use Drupal\Core\Entity\EntityManagerInterface; use Drupal\Core\Entity\Query\QueryFactory; +use Drupal\Core\Form\FormStateInterface; use Drupal\Core\Language\LanguageManager; /** @@ -26,7 +27,7 @@ public function __construct(EntityManagerInterface $entity_manager, LanguageMana /** * {@inheritdoc} */ - protected function actions(array $form, array &$form_state) { + protected function actions(array $form, FormStateInterface $form_state) { $element = parent::actions($form, $form_state); // The user account being edited. @@ -45,7 +46,7 @@ protected function actions(array $form, array &$form_state) { /** * {@inheritdoc} */ - public function save(array $form, array &$form_state) { + public function save(array $form, FormStateInterface $form_state) { $account = $this->entity; $account->save(); $form_state['values']['uid'] = $account->id(); @@ -56,7 +57,7 @@ public function save(array $form, array &$form_state) { /** * Provides a submit handler for the 'Cancel account' button. */ - public function editCancelSubmit($form, &$form_state) { + public function editCancelSubmit($form, FormStateInterface $form_state) { $destination = array(); $query = $this->getRequest()->query; if ($query->has('destination')) { diff --git a/core/modules/user/src/ProfileTranslationHandler.php b/core/modules/user/src/ProfileTranslationHandler.php index c332d83500df4f82d845e709d2b1d5d7043109e7..fd9c90b1cde4577b6993aae1ecc09d040a657590 100644 --- a/core/modules/user/src/ProfileTranslationHandler.php +++ b/core/modules/user/src/ProfileTranslationHandler.php @@ -9,6 +9,7 @@ use Drupal\Core\Entity\EntityInterface; use Drupal\content_translation\ContentTranslationHandler; +use Drupal\Core\Form\FormStateInterface; /** * Defines the translation handler for users. @@ -18,7 +19,7 @@ class ProfileTranslationHandler extends ContentTranslationHandler { /** * {@inheritdoc} */ - public function entityFormAlter(array &$form, array &$form_state, EntityInterface $entity) { + public function entityFormAlter(array &$form, FormStateInterface $form_state, EntityInterface $entity) { parent::entityFormAlter($form, $form_state, $entity); $form['actions']['submit']['#submit'][] = array($this, 'entityFormSave'); } @@ -30,7 +31,7 @@ public function entityFormAlter(array &$form, array &$form_state, EntityInterfac * * @see \Drupal\Core\Entity\EntityForm::build(). */ - function entityFormSave(array $form, array &$form_state) { + function entityFormSave(array $form, FormStateInterface $form_state) { if ($this->getSourceLangcode($form_state)) { $entity = content_translation_form_controller($form_state)->getEntity(); // We need a redirect here, otherwise we would get an access denied page diff --git a/core/modules/user/src/RegisterForm.php b/core/modules/user/src/RegisterForm.php index ddbbcc051e0b877d00b5557da87d87190f54b4a0..f3f251125fb97d06739986a2d8e4665691bc71bf 100644 --- a/core/modules/user/src/RegisterForm.php +++ b/core/modules/user/src/RegisterForm.php @@ -9,6 +9,7 @@ use Drupal\Core\Entity\EntityManagerInterface; use Drupal\Core\Entity\Query\QueryFactory; +use Drupal\Core\Form\FormStateInterface; use Drupal\Core\Language\LanguageManager; use Symfony\Component\HttpFoundation\RedirectResponse; @@ -25,9 +26,9 @@ public function __construct(EntityManagerInterface $entity_manager, LanguageMana } /** - * Overrides Drupal\Core\Entity\EntityForm::form(). + * {@inheritdoc} */ - public function form(array $form, array &$form_state) { + public function form(array $form, FormStateInterface $form_state) { $user = $this->currentUser(); /** @var \Drupal\user\UserInterface $account */ $account = $this->entity; @@ -71,7 +72,7 @@ public function form(array $form, array &$form_state) { /** * Overrides Drupal\Core\Entity\EntityForm::actions(). */ - protected function actions(array $form, array &$form_state) { + protected function actions(array $form, FormStateInterface $form_state) { $element = parent::actions($form, $form_state); $element['submit']['#value'] = $this->t('Create new account'); return $element; @@ -80,7 +81,7 @@ protected function actions(array $form, array &$form_state) { /** * Overrides Drupal\Core\Entity\EntityForm::submit(). */ - public function submit(array $form, array &$form_state) { + public function submit(array $form, FormStateInterface $form_state) { $admin = $form_state['values']['administer_users']; if (!\Drupal::config('user.settings')->get('verify_mail') || $admin) { @@ -102,7 +103,7 @@ public function submit(array $form, array &$form_state) { /** * Overrides Drupal\Core\Entity\EntityForm::submit(). */ - public function save(array $form, array &$form_state) { + public function save(array $form, FormStateInterface $form_state) { $account = $this->entity; $pass = $account->getPassword(); $admin = $form_state['values']['administer_users']; diff --git a/core/modules/user/src/RoleForm.php b/core/modules/user/src/RoleForm.php index 1961a758d29ac61e87f9522dc747a91e5b665601..0587041080a8d154558347c75fb2af8a2ce97f73 100644 --- a/core/modules/user/src/RoleForm.php +++ b/core/modules/user/src/RoleForm.php @@ -9,6 +9,7 @@ use Drupal\Core\Entity\EntityInterface; use Drupal\Core\Entity\EntityForm; +use Drupal\Core\Form\FormStateInterface; /** * Form controller for the role entity edit forms. @@ -18,7 +19,7 @@ class RoleForm extends EntityForm { /** * {@inheritdoc} */ - public function form(array $form, array &$form_state) { + public function form(array $form, FormStateInterface $form_state) { $entity = $this->entity; $form['label'] = array( '#type' => 'textfield', @@ -51,7 +52,7 @@ public function form(array $form, array &$form_state) { /** * {@inheritdoc} */ - public function save(array $form, array &$form_state) { + public function save(array $form, FormStateInterface $form_state) { $entity = $this->entity; // Prevent leading and trailing spaces in role names. diff --git a/core/modules/user/src/RoleListBuilder.php b/core/modules/user/src/RoleListBuilder.php index afe8d7b0771a3a3c8f9d0378272f5ac2bd2b3dc9..8e7feecb08e9c819ac05bdfa4bc44460ed92e72f 100644 --- a/core/modules/user/src/RoleListBuilder.php +++ b/core/modules/user/src/RoleListBuilder.php @@ -9,6 +9,7 @@ use Drupal\Core\Config\Entity\DraggableListBuilder; use Drupal\Core\Entity\EntityInterface; +use Drupal\Core\Form\FormStateInterface; /** * Defines a class to build a listing of user role entities. @@ -58,7 +59,7 @@ public function getDefaultOperations(EntityInterface $entity) { /** * {@inheritdoc} */ - public function submitForm(array &$form, array &$form_state) { + public function submitForm(array &$form, FormStateInterface $form_state) { parent::submitForm($form, $form_state); drupal_set_message(t('The role settings have been updated.')); diff --git a/core/modules/user/src/Tests/UserAccountFormFieldsTest.php b/core/modules/user/src/Tests/UserAccountFormFieldsTest.php index b560a0c6c8771c65a59743c98d270853f60ff21f..47849b9edec9d79680edbe2b6d6ccfaa3027f493 100644 --- a/core/modules/user/src/Tests/UserAccountFormFieldsTest.php +++ b/core/modules/user/src/Tests/UserAccountFormFieldsTest.php @@ -7,6 +7,7 @@ namespace Drupal\user\Tests; +use Drupal\Core\Form\FormState; use Drupal\simpletest\DrupalUnitTestBase; /** @@ -30,7 +31,7 @@ class UserAccountFormFieldsTest extends DrupalUnitTestBase { function testInstallConfigureForm() { require_once DRUPAL_ROOT . '/core/includes/install.core.inc'; $install_state = install_state_defaults(); - $form_state = array(); + $form_state = new FormState(); $form_state['build_info']['args'][] = &$install_state; $form = $this->container->get('form_builder') ->buildForm('Drupal\Core\Installer\Form\SiteConfigureForm', $form_state); diff --git a/core/modules/user/src/Tests/Views/ArgumentValidateTest.php b/core/modules/user/src/Tests/Views/ArgumentValidateTest.php index f1e9c0eb35dd1497654d16cdcc67ae0fe832020c..04c8b0add9cc867b8d1d451573db973bfed7ebbf 100644 --- a/core/modules/user/src/Tests/Views/ArgumentValidateTest.php +++ b/core/modules/user/src/Tests/Views/ArgumentValidateTest.php @@ -7,6 +7,7 @@ namespace Drupal\user\Tests\Views; +use Drupal\Core\Form\FormState; use Drupal\views\Plugin\views\argument\ArgumentPluginBase; use Drupal\views\Views; @@ -45,7 +46,8 @@ function testArgumentValidateUserUid() { // Fail for a valid numeric, but for a user that doesn't exist $this->assertFalse($view->argument['null']->validateArgument(32)); - $form = $form_state = array(); + $form = array(); + $form_state = new FormState(); $view->argument['null']->buildOptionsForm($form, $form_state); $sanitized_id = ArgumentPluginBase::encodeValidatorId('entity:user'); $this->assertTrue($form['validate']['options'][$sanitized_id]['roles']['#states']['visible'][':input[name="options[validate][options][' . $sanitized_id . '][restrict_roles]"]']['checked']); diff --git a/core/modules/user/tests/modules/user_form_test/src/Form/TestCurrentPassword.php b/core/modules/user/tests/modules/user_form_test/src/Form/TestCurrentPassword.php index 1acbea5b8067786c369ca2e1a73791778987409d..b01fc79f23afbb50f279d9b3f8e8724ad7bdd2dd 100644 --- a/core/modules/user/tests/modules/user_form_test/src/Form/TestCurrentPassword.php +++ b/core/modules/user/tests/modules/user_form_test/src/Form/TestCurrentPassword.php @@ -8,6 +8,7 @@ namespace Drupal\user_form_test\Form; use Drupal\Core\Form\FormBase; +use Drupal\Core\Form\FormStateInterface; use Drupal\user\UserInterface; /** @@ -28,7 +29,7 @@ public function getFormId() { * @param \Drupal\user\Entity\UserInterface $user * The user account. */ - public function buildForm(array $form, array &$form_state, UserInterface $user = NULL) { + public function buildForm(array $form, FormStateInterface $form_state, UserInterface $user = NULL) { $form_state['user'] = $user ; $form['user_form_test_field'] = array( '#type' => 'textfield', @@ -60,7 +61,7 @@ public function buildForm(array $form, array &$form_state, UserInterface $user = /** * {@inheritdoc} */ - public function submitForm(array &$form, array &$form_state) { + public function submitForm(array &$form, FormStateInterface $form_state) { drupal_set_message($this->t('The password has been validated and the form submitted successfully.')); } diff --git a/core/modules/user/user.module b/core/modules/user/user.module index 0b3d45311d793bdb852775cae064d832c4223e91..c23cc2ca3fac26c403eede8ea447aee01056de27 100644 --- a/core/modules/user/user.module +++ b/core/modules/user/user.module @@ -4,6 +4,7 @@ use Drupal\Component\Utility\String; use Drupal\Component\Utility\Unicode; use Drupal\Core\Entity\EntityInterface; +use Drupal\Core\Form\FormStateInterface; use Drupal\Core\Routing\RouteMatchInterface; use Drupal\Core\Session\AccountInterface; use Drupal\Core\Session\AnonymousUserSession; @@ -482,7 +483,7 @@ function user_user_view(array &$build, UserInterface $account, EntityViewDisplay /** * Sets the value of the user register and profile forms' langcode element. */ -function _user_language_selector_langcode_value($element, $input, &$form_state) { +function _user_language_selector_langcode_value($element, $input, FormStateInterface $form_state) { // Only add to the description if the form element have a description. if (isset($form_state['complete_form']['language']['preferred_langcode']['#description'])) { $form_state['complete_form']['language']['preferred_langcode']['#description'] .= ' ' . t("This is also assumed to be the primary language of this account's profile information."); @@ -495,7 +496,7 @@ function _user_language_selector_langcode_value($element, $input, &$form_state) * * @see AccountForm::form() */ -function user_validate_current_pass(&$form, &$form_state) { +function user_validate_current_pass(&$form, FormStateInterface $form_state) { $account = $form_state['user']; foreach ($form_state['values']['current_pass_required_values'] as $key => $name) { // This validation only works for required textfields (like mail) or diff --git a/core/modules/views/includes/ajax.inc b/core/modules/views/includes/ajax.inc index 84c33ebe8f3a00fa46c87c930b0fec351bfaafe3..59308567365a53cb47dabc62e44bdc11a04c5c06 100644 --- a/core/modules/views/includes/ajax.inc +++ b/core/modules/views/includes/ajax.inc @@ -5,6 +5,7 @@ * Handles the server side AJAX interactions of Views. */ +use Drupal\Core\Form\FormStateInterface; use Drupal\views\Ajax\HighlightCommand; use Drupal\Core\Ajax\OpenModalDialogCommand; use Drupal\Core\Ajax\AjaxResponse; @@ -14,16 +15,14 @@ * some AJAX stuff automatically. * This makes some assumptions about the client. */ -function views_ajax_form_wrapper($form_class, &$form_state) { +function views_ajax_form_wrapper($form_class, FormStateInterface &$form_state) { // This won't override settings already in. - $form_state += array( - 'rerender' => FALSE, - 'no_redirect' => !empty($form_state['ajax']), - 'no_cache' => TRUE, - 'build_info' => array( - 'args' => array(), - ), - ); + $form_state->setIfNotExists('rerender', FALSE); + $form_state->setIfNotExists('no_redirect', !empty($form_state['ajax'])); + $form_state->setIfNotExists('no_cache', TRUE); + $form_state->setIfNotExists('build_info', array( + 'args' => array(), + )); $form = \Drupal::formBuilder()->buildForm($form_class, $form_state); $output = drupal_render($form); diff --git a/core/modules/views/src/Form/ViewsExposedForm.php b/core/modules/views/src/Form/ViewsExposedForm.php index ae3da03e4b2943a36bece76c69adb98aa80acb10..2c78f5f2be5d27ad3e8412e8d136fe4dcf4987a6 100644 --- a/core/modules/views/src/Form/ViewsExposedForm.php +++ b/core/modules/views/src/Form/ViewsExposedForm.php @@ -9,6 +9,7 @@ use Drupal\Component\Utility\String; use Drupal\Core\Form\FormBase; +use Drupal\Core\Form\FormStateInterface; use Drupal\views\ExposedFormCache; use Symfony\Component\DependencyInjection\ContainerInterface; @@ -51,7 +52,7 @@ public function getFormId() { /** * {@inheritdoc} */ - public function buildForm(array $form, array &$form_state) { + public function buildForm(array $form, FormStateInterface $form_state) { // Don't show the form when batch operations are in progress. if ($batch = batch_get() && isset($batch['current_set'])) { return array( @@ -131,7 +132,7 @@ public function buildForm(array $form, array &$form_state) { /** * {@inheritdoc} */ - public function validateForm(array &$form, array &$form_state) { + public function validateForm(array &$form, FormStateInterface $form_state) { foreach (array('field', 'filter') as $type) { /** @var \Drupal\views\Plugin\views\HandlerBase[] $handlers */ $handlers = &$form_state['view']->$type; @@ -147,7 +148,7 @@ public function validateForm(array &$form, array &$form_state) { /** * {@inheritdoc} */ - public function submitForm(array &$form, array &$form_state) { + public function submitForm(array &$form, FormStateInterface $form_state) { foreach (array('field', 'filter') as $type) { /** @var \Drupal\views\Plugin\views\HandlerBase[] $handlers */ $handlers = &$form_state['view']->$type; diff --git a/core/modules/views/src/Form/ViewsForm.php b/core/modules/views/src/Form/ViewsForm.php index 02bf7cb3fc8fba14fbfd76db3540e71af35fcc65..ac88a11ac0c5f20ae407d162fabfd5ef3d7170fb 100644 --- a/core/modules/views/src/Form/ViewsForm.php +++ b/core/modules/views/src/Form/ViewsForm.php @@ -13,6 +13,7 @@ use Drupal\Core\DependencyInjection\ContainerInjectionInterface; use Drupal\Core\DependencyInjection\DependencySerializationTrait; use Drupal\Core\Form\FormInterface; +use Drupal\Core\Form\FormStateInterface; use Drupal\Core\Routing\UrlGeneratorInterface; use Drupal\views\ViewExecutable; use Symfony\Component\DependencyInjection\ContainerInterface; @@ -115,7 +116,7 @@ public function getFormID() { /** * {@inheritdoc} */ - public function buildForm(array $form, array &$form_state, ViewExecutable $view = NULL, $output = NULL) { + public function buildForm(array $form, FormStateInterface $form_state, ViewExecutable $view = NULL, $output = NULL) { $form_state['step'] = isset($form_state['step']) ? $form_state['step'] : 'views_form_views_form'; $form_state['step_controller']['views_form_views_form'] = 'Drupal\views\Form\ViewsFormMainForm'; @@ -146,7 +147,7 @@ public function buildForm(array $form, array &$form_state, ViewExecutable $view /** * {@inheritdoc} */ - public function validateForm(array &$form, array &$form_state) { + public function validateForm(array &$form, FormStateInterface $form_state) { $form_object = $this->getFormObject($form_state); $form_object->validateForm($form, $form_state); } @@ -154,7 +155,7 @@ public function validateForm(array &$form, array &$form_state) { /** * {@inheritdoc} */ - public function submitForm(array &$form, array &$form_state) { + public function submitForm(array &$form, FormStateInterface $form_state) { $form_object = $this->getFormObject($form_state); $form_object->submitForm($form, $form_state); } @@ -162,13 +163,13 @@ public function submitForm(array &$form, array &$form_state) { /** * Returns the object used to build the step form. * - * @param array $form_state + * @param \Drupal\Core\Form\FormStateInterface $form_state * The form_state of the current form. * * @return \Drupal\Core\Form\FormInterface * The form object to use. */ - protected function getFormObject(array $form_state) { + protected function getFormObject($form_state) { // If this is a class, instantiate it. $form_step_class = isset($form_state['step_controller'][$form_state['step']]) ? $form_state['step_controller'][$form_state['step']] : 'Drupal\views\Form\ViewsFormMainForm'; return $this->classResolver->getInstanceFromDefinition($form_step_class); diff --git a/core/modules/views/src/Form/ViewsFormMainForm.php b/core/modules/views/src/Form/ViewsFormMainForm.php index 98cdc4f97f7ac45f0c3ddaf88819428cb3fe194c..6c48b7e38b7aa6a69ed3b73d4ec03018b2e6a25c 100644 --- a/core/modules/views/src/Form/ViewsFormMainForm.php +++ b/core/modules/views/src/Form/ViewsFormMainForm.php @@ -8,6 +8,7 @@ namespace Drupal\views\Form; use Drupal\Core\Form\FormInterface; +use Drupal\Core\Form\FormStateInterface; use Drupal\views\ViewExecutable; class ViewsFormMainForm implements FormInterface { @@ -21,7 +22,7 @@ public function getFormID() { /** * {@inheritdoc} */ - public function buildForm(array $form, array &$form_state, ViewExecutable $view = NULL, $output = NULL) { + public function buildForm(array $form, FormStateInterface $form_state, ViewExecutable $view = NULL, $output = NULL) { $form['#prefix'] = '