Commit 2de46154 authored by alexpott's avatar alexpott

Issue #1981306 by aspilicious, andypost, pcambra, swentel, amateescu: Drop...

Issue #1981306 by aspilicious, andypost, pcambra, swentel, amateescu: Drop procedural usage of fields in [a-e] modules.
parent a6a4adc9
......@@ -183,22 +183,22 @@ function custom_block_add_body_field($block_type_id, $label = 'Block body') {
$field = field_info_field('block_body');
$instance = field_info_instance('custom_block', 'block_body', $block_type_id);
if (empty($field)) {
$field = array(
$field = entity_create('field_entity', array(
'field_name' => 'block_body',
'type' => 'text_with_summary',
'entity_types' => array('custom_block'),
);
$field = field_create_field($field);
));
$field->save();
}
if (empty($instance)) {
$instance = array(
$instance = entity_create('field_instance', array(
'field_name' => 'block_body',
'entity_type' => 'custom_block',
'bundle' => $block_type_id,
'label' => $label,
'settings' => array('display_summary' => FALSE),
);
$instance = field_create_instance($instance);
));
$instance->save();
// Assign widget settings for the 'default' form mode.
entity_get_form_display('custom_block', $block_type_id, 'default')
......
......@@ -25,14 +25,14 @@ class CustomBlockFieldTest extends CustomBlockTestBase {
/**
* The created field.
*
* @var array
* @var \Drupal\field\Plugin\Core\Entity\Field
*/
protected $field;
/**
* The created instance
* The created instance.
*
* @var array
* @var \Drupal\field\Plugin\Core\Entity\FieldInstance
*/
protected $instance;
......@@ -64,21 +64,21 @@ public function testBlockFields() {
$this->blockType = $this->createCustomBlockType('link');
// Create a field with settings to validate.
$this->field = array(
$this->field = entity_create('field_entity', array(
'field_name' => drupal_strtolower($this->randomName()),
'type' => 'link',
'cardinality' => 2,
);
field_create_field($this->field);
$this->instance = array(
'field_name' => $this->field['field_name'],
));
$this->field->save();
$this->instance = entity_create('field_instance', array(
'field_name' => $this->field->id(),
'entity_type' => 'custom_block',
'bundle' => 'link',
'settings' => array(
'title' => DRUPAL_OPTIONAL,
),
);
field_create_instance($this->instance);
));
$this->instance->save();
entity_get_form_display('custom_block', 'link', 'default')
->setComponent($this->field['field_name'], array(
'type' => 'link_default',
......
......@@ -10,7 +10,7 @@
*/
function comment_uninstall() {
// Delete comment_body field.
field_delete_field('comment_body');
field_info_field('comment_body')->delete();
// Remove variables.
variable_del('comment_block_count');
......
......@@ -345,26 +345,26 @@ function comment_node_type_delete($info) {
function _comment_body_field_create($info) {
// Create the field if needed.
if (!field_read_field('comment_body', array('include_inactive' => TRUE))) {
$field = array(
$field = entity_create('field_entity', array(
'field_name' => 'comment_body',
'type' => 'text_long',
'entity_types' => array('comment'),
);
field_create_field($field);
));
$field->save();
}
// Create the instance if needed.
if (!field_read_instance('comment', 'comment_body', 'comment_node_' . $info->type, array('include_inactive' => TRUE))) {
entity_invoke_bundle_hook('create', 'comment', 'comment_node_' . $info->type);
// Attaches the body field by default.
$instance = array(
$instance = entity_create('field_instance', array(
'field_name' => 'comment_body',
'label' => 'Comment',
'entity_type' => 'comment',
'bundle' => 'comment_node_' . $info->type,
'settings' => array('text_processing' => 1),
'required' => TRUE,
);
field_create_instance($instance);
));
$instance->save();
// Assign widget settings for the 'default' form mode.
entity_get_form_display('comment', 'comment_node_' . $info->type, 'default')
......
......@@ -41,7 +41,7 @@ function testCommentDefaultFields() {
$this->assertTrue(isset($instances['comment_node_' . $type_name]['comment_body']), format_string('The comment_body field is present for comments on type @type', array('@type' => $type_name)));
// Delete the instance along the way.
field_delete_instance($instances['comment_node_' . $type_name]['comment_body']);
$instances['comment_node_' . $type_name]['comment_body']->delete();
}
// Check that the 'comment_body' field is deleted.
......
......@@ -73,7 +73,7 @@ function setUp() {
// Make comment body translatable.
$field = field_info_field('comment_body');
$field['translatable'] = TRUE;
field_update_field($field);
$field->save();
$this->assertTrue(field_is_translatable('comment', $field), 'Comment body is translatable.');
}
......
......@@ -65,7 +65,7 @@ function setupTestFields() {
parent::setupTestFields();
$field = field_info_field('comment_body');
$field['translatable'] = TRUE;
field_update_field($field);
$field->save();
}
/**
......
......@@ -24,7 +24,7 @@ class ContactFieldsTest extends ViewTestBase {
/**
* Contains the field definition array attached to contact used for this test.
*
* @var array
* @var \Drupal\field\Plugin\Core\Entity\Field
*/
protected $field;
......@@ -39,19 +39,17 @@ public static function getInfo() {
protected function setUp() {
parent::setUp();
$field = array(
$this->field = entity_create('field_entity', array(
'field_name' => strtolower($this->randomName()),
'type' => 'text'
);
));
$this->field->save();
$this->field = field_create_field($field);
$instance = array(
'field_name' => $field['field_name'],
entity_create('field_instance', array(
'field_name' => $this->field->id(),
'entity_type' => 'contact_message',
'bundle' => 'contact_message',
);
field_create_instance($instance);
))->save();
$this->container->get('views.views_data')->clear();
}
......@@ -60,7 +58,6 @@ protected function setUp() {
* Tests the views data generation.
*/
public function testViewsData() {
$field_name = $this->field['field_name'];
$table_name = _field_sql_storage_tablename($this->field);
$data = $this->container->get('views.views_data')->get($table_name);
......@@ -68,7 +65,7 @@ public function testViewsData() {
$expected = array('', '_value', '_format');
$this->assertEqual(count($data), count($expected), 'The expected amount of array keys were found.');
foreach ($expected as $suffix) {
$this->assertTrue(isset($data[$field_name . $suffix]));
$this->assertTrue(isset($data[$this->field->id() . $suffix]));
}
$this->assertTrue(empty($data['table']['join']), 'The field is not joined to the non existent contact message base table.');
}
......
......@@ -54,15 +54,15 @@ function setUp() {
*/
function createFieldWithInstance($field_name, $type, $cardinality, $label, $instance_settings, $widget_type, $widget_settings, $formatter_type, $formatter_settings) {
$field = $field_name . '_field';
$this->field = array(
$this->$field = entity_create('field_entity', array(
'field_name' => $field_name,
'type' => $type,
'cardinality' => $cardinality,
);
$this->$field = field_create_field($this->field);
));
$this->$field->save();
$instance = $field_name . '_instance';
$this->$instance = array(
$this->$instance = entity_create('field_instance', array(
'field_name' => $field_name,
'entity_type' => 'entity_test',
'bundle' => 'entity_test',
......@@ -70,8 +70,8 @@ function createFieldWithInstance($field_name, $type, $cardinality, $label, $inst
'description' => $label,
'weight' => mt_rand(0, 127),
'settings' => $instance_settings,
);
field_create_instance($this->$instance);
));
$this->$instance->save();
entity_get_form_display('entity_test', 'entity_test', 'default')
->setComponent($field_name, array(
......
......@@ -79,24 +79,24 @@ function testText() {
$this->assertEqual('direct', $this->getSelectedEditor($items, $field_name), "Without text processing, cardinality 1, the 'direct' editor is selected.");
// Editor selection with text processing, cardinality 1.
$this->field_text_instance['settings']['text_processing'] = 1;
field_update_instance($this->field_text_instance);
$this->field_text_instance->settings['text_processing'] = 1;
$this->field_text_instance->save();
$this->assertEqual('form', $this->getSelectedEditor($items, $field_name), "With text processing, cardinality 1, the 'form' editor is selected.");
// Editor selection without text processing, cardinality 1 (again).
$this->field_text_instance['settings']['text_processing'] = 0;
field_update_instance($this->field_text_instance);
$this->field_text_instance->settings['text_processing'] = 0;
$this->field_text_instance->save();
$this->assertEqual('direct', $this->getSelectedEditor($items, $field_name), "Without text processing again, cardinality 1, the 'direct' editor is selected.");
// Editor selection without text processing, cardinality >1
$this->field_text_field['cardinality'] = 2;
field_update_field($this->field_text_field);
$this->field_text_field->cardinality = 2;
$this->field_text_field->save();
$items[] = array('value' => 'Hallo, wereld!', 'format' => 'full_html');
$this->assertEqual('form', $this->getSelectedEditor($items, $field_name), "Without text processing, cardinality >1, the 'form' editor is selected.");
// Editor selection with text processing, cardinality >1
$this->field_text_instance['settings']['text_processing'] = 1;
field_update_instance($this->field_text_instance);
$this->field_text_instance->settings['text_processing'] = 1;
$this->field_text_instance->save();
$this->assertEqual('form', $this->getSelectedEditor($items, $field_name), "With text processing, cardinality >1, the 'form' editor is selected.");
}
......@@ -133,8 +133,8 @@ function testTextWysiwyg() {
$this->assertEqual('wysiwyg', $this->getSelectedEditor($items, $field_name), "With cardinality 1, and the full_html text format, the 'wysiwyg' editor is selected.");
// Editor selection with text processing, cardinality >1
$this->field_textarea_field['cardinality'] = 2;
field_update_field($this->field_textarea_field);
$this->field_textarea_field->cardinality = 2;
$this->field_textarea_field->save();
$items[] = array('value' => 'Hallo, wereld!', 'format' => 'full_html');
$this->assertEqual('form', $this->getSelectedEditor($items, $field_name), "With cardinality >1, and both items using the full_html text format, the 'form' editor is selected.");
}
......@@ -163,8 +163,8 @@ function testNumber() {
$this->assertEqual('form', $this->getSelectedEditor($items, $field_name), "With cardinality 1, the 'form' editor is selected.");
// Editor selection with cardinality >1.
$this->field_nr_field['cardinality'] = 2;
field_update_field($this->field_nr_field);
$this->field_nr_field->cardinality = 2;
$this->field_nr_field->save();
$this->assertEqual('form', $this->getSelectedEditor($items, $field_name), "With cardinality >1, the 'form' editor is selected.");
}
......
......@@ -137,8 +137,8 @@ function testEditorSelection() {
$this->assertEqual('editor', $this->getSelectedEditor($items, $this->field_name), "With cardinality 1, and the full_html text format, the 'editor' editor is selected.");
// Editor selection with text processing, cardinality >1
$this->field_textarea_field['cardinality'] = 2;
field_update_field($this->field_textarea_field);
$this->field_textarea_field->cardinality = 2;
$this->field_textarea_field->save();
$items[] = array('value' => 'Hallo, wereld!', 'format' => 'full_html');
$this->assertEqual('form', $this->getSelectedEditor($items, $this->field_name), "With cardinality >1, and both items using the full_html text format, the 'form' editor is selected.");
}
......
......@@ -22,6 +22,20 @@ class EmailFieldTest extends WebTestBase {
*/
public static $modules = array('node', 'entity_test', 'email', 'field_ui');
/**
* A field to use in this test class.
*
* @var \Drupal\field\Plugin\Core\Entity\Field
*/
protected $field;
/**
* The instance used in this test class.
*
* @var \Drupal\field\Plugin\Core\Entity\FieldInstance
*/
protected $instance;
public static function getInfo() {
return array(
'name' => 'E-mail field',
......@@ -46,21 +60,22 @@ function setUp() {
*/
function testEmailField() {
// Create a field with settings to validate.
$this->field = array(
'field_name' => drupal_strtolower($this->randomName()),
$field_name = drupal_strtolower($this->randomName());
$this->field = entity_create('field_entity', array(
'field_name' => $field_name,
'type' => 'email',
);
field_create_field($this->field);
$this->instance = array(
'field_name' => $this->field['field_name'],
));
$this->field->save();
$this->instance = entity_create('field_instance', array(
'field_name' => $field_name,
'entity_type' => 'entity_test',
'bundle' => 'entity_test',
);
field_create_instance($this->instance);
));
$this->instance->save();
// Create a form display for the default form mode.
entity_get_form_display('entity_test', 'entity_test', 'default')
->setComponent($this->field['field_name'], array(
->setComponent($field_name, array(
'type' => 'email_default',
'settings' => array(
'placeholder' => 'example@example.com',
......@@ -69,7 +84,7 @@ function testEmailField() {
->save();
// Create a display for the full view mode.
entity_get_display('entity_test', 'entity_test', 'full')
->setComponent($this->field['field_name'], array(
->setComponent($field_name, array(
'type' => 'email_mailto',
))
->save();
......@@ -77,7 +92,7 @@ function testEmailField() {
// Display creation form.
$this->drupalGet('entity_test/add');
$langcode = Language::LANGCODE_NOT_SPECIFIED;
$this->assertFieldByName("{$this->field['field_name']}[$langcode][0][value]", '', 'Widget found.');
$this->assertFieldByName("{$field_name}[$langcode][0][value]", '', 'Widget found.');
$this->assertRaw('placeholder="example@example.com"');
// Submit a valid e-mail address and ensure it is accepted.
......@@ -85,7 +100,7 @@ function testEmailField() {
$edit = array(
'user_id' => 1,
'name' => $this->randomName(),
"{$this->field['field_name']}[$langcode][0][value]" => $value,
"{$field_name}[$langcode][0][value]" => $value,
);
$this->drupalPost(NULL, $edit, t('Save'));
preg_match('|entity_test/manage/(\d+)/edit|', $this->url, $match);
......
......@@ -35,17 +35,15 @@ public function setUp() {
parent::setUp();
// Create an email field and instance for validation.
$this->field = array(
entity_create('field_entity', array(
'field_name' => 'field_email',
'type' => 'email',
);
field_create_field($this->field);
$this->instance = array(
))->save();
entity_create('field_instance', array(
'entity_type' => 'entity_test',
'field_name' => 'field_email',
'bundle' => 'entity_test',
);
field_create_instance($this->instance);
))->save();
// Create a form display for the default form mode.
entity_get_form_display('entity_test', 'entity_test', 'default')
......
......@@ -139,22 +139,23 @@ public function testFieldComponent() {
'mode' => 'default',
));
$field_name = 'test_field';
// Create a field and an instance.
$field = array(
'field_name' => 'test_field',
$field = entity_create('field_entity', array(
'field_name' => $field_name,
'type' => 'test_field'
);
field_create_field($field);
$instance = array(
'field_name' => $field['field_name'],
));
$field->save();
$instance = entity_create('field_instance', array(
'field_name' => $field_name,
'entity_type' => 'entity_test',
'bundle' => 'entity_test',
);
field_create_instance($instance);
));
$instance->save();
// Check that providing no options results in default values being used.
$display->setComponent($field['field_name']);
$field_type_info = field_info_field_types($field['type']);
$display->setComponent($field_name);
$field_type_info = field_info_field_types($field->type);
$default_formatter = $field_type_info['default_formatter'];
$default_settings = field_info_formatter_settings($default_formatter);
$expected = array(
......@@ -163,10 +164,10 @@ public function testFieldComponent() {
'type' => $default_formatter,
'settings' => $default_settings,
);
$this->assertEqual($display->getComponent($field['field_name']), $expected);
$this->assertEqual($display->getComponent($field_name), $expected);
// Check that the getFormatter() method returns the correct formatter plugin.
$formatter = $display->getFormatter($field['field_name']);
$formatter = $display->getFormatter($field_name);
$this->assertEqual($formatter->getPluginId(), $default_formatter);
$this->assertEqual($formatter->getSettings(), $default_settings);
......@@ -174,26 +175,26 @@ public function testFieldComponent() {
// arbitrary property and reading it back.
$random_value = $this->randomString();
$formatter->randomValue = $random_value;
$formatter = $display->getFormatter($field['field_name']);
$formatter = $display->getFormatter($field_name);
$this->assertEqual($formatter->randomValue, $random_value);
// Check that changing the definition creates a new formatter.
$display->setComponent($field['field_name'], array(
$display->setComponent($field_name, array(
'type' => 'field_test_multiple',
));
$formatter = $display->getFormatter($field['field_name']);
$formatter = $display->getFormatter($field_name);
$this->assertEqual($formatter->getPluginId(), 'field_test_multiple');
$this->assertFalse(isset($formatter->randomValue));
// Check that specifying an unknown formatter (e.g. case of a disabled
// module) gets stored as is in the display, but results in the default
// formatter being used.
$display->setComponent($field['field_name'], array(
$display->setComponent($field_name, array(
'type' => 'unknown_formatter',
));
$options = $display->getComponent($field['field_name']);
$options = $display->getComponent($field_name);
$this->assertEqual($options['type'], 'unknown_formatter');
$formatter = $display->getFormatter($field['field_name']);
$formatter = $display->getFormatter($field_name);
$this->assertEqual($formatter->getPluginId(), $default_formatter);
}
......@@ -232,32 +233,33 @@ public function testRenameDeleteBundle() {
public function testDeleteFieldInstance() {
$this->enableModules(array('field_sql_storage', 'field_test'));
$field_name = 'test_field';
// Create a field and an instance.
$field = entity_create('field_entity', array(
'field_name' => 'test_field',
'field_name' => $field_name,
'type' => 'test_field'
));
$field->save();
$instance = entity_create('field_instance', array(
'field_name' => $field['field_name'],
'field_name' => $field_name,
'entity_type' => 'entity_test',
'bundle' => 'entity_test',
));
$instance->save();
// Create an entity display.
$display = entity_create('entity_display', array(
entity_create('entity_display', array(
'targetEntityType' => 'entity_test',
'bundle' => 'entity_test',
'viewMode' => 'default',
))->setComponent($field['field_name'])->save();
))->setComponent($field_name)->save();
// Delete the instance.
$instance->delete();
// Check that the component has been removed from the entity display.
$display = entity_get_display('entity_test', 'entity_test', 'default');
$this->assertFalse($display->getComponent($field['field_name']));
$this->assertFalse($display->getComponent($field_name));
}
}
......@@ -62,21 +62,22 @@ public function testFieldComponent() {
));
// Create a field and an instance.
$field = array(
'field_name' => 'test_field',
$field_name = 'test_field';
$field = entity_create('field_entity', array(
'field_name' => $field_name,
'type' => 'test_field'
);
field_create_field($field);
$instance = array(
'field_name' => $field['field_name'],
));
$field->save();
$instance = entity_create('field_instance', array(
'field_name' => $field_name,
'entity_type' => 'entity_test',
'bundle' => 'entity_test',
);
field_create_instance($instance);
));
$instance->save();
// Check that providing no options results in default values being used.
$form_display->setComponent($field['field_name']);
$field_type_info = field_info_field_types($field['type']);
$form_display->setComponent($field_name);
$field_type_info = field_info_field_types($field->type);
$default_widget = $field_type_info['default_widget'];
$default_settings = field_info_widget_settings($default_widget);
$expected = array(
......@@ -84,10 +85,10 @@ public function testFieldComponent() {
'type' => $default_widget,
'settings' => $default_settings,
);
$this->assertEqual($form_display->getComponent($field['field_name']), $expected);
$this->assertEqual($form_display->getComponent($field_name), $expected);
// Check that the getWidget() method returns the correct widget plugin.
$widget = $form_display->getWidget($field['field_name']);
$widget = $form_display->getWidget($field_name);
$this->assertEqual($widget->getPluginId(), $default_widget);
$this->assertEqual($widget->getSettings(), $default_settings);
......@@ -95,26 +96,26 @@ public function testFieldComponent() {
// arbitrary property and reading it back.
$random_value = $this->randomString();
$widget->randomValue = $random_value;
$widget = $form_display->getWidget($field['field_name']);
$widget = $form_display->getWidget($field_name);
$this->assertEqual($widget->randomValue, $random_value);
// Check that changing the definition creates a new widget.
$form_display->setComponent($field['field_name'], array(
$form_display->setComponent($field_name, array(
'type' => 'field_test_multiple',
));
$widget = $form_display->getWidget($field['field_name']);
$widget = $form_display->getWidget($field_name);
$this->assertEqual($widget->getPluginId(), 'test_field_widget');
$this->assertFalse(isset($widget->randomValue));
// Check that specifying an unknown widget (e.g. case of a disabled module)
// gets stored as is in the display, but results in the default widget being
// used.
$form_display->setComponent($field['field_name'], array(
$form_display->setComponent($field_name, array(
'type' => 'unknown_widget',
));
$options = $form_display->getComponent($field['field_name']);
$options = $form_display->getComponent($field_name);
$this->assertEqual($options['type'], 'unknown_widget');
$widget = $form_display->getWidget($field['field_name']);
$widget = $form_display->getWidget($field_name);
$this->assertEqual($widget->getPluginId(), $default_widget);
}
......
......@@ -194,8 +194,8 @@ function entity_reference_field_update_field($field, $prior_field) {
foreach ($field['bundles'] as $entity_type => $bundles) {
foreach ($bundles as $bundle) {
$instance = field_info_instance($entity_type, $field_name, $bundle);
$instance['settings']['handler_settings'] = array();
field_update_instance($instance);
$instance->settings['handler_settings'] = array();
$instance->save();
}
}
}
......@@ -430,7 +430,7 @@ function entity_reference_create_instance($entity_type, $bundle, $field_name, $f
'target_type' => $target_entity_type,
),
);
field_create_field($field);
entity_create('field_entity', $field)->save();
}
if (empty($instance)) {
......@@ -444,6 +444,7 @@ function entity_reference_create_instance($entity_type, $bundle, $field_name, $f
'handler_settings' => $selection_handler_settings,
),
);
field_create_instance($instance);
entity_create('field_instance', $instance)->save();
}
}
......@@ -35,7 +35,7 @@ function setUp() {
$referenced = $this->drupalCreateContentType();
$this->referenced_type = $referenced->type;
$field = array(
entity_create('field_entity', array(
'translatable' => FALSE,
'entity_types' => array(),
'settings' => array(
......@@ -44,11 +44,9 @@ function setUp() {
'field_name' => 'test_field',
'type' => 'entity_reference',
'cardinality' => FIELD_CARDINALITY_UNLIMITED,
);
field_create_field($field);
))->save();
$instance = array(
entity_create('field_instance', array(
'label' => 'Entity reference field',
'field_name' => 'test_field',
'entity_type' => 'node',
......@@ -64,9 +62,7 @@ function setUp() {
'auto_create' => TRUE,
),
),
);
field_create_instance($instance);
))->save();
entity_get_form_display('node', $referencing->type, 'default')
->setComponent('test_field', array(
......
......@@ -36,22 +36,20 @@ function setUp() {
*/
public function testSort() {
// Add text field to entity, to sort by.
$field_info = array(
entity_create('field_entity', array(
'field_name' => 'field_text',
'type' => 'text',
'entity_types' => array('node'),
);
field_create_field($field_info);
))->save();
$instance_info = array(
entity_create('field_instance', array(
'label' => 'Text Field',