Malicious content.
'; - $edit['body[und][0][format]'] = 'filtered_html'; + $edit['body[0][summary]'] = ''; + $edit['body[0][value]'] = 'Malicious content.
'; + $edit['body[0][format]'] = 'filtered_html'; $edit['op'] = t('Save'); $response = $this->submitFieldForm('node/1/body/und/full', $edit); // @todo Uncomment the below once https://drupal.org/node/2063303 is fixed. @@ -188,9 +188,9 @@ function testUserWithPermission() { $edit['form_id'] = 'edit_field_form'; $edit['form_token'] = $token_match[1]; $edit['form_build_id'] = $build_id_match[1]; - $edit['body[und][0][summary]'] = ''; - $edit['body[und][0][value]'] = 'Fine thanks.
'; - $edit['body[und][0][format]'] = 'filtered_html'; + $edit['body[0][summary]'] = ''; + $edit['body[0][value]'] = 'Fine thanks.
'; + $edit['body[0][format]'] = 'filtered_html'; $edit['op'] = t('Save'); // Submit field form and check response. This should store the diff --git a/core/modules/entity_reference/lib/Drupal/entity_reference/Tests/EntityReferenceAutoCreateTest.php b/core/modules/entity_reference/lib/Drupal/entity_reference/Tests/EntityReferenceAutoCreateTest.php index d81dc5e..1d6c0a2 100644 --- a/core/modules/entity_reference/lib/Drupal/entity_reference/Tests/EntityReferenceAutoCreateTest.php +++ b/core/modules/entity_reference/lib/Drupal/entity_reference/Tests/EntityReferenceAutoCreateTest.php @@ -96,7 +96,7 @@ public function testAutoCreate() { $edit = array( 'title' => $this->randomName(), - 'test_field[und][0][target_id]' => $new_title, + 'test_field[0][target_id]' => $new_title, ); $this->drupalPost("node/add/$this->referencing_type", $edit, 'Save'); diff --git a/core/modules/field/field.deprecated.inc b/core/modules/field/field.deprecated.inc index 25677ac..f759e6d 100644 --- a/core/modules/field/field.deprecated.inc +++ b/core/modules/field/field.deprecated.inc @@ -491,46 +491,41 @@ function field_read_instances($conditions = array(), $include_additional = array * '#tree' => TRUE, * '#field_name' => The name of the field, * '#language' => $langcode, - * $langcode => array( + * '#field_parents' => The 'parents' space for the field in the form, equal + * to the #parents property of the $form parameter received by + * field_attach_form(), + * '#required' => Whether or not the field is required, + * '#title' => The label of the field instance, + * '#description' => The description text for the field instance, + * + * // Only for 'single' widgets: + * '#theme' => 'field_multiple_value_form', + * '#cardinality' => The field cardinality, + * // One sub-array per copy of the widget, keyed by delta. + * 0 => array( + * '#entity_type' => The name of the entity type, + * '#bundle' => The name of the bundle, * '#field_name' => The name of the field, - * '#language' => $langcode, * '#field_parents' => The 'parents' space for the field in the form, * equal to the #parents property of the $form parameter received by * field_attach_form(), - * '#required' => Whether or not the field is required, - * '#title' => The label of the field instance, - * '#description' => The description text for the field instance, - * - * // Only for 'single' widgets: - * '#theme' => 'field_multiple_value_form', - * '#cardinality' => The field cardinality, - * // One sub-array per copy of the widget, keyed by delta. - * 0 => array( - * '#entity_type' => The name of the entity type, - * '#bundle' => The name of the bundle, - * '#field_name' => The name of the field, - * '#field_parents' => The 'parents' space for the field in the form, - * equal to the #parents property of the $form parameter received by - * field_attach_form(), - * '#title' => The title to be displayed by the widget, - * '#default_value' => The field value for delta 0, - * '#required' => Whether the widget should be marked required, - * '#delta' => 0, - * // The remaining elements in the sub-array depend on the widget. - * '#type' => The type of the widget, - * ... - * ), - * 1 => array( - * ... - * ), - * - * // Only for multiple widgets: - * '#entity_type' => The name of the entity type, - * '#bundle' => $instance['bundle'], + * '#title' => The title to be displayed by the widget, + * '#default_value' => The field value for delta 0, + * '#required' => Whether the widget should be marked required, + * '#delta' => 0, * // The remaining elements in the sub-array depend on the widget. * '#type' => The type of the widget, * ... * ), + * 1 => array( + * ... + * ), + * + * // Only for multiple widgets: + * '#entity_type' => The name of the entity type, + * '#bundle' => $instance['bundle'], + * // The remaining elements in the sub-array depend on the widget. + * '#type' => The type of the widget, * ... * ), * ) diff --git a/core/modules/field/lib/Drupal/field/Plugin/Type/Widget/WidgetBase.php b/core/modules/field/lib/Drupal/field/Plugin/Type/Widget/WidgetBase.php index 4cf4556..39b80ef 100644 --- a/core/modules/field/lib/Drupal/field/Plugin/Type/Widget/WidgetBase.php +++ b/core/modules/field/lib/Drupal/field/Plugin/Type/Widget/WidgetBase.php @@ -58,13 +58,8 @@ public function __construct($plugin_id, array $plugin_definition, FieldDefinitio */ public function form(EntityInterface $entity, $langcode, FieldInterface $items, array &$form, array &$form_state, $get_delta = NULL) { $field_name = $this->fieldDefinition->getFieldName(); - $parents = $form['#parents']; - $addition = array( - $field_name => array(), - ); - // Store field information in $form_state. if (!field_form_get_state($parents, $field_name, $langcode, $form_state)) { $field_state = array( @@ -110,19 +105,6 @@ public function form(EntityInterface $entity, $langcode, FieldInterface $items, $elements = $this->formMultipleElements($entity, $items, $langcode, $form, $form_state); } - // Also aid in theming of field widgets by rendering a classified - // container. - $addition[$field_name] = array( - '#type' => 'container', - '#attributes' => array( - 'class' => array( - 'field-type-' . drupal_html_class($this->fieldDefinition->getFieldType()), - 'field-name-' . drupal_html_class($field_name), - 'field-widget-' . drupal_html_class($this->getPluginId()), - ), - ), - ); - // Populate the 'array_parents' information in $form_state['field'] after // the form is built, so that we catch changes in the form structure performed // in alter() hooks. @@ -131,16 +113,29 @@ public function form(EntityInterface $entity, $langcode, FieldInterface $items, $elements['#language'] = $langcode; $elements['#field_parents'] = $parents; - $addition[$field_name] += array( - '#tree' => TRUE, - // The '#language' key can be used to access the field's form element - // when $langcode is unknown. - '#language' => $langcode, - $langcode => $elements, - '#access' => $this->checkFieldAccess('edit', $entity), + // Force field access. + $elements['#access'] = $this->checkFieldAccess('edit', $entity); + + // Most widgets need their internal structure reflected in submitted values. + $elements += array('#tree' => TRUE, '#parents' => array_merge($parents, array($field_name))); + + $return = array( + // @todo should we include the $field_name ourselves ? + $field_name => array( + // Aid in theming of widgets by rendering a classified container. + '#type' => 'container', + '#attributes' => array( + 'class' => array( + 'field-type-' . drupal_html_class($this->fieldDefinition->getFieldType()), + 'field-name-' . drupal_html_class($field_name), + 'field-widget-' . drupal_html_class($this->getPluginId()), + ), + ), + 'widget' => $elements, + ), ); - return $addition; + return $return; } /** @@ -285,7 +280,7 @@ public function extractFormValues(EntityInterface $entity, $langcode, FieldInter $field_name = $this->fieldDefinition->getFieldName(); // Extract the values from $form_state['values']. - $path = array_merge($form['#parents'], array($field_name, $langcode)); + $path = array_merge($form['#parents'], array($field_name)); $key_exists = NULL; $values = NestedArray::getValue($form_state['values'], $path, $key_exists); diff --git a/core/modules/field/lib/Drupal/field/Tests/NestedFormTest.php b/core/modules/field/lib/Drupal/field/Tests/NestedFormTest.php index e812ff5..a83df9b 100644 --- a/core/modules/field/lib/Drupal/field/Tests/NestedFormTest.php +++ b/core/modules/field/lib/Drupal/field/Tests/NestedFormTest.php @@ -93,19 +93,19 @@ function testNestedFieldForm() { // Display the 'combined form'. $this->drupalGet('test-entity/nested/1/2'); - $this->assertFieldByName('field_single[und][0][value]', 0, 'Entity 1: field_single value appears correctly is the form.'); - $this->assertFieldByName('field_unlimited[und][0][value]', 1, 'Entity 1: field_unlimited value 0 appears correctly is the form.'); - $this->assertFieldByName('entity_2[field_single][und][0][value]', 10, 'Entity 2: field_single value appears correctly is the form.'); - $this->assertFieldByName('entity_2[field_unlimited][und][0][value]', 11, 'Entity 2: field_unlimited value 0 appears correctly is the form.'); + $this->assertFieldByName('field_single[0][value]', 0, 'Entity 1: field_single value appears correctly is the form.'); + $this->assertFieldByName('field_unlimited[0][value]', 1, 'Entity 1: field_unlimited value 0 appears correctly is the form.'); + $this->assertFieldByName('entity_2[field_single][0][value]', 10, 'Entity 2: field_single value appears correctly is the form.'); + $this->assertFieldByName('entity_2[field_unlimited][0][value]', 11, 'Entity 2: field_unlimited value 0 appears correctly is the form.'); // Submit the form and check that the entities are updated accordingly. $edit = array( - 'field_single[und][0][value]' => 1, - 'field_unlimited[und][0][value]' => 2, - 'field_unlimited[und][1][value]' => 3, - 'entity_2[field_single][und][0][value]' => 11, - 'entity_2[field_unlimited][und][0][value]' => 12, - 'entity_2[field_unlimited][und][1][value]' => 13, + 'field_single[0][value]' => 1, + 'field_unlimited[0][value]' => 2, + 'field_unlimited[1][value]' => 3, + 'entity_2[field_single][0][value]' => 11, + 'entity_2[field_unlimited][0][value]' => 12, + 'entity_2[field_unlimited][1][value]' => 13, ); $this->drupalPost(NULL, $edit, t('Save')); field_cache_clear(); @@ -119,14 +119,14 @@ function testNestedFieldForm() { // Submit invalid values and check that errors are reported on the // correct widgets. $edit = array( - 'field_unlimited[und][1][value]' => -1, + 'field_unlimited[1][value]' => -1, ); $this->drupalPost('test-entity/nested/1/2', $edit, t('Save')); $this->assertRaw(t('%label does not accept the value -1', array('%label' => 'Unlimited field')), 'Entity 1: the field validation error was reported.'); $error_field = $this->xpath('//input[@id=:id and contains(@class, "error")]', array(':id' => 'edit-field-unlimited-und-1-value')); $this->assertTrue($error_field, 'Entity 1: the error was flagged on the correct element.'); $edit = array( - 'entity_2[field_unlimited][und][1][value]' => -1, + 'entity_2[field_unlimited][1][value]' => -1, ); $this->drupalPost('test-entity/nested/1/2', $edit, t('Save')); $this->assertRaw(t('%label does not accept the value -1', array('%label' => 'Unlimited field')), 'Entity 2: the field validation error was reported.'); @@ -135,10 +135,10 @@ function testNestedFieldForm() { // Test that reordering works on both entities. $edit = array( - 'field_unlimited[und][0][_weight]' => 0, - 'field_unlimited[und][1][_weight]' => -1, - 'entity_2[field_unlimited][und][0][_weight]' => 0, - 'entity_2[field_unlimited][und][1][_weight]' => -1, + 'field_unlimited[0][_weight]' => 0, + 'field_unlimited[1][_weight]' => -1, + 'entity_2[field_unlimited][0][_weight]' => 0, + 'entity_2[field_unlimited][1][_weight]' => -1, ); $this->drupalPost('test-entity/nested/1/2', $edit, t('Save')); field_cache_clear(); @@ -151,21 +151,21 @@ function testNestedFieldForm() { // 'Add more' button in the first entity: $this->drupalGet('test-entity/nested/1/2'); $this->drupalPostAJAX(NULL, array(), 'field_unlimited_add_more'); - $this->assertFieldByName('field_unlimited[und][0][value]', 3, 'Entity 1: field_unlimited value 0 appears correctly is the form.'); - $this->assertFieldByName('field_unlimited[und][1][value]', 2, 'Entity 1: field_unlimited value 1 appears correctly is the form.'); - $this->assertFieldByName('field_unlimited[und][2][value]', '', 'Entity 1: field_unlimited value 2 appears correctly is the form.'); - $this->assertFieldByName('field_unlimited[und][3][value]', '', 'Entity 1: an empty widget was added for field_unlimited value 3.'); + $this->assertFieldByName('field_unlimited[0][value]', 3, 'Entity 1: field_unlimited value 0 appears correctly is the form.'); + $this->assertFieldByName('field_unlimited[1][value]', 2, 'Entity 1: field_unlimited value 1 appears correctly is the form.'); + $this->assertFieldByName('field_unlimited[2][value]', '', 'Entity 1: field_unlimited value 2 appears correctly is the form.'); + $this->assertFieldByName('field_unlimited[3][value]', '', 'Entity 1: an empty widget was added for field_unlimited value 3.'); // 'Add more' button in the first entity (changing field values): $edit = array( - 'entity_2[field_unlimited][und][0][value]' => 13, - 'entity_2[field_unlimited][und][1][value]' => 14, - 'entity_2[field_unlimited][und][2][value]' => 15, + 'entity_2[field_unlimited][0][value]' => 13, + 'entity_2[field_unlimited][1][value]' => 14, + 'entity_2[field_unlimited][2][value]' => 15, ); $this->drupalPostAJAX(NULL, $edit, 'entity_2_field_unlimited_add_more'); - $this->assertFieldByName('entity_2[field_unlimited][und][0][value]', 13, 'Entity 2: field_unlimited value 0 appears correctly is the form.'); - $this->assertFieldByName('entity_2[field_unlimited][und][1][value]', 14, 'Entity 2: field_unlimited value 1 appears correctly is the form.'); - $this->assertFieldByName('entity_2[field_unlimited][und][2][value]', 15, 'Entity 2: field_unlimited value 2 appears correctly is the form.'); - $this->assertFieldByName('entity_2[field_unlimited][und][3][value]', '', 'Entity 2: an empty widget was added for field_unlimited value 3.'); + $this->assertFieldByName('entity_2[field_unlimited][0][value]', 13, 'Entity 2: field_unlimited value 0 appears correctly is the form.'); + $this->assertFieldByName('entity_2[field_unlimited][1][value]', 14, 'Entity 2: field_unlimited value 1 appears correctly is the form.'); + $this->assertFieldByName('entity_2[field_unlimited][2][value]', 15, 'Entity 2: field_unlimited value 2 appears correctly is the form.'); + $this->assertFieldByName('entity_2[field_unlimited][3][value]', '', 'Entity 2: an empty widget was added for field_unlimited value 3.'); // Save the form and check values are saved correctly. $this->drupalPost(NULL, array(), t('Save')); field_cache_clear(); diff --git a/core/modules/field/lib/Drupal/field/Tests/TranslationWebTest.php b/core/modules/field/lib/Drupal/field/Tests/TranslationWebTest.php index d4b95da..1d4d8b6 100644 --- a/core/modules/field/lib/Drupal/field/Tests/TranslationWebTest.php +++ b/core/modules/field/lib/Drupal/field/Tests/TranslationWebTest.php @@ -120,7 +120,7 @@ function testFieldFormTranslationRevisions() { $edit = array( 'user_id' => 1, 'name' => $this->randomName(), - "{$field_name}[$langcode][0][value]" => $entity->{$field_name}->value, + "{$field_name}[0][value]" => $entity->{$field_name}->value, 'revision' => TRUE, ); $this->drupalPost($this->entity_type . '/manage/' . $entity->id() . '/edit', $edit, t('Save')); diff --git a/core/modules/field/lib/Drupal/field/Tests/reEnableModuleFieldTest.php b/core/modules/field/lib/Drupal/field/Tests/reEnableModuleFieldTest.php index 0b5400d..2a3b539 100644 --- a/core/modules/field/lib/Drupal/field/Tests/reEnableModuleFieldTest.php +++ b/core/modules/field/lib/Drupal/field/Tests/reEnableModuleFieldTest.php @@ -80,13 +80,13 @@ function testReEnabledField() { // Display the article node form and verify the telephone widget is present. $this->drupalGet('node/add/article'); - $this->assertFieldByName("field_telephone[und][0][value]", '', 'Widget found.'); + $this->assertFieldByName("field_telephone[0][value]", '', 'Widget found.'); // Submit an article node with a telephone field so data exist for the // field. $edit = array( "title" => $this->randomName(), - "field_telephone[und][0][value]" => "123456789", + "field_telephone[0][value]" => "123456789", ); $this->drupalPost(NULL, $edit, t('Save')); $this->assertRaw(''); @@ -97,7 +97,7 @@ function testReEnabledField() { // Display the article creation form and verify the widget still exists. $this->drupalGet('node/add/article'); - $this->assertFieldByName("field_telephone[und][0][value]", '', 'Widget found.'); + $this->assertFieldByName("field_telephone[0][value]", '', 'Widget found.'); // Test that the module can't be disabled from the UI while there is data // for it's fields. diff --git a/core/modules/filter/lib/Drupal/filter/Tests/FilterHtmlImageSecureTest.php b/core/modules/filter/lib/Drupal/filter/Tests/FilterHtmlImageSecureTest.php index 90aaf1c..47e3ac1 100644 --- a/core/modules/filter/lib/Drupal/filter/Tests/FilterHtmlImageSecureTest.php +++ b/core/modules/filter/lib/Drupal/filter/Tests/FilterHtmlImageSecureTest.php @@ -117,7 +117,7 @@ function testImageSource() { $comment[] = '