Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in
Toggle navigation
Menu
Open sidebar
project
drupal
Commits
fc5e111a
Commit
fc5e111a
authored
Jul 30, 2014
by
Dries
Browse files
Issue
#2225353
by tim.plunkett: Convert to an object and provide methods like setError().
parent
4d07e60a
Changes
688
Hide whitespace changes
Inline
Side-by-side
core/includes/ajax.inc
View file @
fc5e111a
...
...
@@ -5,6 +5,8 @@
* Functions for use with Drupal's Ajax framework.
*/
use
Drupal\Core\Form\FormStateInterface
;
/**
* @defgroup ajax Ajax framework
* @{
...
...
@@ -64,7 +66,7 @@
* return \Drupal::formBuilder()->getForm('ajax_example_simplest');
* }
*
* function ajax_example_simplest($form,
&
$form_state) {
* function ajax_example_simplest($form,
FormStateInterface
$form_state) {
* $form = array();
* $form['changethis'] = array(
* '#type' => 'select',
...
...
@@ -236,7 +238,7 @@
*
* @see ajax_pre_render_element()
*/
function
ajax_process_form
(
$element
,
&
$form_state
)
{
function
ajax_process_form
(
$element
,
FormStateInterface
$form_state
)
{
$element
=
ajax_pre_render_element
(
$element
);
if
(
!
empty
(
$element
[
'#ajax_processed'
]))
{
$form_state
[
'cache'
]
=
TRUE
;
...
...
core/includes/batch.inc
View file @
fc5e111a
...
...
@@ -17,6 +17,7 @@
use
Drupal\Component\Utility\SafeMarkup
;
use
Drupal\Component\Utility\Timer
;
use
Drupal\Core\Batch\Percentage
;
use
Drupal\Core\Form\FormState
;
use
Drupal\Core\Page\DefaultHtmlPageRenderer
;
use
Symfony\Component\HttpFoundation\JsonResponse
;
use
Symfony\Component\HttpFoundation\Request
;
...
...
@@ -442,6 +443,9 @@ function _batch_finished() {
}
// Determine the target path to redirect to.
if
(
!
isset
(
$_batch
[
'form_state'
]))
{
$_batch
[
'form_state'
]
=
new
FormState
();
}
if
(
!
isset
(
$_batch
[
'form_state'
][
'redirect'
]))
{
if
(
isset
(
$_batch
[
'redirect'
]))
{
$_batch
[
'form_state'
][
'redirect'
]
=
$_batch
[
'redirect'
];
...
...
core/includes/form.inc
View file @
fc5e111a
...
...
@@ -12,6 +12,7 @@
use
Drupal\Component\Utility\UrlHelper
;
use
Drupal\Component\Utility\Xss
;
use
Drupal\Core\Database\Database
;
use
Drupal\Core\Form\FormStateInterface
;
use
Drupal\Core\Form\OptGroup
;
use
Drupal\Core\Render\Element
;
use
Drupal\Core\Template\Attribute
;
...
...
@@ -26,7 +27,7 @@
*
* @see \Drupal\Core\Form\FormBuilderInterface::getCache().
*/
function
form_get_cache
(
$form_build_id
,
&
$form_state
)
{
function
form_get_cache
(
$form_build_id
,
FormStateInterface
$form_state
)
{
return
\
Drupal
::
formBuilder
()
->
getCache
(
$form_build_id
,
$form_state
);
}
...
...
@@ -73,7 +74,7 @@ function form_set_cache($form_build_id, $form, $form_state) {
*
* @see module_load_include()
*/
function
form_load_include
(
&
$form_state
,
$type
,
$module
,
$name
=
NULL
)
{
function
form_load_include
(
FormStateInterface
$form_state
,
$type
,
$module
,
$name
=
NULL
)
{
if
(
!
isset
(
$name
))
{
$name
=
$module
;
}
...
...
@@ -99,7 +100,7 @@ function form_load_include(&$form_state, $type, $module, $name = NULL) {
*
* @see \Drupal\Core\Form\FormBuilderInterface::submitForm().
*/
function
drupal_form_submit
(
$form_arg
,
&
$form_state
)
{
function
drupal_form_submit
(
$form_arg
,
FormStateInterface
$form_state
)
{
\
Drupal
::
formBuilder
()
->
submitForm
(
$form_arg
,
$form_state
);
}
...
...
@@ -111,7 +112,7 @@ function drupal_form_submit($form_arg, &$form_state) {
*
* @see \Drupal\Core\Form\FormBuilderInterface::retrieveForm().
*/
function
drupal_retrieve_form
(
$form_id
,
&
$form_state
)
{
function
drupal_retrieve_form
(
$form_id
,
FormStateInterface
$form_state
)
{
return
\
Drupal
::
formBuilder
()
->
retrieveForm
(
$form_id
,
$form_state
);
}
...
...
@@ -123,7 +124,7 @@ function drupal_retrieve_form($form_id, &$form_state) {
*
* @see \Drupal\Core\Form\FormBuilderInterface::processForm().
*/
function
drupal_process_form
(
$form_id
,
&
$form
,
&
$form_state
)
{
function
drupal_process_form
(
$form_id
,
&
$form
,
FormStateInterface
$form_state
)
{
\
Drupal
::
formBuilder
()
->
processForm
(
$form_id
,
$form
,
$form_state
);
}
...
...
@@ -149,7 +150,7 @@ function drupal_redirect_form($form_state) {
* @see \Drupal\Core\Form\FormSubmitterInterface::executeSubmitHandlers()
* @see \Drupal\Core\Form\FormValidatorInterface::executeValidateHandlers()
*/
function
form_execute_handlers
(
$type
,
&
$form
,
&
$form_state
)
{
function
form_execute_handlers
(
$type
,
&
$form
,
FormStateInterface
$form_state
)
{
if
(
$type
==
'submit'
)
{
\
Drupal
::
service
(
'form_submitter'
)
->
executeSubmitHandlers
(
$form
,
$form_state
);
}
...
...
@@ -166,7 +167,7 @@ function form_execute_handlers($type, &$form, &$form_state) {
*
* @see \Drupal\Core\Form\FormErrorInterface::setErrorByName().
*/
function
form_set_error
(
$name
,
array
&
$form_state
,
$message
=
''
)
{
function
form_set_error
(
$name
,
FormStateInterface
$form_state
,
$message
=
''
)
{
\
Drupal
::
formBuilder
()
->
setErrorByName
(
$name
,
$form_state
,
$message
);
}
...
...
@@ -178,7 +179,7 @@ function form_set_error($name, array &$form_state, $message = '') {
*
* @see \Drupal\Core\Form\FormErrorInterface::getErrors()
*/
function
form_get_errors
(
array
&
$form_state
)
{
function
form_get_errors
(
FormStateInterface
$form_state
)
{
return
\
Drupal
::
formBuilder
()
->
getErrors
(
$form_state
);
}
...
...
@@ -190,7 +191,7 @@ function form_get_errors(array &$form_state) {
*
* @see \Drupal\Core\Form\FormErrorInterface::getError().
*/
function
form_get_error
(
$element
,
array
&
$form_state
)
{
function
form_get_error
(
$element
,
FormStateInterface
$form_state
)
{
return
\
Drupal
::
formBuilder
()
->
getError
(
$element
,
$form_state
);
}
...
...
@@ -202,7 +203,7 @@ function form_get_error($element, array &$form_state) {
*
* @see \Drupal\Core\Form\FormErrorInterface::setError().
*/
function
form_error
(
&
$element
,
array
&
$form_state
,
$message
=
''
)
{
function
form_error
(
&
$element
,
FormStateInterface
$form_state
,
$message
=
''
)
{
\
Drupal
::
formBuilder
()
->
setError
(
$element
,
$form_state
,
$message
);
}
...
...
@@ -214,7 +215,7 @@ function form_error(&$element, array &$form_state, $message = '') {
*
* @see \Drupal\Core\Form\FormBuilderInterface::doBuildForm().
*/
function
form_builder
(
$form_id
,
&
$element
,
&
$form_state
)
{
function
form_builder
(
$form_id
,
&
$element
,
FormStateInterface
$form_state
)
{
return
\
Drupal
::
formBuilder
()
->
doBuildForm
(
$form_id
,
$element
,
$form_state
);
}
...
...
@@ -233,10 +234,9 @@ function form_builder($form_id, &$element, &$form_state) {
* - op
*
* @param $form_state
* A keyed array containing the current state of the form, including
* submitted form values; altered by reference.
* The current state of the form, including submitted form values.
*/
function
form_state_values_clean
(
&
$form_state
)
{
function
form_state_values_clean
(
FormStateInterface
$form_state
)
{
// Remove internal Form API values.
unset
(
$form_state
[
'values'
][
'form_id'
],
$form_state
[
'values'
][
'form_token'
],
$form_state
[
'values'
][
'form_build_id'
],
$form_state
[
'values'
][
'op'
]);
...
...
@@ -282,7 +282,7 @@ function form_state_values_clean(&$form_state) {
* The incoming input to populate the form element. If this is FALSE,
* the element's default value should be returned.
* @param $form_state
*
A keyed array containing t
he current state of the form.
*
T
he current state of the form.
*
* @return
* The data that will appear in the $form_state['values'] collection
...
...
@@ -619,7 +619,7 @@ function form_type_token_value($element, $input = FALSE) {
*
* @see \Drupal\Core\Form\FormBuilderInterface::setValue().
*/
function
form_set_value
(
$element
,
$value
,
&
$form_state
)
{
function
form_set_value
(
$element
,
$value
,
FormStateInterface
$form_state
)
{
\
Drupal
::
formBuilder
()
->
setValue
(
$element
,
$value
,
$form_state
);
}
...
...
@@ -1255,12 +1255,12 @@ function form_process_checkboxes($element) {
* An associative array containing the properties and children of the
* form actions container.
* @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.
*
* @return
* The processed element.
*/
function
form_process_actions
(
$element
,
&
$form_state
)
{
function
form_process_actions
(
$element
,
FormStateInterface
$form_state
)
{
$element
[
'#attributes'
][
'class'
][]
=
'form-actions'
;
return
$element
;
}
...
...
@@ -1318,14 +1318,14 @@ function form_pre_render_actions_dropbutton(array $element) {
* An associative array containing the properties and children of the
* generic input 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.
*
* @return
* The processed element.
*
* @see form_validate_pattern()
*/
function
form_process_pattern
(
$element
,
&
$form_state
)
{
function
form_process_pattern
(
$element
,
FormStateInterface
$form_state
)
{
if
(
isset
(
$element
[
'#pattern'
])
&&
!
isset
(
$element
[
'#attributes'
][
'pattern'
]))
{
$element
[
'#attributes'
][
'pattern'
]
=
$element
[
'#pattern'
];
$element
[
'#element_validate'
][]
=
'form_validate_pattern'
;
...
...
@@ -1341,11 +1341,11 @@ function form_process_pattern($element, &$form_state) {
* 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()
*/
function
form_validate_pattern
(
$element
,
&
$form_state
)
{
function
form_validate_pattern
(
$element
,
FormStateInterface
$form_state
)
{
if
(
$element
[
'#value'
]
!==
''
)
{
// The pattern must match the entire string and should have the same
// behavior as the RegExp object in ECMA 262.
...
...
@@ -1368,12 +1368,12 @@ function form_validate_pattern($element, &$form_state) {
* An associative array containing the properties and children of the
* container.
* @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.
*
* @return
* The processed element.
*/
function
form_process_container
(
$element
,
&
$form_state
)
{
function
form_process_container
(
$element
,
FormStateInterface
$form_state
)
{
// Generate the ID of the element if it's not explicitly given.
if
(
!
isset
(
$element
[
'#id'
]))
{
$element
[
'#id'
]
=
drupal_html_id
(
implode
(
'-'
,
$element
[
'#parents'
])
.
'-wrapper'
);
...
...
@@ -1568,7 +1568,7 @@ function form_process_tableselect($element) {
* @param array $element
* An associative array containing the properties and children of the
* table element.
* @param
array
$form_state
* @param
\Drupal\Core\Form\FormStateInterface
$form_state
* The current state of the form.
*
* @return array
...
...
@@ -1577,7 +1577,7 @@ function form_process_tableselect($element) {
* @see form_process_tableselect()
* @see theme_tableselect()
*/
function
form_process_table
(
$element
,
&
$form_state
)
{
function
form_process_table
(
$element
,
FormStateInterface
$form_state
)
{
if
(
$element
[
'#tableselect'
])
{
if
(
$element
[
'#multiple'
])
{
$value
=
is_array
(
$element
[
'#value'
])
?
$element
[
'#value'
]
:
array
();
...
...
@@ -1694,10 +1694,10 @@ function form_process_table($element, &$form_state) {
* @param array $element
* An associative array containing the properties and children of the
* table element.
* @param
array
$form_state
* @param
\Drupal\Core\Form\FormStateInterface
$form_state
* The current state of the form.
*/
function
form_validate_table
(
$element
,
&
$form_state
)
{
function
form_validate_table
(
$element
,
FormStateInterface
$form_state
)
{
// Skip this validation if the button to submit the form does not require
// selected table row data.
if
(
empty
(
$form_state
[
'triggering_element'
][
'#tableselect'
]))
{
...
...
@@ -1745,7 +1745,7 @@ function form_validate_table($element, &$form_state) {
* - #disabled: (optional) Should be set to TRUE in case an existing machine
* name must not be changed after initial creation.
*/
function
form_process_machine_name
(
$element
,
&
$form_state
)
{
function
form_process_machine_name
(
$element
,
FormStateInterface
$form_state
)
{
// We need to pass the langcode to the client.
$language
=
\
Drupal
::
languageManager
()
->
getCurrentLanguage
();
...
...
@@ -1829,7 +1829,7 @@ function form_process_machine_name($element, &$form_state) {
*
* Note that #maxlength is validated by _form_validate() already.
*/
function
form_validate_machine_name
(
&
$element
,
&
$form_state
)
{
function
form_validate_machine_name
(
&
$element
,
FormStateInterface
$form_state
)
{
// Verify that the machine name not only consists of replacement tokens.
if
(
preg_match
(
'@^'
.
$element
[
'#machine_name'
][
'replace'
]
.
'+$@'
,
$element
[
'#value'
]))
{
form_error
(
$element
,
$form_state
,
t
(
'The machine-readable name must contain unique characters.'
));
...
...
@@ -1870,12 +1870,12 @@ function form_validate_machine_name(&$element, &$form_state) {
* element. Note that $element must be taken by reference here, so processed
* child elements are taken over into $form_state.
* @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.
*
* @return
* The processed element.
*/
function
form_process_group
(
&
$element
,
&
$form_state
)
{
function
form_process_group
(
&
$element
,
FormStateInterface
$form_state
)
{
$parents
=
implode
(
']['
,
$element
[
'#parents'
]);
// Each details element forms a new group. The #type 'vertical_tabs' basically
...
...
@@ -1994,12 +1994,12 @@ function form_pre_render_group($element) {
* An associative array containing the properties and children of the
* details element.
* @param $form_state
* The
$form_state array
for the form this vertical tab widget belongs to.
* The
current state of the form
for the form this vertical tab widget belongs to.
*
* @return
* The processed element.
*/
function
form_process_vertical_tabs
(
$element
,
&
$form_state
)
{
function
form_process_vertical_tabs
(
$element
,
FormStateInterface
$form_state
)
{
// Inject a new details as child, so that form_process_details() processes
// this details element like any other details.
$element
[
'group'
]
=
array
(
...
...
@@ -2088,13 +2088,13 @@ function template_preprocess_vertical_tabs(&$variables) {
* autocomplete JavaScript library.
* - #autocomplete_route_parameters: The parameters to be used in conjunction
* with the route name.
* @param
array
$form_state
*
An associative array containing t
he current state of the form.
* @param
\Drupal\Core\Form\FormStateInterface
$form_state
*
T
he current state of the form.
*
* @return array
* The form element.
*/
function
form_process_autocomplete
(
$element
,
&
$form_state
)
{
function
form_process_autocomplete
(
$element
,
FormStateInterface
$form_state
)
{
$access
=
FALSE
;
if
(
!
empty
(
$element
[
'#autocomplete_route_name'
]))
{
$parameters
=
isset
(
$element
[
'#autocomplete_route_parameters'
])
?
$element
[
'#autocomplete_route_parameters'
]
:
array
();
...
...
@@ -2254,7 +2254,7 @@ function form_pre_render_email($element) {
*
* Note that #maxlength and #required is validated by _form_validate() already.
*/
function
form_validate_email
(
&
$element
,
&
$form_state
)
{
function
form_validate_email
(
&
$element
,
FormStateInterface
$form_state
)
{
$value
=
trim
(
$element
[
'#value'
]);
form_set_value
(
$element
,
$value
,
$form_state
);
...
...
@@ -2325,7 +2325,7 @@ function form_pre_render_range($element) {
*
* Note that #required is validated by _form_validate() already.
*/
function
form_validate_number
(
&
$element
,
&
$form_state
)
{
function
form_validate_number
(
&
$element
,
FormStateInterface
$form_state
)
{
$value
=
$element
[
'#value'
];
if
(
$value
===
''
)
{
return
;
...
...
@@ -2433,7 +2433,7 @@ function form_pre_render_search($element) {
*
* Note that #maxlength and #required is validated by _form_validate() already.
*/
function
form_validate_url
(
&
$element
,
&
$form_state
)
{
function
form_validate_url
(
&
$element
,
FormStateInterface
$form_state
)
{
$value
=
trim
(
$element
[
'#value'
]);
form_set_value
(
$element
,
$value
,
$form_state
);
...
...
@@ -2445,7 +2445,7 @@ function form_validate_url(&$element, &$form_state) {
/**
* Form element validation handler for #type 'color'.
*/
function
form_validate_color
(
&
$element
,
&
$form_state
)
{
function
form_validate_color
(
&
$element
,
FormStateInterface
$form_state
)
{
$value
=
trim
(
$element
[
'#value'
]);
// Default to black if no value is given.
...
...
core/includes/install.core.inc
View file @
fc5e111a
...
...
@@ -7,6 +7,7 @@
use
Drupal\Core\Database\Database
;
use
Drupal\Core\Database\DatabaseExceptionWrapper
;
use
Drupal\Core\Database\Install\TaskException
;
use
Drupal\Core\Form\FormState
;
use
Drupal\Core\Installer\Exception\AlreadyInstalledException
;
use
Drupal\Core\Installer\Exception\InstallerException
;
use
Drupal\Core\Installer\Exception\NoProfilesException
;
...
...
@@ -157,7 +158,7 @@ function install_drupal($settings = array()) {
* submission is for, and the values are used as the $form_state['values']
* array that is passed on to the form submission via drupal_form_submit()).
*
* @see
d
rupal
_form_
submit()
* @see
\D
rupal
\Core\Form\FormBuilderInterface::
submit
Form
()
*/
function
install_state_defaults
()
{
$defaults
=
array
(
...
...
@@ -804,12 +805,12 @@ function install_tasks_to_display($install_state) {
function
install_get_form
(
$form_id
,
array
&
$install_state
)
{
// Ensure the form will not redirect, since install_run_tasks() uses a custom
// redirection logic.
$form_state
=
array
(
$form_state
=
new
FormState
(
array
(
'build_info'
=>
array
(
'args'
=>
array
(
&
$install_state
),
),
'no_redirect'
=>
TRUE
,
);
)
);
$form_builder
=
\
Drupal
::
formBuilder
();
if
(
$install_state
[
'interactive'
])
{
$form
=
$form_builder
->
buildForm
(
$form_id
,
$form_state
);
...
...
core/lib/Drupal/Core/Action/ConfigurableActionBase.php
View file @
fc5e111a
...
...
@@ -9,6 +9,7 @@
use
Drupal\Component\Plugin\ConfigurablePluginInterface
;
use
Drupal\Core\Action\ActionBase
;
use
Drupal\Core\Form\FormStateInterface
;
use
Drupal\Core\Plugin\PluginFormInterface
;
/**
...
...
@@ -49,7 +50,7 @@ public function setConfiguration(array $configuration) {
/**
* {@inheritdoc}
*/
public
function
validateConfigurationForm
(
array
&
$form
,
array
&
$form_state
)
{
public
function
validateConfigurationForm
(
array
&
$form
,
FormStateInterface
$form_state
)
{
}
/**
...
...
core/lib/Drupal/Core/Condition/ConditionPluginBase.php
View file @
fc5e111a
...
...
@@ -8,6 +8,7 @@
namespace
Drupal\Core\Condition
;
use
Drupal\Core\Executable\ExecutablePluginBase
;
use
Drupal\Core\Form\FormStateInterface
;
/**
* Provides a basis for fulfilling contexts for condition plugins.
...
...
@@ -39,7 +40,7 @@ public function isNegated() {
/**
* {@inheritdoc}
*/
public
function
buildConfigurationForm
(
array
$form
,
array
&
$form_state
)
{
public
function
buildConfigurationForm
(
array
$form
,
FormStateInterface
$form_state
)
{
$form
[
'negate'
]
=
array
(
'#type'
=>
'checkbox'
,
'#title'
=>
$this
->
t
(
'Negate the condition.'
),
...
...
@@ -51,13 +52,13 @@ 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
)
{
}
/**
* {@inheritdoc}
*/
public
function
submitConfigurationForm
(
array
&
$form
,
array
&
$form_state
)
{
public
function
submitConfigurationForm
(
array
&
$form
,
FormStateInterface
$form_state
)
{
$this
->
configuration
[
'negate'
]
=
$form_state
[
'values'
][
'negate'
];
}
...
...
core/lib/Drupal/Core/Config/Entity/DraggableListBuilder.php
View file @
fc5e111a
...
...
@@ -11,6 +11,7 @@
use
Drupal\Core\Entity\EntityStorageInterface
;
use
Drupal\Core\Entity\EntityTypeInterface
;
use
Drupal\Core\Form\FormInterface
;
use
Drupal\Core\Form\FormStateInterface
;
/**
* Defines a class to build a draggable listing of configuration entities.
...
...
@@ -102,7 +103,7 @@ public function render() {
/**
* {@inheritdoc}
*/
public
function
buildForm
(
array
$form
,
array
&
$form_state
)
{
public
function
buildForm
(
array
$form
,
FormStateInterface
$form_state
)
{
$form
[
$this
->
entitiesKey
]
=
array
(
'#type'
=>
'table'
,
'#header'
=>
$this
->
buildHeader
(),
...
...
@@ -138,14 +139,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
)
{
// No validation.
}
/**
* {@inheritdoc}
*/
public
function
submitForm
(
array
&
$form
,
array
&
$form_state
)
{
public
function
submitForm
(
array
&
$form
,
FormStateInterface
$form_state
)
{
foreach
(
$form_state
[
'values'
][
$this
->
entitiesKey
]
as
$id
=>
$value
)
{
if
(
isset
(
$this
->
entities
[
$id
])
&&
$this
->
entities
[
$id
]
->
get
(
$this
->
weightKey
)
!=
$value
[
'weight'
])
{
// Save entity only when its weight was changed.
...
...
core/lib/Drupal/Core/Controller/FormController.php
View file @
fc5e111a
...
...
@@ -9,6 +9,7 @@
use
Drupal\Core\DependencyInjection\DependencySerializationTrait
;
use
Drupal\Core\Form\FormBuilderInterface
;
use
Drupal\Core\Form\FormState
;
use
Symfony\Component\HttpFoundation\Request
;
/**
...
...
@@ -66,7 +67,7 @@ public function getContentResult(Request $request) {
// Add the form and form_state to trick the getArguments method of the
// controller resolver.
$form_state
=
array
();
$form_state
=
new
FormState
();
$request
->
attributes
->
set
(
'form'
,
array
());
$request
->
attributes
->
set
(
'form_state'
,
$form_state
);
$args
=
$this
->
controllerResolver
->
getArguments
(
$request
,
array
(
$form_object
,
'buildForm'
));
...
...
core/lib/Drupal/Core/Display/VariantBase.php
View file @
fc5e111a
...
...
@@ -7,6 +7,7 @@
namespace
Drupal\Core\Display
;
use
Drupal\Core\Form\FormStateInterface
;
use
Drupal\Core\Plugin\PluginBase
;
use
Drupal\Core\Plugin\PluginDependencyTrait
;
use
Drupal\Core\Session\AccountInterface
;
...
...
@@ -100,7 +101,7 @@ public function calculateDependencies() {
/**
* {@inheritdoc}
*/
public
function
buildConfigurationForm
(
array
$form
,
array
&
$form_state
)
{
public
function
buildConfigurationForm
(
array
$form
,
FormStateInterface
$form_state
)
{
$form
[
'label'
]
=
array
(
'#type'
=>
'textfield'
,
'#title'
=>
$this
->
t
(
'Label'
),
...
...
@@ -114,13 +115,13 @@ 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
)
{
}
/**
* {@inheritdoc}
*/
public
function
submitConfigurationForm
(
array
&
$form
,
array
&
$form_state
)
{
public
function
submitConfigurationForm
(
array
&
$form
,
FormStateInterface
$form_state
)
{
$this
->
configuration
[
'label'
]
=
$form_state
[
'values'
][
'label'
];
}
...
...
core/lib/Drupal/Core/Entity/ContentEntityConfirmFormBase.php
View file @
fc5e111a
...
...
@@ -9,6 +9,7 @@
use
Drupal\Core\Form\ConfirmFormHelper
;
use
Drupal\Core\Form\ConfirmFormInterface
;
use
Drupal\Core\Form\FormStateInterface
;
/**
* Provides a generic base class for an entity-based confirmation form.
...
...
@@ -53,7 +54,7 @@ public function getFormName() {
/**
* {@inheritdoc}
*/
public
function
buildForm
(
array
$form
,
array
&
$form_state
)
{
public
function
buildForm
(
array
$form
,
FormStateInterface
$form_state
)
{
$form
=
parent
::
buildForm
(
$form
,
$form_state
);
$form
[
'#title'
]
=
$this
->
getQuestion
();
...
...
@@ -72,7 +73,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
)
{
// Do not attach fields to the confirm form.
return
$form
;
}
...
...
@@ -80,7 +81,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
->
getConfirmText
();
unset
(
$actions
[
'delete'
]);
...
...
core/lib/Drupal/Core/Entity/ContentEntityForm.php
View file @
fc5e111a
...
...
@@ -8,6 +8,7 @@
namespace
Drupal\Core\Entity
;
use
Drupal\Core\Entity\Display\EntityFormDisplayInterface
;
use
Drupal\Core\Form\FormStateInterface
;
use
Drupal\entity\Entity\EntityFormDisplay
;
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
)
{
$form
=
parent
::
form
(
$form
,
$form_state
);
$this
->
getFormDisplay
(
$form_state
)
->
buildForm
(
$this
->
entity
,
$form
,
$form_state
);
return
$form
;
...
...
@@ -56,7 +57,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
)
{
$this
->
updateFormLangcode
(
$form_state
);
$entity
=
$this
->
buildEntity
(
$form
,
$form_state
);
$this
->
getFormDisplay
(
$form_state
)
->
validateFormValues
(
$entity
,
$form
,
$form_state
);
...
...
@@ -70,7 +71,7 @@ public function validate(array $form, array &$form_state) {
/**
* Initialize the form state and the entity before the first form build.
*/
protected
function
init
(
array
&
$form_state
)
{
protected
function
init
(
FormStateInterface
$form_state
)
{
// Ensure we act on the translation object corresponding to the current form
// language.
$langcode
=
$this
->
getFormLangcode
(
$form_state
);
...
...
@@ -85,7 +86,7 @@ protected function init(array &$form_state) {
/**
* {@inheritdoc}
*/
public
function
getFormLangcode
(
array
&
$form_state
)
{
public
function
getFormLangcode
(
FormStateInterface
$form_state
)
{
if
(
empty
(
$form_state
[
'langcode'
]))
{
// Imply a 'view' operation to ensure users edit entities in the same
// language they are displayed. This allows to keep contextual editing
...
...
@@ -98,14 +99,14 @@ public function getFormLangcode(array &$form_state) {
/**
* {@inheritdoc}
*/
public
function
isDefaultFormLangcode
(
array
$form_state
)
{
public
function
isDefaultFormLangcode
(
FormStateInterface
$form_state
)
{
return
$this
->
getFormLangcode
(
$form_state
)
==
$this
->
entity
->
getUntranslated
()
->
language
()
->
id
;
}
/**
* {@inheritdoc}
*/
protected
function
copyFormValuesToEntity
(
EntityInterface
$entity
,
array
$form
,
array
&
$form_state
)
{
protected
function
copyFormValuesToEntity
(
EntityInterface
$entity
,
array
$form
,
FormStateInterface
$form_state
)
{
// First, extract values from widgets.
$extracted
=
$this
->
getFormDisplay
(
$form_state
)
->
extractFormValues
(
$entity
,
$form
,
$form_state
);