Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in
Toggle navigation
D
drupal
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Locked Files
Custom Issue Tracker
Custom Issue Tracker
Labels
Merge Requests
304
Merge Requests
304
Requirements
Requirements
List
Security & Compliance
Security & Compliance
Dependency List
License Compliance
Analytics
Analytics
Code Review
Insights
Issue
Repository
Value Stream
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Commits
Open sidebar
project
drupal
Commits
5f4bbab9
Commit
5f4bbab9
authored
Aug 04, 2014
by
alexpott
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Issue
#2313823
by tim.plunkett, martin107: Use FormStateInterface for all typehints.
parent
4f5d8582
Changes
32
Hide whitespace changes
Inline
Side-by-side
Showing
32 changed files
with
86 additions
and
77 deletions
+86
-77
core/includes/ajax.inc
core/includes/ajax.inc
+1
-1
core/includes/form.inc
core/includes/form.inc
+5
-5
core/modules/book/book.module
core/modules/book/book.module
+2
-2
core/modules/comment/comment.module
core/modules/comment/comment.module
+4
-4
core/modules/content_translation/content_translation.module
core/modules/content_translation/content_translation.module
+1
-1
core/modules/content_translation/src/ContentTranslationHandler.php
...les/content_translation/src/ContentTranslationHandler.php
+2
-2
core/modules/content_translation/src/ContentTranslationHandlerInterface.php
...nt_translation/src/ContentTranslationHandlerInterface.php
+1
-1
core/modules/dblog/dblog.module
core/modules/dblog/dblog.module
+1
-1
core/modules/editor/editor.module
core/modules/editor/editor.module
+1
-1
core/modules/entity/src/Entity/EntityFormDisplay.php
core/modules/entity/src/Entity/EntityFormDisplay.php
+1
-1
core/modules/entity_reference/entity_reference.module
core/modules/entity_reference/entity_reference.module
+2
-2
core/modules/field/tests/modules/field_third_party_test/field_third_party_test.module
...ules/field_third_party_test/field_third_party_test.module
+4
-2
core/modules/field_ui/field_ui.api.php
core/modules/field_ui/field_ui.api.php
+2
-2
core/modules/field_ui/field_ui.module
core/modules/field_ui/field_ui.module
+1
-1
core/modules/file/src/Plugin/Field/FieldWidget/FileWidget.php
.../modules/file/src/Plugin/Field/FieldWidget/FileWidget.php
+1
-1
core/modules/locale/locale.module
core/modules/locale/locale.module
+4
-4
core/modules/menu_ui/menu_ui.module
core/modules/menu_ui/menu_ui.module
+4
-4
core/modules/node/src/Plugin/Search/NodeSearch.php
core/modules/node/src/Plugin/Search/NodeSearch.php
+1
-1
core/modules/path/path.module
core/modules/path/path.module
+2
-1
core/modules/search/src/Plugin/SearchInterface.php
core/modules/search/src/Plugin/SearchInterface.php
+1
-1
core/modules/search/src/Plugin/SearchPluginBase.php
core/modules/search/src/Plugin/SearchPluginBase.php
+1
-1
core/modules/system/src/Form/ModulesListForm.php
core/modules/system/src/Form/ModulesListForm.php
+1
-1
core/modules/system/tests/modules/ajax_forms_test/ajax_forms_test.module
...stem/tests/modules/ajax_forms_test/ajax_forms_test.module
+19
-19
core/modules/system/tests/modules/ajax_forms_test/src/Callbacks.php
...es/system/tests/modules/ajax_forms_test/src/Callbacks.php
+3
-2
core/modules/system/tests/modules/form_test/src/Form/FormTestTableSelectFormBase.php
...odules/form_test/src/Form/FormTestTableSelectFormBase.php
+2
-1
core/modules/update/update.module
core/modules/update/update.module
+1
-1
core/modules/views/src/Form/ViewsForm.php
core/modules/views/src/Form/ViewsForm.php
+1
-1
core/modules/views/src/Plugin/views/wizard/WizardPluginBase.php
...odules/views/src/Plugin/views/wizard/WizardPluginBase.php
+8
-8
core/modules/views_ui/admin.inc
core/modules/views_ui/admin.inc
+2
-2
core/modules/views_ui/src/ViewUI.php
core/modules/views_ui/src/ViewUI.php
+1
-1
core/profiles/minimal/minimal.profile
core/profiles/minimal/minimal.profile
+3
-1
core/profiles/standard/standard.profile
core/profiles/standard/standard.profile
+3
-1
No files found.
core/includes/ajax.inc
View file @
5f4bbab9
...
...
@@ -94,7 +94,7 @@
* return $form;
* }
*
* function ajax_example_simplest_callback($form, $form_state) {
* function ajax_example_simplest_callback($form,
FormStateInterface
$form_state) {
* // The form has already been submitted and updated. We can return the replaced
* // item as it is.
* return $form['replace_textfield'];
...
...
core/includes/form.inc
View file @
5f4bbab9
...
...
@@ -39,7 +39,7 @@ function form_get_cache($form_build_id, FormStateInterface $form_state) {
*
* @see \Drupal\Core\Form\FormBuilderInterface::setCache().
*/
function
form_set_cache
(
$form_build_id
,
$form
,
$form_state
)
{
function
form_set_cache
(
$form_build_id
,
$form
,
FormStateInterface
$form_state
)
{
\
Drupal
::
formBuilder
()
->
setCache
(
$form_build_id
,
$form
,
$form_state
);
}
...
...
@@ -136,7 +136,7 @@ function drupal_process_form($form_id, &$form, FormStateInterface $form_state) {
*
* @see \Drupal\Core\Form\FormSubmitterInterface::redirectForm().
*/
function
drupal_redirect_form
(
$form_state
)
{
function
drupal_redirect_form
(
FormStateInterface
$form_state
)
{
return
\
Drupal
::
service
(
'form_submitter'
)
->
redirectForm
(
$form_state
);
}
...
...
@@ -288,7 +288,7 @@ function form_state_values_clean(FormStateInterface $form_state) {
* The data that will appear in the $form_state['values'] collection
* for this element. Return nothing to use the default.
*/
function
form_type_image_button_value
(
$form
,
$input
,
$form_state
)
{
function
form_type_image_button_value
(
$form
,
$input
,
FormStateInterface
$form_state
)
{
if
(
$input
!==
FALSE
)
{
if
(
!
empty
(
$input
))
{
// If we're dealing with Mozilla or Opera, we're lucky. It will
...
...
@@ -1172,7 +1172,7 @@ function form_pre_render_conditional_form_element($element) {
/**
* Processes a form button element.
*/
function
form_process_button
(
$element
,
$form_state
)
{
function
form_process_button
(
$element
,
FormStateInterface
$form_state
)
{
// If this is a button intentionally allowing incomplete form submission
// (e.g., a "Previous" or "Add another item" button), then also skip
// client-side validation.
...
...
@@ -1185,7 +1185,7 @@ function form_process_button($element, $form_state) {
/**
* Sets the #checked property of a checkbox element.
*/
function
form_process_checkbox
(
$element
,
$form_state
)
{
function
form_process_checkbox
(
$element
,
FormStateInterface
$form_state
)
{
$value
=
$element
[
'#value'
];
$return_value
=
$element
[
'#return_value'
];
// On form submission, the #value of an available and enabled checked
...
...
core/modules/book/book.module
View file @
5f4bbab9
...
...
@@ -231,7 +231,7 @@ function book_pick_book_nojs_submit($form, FormStateInterface $form_state) {
* @return
* The rendered parent page select element.
*/
function
book_form_update
(
$form
,
$form_state
)
{
function
book_form_update
(
$form
,
FormStateInterface
$form_state
)
{
return
$form
[
'book'
][
'pid'
];
}
...
...
@@ -352,7 +352,7 @@ function book_node_prepare_form(NodeInterface $node, $operation, FormStateInterf
*
* @see node_delete_confirm()
*/
function
book_form_node_delete_confirm_alter
(
&
$form
,
$form_state
)
{
function
book_form_node_delete_confirm_alter
(
&
$form
,
FormStateInterface
$form_state
)
{
$node
=
node_load
(
$form
[
'nid'
][
'#value'
]);
if
(
isset
(
$node
->
book
)
&&
$node
->
book
[
'has_children'
])
{
...
...
core/modules/comment/comment.module
View file @
5f4bbab9
...
...
@@ -489,7 +489,7 @@ function comment_view_multiple($comments, $view_mode = 'full', $langcode = NULL)
/**
* Implements hook_form_FORM_ID_alter() for field_ui_field_overview_form.
*/
function
comment_form_field_ui_field_overview_form_alter
(
&
$form
,
$form_state
)
{
function
comment_form_field_ui_field_overview_form_alter
(
&
$form
,
FormStateInterface
$form_state
)
{
$request
=
\
Drupal
::
request
();
if
(
$form
[
'#entity_type'
]
==
'comment'
&&
$request
->
attributes
->
has
(
'commented_entity_type'
))
{
$form
[
'#title'
]
=
\
Drupal
::
service
(
'comment.manager'
)
->
getFieldUIPageTitle
(
$request
->
attributes
->
get
(
'commented_entity_type'
),
$request
->
attributes
->
get
(
'field_name'
));
...
...
@@ -504,7 +504,7 @@ function comment_form_field_ui_field_overview_form_alter(&$form, $form_state) {
/**
* Implements hook_form_FORM_ID_alter().
*/
function
comment_form_field_ui_form_display_overview_form_alter
(
&
$form
,
$form_state
)
{
function
comment_form_field_ui_form_display_overview_form_alter
(
&
$form
,
FormStateInterface
$form_state
)
{
$request
=
\
Drupal
::
request
();
if
(
$form
[
'#entity_type'
]
==
'comment'
&&
$request
->
attributes
->
has
(
'commented_entity_type'
))
{
$form
[
'#title'
]
=
\
Drupal
::
service
(
'comment.manager'
)
->
getFieldUIPageTitle
(
$request
->
attributes
->
get
(
'commented_entity_type'
),
$request
->
attributes
->
get
(
'field_name'
));
...
...
@@ -514,7 +514,7 @@ function comment_form_field_ui_form_display_overview_form_alter(&$form, $form_st
/**
* Implements hook_form_FORM_ID_alter().
*/
function
comment_form_field_ui_display_overview_form_alter
(
&
$form
,
$form_state
)
{
function
comment_form_field_ui_display_overview_form_alter
(
&
$form
,
FormStateInterface
$form_state
)
{
$request
=
\
Drupal
::
request
();
if
(
$form
[
'#entity_type'
]
==
'comment'
&&
$request
->
attributes
->
has
(
'commented_entity_type'
))
{
$form
[
'#title'
]
=
\
Drupal
::
service
(
'comment.manager'
)
->
getFieldUIPageTitle
(
$request
->
attributes
->
get
(
'commented_entity_type'
),
$request
->
attributes
->
get
(
'field_name'
));
...
...
@@ -524,7 +524,7 @@ function comment_form_field_ui_display_overview_form_alter(&$form, $form_state)
/**
* Implements hook_form_FORM_ID_alter().
*/
function
comment_form_field_ui_field_storage_edit_form_alter
(
&
$form
,
$form_state
)
{
function
comment_form_field_ui_field_storage_edit_form_alter
(
&
$form
,
FormStateInterface
$form_state
)
{
if
(
$form
[
'#field'
]
->
getType
()
==
'comment'
)
{
// We only support posting one comment at the time so it doesn't make sense
// to let the site builder choose anything else.
...
...
core/modules/content_translation/content_translation.module
View file @
5f4bbab9
...
...
@@ -376,7 +376,7 @@ function content_translation_controller($entity_type_id) {
*
* @todo Move to \Drupal\content_translation\ContentTranslationManager.
*/
function
content_translation_form_controller
(
$form_state
)
{
function
content_translation_form_controller
(
FormStateInterface
$form_state
)
{
return
isset
(
$form_state
[
'controller'
])
&&
$form_state
[
'controller'
]
instanceof
EntityFormInterface
?
$form_state
[
'controller'
]
:
FALSE
;
}
...
...
core/modules/content_translation/src/ContentTranslationHandler.php
View file @
5f4bbab9
...
...
@@ -76,7 +76,7 @@ public function getTranslationAccess(EntityInterface $entity, $op) {
/**
* {@inheritdoc}
*/
public
function
getSourceLangcode
(
$form_state
)
{
public
function
getSourceLangcode
(
FormStateInterface
$form_state
)
{
return
isset
(
$form_state
[
'content_translation'
][
'source'
])
?
$form_state
[
'content_translation'
][
'source'
]
->
id
:
FALSE
;
}
...
...
@@ -288,7 +288,7 @@ public function entityFormAlter(array &$form, FormStateInterface $form_state, En
*
* @see \Drupal\content_translation\ContentTranslationHandler::entityFormAlter()
*/
public
function
entityFormSharedElements
(
$element
,
$form_state
,
$form
)
{
public
function
entityFormSharedElements
(
$element
,
FormStateInterface
$form_state
,
$form
)
{
static
$ignored_types
;
// @todo Find a more reliable way to determine if a form element concerns a
...
...
core/modules/content_translation/src/ContentTranslationHandlerInterface.php
View file @
5f4bbab9
...
...
@@ -44,7 +44,7 @@ public function getTranslationAccess(EntityInterface $entity, $op);
* @return string
* The source language code.
*/
public
function
getSourceLangcode
(
$form_state
);
public
function
getSourceLangcode
(
FormStateInterface
$form_state
);
/**
* Marks translations as outdated.
...
...
core/modules/dblog/dblog.module
View file @
5f4bbab9
...
...
@@ -95,7 +95,7 @@ function _dblog_get_message_types() {
/**
* Implements hook_form_FORM_ID_alter() for system_logging_settings().
*/
function
dblog_form_system_logging_settings_alter
(
&
$form
,
$form_state
)
{
function
dblog_form_system_logging_settings_alter
(
&
$form
,
FormStateInterface
$form_state
)
{
$row_limits
=
array
(
100
,
1000
,
10000
,
100000
,
1000000
);
$form
[
'dblog_row_limit'
]
=
array
(
'#type'
=>
'select'
,
...
...
core/modules/editor/editor.module
View file @
5f4bbab9
...
...
@@ -70,7 +70,7 @@ function editor_element_info() {
/**
* Implements hook_form_FORM_ID_alter().
*/
function
editor_form_filter_admin_overview_alter
(
&
$form
,
$form_state
)
{
function
editor_form_filter_admin_overview_alter
(
&
$form
,
FormStateInterface
$form_state
)
{
// @todo Cleanup column injection: http://drupal.org/node/1876718
// Splice in the column for "Text editor" into the header.
$position
=
array_search
(
'name'
,
$form
[
'formats'
][
'#header'
])
+
1
;
...
...
core/modules/entity/src/Entity/EntityFormDisplay.php
View file @
5f4bbab9
...
...
@@ -176,7 +176,7 @@ public function buildForm(ContentEntityInterface $entity, array &$form, FormStat
*
* @see \Drupal\entity\Entity\EntityFormDisplay::buildForm()
*/
public
function
processForm
(
$element
,
$form_state
,
$form
)
{
public
function
processForm
(
$element
,
FormStateInterface
$form_state
,
$form
)
{
// Assign the weights configured in the form display.
foreach
(
$this
->
getComponents
()
as
$name
=>
$options
)
{
if
(
isset
(
$element
[
$name
]))
{
...
...
core/modules/entity_reference/entity_reference.module
View file @
5f4bbab9
...
...
@@ -106,7 +106,7 @@ function entity_reference_field_storage_config_update(FieldStorageConfigInterfac
*
* @see entity_reference_field_instance_settings_form()
*/
function
_entity_reference_field_instance_settings_ajax_process
(
$form
,
$form_state
)
{
function
_entity_reference_field_instance_settings_ajax_process
(
$form
,
FormStateInterface
$form_state
)
{
_entity_reference_field_instance_settings_ajax_process_element
(
$form
,
$form
);
return
$form
;
}
...
...
@@ -158,7 +158,7 @@ function _entity_reference_element_validate_filter(&$element, FormStateInterface
*
* @see entity_reference_field_instance_settings_form()
*/
function
entity_reference_settings_ajax
(
$form
,
$form_state
)
{
function
entity_reference_settings_ajax
(
$form
,
FormStateInterface
$form_state
)
{
$trigger
=
$form_state
[
'triggering_element'
];
return
NestedArray
::
getValue
(
$form
,
$trigger
[
'#ajax'
][
'element'
]);
}
...
...
core/modules/field/tests/modules/field_third_party_test/field_third_party_test.module
View file @
5f4bbab9
<?php
use
Drupal\Core\Form\FormStateInterface
;
/**
* Implements hook_field_widget_third_party_settings_form().
*/
function
field_third_party_test_field_widget_third_party_settings_form
(
\
Drupal\Core\Field\WidgetInterface
$plugin
,
\
Drupal\Core\Field\FieldDefinitionInterface
$field_definition
,
$form_mode
,
$form
,
$form_state
)
{
function
field_third_party_test_field_widget_third_party_settings_form
(
\
Drupal\Core\Field\WidgetInterface
$plugin
,
\
Drupal\Core\Field\FieldDefinitionInterface
$field_definition
,
$form_mode
,
$form
,
FormStateInterface
$form_state
)
{
$element
[
'field_test_widget_third_party_settings_form'
]
=
array
(
'#type'
=>
'textfield'
,
'#title'
=>
t
(
'3rd party widget settings form'
),
...
...
@@ -23,7 +25,7 @@ function field_third_party_test_field_widget_settings_summary_alter(&$summary, $
/**
* Implements hook_field_formatter_third_party_settings_form().
*/
function
field_third_party_test_field_formatter_third_party_settings_form
(
\
Drupal\Core\Field\FormatterInterface
$plugin
,
\
Drupal\Core\Field\FieldDefinitionInterface
$field_definition
,
$view_mode
,
$form
,
$form_state
)
{
function
field_third_party_test_field_formatter_third_party_settings_form
(
\
Drupal\Core\Field\FormatterInterface
$plugin
,
\
Drupal\Core\Field\FieldDefinitionInterface
$field_definition
,
$view_mode
,
$form
,
FormStateInterface
$form_state
)
{
$element
[
'field_test_field_formatter_third_party_settings_form'
]
=
array
(
'#type'
=>
'textfield'
,
'#title'
=>
t
(
'3rd party formatter settings form'
),
...
...
core/modules/field_ui/field_ui.api.php
View file @
5f4bbab9
...
...
@@ -29,7 +29,7 @@
*
* @see \Drupal\field_ui\DisplayOverView.
*/
function
hook_field_formatter_third_party_settings_form
(
\
Drupal\Core\Field\FormatterInterface
$plugin
,
\
Drupal\Core\Field\FieldDefinitionInterface
$field_definition
,
$view_mode
,
$form
,
$form_state
)
{
function
hook_field_formatter_third_party_settings_form
(
\
Drupal\Core\Field\FormatterInterface
$plugin
,
\
Drupal\Core\Field\FieldDefinitionInterface
$field_definition
,
$view_mode
,
$form
,
\
Drupal\Core\Form\FormStateInterface
$form_state
)
{
$element
=
array
();
// Add a 'my_setting' checkbox to the settings form for 'foo_formatter' field
// formatters.
...
...
@@ -62,7 +62,7 @@ function hook_field_formatter_third_party_settings_form(\Drupal\Core\Field\Forma
*
* @see \Drupal\field_ui\FormDisplayOverView.
*/
function
hook_field_widget_third_party_settings_form
(
\
Drupal\Core\Field\WidgetInterface
$plugin
,
\
Drupal\Core\Field\FieldDefinitionInterface
$field_definition
,
$form_mode
,
$form
,
$form_state
)
{
function
hook_field_widget_third_party_settings_form
(
\
Drupal\Core\Field\WidgetInterface
$plugin
,
\
Drupal\Core\Field\FieldDefinitionInterface
$field_definition
,
$form_mode
,
$form
,
\
Drupal\Core\Form\FormStateInterface
$form_state
)
{
$element
=
array
();
// Add a 'my_setting' checkbox to the settings form for 'foo_widget' field
// widgets.
...
...
core/modules/field_ui/field_ui.module
View file @
5f4bbab9
...
...
@@ -149,7 +149,7 @@ function field_ui_entity_bundle_rename($entity_type, $bundle_old, $bundle_new) {
* @see node_type_form()
* @see field_ui_form_node_type_form_submit()
*/
function
field_ui_form_node_type_form_alter
(
&
$form
,
$form_state
)
{
function
field_ui_form_node_type_form_alter
(
&
$form
,
FormStateInterface
$form_state
)
{
// We want to display the button only on add page.
if
(
$form_state
[
'controller'
]
->
getEntity
()
->
isNew
())
{
$form
[
'actions'
][
'save_continue'
]
=
$form
[
'actions'
][
'submit'
];
...
...
core/modules/file/src/Plugin/Field/FieldWidget/FileWidget.php
View file @
5f4bbab9
...
...
@@ -279,7 +279,7 @@ public function massageFormValues(array $values, array $form, FormStateInterface
*
* This method is assigned as a #value_callback in formElement() method.
*/
public
static
function
value
(
$element
,
$input
=
FALSE
,
$form_state
)
{
public
static
function
value
(
$element
,
$input
=
FALSE
,
FormStateInterface
$form_state
)
{
if
(
$input
)
{
// Checkboxes lose their value when empty.
// If the display field is present make sure its unchecked value is saved.
...
...
core/modules/locale/locale.module
View file @
5f4bbab9
...
...
@@ -711,7 +711,7 @@ function locale_form_language_admin_add_form_alter(&$form, FormStateInterface $f
*
* Set a batch for a newly-added language.
*/
function
locale_form_language_admin_add_form_alter_submit
(
$form
,
$form_state
)
{
function
locale_form_language_admin_add_form_alter_submit
(
$form
,
FormStateInterface
$form_state
)
{
if
(
\
Drupal
::
config
(
'locale.settings'
)
->
get
(
'translation.import_enabled'
))
{
if
(
empty
(
$form_state
[
'values'
][
'predefined_langcode'
])
||
$form_state
[
'values'
][
'predefined_langcode'
]
==
'custom'
)
{
$langcode
=
$form_state
[
'values'
][
'langcode'
];
...
...
@@ -751,7 +751,7 @@ function locale_form_language_admin_edit_form_alter(&$form, FormStateInterface $
/**
* Form submission handler for language_admin_edit_form().
*/
function
locale_form_language_admin_edit_form_alter_submit
(
$form
,
$form_state
)
{
function
locale_form_language_admin_edit_form_alter_submit
(
$form
,
FormStateInterface
$form_state
)
{
\
Drupal
::
config
(
'locale.settings'
)
->
set
(
'translate_english'
,
intval
(
$form_state
[
'values'
][
'locale_translate_english'
]))
->
save
();
}
...
...
@@ -770,7 +770,7 @@ function locale_translate_english() {
*
* Add interface translation directory setting to directories configuration.
*/
function
locale_form_system_file_system_settings_alter
(
&
$form
,
$form_state
)
{
function
locale_form_system_file_system_settings_alter
(
&
$form
,
FormStateInterface
$form_state
)
{
$form
[
'translation_path'
]
=
array
(
'#type'
=>
'textfield'
,
'#title'
=>
t
(
'Interface translations directory'
),
...
...
@@ -794,7 +794,7 @@ function locale_form_system_file_system_settings_alter(&$form, $form_state) {
* changes. Without a translations directory local po files in the directory
* should be ignored. The old translation status is no longer valid.
*/
function
locale_system_file_system_settings_submit
(
&
$form
,
$form_state
)
{
function
locale_system_file_system_settings_submit
(
&
$form
,
FormStateInterface
$form_state
)
{
if
(
$form
[
'translation_path'
][
'#default_value'
]
!=
$form_state
[
'values'
][
'translation_path'
])
{
locale_translation_clear_status
();
}
...
...
core/modules/menu_ui/menu_ui.module
View file @
5f4bbab9
...
...
@@ -317,7 +317,7 @@ function menu_ui_node_prepare_form(NodeInterface $node, $operation, FormStateInt
*
* @see menu_ui_node_submit()
*/
function
menu_ui_form_node_form_alter
(
&
$form
,
$form_state
)
{
function
menu_ui_form_node_form_alter
(
&
$form
,
FormStateInterface
$form_state
)
{
// Generate a list of possible parents (not including this link or descendants).
// @todo This must be handled in a #process handler.
$node
=
$form_state
[
'controller'
]
->
getEntity
();
...
...
@@ -407,7 +407,7 @@ function menu_ui_form_node_form_alter(&$form, $form_state) {
*
* @see menu_ui_form_node_form_alter()
*/
function
menu_ui_node_submit
(
EntityInterface
$node
,
$form
,
$form_state
)
{
function
menu_ui_node_submit
(
EntityInterface
$node
,
$form
,
FormStateInterface
$form_state
)
{
if
(
!
empty
(
$form_state
[
'values'
][
'menu'
]))
{
$definition
=
$form_state
[
'values'
][
'menu'
];
if
(
empty
(
$definition
[
'enabled'
]))
{
...
...
@@ -441,7 +441,7 @@ function menu_ui_node_submit(EntityInterface $node, $form, $form_state) {
* @see NodeTypeForm::form().
* @see menu_ui_form_node_type_form_submit().
*/
function
menu_ui_form_node_type_form_alter
(
&
$form
,
$form_state
)
{
function
menu_ui_form_node_type_form_alter
(
&
$form
,
FormStateInterface
$form_state
)
{
/** @var \Drupal\Core\Menu\MenuParentFormSelectorInterface $menu_parent_selector */
$menu_parent_selector
=
\
Drupal
::
service
(
'menu.parent_form_selector'
);
$menu_options
=
menu_ui_get_menus
();
...
...
@@ -493,7 +493,7 @@ function menu_ui_form_node_type_form_alter(&$form, $form_state) {
*
* @see menu_ui_form_node_type_form_alter().
*/
function
menu_ui_form_node_type_form_submit
(
&
$form
,
$form_state
)
{
function
menu_ui_form_node_type_form_submit
(
&
$form
,
FormStateInterface
$form_state
)
{
$type
=
$form_state
[
'controller'
]
->
getEntity
();
\
Drupal
::
config
(
'menu.entity.node.'
.
$type
->
id
())
->
set
(
'available_menus'
,
array_values
(
array_filter
(
$form_state
[
'values'
][
'menu_options'
])))
...
...
core/modules/node/src/Plugin/Search/NodeSearch.php
View file @
5f4bbab9
...
...
@@ -480,7 +480,7 @@ public function searchFormAlter(array &$form, FormStateInterface $form_state) {
/*
* {@inheritdoc}
*/
public
function
buildSearchUrlQuery
(
$form_state
)
{
public
function
buildSearchUrlQuery
(
FormStateInterface
$form_state
)
{
// Read keyword and advanced search information from the form values,
// and put these into the GET parameters.
$keys
=
trim
(
$form_state
[
'values'
][
'keys'
]);
...
...
core/modules/path/path.module
View file @
5f4bbab9
...
...
@@ -9,6 +9,7 @@
use
Drupal\Core\Entity\EntityInterface
;
use
Drupal\Core\Entity\ContentEntityInterface
;
use
Drupal\Core\Field\FieldDefinition
;
use
Drupal\Core\Form\FormStateInterface
;
use
Drupal\Core\Routing\RouteMatchInterface
;
/**
...
...
@@ -54,7 +55,7 @@ function path_permission() {
/**
* Implements hook_form_BASE_FORM_ID_alter() for node_form().
*/
function
path_form_node_form_alter
(
&
$form
,
$form_state
)
{
function
path_form_node_form_alter
(
&
$form
,
FormStateInterface
$form_state
)
{
$node
=
$form_state
[
'controller'
]
->
getEntity
();
if
(
$node
->
hasField
(
'path'
)
&&
$node
->
get
(
'path'
)
->
access
(
'edit'
))
{
$form
[
'path_settings'
]
=
array
(
...
...
core/modules/search/src/Plugin/SearchInterface.php
View file @
5f4bbab9
...
...
@@ -120,6 +120,6 @@ public function searchFormAlter(array &$form, FormStateInterface $form_state);
*
* @see SearchInterface::searchFormAlter()
*/
public
function
buildSearchUrlQuery
(
$form_state
);
public
function
buildSearchUrlQuery
(
FormStateInterface
$form_state
);
}
core/modules/search/src/Plugin/SearchPluginBase.php
View file @
5f4bbab9
...
...
@@ -112,7 +112,7 @@ public function searchFormAlter(array &$form, FormStateInterface $form_state) {
/*
* {@inheritdoc}
*/
public
function
buildSearchUrlQuery
(
$form_state
)
{
public
function
buildSearchUrlQuery
(
FormStateInterface
$form_state
)
{
// Grab the keywords entered in the form and put them as 'keys' in the GET.
$keys
=
trim
(
$form_state
[
'values'
][
'keys'
]);
$query
=
array
(
'keys'
=>
$keys
);
...
...
core/modules/system/src/Form/ModulesListForm.php
View file @
5f4bbab9
...
...
@@ -415,7 +415,7 @@ protected function buildRow(array $modules, Extension $module, $distribution) {
* @return array
* An array of modules to install and their dependencies.
*/
protected
function
buildModuleList
(
$form_state
)
{
protected
function
buildModuleList
(
FormStateInterface
$form_state
)
{
$packages
=
$form_state
[
'values'
][
'modules'
];
// Build a list of modules to install.
...
...
core/modules/system/tests/modules/ajax_forms_test/ajax_forms_test.module
View file @
5f4bbab9
...
...
@@ -12,7 +12,7 @@
/**
* Ajax form callback: Selects 'after'.
*/
function
ajax_forms_test_advanced_commands_after_callback
(
$form
,
$form_state
)
{
function
ajax_forms_test_advanced_commands_after_callback
(
$form
,
FormStateInterface
$form_state
)
{
$selector
=
'#after_div'
;
$response
=
new
AjaxResponse
();
...
...
@@ -23,7 +23,7 @@ function ajax_forms_test_advanced_commands_after_callback($form, $form_state) {
/**
* Ajax form callback: Selects 'alert'.
*/
function
ajax_forms_test_advanced_commands_alert_callback
(
$form
,
$form_state
)
{
function
ajax_forms_test_advanced_commands_alert_callback
(
$form
,
FormStateInterface
$form_state
)
{
$response
=
new
AjaxResponse
();
$response
->
addCommand
(
new
Ajax\AlertCommand
(
'Alert'
));
return
$response
;
...
...
@@ -32,7 +32,7 @@ function ajax_forms_test_advanced_commands_alert_callback($form, $form_state) {
/**
* Ajax form callback: Selects 'append'.
*/
function
ajax_forms_test_advanced_commands_append_callback
(
$form
,
$form_state
)
{
function
ajax_forms_test_advanced_commands_append_callback
(
$form
,
FormStateInterface
$form_state
)
{
$selector
=
'#append_div'
;
$response
=
new
AjaxResponse
();
$response
->
addCommand
(
new
Ajax\AppendCommand
(
$selector
,
"Appended text"
));
...
...
@@ -42,7 +42,7 @@ function ajax_forms_test_advanced_commands_append_callback($form, $form_state) {
/**
* Ajax form callback: Selects 'before'.
*/
function
ajax_forms_test_advanced_commands_before_callback
(
$form
,
$form_state
)
{
function
ajax_forms_test_advanced_commands_before_callback
(
$form
,
FormStateInterface
$form_state
)
{
$selector
=
'#before_div'
;
$response
=
new
AjaxResponse
();
$response
->
addCommand
(
new
Ajax\BeforeCommand
(
$selector
,
"Before text"
));
...
...
@@ -52,7 +52,7 @@ function ajax_forms_test_advanced_commands_before_callback($form, $form_state) {
/**
* Ajax form callback: Selects 'changed'.
*/
function
ajax_forms_test_advanced_commands_changed_callback
(
$form
,
$form_state
)
{
function
ajax_forms_test_advanced_commands_changed_callback
(
$form
,
FormStateInterface
$form_state
)
{
$response
=
new
AjaxResponse
();
$response
->
addCommand
(
new
Ajax\ChangedCommand
(
'#changed_div'
));
return
$response
;
...
...
@@ -61,7 +61,7 @@ function ajax_forms_test_advanced_commands_changed_callback($form, $form_state)
/**
* Ajax form callback: Selects 'changed' with asterisk marking inner div.
*/
function
ajax_forms_test_advanced_commands_changed_asterisk_callback
(
$form
,
$form_state
)
{
function
ajax_forms_test_advanced_commands_changed_asterisk_callback
(
$form
,
FormStateInterface
$form_state
)
{
$response
=
new
AjaxResponse
();
$response
->
addCommand
(
new
Ajax\ChangedCommand
(
'#changed_div'
,
'#changed_div_mark_this'
));
return
$response
;
...
...
@@ -70,7 +70,7 @@ function ajax_forms_test_advanced_commands_changed_asterisk_callback($form, $for
/**
* Ajax form callback: Selects 'css'.
*/
function
ajax_forms_test_advanced_commands_css_callback
(
$form
,
$form_state
)
{
function
ajax_forms_test_advanced_commands_css_callback
(
$form
,
FormStateInterface
$form_state
)
{
$selector
=
'#css_div'
;
$color
=
'blue'
;
...
...
@@ -82,7 +82,7 @@ function ajax_forms_test_advanced_commands_css_callback($form, $form_state) {
/**
* Ajax form callback: Selects 'data'.
*/
function
ajax_forms_test_advanced_commands_data_callback
(
$form
,
$form_state
)
{
function
ajax_forms_test_advanced_commands_data_callback
(
$form
,
FormStateInterface
$form_state
)
{
$selector
=
'#data_div'
;
$response
=
new
AjaxResponse
();
$response
->
addCommand
(
new
Ajax\DataCommand
(
$selector
,
'testkey'
,
'testvalue'
));
...
...
@@ -92,7 +92,7 @@ function ajax_forms_test_advanced_commands_data_callback($form, $form_state) {
/**
* Ajax form callback: Selects 'invoke'.
*/
function
ajax_forms_test_advanced_commands_invoke_callback
(
$form
,
$form_state
)
{
function
ajax_forms_test_advanced_commands_invoke_callback
(
$form
,
FormStateInterface
$form_state
)
{
$response
=
new
AjaxResponse
();
$response
->
addCommand
(
new
Ajax\InvokeCommand
(
'#invoke_div'
,
'addClass'
,
array
(
'error'
)));
return
$response
;
...
...
@@ -101,7 +101,7 @@ function ajax_forms_test_advanced_commands_invoke_callback($form, $form_state) {
/**
* Ajax form callback: Selects 'html'.
*/
function
ajax_forms_test_advanced_commands_html_callback
(
$form
,
$form_state
)
{
function
ajax_forms_test_advanced_commands_html_callback
(
$form
,
FormStateInterface
$form_state
)
{
$response
=
new
AjaxResponse
();
$response
->
addCommand
(
new
Ajax\HtmlCommand
(
'#html_div'
,
'replacement text'
));
return
$response
;
...
...
@@ -110,7 +110,7 @@ function ajax_forms_test_advanced_commands_html_callback($form, $form_state) {
/**
* Ajax form callback: Selects 'insert'.
*/
function
ajax_forms_test_advanced_commands_insert_callback
(
$form
,
$form_state
)
{
function
ajax_forms_test_advanced_commands_insert_callback
(
$form
,
FormStateInterface
$form_state
)
{
$response
=
new
AjaxResponse
();
$response
->
addCommand
(
new
Ajax\InsertCommand
(
'#insert_div'
,
'insert replacement text'
));
return
$response
;
...
...
@@ -119,7 +119,7 @@ function ajax_forms_test_advanced_commands_insert_callback($form, $form_state) {
/**
* Ajax form callback: Selects 'prepend'.
*/
function
ajax_forms_test_advanced_commands_prepend_callback
(
$form
,
$form_state
)
{
function
ajax_forms_test_advanced_commands_prepend_callback
(
$form
,
FormStateInterface
$form_state
)
{
$response
=
new
AjaxResponse
();
$response
->
addCommand
(
new
Ajax\PrependCommand
(
'#prepend_div'
,
"prepended text"
));
return
$response
;
...
...
@@ -128,7 +128,7 @@ function ajax_forms_test_advanced_commands_prepend_callback($form, $form_state)
/**
* Ajax form callback: Selects 'remove'.
*/
function
ajax_forms_test_advanced_commands_remove_callback
(
$form
,
$form_state
)
{
function
ajax_forms_test_advanced_commands_remove_callback
(
$form
,
FormStateInterface
$form_state
)
{
$response
=
new
AjaxResponse
();
$response
->
addCommand
(
new
Ajax\RemoveCommand
(
'#remove_text'
));
return
$response
;
...
...
@@ -137,7 +137,7 @@ function ajax_forms_test_advanced_commands_remove_callback($form, $form_state) {
/**
* Ajax form callback: Selects 'restripe'.
*/
function
ajax_forms_test_advanced_commands_restripe_callback
(
$form
,
$form_state
)
{
function
ajax_forms_test_advanced_commands_restripe_callback
(
$form
,
FormStateInterface
$form_state
)
{
$response
=
new
AjaxResponse
();
$response
->
addCommand
(
new
Ajax\RestripeCommand
(
'#restripe_table'
));
return
$response
;
...
...
@@ -146,7 +146,7 @@ function ajax_forms_test_advanced_commands_restripe_callback($form, $form_state)
/**
* Ajax form callback: Selects 'settings'.
*/
function
ajax_forms_test_advanced_commands_settings_callback
(
$form
,
$form_state
)
{
function
ajax_forms_test_advanced_commands_settings_callback
(
$form
,
FormStateInterface
$form_state
)
{
$setting
[
'ajax_forms_test'
][
'foo'
]
=
42
;
$response
=
new
AjaxResponse
();
$response
->
addCommand
(
new
Ajax\SettingsCommand
(
$setting
));
...
...
@@ -156,7 +156,7 @@ function ajax_forms_test_advanced_commands_settings_callback($form, $form_state)
/**
* Ajax callback for 'add_css'.
*/
function
ajax_forms_test_advanced_commands_add_css_callback
(
$form
,
$form_state
)
{
function
ajax_forms_test_advanced_commands_add_css_callback
(
$form
,
FormStateInterface
$form_state
)
{
$response
=
new
AjaxResponse
();
$response
->
addCommand
(
new
Ajax\AddCssCommand
(
'my/file.css'
));
return
$response
;
...
...
@@ -165,7 +165,7 @@ function ajax_forms_test_advanced_commands_add_css_callback($form, $form_state)
/**
* Ajax callback for 'settings' but with setting overrides.
*/
function
ajax_forms_test_advanced_commands_settings_with_merging_callback
(
$form
,
$form_state
)
{
function
ajax_forms_test_advanced_commands_settings_with_merging_callback
(
$form
,
FormStateInterface
$form_state
)
{
$attached
=
array
(
'#attached'
=>
array
(
'js'
=>
array
(
...
...
@@ -189,7 +189,7 @@ function ajax_forms_test_advanced_commands_settings_with_merging_callback($form,
/**
* Ajax form callback: Selects the 'drivertext' element of the validation form.
*/
function
ajax_forms_test_validation_form_callback
(
$form
,
$form_state
)
{
function
ajax_forms_test_validation_form_callback
(
$form
,
FormStateInterface
$form_state
)
{
drupal_set_message
(
"ajax_forms_test_validation_form_callback invoked"
);
drupal_set_message
(
t
(
"Callback: drivertext=%drivertext, spare_required_field=%spare_required_field"
,
array
(
'%drivertext'
=>
$form_state
[
'values'
][
'drivertext'
],
'%spare_required_field'
=>
$form_state
[
'values'
][
'spare_required_field'
])));
return
'<div id="message_area">ajax_forms_test_validation_form_callback at '
.
date
(
'c'
)
.
'</div>'
;
...
...
@@ -198,7 +198,7 @@ function ajax_forms_test_validation_form_callback($form, $form_state) {
/**
* Ajax form callback: Selects the 'drivernumber' element of the validation form.
*/
function
ajax_forms_test_validation_number_form_callback
(
$form
,
$form_state
)
{
function
ajax_forms_test_validation_number_form_callback
(
$form
,
FormStateInterface
$form_state
)
{
drupal_set_message
(
"ajax_forms_test_validation_number_form_callback invoked"
);
drupal_set_message
(
t
(
"Callback: drivernumber=%drivernumber, spare_required_field=%spare_required_field"
,
array
(
'%drivernumber'
=>
$form_state
[
'values'
][
'drivernumber'
],
'%spare_required_field'
=>
$form_state
[
'values'
][
'spare_required_field'
])));
return
'<div id="message_area_number">ajax_forms_test_validation_number_form_callback at '
.
date
(
'c'
)
.
'</div>'
;
...
...
core/modules/system/tests/modules/ajax_forms_test/src/Callbacks.php
View file @
5f4bbab9
...
...
@@ -10,6 +10,7 @@
use
Drupal\Core\Ajax\AjaxResponse
;
use
Drupal\Core\Ajax\DataCommand
;
use
Drupal\Core\Ajax\HtmlCommand
;
use
Drupal\Core\Form\FormStateInterface
;
/**
* Simple object for testing methods as Ajax callbacks.
...
...
@@ -19,7 +20,7 @@ class Callbacks {
/**
* Ajax callback triggered by select.
*/
function
selectCallback
(
$form
,
$form_state
)
{
function
selectCallback
(
$form
,
FormStateInterface
$form_state
)
{
$response
=
new
AjaxResponse
();
$response
->
addCommand
(
new
HtmlCommand
(
'#ajax_selected_color'
,
$form_state
[
'values'
][
'select'
]));
$response
->
addCommand
(
new
DataCommand
(
'#ajax_selected_color'
,
'form_state_value_select'
,
$form_state
[
'values'
][
'select'
]));
...
...
@@ -29,7 +30,7 @@ function selectCallback($form, $form_state) {
/**
* Ajax callback triggered by checkbox.
*/
function
checkboxCallback
(
$form
,
$form_state
)
{
function
checkboxCallback
(
$form
,
FormStateInterface
$form_state
)
{
$response
=
new
AjaxResponse
();
$response
->
addCommand
(
new
HtmlCommand
(
'#ajax_checkbox_value'
,
(
int
)
$form_state
[
'values'
][
'checkbox'
]));
$response
->
addCommand
(
new
DataCommand
(
'#ajax_checkbox_value'
,
'form_state_value_select'
,
(
int
)
$form_state
[
'values'
][
'checkbox'
]));
...
...
core/modules/system/tests/modules/form_test/src/Form/FormTestTableSelectFormBase.php
View file @
5f4bbab9
...
...
@@ -8,6 +8,7 @@
namespace
Drupal\form_test\Form
;
use
Drupal\Core\Form\FormBase
;
use
Drupal\Core\Form\FormStateInterface
;
/**
* Provides a base class for tableselect forms.
...
...
@@ -27,7 +28,7 @@ abstract class FormTestTableSelectFormBase extends FormBase {
* @return array
* A form with a tableselect element and a submit button.
*/
function
tableselectFormBuilder
(
$form
,
$form_state
,
$element_properties
)
{
function
tableselectFormBuilder
(
$form
,
FormStateInterface
$form_state
,
$element_properties
)
{
list
(
$header
,
$options
)
=
_form_test_tableselect_get_data
();
$form
[
'tableselect'
]
=
$element_properties
;
...
...
core/modules/update/update.module
View file @
5f4bbab9
...
...
@@ -258,7 +258,7 @@ function update_themes_disabled($themes) {
*