diff --git a/core/modules/entity_reference/lib/Drupal/entity_reference/Tests/EntityReferenceAdminTest.php b/core/modules/entity_reference/lib/Drupal/entity_reference/Tests/EntityReferenceAdminTest.php index 932f55f..ef1a04c 100644 --- a/core/modules/entity_reference/lib/Drupal/entity_reference/Tests/EntityReferenceAdminTest.php +++ b/core/modules/entity_reference/lib/Drupal/entity_reference/Tests/EntityReferenceAdminTest.php @@ -106,4 +106,5 @@ public function testFieldAdminHandler() { // Check that the field appears in the overview form. $this->assertFieldByXPath('//table[@id="field-overview"]//td[1]', 'Test label', 'Field was created and appears in the overview page.'); } + } diff --git a/core/modules/entity_reference/lib/Drupal/entity_reference/Tests/EntityReferenceSelectionSortTest.php b/core/modules/entity_reference/lib/Drupal/entity_reference/Tests/EntityReferenceSelectionSortTest.php index f7b8fbc..bf4efdc 100644 --- a/core/modules/entity_reference/lib/Drupal/entity_reference/Tests/EntityReferenceSelectionSortTest.php +++ b/core/modules/entity_reference/lib/Drupal/entity_reference/Tests/EntityReferenceSelectionSortTest.php @@ -36,13 +36,13 @@ function setUp() { */ public function testSort() { // Add text field to entity, to sort by. - entity_create('field_entity', array( + entity_create('field_config', array( 'field_name' => 'field_text', 'type' => 'text', 'entity_types' => array('node'), ))->save(); - entity_create('field_instance', array( + entity_create('field_instance_config', array( 'label' => 'Text Field', 'field_name' => 'field_text', 'entity_type' => 'node', @@ -53,7 +53,7 @@ public function testSort() { // Create a field and instance. - $field = entity_create('field_entity', array( + $field = entity_create('field_config', array( 'translatable' => FALSE, 'entity_types' => array(), 'settings' => array( @@ -64,7 +64,7 @@ public function testSort() { 'cardinality' => 1, )); $field->save(); - $instance = entity_create('field_instance', array( + $instance = entity_create('field_instance_config', array( 'field_name' => 'test_field', 'entity_type' => 'test_entity', 'bundle' => 'test_bundle', diff --git a/core/modules/entity_reference/lib/Drupal/entity_reference/Tests/Views/SelectionTest.php b/core/modules/entity_reference/lib/Drupal/entity_reference/Tests/Views/SelectionTest.php index 8127682..deea202 100644 --- a/core/modules/entity_reference/lib/Drupal/entity_reference/Tests/Views/SelectionTest.php +++ b/core/modules/entity_reference/lib/Drupal/entity_reference/Tests/Views/SelectionTest.php @@ -40,7 +40,7 @@ public function testSelectionHandler() { } // Create a field and instance. - $field = entity_create('field_entity', array( + $field = entity_create('field_config', array( 'translatable' => FALSE, 'entity_types' => array(), 'settings' => array( @@ -51,7 +51,7 @@ public function testSelectionHandler() { 'cardinality' => '1', )); $field->save(); - $instance = entity_create('field_instance', array( + $instance = entity_create('field_instance_config', array( 'field_name' => 'test_field', 'entity_type' => 'test_entity', 'bundle' => 'test_bundle', diff --git a/core/modules/field/field.attach.inc b/core/modules/field/field.attach.inc index 20a25ab..4ed2962 100644 --- a/core/modules/field/field.attach.inc +++ b/core/modules/field/field.attach.inc @@ -684,7 +684,7 @@ function field_attach_load($entity_type, $entities, $age = FIELD_LOAD_CURRENT, $ // values for a deleted field. Instead, generate FieldItem objects // directly, and call their prepareCache() method. foreach ($queried_entities as $entity) { - $field = $options['instance']->getField(); + $field = $options['instance']->getFieldConfig(); $field_name = $field->id(); // Call the prepareCache() method on each item. foreach ($entity->{$field_name} as $langcode => $values) { diff --git a/core/modules/field/lib/Drupal/field/Plugin/Type/FieldType/ConfigEntityReferenceItemBase.php b/core/modules/field/lib/Drupal/field/Plugin/Type/FieldType/ConfigEntityReferenceItemBase.php index 6cdf0ea..205134d 100644 --- a/core/modules/field/lib/Drupal/field/Plugin/Type/FieldType/ConfigEntityReferenceItemBase.php +++ b/core/modules/field/lib/Drupal/field/Plugin/Type/FieldType/ConfigEntityReferenceItemBase.php @@ -141,7 +141,7 @@ public function settingsForm(array $form, array &$form_state) { * since we cannot extend it. */ public function instanceSettingsForm(array $form, array &$form_state) { - if ($callback = $this->getLegacyCallback('instance_settings_form')) { + if ($callback = $this->getLegacyCallback('instance_config_settings_form')) { return $callback($this->getInstance()->getFieldConfig(), $this->getInstance(), $form_state); } return array(); diff --git a/core/modules/field/lib/Drupal/field/Plugin/field/field_type/LegacyConfigFieldItem.php b/core/modules/field/lib/Drupal/field/Plugin/field/field_type/LegacyConfigFieldItem.php index 0c4b851..a8343fd 100644 --- a/core/modules/field/lib/Drupal/field/Plugin/field/field_type/LegacyConfigFieldItem.php +++ b/core/modules/field/lib/Drupal/field/Plugin/field/field_type/LegacyConfigFieldItem.php @@ -67,7 +67,7 @@ public function settingsForm(array $form, array &$form_state) { * {@inheritdoc} */ public function instanceSettingsForm(array $form, array &$form_state) { - if ($callback = $this->getLegacyCallback('instance_settings_form')) { + if ($callback = $this->getLegacyCallback('instance_config_settings_form')) { return $callback($this->getInstance()->getFieldConfig(), $this->getInstance(), $form_state); } return array(); diff --git a/core/modules/field/lib/Drupal/field/Tests/FieldAttachStorageTest.php b/core/modules/field/lib/Drupal/field/Tests/FieldAttachStorageTest.php index 2dcc6c6..39886ba 100644 --- a/core/modules/field/lib/Drupal/field/Tests/FieldAttachStorageTest.php +++ b/core/modules/field/lib/Drupal/field/Tests/FieldAttachStorageTest.php @@ -56,8 +56,8 @@ function testFieldAttachSaveLoad() { // Configure the instance so that we test hook_field_load() (see // field_test_field_load() in field_test.module). - $this->field_instance_config['settings']['test_hook_field_load'] = TRUE; - $this->field_instance_config->save(); + $this->instance['settings']['test_hook_field_load'] = TRUE; + $this->instance->save(); // TODO : test empty values filtering and "compression" (store consecutive deltas). // Preparation: create three revisions and store them in $revision array. @@ -340,8 +340,8 @@ function testFieldAttachSaveEmptyDataDefaultValue() { $this->createFieldWithInstance('', $entity_type); // Add a default value function. - $this->field_instance_config['default_value_function'] = 'field_test_default_value'; - $this->field_instance_config->save(); + $this->instance['default_value_function'] = 'field_test_default_value'; + $this->instance->save(); // Verify that fields are populated with default values. $entity_init = entity_create($entity_type, array('id' => 1, 'revision_id' => 1)); @@ -481,7 +481,7 @@ function testEntityDeleteBundle() { $instance = array( 'field_name' => $field_name, 'entity_type' => $entity_type, - 'bundle' => $this->field_instance_config['bundle'], + 'bundle' => $this->instance['bundle'], 'label' => $this->randomName() . '_label', 'description' => $this->randomName() . '_description', 'weight' => mt_rand(0, 127), @@ -489,29 +489,29 @@ function testEntityDeleteBundle() { entity_create('field_instance_config', $instance)->save(); // Save an entity with data for both fields - $entity = entity_create($entity_type, array('id' => 0, 'revision_id' => 0, 'type' => $this->field_instance_config['bundle'])); + $entity = entity_create($entity_type, array('id' => 0, 'revision_id' => 0, 'type' => $this->instance['bundle'])); $values = $this->_generateTestFieldValues($this->field['cardinality']); $entity->{$this->field_name} = $values; $entity->{$field_name} = $this->_generateTestFieldValues(1); field_attach_insert($entity); // Verify the fields are present on load - $entity = entity_create($entity_type, array('id' => 0, 'revision_id' => 0, 'type' => $this->field_instance_config['bundle'])); + $entity = entity_create($entity_type, array('id' => 0, 'revision_id' => 0, 'type' => $this->instance['bundle'])); field_attach_load($entity_type, array(0 => $entity)); $this->assertEqual(count($entity->{$this->field_name}), 4, 'First field got loaded'); $this->assertEqual(count($entity->{$field_name}), 1, 'Second field got loaded'); // Delete the bundle. - entity_test_delete_bundle($this->field_instance_config['bundle'], $entity_type); + entity_test_delete_bundle($this->instance['bundle'], $entity_type); // Verify no data gets loaded - $entity = entity_create($entity_type, array('id' => 0, 'revision_id' => 0, 'type' => $this->field_instance_config['bundle'])); + $entity = entity_create($entity_type, array('id' => 0, 'revision_id' => 0, 'type' => $this->instance['bundle'])); field_attach_load($entity_type, array(0 => $entity)); $this->assertTrue(empty($entity->{$this->field_name}), 'No data for first field'); $this->assertTrue(empty($entity->{$field_name}), 'No data for second field'); // Verify that the instances are gone - $this->assertFalse(field_read_instance('entity_test', $this->field_name, $this->field_instance_config['bundle']), "First field is deleted"); + $this->assertFalse(field_read_instance('entity_test', $this->field_name, $this->instance['bundle']), "First field is deleted"); $this->assertFalse(field_read_instance('entity_test', $field_name, $instance['bundle']), "Second field is deleted"); } diff --git a/core/modules/field/lib/Drupal/field/Tests/Views/HandlerFieldFieldTest.php b/core/modules/field/lib/Drupal/field/Tests/Views/HandlerFieldFieldTest.php index 8658c52..63d97d7 100644 --- a/core/modules/field/lib/Drupal/field/Tests/Views/HandlerFieldFieldTest.php +++ b/core/modules/field/lib/Drupal/field/Tests/Views/HandlerFieldFieldTest.php @@ -47,10 +47,10 @@ protected function setUp() { $this->setUpFields(3); // Setup a field with cardinality > 1. - $this->fields[3] = $field = entity_create('field_entity', array('field_name' => 'field_name_3', 'type' => 'text', 'cardinality' => FIELD_CARDINALITY_UNLIMITED)); + $this->fields[3] = $field = entity_create('field_config', array('field_name' => 'field_name_3', 'type' => 'text', 'cardinality' => FIELD_CARDINALITY_UNLIMITED)); $field->save(); // Setup a field that will have no value. - $this->fields[4] = $field = entity_create('field_entity', array('field_name' => 'field_name_4', 'type' => 'text', 'cardinality' => FIELD_CARDINALITY_UNLIMITED)); + $this->fields[4] = $field = entity_create('field_config', array('field_name' => 'field_name_4', 'type' => 'text', 'cardinality' => FIELD_CARDINALITY_UNLIMITED)); $field->save(); $this->setUpInstances(); diff --git a/core/modules/field_sql_storage/lib/Drupal/field_sql_storage/Tests/FieldSqlStorageTest.php b/core/modules/field_sql_storage/lib/Drupal/field_sql_storage/Tests/FieldSqlStorageTest.php index 38b655e..4a9b12c 100644 --- a/core/modules/field_sql_storage/lib/Drupal/field_sql_storage/Tests/FieldSqlStorageTest.php +++ b/core/modules/field_sql_storage/lib/Drupal/field_sql_storage/Tests/FieldSqlStorageTest.php @@ -70,20 +70,20 @@ function setUp() { $entity_type = 'entity_test_rev'; $this->field_name = strtolower($this->randomName()); - $this->field = entity_create('field_config', array( + $this->field_config = entity_create('field_config', array( 'field_name' => $this->field_name, 'type' => 'test_field', 'cardinality' => 4, )); - $this->field->save(); + $this->field_config->save(); $this->field_instance_config = entity_create('field_instance_config', array( 'field_name' => $this->field_name, 'entity_type' => $entity_type, 'bundle' => $entity_type )); $this->field_instance_config->save(); - $this->table = _field_sql_storage_tablename($this->field); - $this->revision_table = _field_sql_storage_revision_tablename($this->field); + $this->table = _field_sql_storage_tablename($this->field_config); + $this->revision_table = _field_sql_storage_revision_tablename($this->field_config); } /** @@ -102,7 +102,7 @@ function testFieldAttachLoad() { for ($evid = 0; $evid < 4; ++$evid) { $values[$evid] = array(); // Note: we insert one extra value ('<=' instead of '<'). - for ($delta = 0; $delta <= $this->field['cardinality']; $delta++) { + for ($delta = 0; $delta <= $this->field_config['cardinality']; $delta++) { $value = mt_rand(1, 127); $values[$evid][] = $value; $query->values(array($entity_type, $eid, $evid, $delta, $langcode, $value)); @@ -124,7 +124,7 @@ function testFieldAttachLoad() { )); field_attach_load($entity_type, array($eid => $entity)); foreach ($values[0] as $delta => $value) { - if ($delta < $this->field['cardinality']) { + if ($delta < $this->field_config['cardinality']) { $this->assertEqual($entity->{$this->field_name}[$delta]->value, $value, "Value $delta is loaded correctly for current revision"); } else { @@ -140,7 +140,7 @@ function testFieldAttachLoad() { )); field_attach_load_revision($entity_type, array($eid => $entity)); foreach ($values[$evid] as $delta => $value) { - if ($delta < $this->field['cardinality']) { + if ($delta < $this->field_config['cardinality']) { $this->assertEqual($entity->{$this->field_name}[$delta]->value, $value, "Value $delta for revision $evid is loaded correctly"); } else { @@ -180,7 +180,7 @@ function testFieldAttachInsertAndUpdate() { $values = array(); // Note: we try to insert one extra value ('<=' instead of '<'). // TODO : test empty values filtering and "compression" (store consecutive deltas). - for ($delta = 0; $delta <= $this->field['cardinality']; $delta++) { + for ($delta = 0; $delta <= $this->field_config['cardinality']; $delta++) { $values[$delta]['value'] = mt_rand(1, 127); } $entity->{$this->field_name} = $rev_values[0] = $values; @@ -188,7 +188,7 @@ function testFieldAttachInsertAndUpdate() { $rows = db_select($this->table, 't')->fields('t')->execute()->fetchAllAssoc('delta', PDO::FETCH_ASSOC); foreach ($values as $delta => $value) { - if ($delta < $this->field['cardinality']) { + if ($delta < $this->field_config['cardinality']) { $this->assertEqual($rows[$delta][$this->field_name . '_value'], $value['value'], t("Value $delta is inserted correctly")); } else { @@ -203,7 +203,7 @@ function testFieldAttachInsertAndUpdate() { )); $values = array(); // Note: we try to update one extra value ('<=' instead of '<'). - for ($delta = 0; $delta <= $this->field['cardinality']; $delta++) { + for ($delta = 0; $delta <= $this->field_config['cardinality']; $delta++) { $values[$delta]['value'] = mt_rand(1, 127); } $rev_values[1] = $values; @@ -211,7 +211,7 @@ function testFieldAttachInsertAndUpdate() { field_attach_update($entity); $rows = db_select($this->table, 't')->fields('t')->execute()->fetchAllAssoc('delta', PDO::FETCH_ASSOC); foreach ($values as $delta => $value) { - if ($delta < $this->field['cardinality']) { + if ($delta < $this->field_config['cardinality']) { $this->assertEqual($rows[$delta][$this->field_name . '_value'], $value['value'], t("Value $delta is updated correctly")); } else { @@ -241,7 +241,7 @@ function testFieldAttachInsertAndUpdate() { field_attach_update($entity); $rows = db_select($this->table, 't')->fields('t')->execute()->fetchAllAssoc('delta', PDO::FETCH_ASSOC); foreach ($values as $delta => $value) { - if ($delta < $this->field->cardinality) { + if ($delta < $this->field_config->cardinality) { $this->assertEqual($rows[$delta][$this->field_name . '_value'], $value['value'], t("Update with no field_name entry leaves value $delta untouched")); } } diff --git a/core/modules/field_ui/lib/Drupal/field_ui/Form/FieldInstanceEditForm.php b/core/modules/field_ui/lib/Drupal/field_ui/Form/FieldInstanceEditForm.php index 0cae805..21f9395 100644 --- a/core/modules/field_ui/lib/Drupal/field_ui/Form/FieldInstanceEditForm.php +++ b/core/modules/field_ui/lib/Drupal/field_ui/Form/FieldInstanceEditForm.php @@ -32,7 +32,7 @@ public function buildForm(array $form, array &$form_state, FieldInstanceConfigIn $bundle = $this->fieldInstanceConfig['bundle']; $entity_type = $this->fieldInstanceConfig['entity_type']; - $field = $this->fieldInstanceConfig->getFieldConfig(); + $field_config = $this->fieldInstanceConfig->getFieldConfig(); $entity_form_display = entity_get_form_display($entity_type, $bundle, 'default'); $bundles = entity_get_bundles(); @@ -41,14 +41,14 @@ public function buildForm(array $form, array &$form_state, FieldInstanceConfigIn '%bundle' => $bundles[$entity_type][$bundle]['label'], )), PASS_THROUGH); - $form['#field'] = $field; + $form['#field'] = $field_config; $form['#entity_form_display'] = $entity_form_display; // Create an arbitrary entity object (used by the 'default value' widget). $ids = (object) array('entity_type' => $this->fieldInstanceConfig['entity_type'], 'bundle' => $this->fieldInstanceConfig['bundle'], 'entity_id' => NULL); $form['#entity'] = _field_create_entity_from_ids($ids); $form['#entity']->field_ui_default_value = TRUE; - if (!empty($field['locked'])) { + if (!empty($field_config['locked'])) { $form['locked'] = array( '#markup' => t('The field %field is locked and cannot be edited.', array('%field' => $this->fieldInstanceConfig->label())), ); @@ -78,7 +78,7 @@ public function buildForm(array $form, array &$form_state, FieldInstanceConfigIn $form['instance']['label'] = array( '#type' => 'textfield', '#title' => t('Label'), - '#default_value' => $this->fieldInstanceConfig->label() ?: $field['field_name'], + '#default_value' => $this->fieldInstanceConfig->label() ?: $field_config['field_name'], '#required' => TRUE, '#weight' => -20, ); @@ -105,7 +105,7 @@ public function buildForm(array $form, array &$form_state, FieldInstanceConfigIn // Add handling for default value if not provided by any other module. if (field_behaviors_widget('default_value', $this->fieldInstanceConfig) == FIELD_BEHAVIOR_DEFAULT && empty($this->fieldInstanceConfig['default_value_function'])) { - $form['instance']['default_value_widget'] = $this->getDefaultValueWidget($field, $form, $form_state); + $form['instance']['default_value_widget'] = $this->getDefaultValueWidget($field_config, $form, $form_state); } $form['actions'] = array('#type' => 'actions'); diff --git a/core/modules/field_ui/lib/Drupal/field_ui/Tests/ManageFieldsTest.php b/core/modules/field_ui/lib/Drupal/field_ui/Tests/ManageFieldsTest.php index bfcfbb3..621763a 100644 --- a/core/modules/field_ui/lib/Drupal/field_ui/Tests/ManageFieldsTest.php +++ b/core/modules/field_ui/lib/Drupal/field_ui/Tests/ManageFieldsTest.php @@ -546,4 +546,5 @@ function fieldListAdminPage() { $this->assertText($this->field_name, 'Field name is displayed in field list.'); $this->assertTrue($this->assertLinkByHref('admin/structure/types/manage/' . $this->type . '/fields'), 'Link to content type using field is displayed in field list.'); } + } diff --git a/core/modules/image/lib/Drupal/image/Tests/ImageFieldDefaultImagesTest.php b/core/modules/image/lib/Drupal/image/Tests/ImageFieldDefaultImagesTest.php index 086182c..24f56f2 100644 --- a/core/modules/image/lib/Drupal/image/Tests/ImageFieldDefaultImagesTest.php +++ b/core/modules/image/lib/Drupal/image/Tests/ImageFieldDefaultImagesTest.php @@ -51,23 +51,23 @@ function testDefaultImages() { $widget_settings = array( 'preview_image_style' => 'medium', ); - $instance = $this->createImageField($field_name, 'article', $field_settings, $instance_settings, $widget_settings); + $field_instance_config = $this->createImageField($field_name, 'article', $field_settings, $instance_settings, $widget_settings); $field = field_info_field($field_name); // Add another instance with another default image to the page content type. - $instance2 = entity_create('field_instance_config', array( + $field_instance_config2 = entity_create('field_instance_config', array( 'field_name' => $field->id(), 'entity_type' => 'node', 'bundle' => 'page', - 'label' => $instance->label(), - 'required' => $instance->required, + 'label' => $field_instance_config->label(), + 'required' => $field_instance_config->required, 'settings' => array( 'default_image' => $default_images['instance2']->id(), ), )); - $instance2->save(); + $field_instance_config2->save(); - $widget_settings = entity_get_form_display($instance['entity_type'], $instance['bundle'], 'default')->getComponent($field['field_name']); + $widget_settings = entity_get_form_display($field_instance_config['entity_type'], $field_instance_config['bundle'], 'default')->getComponent($field['field_name']); entity_get_form_display('node', 'page', 'default') ->setComponent($field->id(), $widget_settings) ->save(); @@ -76,7 +76,7 @@ function testDefaultImages() { ->save(); // Confirm the defaults are present on the article field settings form. - $this->drupalGet("admin/structure/types/manage/article/fields/$instance->id/field"); + $this->drupalGet("admin/structure/types/manage/article/fields/$field_instance_config->id/field"); $this->assertFieldByXpath( '//input[@name="field[settings][default_image][fids]"]', $default_images['field']->id(), @@ -86,7 +86,7 @@ function testDefaultImages() { ) ); // Confirm the defaults are present on the article field edit form. - $this->drupalGet("admin/structure/types/manage/article/fields/$instance->id"); + $this->drupalGet("admin/structure/types/manage/article/fields/$field_instance_config->id"); $this->assertFieldByXpath( '//input[@name="instance[settings][default_image][fids]"]', $default_images['instance']->id(), @@ -97,7 +97,7 @@ function testDefaultImages() { ); // Confirm the defaults are present on the page field settings form. - $this->drupalGet("admin/structure/types/manage/page/fields/$instance->id/field"); + $this->drupalGet("admin/structure/types/manage/page/fields/$field_instance_config->id/field"); $this->assertFieldByXpath( '//input[@name="field[settings][default_image][fids]"]', $default_images['field']->id(), @@ -107,7 +107,7 @@ function testDefaultImages() { ) ); // Confirm the defaults are present on the page field edit form. - $this->drupalGet("admin/structure/types/manage/page/fields/$instance2->id"); + $this->drupalGet("admin/structure/types/manage/page/fields/$field_instance_config2->id"); $this->assertFieldByXpath( '//input[@name="instance[settings][default_image][fids]"]', $default_images['instance2']->id(), @@ -146,7 +146,7 @@ function testDefaultImages() { $field->save(); // Confirm that the new default is used on the article field settings form. - $this->drupalGet("admin/structure/types/manage/article/fields/$instance->id/field"); + $this->drupalGet("admin/structure/types/manage/article/fields/$field_instance_config->id/field"); $this->assertFieldByXpath( '//input[@name="field[settings][default_image][fids]"]', $default_images['field_new']->id(), @@ -177,12 +177,12 @@ function testDefaultImages() { ); // Upload a new default for the article's field instance. - $instance['settings']['default_image'] = $default_images['instance_new']->id(); - $instance->save(); + $field_instance_config['settings']['default_image'] = $default_images['instance_new']->id(); + $field_instance_config->save(); // Confirm the new field instance default is used on the article field // admin form. - $this->drupalGet("admin/structure/types/manage/article/fields/$instance->id"); + $this->drupalGet("admin/structure/types/manage/article/fields/$field_instance_config->id"); $this->assertFieldByXpath( '//input[@name="instance[settings][default_image][fids]"]', $default_images['instance_new']->id(), @@ -216,11 +216,11 @@ function testDefaultImages() { ); // Remove the instance default from articles. - $instance['settings']['default_image'] = 0; - $instance->save(); + $field_instance_config['settings']['default_image'] = 0; + $field_instance_config->save(); // Confirm the article field instance default has been removed. - $this->drupalGet("admin/structure/types/manage/article/fields/$instance->id"); + $this->drupalGet("admin/structure/types/manage/article/fields/$field_instance_config->id"); $this->assertFieldByXpath( '//input[@name="instance[settings][default_image][fids]"]', '', diff --git a/core/modules/options/lib/Drupal/options/Tests/OptionsFieldTest.php b/core/modules/options/lib/Drupal/options/Tests/OptionsFieldTest.php index 8a1424d..3b31ba2 100644 --- a/core/modules/options/lib/Drupal/options/Tests/OptionsFieldTest.php +++ b/core/modules/options/lib/Drupal/options/Tests/OptionsFieldTest.php @@ -48,9 +48,9 @@ function testUpdateAllowedValues() { $entity = entity_create('entity_test', array()); $entity->{$this->fieldName}->value = 1; $entity->save(); - $this->field->settings['allowed_values'] = array(2 => 'Two'); + $this->field_config->settings['allowed_values'] = array(2 => 'Two'); try { - $this->field->save(); + $this->field_config->save(); $this->fail(t('Cannot update a list field to not include keys with existing data.')); } catch (FieldException $e) { @@ -61,8 +61,9 @@ function testUpdateAllowedValues() { $entity->save(); // Removed options do not appear. - $this->field->settings['allowed_values'] = array(2 => 'Two'); - $this->field->save(); + $this->field_config->settings['allowed_values'] = array(2 => 'Two'); + $this->field_config->save(); + $entity = entity_create('entity_test', array()); $form = \Drupal::entityManager()->getForm($entity); $this->assertTrue(empty($form[$this->fieldName][$langcode][1]), 'Option 1 does not exist'); @@ -70,8 +71,8 @@ function testUpdateAllowedValues() { $this->assertTrue(empty($form[$this->fieldName][$langcode][3]), 'Option 3 does not exist'); // Completely new options appear. - $this->field['settings']['allowed_values'] = array(10 => 'Update', 20 => 'Twenty'); - $this->field->save(); + $this->field_config['settings']['allowed_values'] = array(10 => 'Update', 20 => 'Twenty'); + $this->field_config->save(); $form = \Drupal::entityManager()->getForm($entity); $this->assertTrue(empty($form[$this->fieldName][$langcode][1]), 'Option 1 does not exist'); $this->assertTrue(empty($form[$this->fieldName][$langcode][2]), 'Option 2 does not exist'); @@ -80,7 +81,7 @@ function testUpdateAllowedValues() { $this->assertTrue(!empty($form[$this->fieldName][$langcode][20]), 'Option 20 exists'); // Options are reset when a new field with the same name is created. - $this->field->delete(); + $this->field_config->delete(); entity_create('field_config', $this->fieldDefinition)->save(); entity_create('field_instance_config', array( 'field_name' => $this->fieldName, diff --git a/core/modules/system/lib/Drupal/system/Tests/Upgrade/FieldUpgradePathTest.php b/core/modules/system/lib/Drupal/system/Tests/Upgrade/FieldUpgradePathTest.php index 57555e9..a656028 100644 --- a/core/modules/system/lib/Drupal/system/Tests/Upgrade/FieldUpgradePathTest.php +++ b/core/modules/system/lib/Drupal/system/Tests/Upgrade/FieldUpgradePathTest.php @@ -229,4 +229,5 @@ function testFieldUpgradeToConfig() { $this->drupalPost('node/add/article', $edit, 'Save and publish'); $this->assertText($value); } + }