diff --git a/core/lib/Drupal/Core/Entity/ContentEntityDatabaseStorage.php b/core/lib/Drupal/Core/Entity/ContentEntityDatabaseStorage.php
index cded360..9ae4ebc 100644
--- a/core/lib/Drupal/Core/Entity/ContentEntityDatabaseStorage.php
+++ b/core/lib/Drupal/Core/Entity/ContentEntityDatabaseStorage.php
@@ -1519,7 +1519,7 @@ public function onBundleRename($bundle, $bundle_new) {
// configurable fields, so we use the specific API.
// @todo Use the unified store of deleted field definitions instead in
// https://www.drupal.org/node/2282119
- $field_definitions += entity_load_multiple_by_properties('field_instance_config', array('entity_type' => $this->entityTypeId, 'bundle' => $bundle, 'deleted' => TRUE, 'include_deleted' => TRUE));
+ $field_definitions += entity_load_multiple_by_properties('field_config', array('entity_type' => $this->entityTypeId, 'bundle' => $bundle, 'deleted' => TRUE, 'include_deleted' => TRUE));
foreach ($field_definitions as $field_definition) {
$storage_definition = $field_definition->getFieldStorageDefinition();
diff --git a/core/lib/Drupal/Core/Entity/ContentEntityStorageBase.php b/core/lib/Drupal/Core/Entity/ContentEntityStorageBase.php
index a4849be..6d75946 100644
--- a/core/lib/Drupal/Core/Entity/ContentEntityStorageBase.php
+++ b/core/lib/Drupal/Core/Entity/ContentEntityStorageBase.php
@@ -10,8 +10,6 @@
use Drupal\Component\Utility\String;
use Drupal\Core\Field\FieldDefinitionInterface;
use Drupal\Core\Field\FieldStorageDefinitionInterface;
-use Drupal\Core\Cache\Cache;
-use Drupal\field\FieldInstanceConfigInterface;
use Symfony\Component\DependencyInjection\ContainerInterface;
abstract class ContentEntityStorageBase extends EntityStorageBase implements FieldableEntityStorageInterface {
@@ -137,7 +135,7 @@ public function purgeFieldData(FieldDefinitionInterface $field_definition, $batc
* Reads values to be purged for a single field.
*
* This method is called during field data purge, on fields for which
- * onFieldDelete() or onFieldInstanceDelete() has previously run.
+ * onFieldDelete() or onFieldDelete() has previously run.
*
* @param \Drupal\Core\Field\FieldDefinitionInterface $field_definition
* The field definition.
diff --git a/core/lib/Drupal/Core/Field/FieldDefinition.php b/core/lib/Drupal/Core/Field/FieldDefinition.php
index 1c3496a..aa5cace 100644
--- a/core/lib/Drupal/Core/Field/FieldDefinition.php
+++ b/core/lib/Drupal/Core/Field/FieldDefinition.php
@@ -62,7 +62,7 @@ public static function create($type) {
// settings for the field type.
// @todo Cleanup in https://drupal.org/node/2116341.
$field_type_manager = \Drupal::service('plugin.manager.field.field_type');
- $default_settings = $field_type_manager->getDefaultSettings($type) + $field_type_manager->getDefaultInstanceSettings($type);
+ $default_settings = $field_type_manager->getDefaultSettings($type) + $field_type_manager->getDefaultFieldSettings($type);
$field_definition->itemDefinition->setSettings($default_settings);
return $field_definition;
}
diff --git a/core/lib/Drupal/Core/Field/FieldDefinitionInterface.php b/core/lib/Drupal/Core/Field/FieldDefinitionInterface.php
index cf6947b..1b37991 100644
--- a/core/lib/Drupal/Core/Field/FieldDefinitionInterface.php
+++ b/core/lib/Drupal/Core/Field/FieldDefinitionInterface.php
@@ -28,16 +28,16 @@
* information comes from. For example, field.module provides an implementation
* based on two levels of configuration. It allows the site administrator to add
* custom fields to any entity type and bundle via the "field_storage_config"
- * and "field_instance_config" configuration entities. The former for storing
+ * and "field_config" configuration entities. The former for storing
* configuration that is independent of which entity type and bundle the field
* is added to, and the latter for storing configuration that is specific to the
- * entity type and bundle. The class that implements "field_instance_config"
+ * entity type and bundle. The class that implements "field_config"
* configuration entities also implements this interface, returning information
* from either itself, or from the corresponding "field_storage_config"
* configuration, as appropriate.
*
* However, entity base fields, such as $node->title, are not managed by
- * field.module and its "field_storage_config"/"field_instance_config"
+ * field.module and its "field_storage_config"/"field_config"
* configuration entities. Therefore, their definitions are provided by
* different objects based on the class \Drupal\Core\Field\FieldDefinition,
* which implements this interface as well.
diff --git a/core/lib/Drupal/Core/Field/FieldItemBase.php b/core/lib/Drupal/Core/Field/FieldItemBase.php
index 715bbb7..3360ea2 100644
--- a/core/lib/Drupal/Core/Field/FieldItemBase.php
+++ b/core/lib/Drupal/Core/Field/FieldItemBase.php
@@ -35,7 +35,7 @@ public static function defaultSettings() {
/**
* {@inheritdoc}
*/
- public static function defaultInstanceSettings() {
+ public static function defaultFieldSettings() {
return array();
}
@@ -252,7 +252,7 @@ public function settingsForm(array &$form, FormStateInterface $form_state, $has_
/**
* {@inheritdoc}
*/
- public function instanceSettingsForm(array $form, FormStateInterface $form_state) {
+ public function fieldSettingsForm(array $form, FormStateInterface $form_state) {
return array();
}
@@ -273,14 +273,14 @@ public static function settingsFromConfigData(array $settings) {
/**
* {@inheritdoc}
*/
- public static function instanceSettingsToConfigData(array $settings) {
+ public static function fieldSettingsToConfigData(array $settings) {
return $settings;
}
/**
* {@inheritdoc}
*/
- public static function instanceSettingsFromConfigData(array $settings) {
+ public static function fieldSettingsFromConfigData(array $settings) {
return $settings;
}
diff --git a/core/lib/Drupal/Core/Field/FieldItemInterface.php b/core/lib/Drupal/Core/Field/FieldItemInterface.php
index b3a9269..d6398dd 100644
--- a/core/lib/Drupal/Core/Field/FieldItemInterface.php
+++ b/core/lib/Drupal/Core/Field/FieldItemInterface.php
@@ -55,7 +55,7 @@ public static function mainPropertyName();
*
* This method is static because the field schema information is needed on
* creation of the field. FieldItemInterface objects instantiated at that
- * time are not reliable as field instance settings might be missing.
+ * time are not reliable as field settings might be missing.
*
* Computed fields having no schema should return an empty array.
*
@@ -225,12 +225,12 @@ public function deleteRevision();
public static function defaultSettings();
/**
- * Defines the instance-level settings for this plugin.
+ * Defines the field-level settings for this plugin.
*
* @return array
* A list of default settings, keyed by the setting name.
*/
- public static function defaultInstanceSettings();
+ public static function defaultFieldSettings();
/**
* Returns a settings array that can be stored as a configuration value.
@@ -286,12 +286,10 @@ public static function settingsFromConfigData(array $settings);
/**
* Returns a settings array that can be stored as a configuration value.
*
- * Same as static::settingsToConfigData(), but for the field's instance
- * settings.
+ * Same as static::settingsToConfigData(), but for the field's settings.
*
* @param array $settings
- * The field's instance settings in the field type's canonical
- * representation.
+ * The field's settings in the field type's canonical representation.
*
* @return array
* An array (either the unmodified $settings or a modified representation)
@@ -299,26 +297,26 @@ public static function settingsFromConfigData(array $settings);
*
* @see \Drupal\Core\Field\FieldItemInterface::settingsToConfigData()
*/
- public static function instanceSettingsToConfigData(array $settings);
+ public static function fieldSettingsToConfigData(array $settings);
/**
* Returns a settings array in the field type's canonical representation.
*
- * This function does the inverse of static::instanceSettingsToConfigData().
- * It's called when loading a field's instance settings from a configuration
+ * This function does the inverse of static::fieldSettingsToConfigData().
+ * It's called when loading a field's settings from a configuration
* object.
*
* @param array $settings
- * The field's instance settings, as it is stored within a configuration
+ * The field's settings, as it is stored within a configuration
* object.
*
* @return array
- * The instance settings, in the representation expected by the field type
+ * The field settings, in the representation expected by the field type
* and code that interacts with it.
*
- * @see \Drupal\Core\Field\FieldItemInterface::instanceSettingsToConfigData()
+ * @see \Drupal\Core\Field\FieldItemInterface::fieldSettingsToConfigData()
*/
- public static function instanceSettingsFromConfigData(array $settings);
+ public static function fieldSettingsFromConfigData(array $settings);
/**
* Returns a form for the field-level settings.
@@ -345,10 +343,10 @@ public static function instanceSettingsFromConfigData(array $settings);
public function settingsForm(array &$form, FormStateInterface $form_state, $has_data);
/**
- * Returns a form for the instance-level settings.
+ * Returns a form for the field-level settings.
*
- * Invoked from \Drupal\field_ui\Form\FieldInstanceEditForm to allow
- * administrators to configure instance-level settings.
+ * Invoked from \Drupal\field_ui\Form\FieldEditForm to allow
+ * administrators to configure field-level settings.
*
* @param array $form
* The form where the settings form is being included in.
@@ -356,8 +354,8 @@ public function settingsForm(array &$form, FormStateInterface $form_state, $has_
* The form state of the (entire) configuration form.
*
* @return array
- * The form definition for the field instance settings.
+ * The form definition for the field settings.
*/
- public function instanceSettingsForm(array $form, FormStateInterface $form_state);
+ public function fieldSettingsForm(array $form, FormStateInterface $form_state);
}
diff --git a/core/lib/Drupal/Core/Field/FieldItemListInterface.php b/core/lib/Drupal/Core/Field/FieldItemListInterface.php
index 402aa19..30d4180 100644
--- a/core/lib/Drupal/Core/Field/FieldItemListInterface.php
+++ b/core/lib/Drupal/Core/Field/FieldItemListInterface.php
@@ -184,7 +184,7 @@ public function view($display_options = array());
/**
* Returns a form for the default value input.
*
- * Invoked from \Drupal\field_ui\Form\FieldInstanceEditForm to allow
+ * Invoked from \Drupal\field_ui\Form\FieldEditForm to allow
* administrators to configure instance-level default value.
*
* @param array $form
@@ -200,7 +200,7 @@ public function defaultValuesForm(array &$form, FormStateInterface $form_state);
/**
* Validates the submitted default value.
*
- * Invoked from \Drupal\field_ui\Form\FieldInstanceEditForm to allow
+ * Invoked from \Drupal\field_ui\Form\FieldEditForm to allow
* administrators to configure instance-level default value.
*
* @param array $element
@@ -215,7 +215,7 @@ public function defaultValuesFormValidate(array $element, array &$form, FormStat
/**
* Processes the submitted default value.
*
- * Invoked from \Drupal\field_ui\Form\FieldInstanceEditForm to allow
+ * Invoked from \Drupal\field_ui\Form\FieldEditForm to allow
* administrators to configure instance-level default value.
*
* @param array $element
diff --git a/core/lib/Drupal/Core/Field/FieldTypePluginManager.php b/core/lib/Drupal/Core/Field/FieldTypePluginManager.php
index 6a5f39a..bd34699 100644
--- a/core/lib/Drupal/Core/Field/FieldTypePluginManager.php
+++ b/core/lib/Drupal/Core/Field/FieldTypePluginManager.php
@@ -61,11 +61,11 @@ public function getDefaultSettings($type) {
/**
* {@inheritdoc}
*/
- public function getDefaultInstanceSettings($type) {
+ public function getDefaultFieldSettings($type) {
$plugin_definition = $this->getDefinition($type, FALSE);
if (!empty($plugin_definition['class'])) {
$plugin_class = DefaultFactory::getPluginClass($type, $plugin_definition);
- return $plugin_class::defaultInstanceSettings();
+ return $plugin_class::defaultFieldSettings();
}
return array();
}
diff --git a/core/lib/Drupal/Core/Field/FieldTypePluginManagerInterface.php b/core/lib/Drupal/Core/Field/FieldTypePluginManagerInterface.php
index cf47637..bcbc108 100644
--- a/core/lib/Drupal/Core/Field/FieldTypePluginManagerInterface.php
+++ b/core/lib/Drupal/Core/Field/FieldTypePluginManagerInterface.php
@@ -17,24 +17,24 @@
interface FieldTypePluginManagerInterface extends PluginManagerInterface {
/**
- * Returns the default instance-level settings for a field type.
- *
- * @param string $type
- * A field type name.
- *
- * @return array
- * The instance's default settings, as provided by the plugin definition, or
- * an empty array if type or settings are undefined.
- */
- public function getDefaultInstanceSettings($type);
-
- /**
* Returns the default field-level settings for a field type.
*
* @param string $type
* A field type name.
*
* @return array
+ * The field's default settings, as provided by the plugin definition, or
+ * an empty array if type or settings are undefined.
+ */
+ public function getDefaultFieldSettings($type);
+
+ /**
+ * Returns the default storage-level settings for a field type.
+ *
+ * @param string $type
+ * A field type name.
+ *
+ * @return array
* The type's default settings, as provided by the plugin definition, or an
* empty array if type or settings are undefined.
*/
diff --git a/core/lib/Drupal/Core/Field/FormatterInterface.php b/core/lib/Drupal/Core/Field/FormatterInterface.php
index 8596e6b..f8bd7af 100644
--- a/core/lib/Drupal/Core/Field/FormatterInterface.php
+++ b/core/lib/Drupal/Core/Field/FormatterInterface.php
@@ -19,7 +19,7 @@
/**
* Returns a form to configure settings for the formatter.
*
- * Invoked from \Drupal\field_ui\Form\FieldInstanceEditForm to allow
+ * Invoked from \Drupal\field_ui\Form\FieldEditForm to allow
* administrators to configure the formatter. The field_ui module takes care
* of handling submitted form values.
*
diff --git a/core/lib/Drupal/Core/Field/Plugin/Field/FieldType/EntityReferenceItem.php b/core/lib/Drupal/Core/Field/Plugin/Field/FieldType/EntityReferenceItem.php
index 5233910..a8091a7 100644
--- a/core/lib/Drupal/Core/Field/Plugin/Field/FieldType/EntityReferenceItem.php
+++ b/core/lib/Drupal/Core/Field/Plugin/Field/FieldType/EntityReferenceItem.php
@@ -47,10 +47,10 @@ public static function defaultSettings() {
/**
* {@inheritdoc}
*/
- public static function defaultInstanceSettings() {
+ public static function defaultFieldSettings() {
return array(
'handler' => 'default',
- ) + parent::defaultInstanceSettings();
+ ) + parent::defaultFieldSettings();
}
/**
diff --git a/core/lib/Drupal/Core/Field/Plugin/Field/FieldType/IntegerItem.php b/core/lib/Drupal/Core/Field/Plugin/Field/FieldType/IntegerItem.php
index 2d3fa30..9af1b8a 100644
--- a/core/lib/Drupal/Core/Field/Plugin/Field/FieldType/IntegerItem.php
+++ b/core/lib/Drupal/Core/Field/Plugin/Field/FieldType/IntegerItem.php
@@ -35,7 +35,7 @@ public static function defaultSettings() {
/**
* {@inheritdoc}
*/
- public static function defaultInstanceSettings() {
+ public static function defaultFieldSettings() {
return array(
'min' => '',
'max' => '',
@@ -44,7 +44,7 @@ public static function defaultInstanceSettings() {
// Valid size property values include: 'tiny', 'small', 'medium', 'normal'
// and 'big'.
'size' => 'normal',
- ) + parent::defaultInstanceSettings();
+ ) + parent::defaultFieldSettings();
}
/**
diff --git a/core/lib/Drupal/Core/Field/Plugin/Field/FieldType/NumericItemBase.php b/core/lib/Drupal/Core/Field/Plugin/Field/FieldType/NumericItemBase.php
index 28846bb..45dbab1 100644
--- a/core/lib/Drupal/Core/Field/Plugin/Field/FieldType/NumericItemBase.php
+++ b/core/lib/Drupal/Core/Field/Plugin/Field/FieldType/NumericItemBase.php
@@ -18,19 +18,19 @@
/**
* {@inheritdoc}
*/
- public static function defaultInstanceSettings() {
+ public static function defaultFieldSettings() {
return array(
'min' => '',
'max' => '',
'prefix' => '',
'suffix' => '',
- ) + parent::defaultInstanceSettings();
+ ) + parent::defaultFieldSettings();
}
/**
* {@inheritdoc}
*/
- public function instanceSettingsForm(array $form, FormStateInterface $form_state) {
+ public function fieldSettingsForm(array $form, FormStateInterface $form_state) {
$element = array();
$settings = $this->getSettings();
diff --git a/core/lib/Drupal/Core/Field/WidgetInterface.php b/core/lib/Drupal/Core/Field/WidgetInterface.php
index 9c045a6..7df468c 100644
--- a/core/lib/Drupal/Core/Field/WidgetInterface.php
+++ b/core/lib/Drupal/Core/Field/WidgetInterface.php
@@ -25,7 +25,7 @@
/**
* Returns a form to configure settings for the widget.
*
- * Invoked from \Drupal\field_ui\Form\FieldInstanceEditForm to allow
+ * Invoked from \Drupal\field_ui\Form\FieldEditForm to allow
* administrators to configure the widget. The field_ui module takes care of
* handling submitted form values.
*
diff --git a/core/modules/block_content/block_content.module b/core/modules/block_content/block_content.module
index dadcf4b..0f7c6ba 100644
--- a/core/modules/block_content/block_content.module
+++ b/core/modules/block_content/block_content.module
@@ -6,7 +6,7 @@
*/
use Drupal\Core\Routing\RouteMatchInterface;
-use Drupal\field\Entity\FieldInstanceConfig;
+use Drupal\field\Entity\FieldConfig;
use Drupal\field\Entity\FieldStorageConfig;
/**
@@ -78,7 +78,7 @@ function block_content_entity_type_alter(array &$entity_types) {
function block_content_add_body_field($block_type_id, $label = 'Body') {
// Add or remove the body field, as needed.
$field_storage = FieldStorageConfig::loadByName('block_content', 'body');
- $instance = FieldInstanceConfig::loadByName('block_content', $block_type_id, 'body');
+ $instance = FieldConfig::loadByName('block_content', $block_type_id, 'body');
if (empty($field_storage)) {
$field_storage = entity_create('field_storage_config', array(
'name' => 'body',
@@ -88,7 +88,7 @@ function block_content_add_body_field($block_type_id, $label = 'Body') {
$field_storage->save();
}
if (empty($instance)) {
- $instance = entity_create('field_instance_config', array(
+ $instance = entity_create('field_config', array(
'field_storage' => $field_storage,
'bundle' => $block_type_id,
'label' => $label,
diff --git a/core/modules/block_content/src/Tests/BlockContentFieldTest.php b/core/modules/block_content/src/Tests/BlockContentFieldTest.php
index 2b8023c..c1200fe 100644
--- a/core/modules/block_content/src/Tests/BlockContentFieldTest.php
+++ b/core/modules/block_content/src/Tests/BlockContentFieldTest.php
@@ -33,7 +33,7 @@ class BlockContentFieldTest extends BlockContentTestBase {
/**
* The created instance.
*
- * @var \Drupal\field\Entity\FieldInstanceConfig
+ * @var \Drupal\field\Entity\FieldConfig
*/
protected $instance;
@@ -61,7 +61,7 @@ public function testBlockFields() {
'cardinality' => 2,
));
$this->fieldStorage->save();
- $this->instance = entity_create('field_instance_config', array(
+ $this->instance = entity_create('field_config', array(
'field_storage' => $this->fieldStorage,
'bundle' => 'link',
'settings' => array(
diff --git a/core/modules/comment/comment.module b/core/modules/comment/comment.module
index 5ce3ba9..da066b9 100644
--- a/core/modules/comment/comment.module
+++ b/core/modules/comment/comment.module
@@ -26,7 +26,7 @@
use Drupal\Core\Render\Element;
use Drupal\Core\Url;
use Drupal\field\Entity\FieldStorageConfig;
-use Drupal\field\FieldInstanceConfigInterface;
+use Drupal\field\FieldConfigInterface;
use Drupal\field\FieldStorageConfigInterface;
use Drupal\file\FileInterface;
use Drupal\user\EntityOwnerInterface;
@@ -143,9 +143,9 @@ function comment_theme() {
}
/**
- * Implements hook_ENTITY_TYPE_create() for 'field_instance_config'.
+ * Implements hook_ENTITY_TYPE_create() for 'field_config'.
*/
-function comment_field_instance_config_create(FieldInstanceConfigInterface $instance) {
+function comment_field_config_create(FieldConfigInterface $instance) {
if ($instance->getType() == 'comment' && !$instance->isSyncing()) {
// Assign default values for the field instance.
if (!isset($instance->default_value)) {
@@ -164,9 +164,9 @@ function comment_field_instance_config_create(FieldInstanceConfigInterface $inst
}
/**
- * Implements hook_ENTITY_TYPE_update() for 'field_instance_config'.
+ * Implements hook_ENTITY_TYPE_update() for 'field_config'.
*/
-function comment_field_instance_config_update(FieldInstanceConfigInterface $instance) {
+function comment_field_config_update(FieldConfigInterface $instance) {
if ($instance->getType() == 'comment') {
// Comment field settings also affects the rendering of *comment* entities,
// not only the *commented* entities.
@@ -188,9 +188,9 @@ function comment_field_storage_config_insert(FieldStorageConfigInterface $field_
}
/**
- * Implements hook_ENTITY_TYPE_delete() for 'field_instance_config'.
+ * Implements hook_ENTITY_TYPE_delete() for 'field_config'.
*/
-function comment_field_instance_config_delete(FieldInstanceConfigInterface $instance) {
+function comment_field_config_delete(FieldConfigInterface $instance) {
if ($instance->getType() == 'comment') {
// Delete all comments that used by the entity bundle.
$entity_query = \Drupal::entityQuery('comment');
diff --git a/core/modules/comment/src/CommentManager.php b/core/modules/comment/src/CommentManager.php
index f8dac54..17eae24 100644
--- a/core/modules/comment/src/CommentManager.php
+++ b/core/modules/comment/src/CommentManager.php
@@ -20,7 +20,7 @@
use Drupal\Core\StringTranslation\StringTranslationTrait;
use Drupal\Core\StringTranslation\TranslationInterface;
use Drupal\field\Entity\FieldStorageConfig;
-use Drupal\field\Entity\FieldInstanceConfig;
+use Drupal\field\Entity\FieldConfig;
/**
* Comment manager contains common functions to manage comment fields.
@@ -157,7 +157,7 @@ public function addDefaultField($entity_type, $bundle, $field_name = 'comment',
}
// Make sure the instance doesn't already exist.
if (!array_key_exists($field_name, $this->entityManager->getFieldDefinitions($entity_type, $bundle))) {
- $instance = $this->entityManager->getStorage('field_instance_config')->create(array(
+ $instance = $this->entityManager->getStorage('field_config')->create(array(
'label' => 'Comments',
'description' => '',
'field_name' => $field_name,
@@ -227,9 +227,9 @@ public function addBodyField($comment_type_id) {
));
$field_storage->save();
}
- if (!FieldInstanceConfig::loadByName('comment', $comment_type_id, 'comment_body')) {
+ if (!FieldConfig::loadByName('comment', $comment_type_id, 'comment_body')) {
// Attaches the body field by default.
- $field_instance = $this->entityManager->getStorage('field_instance_config')->create(array(
+ $field_instance = $this->entityManager->getStorage('field_config')->create(array(
'field_name' => 'comment_body',
'label' => 'Comment',
'entity_type' => 'comment',
diff --git a/core/modules/comment/src/Plugin/Field/FieldType/CommentItem.php b/core/modules/comment/src/Plugin/Field/FieldType/CommentItem.php
index 57e41d8..3c80586 100644
--- a/core/modules/comment/src/Plugin/Field/FieldType/CommentItem.php
+++ b/core/modules/comment/src/Plugin/Field/FieldType/CommentItem.php
@@ -40,14 +40,14 @@ public static function defaultSettings() {
/**
* {@inheritdoc}
*/
- public static function defaultInstanceSettings() {
+ public static function defaultFieldSettings() {
return array(
'default_mode' => CommentManagerInterface::COMMENT_MODE_THREADED,
'per_page' => 50,
'form_location' => COMMENT_FORM_BELOW,
'anonymous' => COMMENT_ANONYMOUS_MAYNOT_CONTACT,
'preview' => DRUPAL_OPTIONAL,
- ) + parent::defaultInstanceSettings();
+ ) + parent::defaultFieldSettings();
}
/**
@@ -99,7 +99,7 @@ public static function schema(FieldStorageDefinitionInterface $field_definition)
/**
* {@inheritdoc}
*/
- public function instanceSettingsForm(array $form, FormStateInterface $form_state) {
+ public function fieldSettingsForm(array $form, FormStateInterface $form_state) {
$element = array();
$settings = $this->getSettings();
diff --git a/core/modules/comment/src/Tests/CommentFieldsTest.php b/core/modules/comment/src/Tests/CommentFieldsTest.php
index 393bfd7..17d5d1e 100644
--- a/core/modules/comment/src/Tests/CommentFieldsTest.php
+++ b/core/modules/comment/src/Tests/CommentFieldsTest.php
@@ -9,7 +9,7 @@
use Drupal\comment\Plugin\Field\FieldType\CommentItemInterface;
use Drupal\field\Entity\FieldStorageConfig;
-use Drupal\field\Entity\FieldInstanceConfig;
+use Drupal\field\Entity\FieldConfig;
/**
* Tests fields on comments.
@@ -35,7 +35,7 @@ function testCommentDefaultFields() {
$this->container->get('comment.manager')->addDefaultField('node', 'test_node_type');
// Check that the 'comment_body' field is present on the comment bundle.
- $instance = FieldInstanceConfig::loadByName('comment', 'comment', 'comment_body');
+ $instance = FieldConfig::loadByName('comment', 'comment', 'comment_body');
$this->assertTrue(!empty($instance), 'The comment_body field is added when a comment bundle is created');
$instance->delete();
@@ -53,12 +53,12 @@ function testCommentDefaultFields() {
// new comment bundle.
$field_storage = FieldStorageConfig::loadByName('comment', 'comment_body');
$this->assertTrue($field_storage, 'The comment_body field exists');
- $instance = FieldInstanceConfig::loadByName('comment', 'comment', 'comment_body');
+ $instance = FieldConfig::loadByName('comment', 'comment', 'comment_body');
$this->assertTrue(isset($instance), format_string('The comment_body field is present for comments on type @type', array('@type' => $type_name)));
// Test adding a field that defaults to CommentItemInterface::CLOSED.
$this->container->get('comment.manager')->addDefaultField('node', 'test_node_type', 'who_likes_ponies', CommentItemInterface::CLOSED, 'who_likes_ponies');
- $field_storage = entity_load('field_instance_config', 'node.test_node_type.who_likes_ponies');
+ $field_storage = entity_load('field_config', 'node.test_node_type.who_likes_ponies');
$this->assertEqual($field_storage->default_value[0]['status'], CommentItemInterface::CLOSED);
}
@@ -120,7 +120,7 @@ function testCommentInstallAfterContentModule() {
function testCommentFormat() {
// Disable text processing for comments.
$this->drupalLogin($this->admin_user);
- $edit = array('instance[settings][text_processing]' => 0);
+ $edit = array('field[settings][text_processing]' => 0);
$this->drupalPostForm('admin/structure/comment/manage/comment/fields/comment.comment.comment_body', $edit, t('Save settings'));
// Change formatter settings.
diff --git a/core/modules/comment/src/Tests/CommentNodeChangesTest.php b/core/modules/comment/src/Tests/CommentNodeChangesTest.php
index f208786..35666f8 100644
--- a/core/modules/comment/src/Tests/CommentNodeChangesTest.php
+++ b/core/modules/comment/src/Tests/CommentNodeChangesTest.php
@@ -28,10 +28,10 @@ function testNodeDeletion() {
// Make sure the comment field and all its instances are deleted when node
// type is deleted.
$this->assertNotNull(entity_load('field_storage_config', 'node.comment'), 'Comment field exists');
- $this->assertNotNull(entity_load('field_instance_config', 'node.article.comment'), 'Comment instance exists');
+ $this->assertNotNull(entity_load('field_config', 'node.article.comment'), 'Comment instance exists');
// Delete the node type.
entity_delete_multiple('node_type', array($this->node->bundle()));
$this->assertNull(entity_load('field_storage_config', 'node.comment'), 'Comment field deleted');
- $this->assertNull(entity_load('field_instance_config', 'node.article.comment'), 'Comment instance deleted');
+ $this->assertNull(entity_load('field_config', 'node.article.comment'), 'Comment instance deleted');
}
}
diff --git a/core/modules/comment/src/Tests/CommentNonNodeTest.php b/core/modules/comment/src/Tests/CommentNonNodeTest.php
index e13a019..082897f 100644
--- a/core/modules/comment/src/Tests/CommentNonNodeTest.php
+++ b/core/modules/comment/src/Tests/CommentNonNodeTest.php
@@ -10,7 +10,7 @@
use Drupal\comment\CommentInterface;
use Drupal\comment\Entity\CommentType;
use Drupal\comment\Plugin\Field\FieldType\CommentItemInterface;
-use Drupal\field\Entity\FieldInstanceConfig;
+use Drupal\field\Entity\FieldConfig;
use Drupal\simpletest\WebTestBase;
use Drupal\Core\Entity\EntityInterface;
@@ -94,7 +94,7 @@ function postComment(EntityInterface $entity, $comment, $subject = '', $contact
$edit = array();
$edit['comment_body[0][value]'] = $comment;
- $instance = FieldInstanceConfig::loadByName('entity_test', 'entity_test', 'comment');
+ $instance = FieldConfig::loadByName('entity_test', 'entity_test', 'comment');
$preview_mode = $instance->getSetting('preview');
// Must get the page before we test for fields.
diff --git a/core/modules/comment/src/Tests/CommentTestBase.php b/core/modules/comment/src/Tests/CommentTestBase.php
index 6decc59..12f38e1 100644
--- a/core/modules/comment/src/Tests/CommentTestBase.php
+++ b/core/modules/comment/src/Tests/CommentTestBase.php
@@ -10,7 +10,7 @@
use Drupal\comment\Entity\CommentType;
use Drupal\comment\Entity\Comment;
use Drupal\comment\CommentInterface;
-use Drupal\field\Entity\FieldInstanceConfig;
+use Drupal\field\Entity\FieldConfig;
use Drupal\simpletest\WebTestBase;
/**
@@ -108,10 +108,10 @@ public function postComment($entity, $comment, $subject = '', $contact = NULL, $
$edit['comment_body[0][value]'] = $comment;
if ($entity !== NULL) {
- $instance = FieldInstanceConfig::loadByName('node', $entity->bundle(), $field_name);
+ $instance = FieldConfig::loadByName('node', $entity->bundle(), $field_name);
}
else {
- $instance = FieldInstanceConfig::loadByName('node', 'article', $field_name);
+ $instance = FieldConfig::loadByName('node', 'article', $field_name);
}
$preview_mode = $instance->settings['preview'];
@@ -308,7 +308,7 @@ public function setCommentsPerPage($number, $field_name = 'comment') {
* Defaults to 'comment'.
*/
public function setCommentSettings($name, $value, $message, $field_name = 'comment') {
- $instance = FieldInstanceConfig::loadByName('node', 'article', $field_name);
+ $instance = FieldConfig::loadByName('node', 'article', $field_name);
$instance->settings[$name] = $value;
$instance->save();
// Display status message.
diff --git a/core/modules/comment/src/Tests/CommentTypeTest.php b/core/modules/comment/src/Tests/CommentTypeTest.php
index d136bcb..bce7426 100644
--- a/core/modules/comment/src/Tests/CommentTypeTest.php
+++ b/core/modules/comment/src/Tests/CommentTypeTest.php
@@ -10,7 +10,7 @@
use Drupal\comment\Entity\CommentType;
use Drupal\comment\Plugin\Field\FieldType\CommentItemInterface;
use Drupal\field\Entity\FieldStorageConfig;
-use Drupal\field\Entity\FieldInstanceConfig;
+use Drupal\field\Entity\FieldConfig;
use Drupal\node\Entity\Node;
/**
@@ -84,7 +84,7 @@ public function testCommentTypeCreation() {
public function testCommentTypeEditing() {
$this->drupalLogin($this->adminUser);
- $instance = FieldInstanceConfig::loadByName('comment', 'comment', 'comment_body');
+ $instance = FieldConfig::loadByName('comment', 'comment', 'comment_body');
$this->assertEqual($instance->getLabel(), 'Comment', 'Comment body field was found.');
// Change the comment type name.
diff --git a/core/modules/comment/src/Tests/CommentValidationTest.php b/core/modules/comment/src/Tests/CommentValidationTest.php
index 4b5153c..0677d09 100644
--- a/core/modules/comment/src/Tests/CommentValidationTest.php
+++ b/core/modules/comment/src/Tests/CommentValidationTest.php
@@ -62,7 +62,7 @@ public function testValidation() {
))->save();
// Add comment field instance to page content.
- $this->entityManager->getStorage('field_instance_config')->create(array(
+ $this->entityManager->getStorage('field_config')->create(array(
'field_name' => 'comment',
'entity_type' => 'node',
'bundle' => 'page',
diff --git a/core/modules/config/src/Tests/ConfigExportImportUITest.php b/core/modules/config/src/Tests/ConfigExportImportUITest.php
index 6d1ad7c..5a2c0fe 100644
--- a/core/modules/config/src/Tests/ConfigExportImportUITest.php
+++ b/core/modules/config/src/Tests/ConfigExportImportUITest.php
@@ -70,7 +70,7 @@ public function testExportImport() {
'type' => 'text',
));
$this->fieldStorage->save();
- entity_create('field_instance_config', array(
+ entity_create('field_config', array(
'field_storage' => $this->fieldStorage,
'bundle' => $this->content_type->type,
))->save();
@@ -96,7 +96,7 @@ public function testExportImport() {
$this->assertEqual(\Drupal::config('system.site')->get('slogan'), $this->originalSlogan);
// Delete the custom field.
- $field_instances = entity_load_multiple('field_instance_config');
+ $field_instances = entity_load_multiple('field_config');
foreach ($field_instances as $field_instance) {
if ($field_instance->field_name == $this->fieldName) {
$field_instance->delete();
diff --git a/core/modules/config_translation/config_translation.api.php b/core/modules/config_translation/config_translation.api.php
index 27c89b1..9f7abfc 100644
--- a/core/modules/config_translation/config_translation.api.php
+++ b/core/modules/config_translation/config_translation.api.php
@@ -36,13 +36,13 @@ function hook_config_translation_info(&$info) {
$route_provider = \Drupal::service('router.route_provider');
// If field UI is not enabled, the base routes of the type
- // "field_ui.instance_edit_$entity_type" are not defined.
+ // "field_ui.field_edit_$entity_type" are not defined.
if (\Drupal::moduleHandler()->moduleExists('field_ui')) {
// Add fields entity mappers to all fieldable entity types defined.
foreach ($entity_manager->getDefinitions() as $entity_type_id => $entity_type) {
$base_route = NULL;
try {
- $base_route = $route_provider->getRouteByName('field_ui.instance_edit_' . $entity_type_id);
+ $base_route = $route_provider->getRouteByName('field_ui.field_edit_' . $entity_type_id);
}
catch (RouteNotFoundException $e) {
// Ignore non-existent routes.
@@ -51,10 +51,10 @@ function hook_config_translation_info(&$info) {
// Make sure entity type is fieldable and has a base route.
if ($entity_type->isFieldable() && !empty($base_route)) {
$info[$entity_type_id . '_fields'] = array(
- 'base_route_name' => 'field_ui.instance_edit_' . $entity_type_id,
- 'entity_type' => 'field_instance_config',
+ 'base_route_name' => 'field_ui.field_edit_' . $entity_type_id,
+ 'entity_type' => 'field_config',
'title' => t('!label field'),
- 'class' => '\Drupal\config_translation\ConfigFieldInstanceMapper',
+ 'class' => '\Drupal\config_translation\ConfigFieldMapper',
'base_entity_type' => $entity_type_id,
'weight' => 10,
);
diff --git a/core/modules/config_translation/config_translation.module b/core/modules/config_translation/config_translation.module
index b0565b7..d84ee17 100644
--- a/core/modules/config_translation/config_translation.module
+++ b/core/modules/config_translation/config_translation.module
@@ -92,9 +92,9 @@ function config_translation_entity_type_alter(array &$entity_types) {
if ($entity_type_id == 'block') {
$class = 'Drupal\config_translation\Controller\ConfigTranslationBlockListBuilder';
}
- elseif ($entity_type_id == 'field_instance_config') {
- $class = 'Drupal\config_translation\Controller\ConfigTranslationFieldInstanceListBuilder';
- // Will be filled in dynamically, see \Drupal\field\Entity\FieldInstanceConfig::linkTemplates().
+ elseif ($entity_type_id == 'field_config') {
+ $class = 'Drupal\config_translation\Controller\ConfigTranslationFieldListBuilder';
+ // Will be filled in dynamically, see \Drupal\field\Entity\FieldConfig::linkTemplates().
$entity_type->setLinkTemplate('drupal:config-translation-overview', 'config_translation.item.overview.');
}
else {
@@ -117,17 +117,17 @@ function config_translation_config_translation_info(&$info) {
$route_provider = \Drupal::service('router.route_provider');
// If field UI is not enabled, the base routes of the type
- // "field_ui.instance_edit_$entity_type" are not defined.
+ // "field_ui.field_edit_$entity_type" are not defined.
if (\Drupal::moduleHandler()->moduleExists('field_ui')) {
// Add fields entity mappers to all fieldable entity types defined.
foreach ($entity_manager->getDefinitions() as $entity_type_id => $entity_type) {
$base_route = NULL;
try {
- $base_route = $route_provider->getRouteByName('field_ui.instance_edit_' . $entity_type_id);
+ $base_route = $route_provider->getRouteByName('field_ui.field_edit_' . $entity_type_id);
}
catch (RouteNotFoundException $e) {
if ($collection = \Drupal::service('router.builder')->getCollectionDuringRebuild()) {
- $base_route = $collection->get('field_ui.instance_edit_' . $entity_type_id);
+ $base_route = $collection->get('field_ui.field_edit_' . $entity_type_id);
}
// Ignore non-existent routes.
}
@@ -135,10 +135,10 @@ function config_translation_config_translation_info(&$info) {
// Make sure entity type is fieldable and has a base route.
if ($entity_type->isFieldable() && !empty($base_route)) {
$info[$entity_type_id . '_fields'] = array(
- 'base_route_name' => 'field_ui.instance_edit_' . $entity_type_id,
- 'entity_type' => 'field_instance_config',
+ 'base_route_name' => 'field_ui.field_edit_' . $entity_type_id,
+ 'entity_type' => 'field_config',
'title' => '!label field',
- 'class' => '\Drupal\config_translation\ConfigFieldInstanceMapper',
+ 'class' => '\Drupal\config_translation\ConfigFieldMapper',
'base_entity_type' => $entity_type_id,
'weight' => 10,
);
diff --git a/core/modules/config_translation/src/ConfigFieldInstanceMapper.php b/core/modules/config_translation/src/ConfigFieldMapper.php
similarity index 82%
rename from core/modules/config_translation/src/ConfigFieldInstanceMapper.php
rename to core/modules/config_translation/src/ConfigFieldMapper.php
index 5eb2cfe..e028831 100644
--- a/core/modules/config_translation/src/ConfigFieldInstanceMapper.php
+++ b/core/modules/config_translation/src/ConfigFieldMapper.php
@@ -2,13 +2,13 @@
/**
* @file
- * Contains \Drupal\config_translation\ConfigFieldInstanceMapper.
+ * Contains \Drupal\config_translation\ConfigFieldMapper.
*/
namespace Drupal\config_translation;
/**
- * Configuration mapper for field instances.
+ * Configuration mapper for fields.
*
* On top of plugin definition values on ConfigEntityMapper, the plugin
* definition for field instance mappers are required to contain the following
@@ -16,12 +16,12 @@
* - base_entity_type: The name of the entity type the field instances are
* attached to.
*/
-class ConfigFieldInstanceMapper extends ConfigEntityMapper {
+class ConfigFieldMapper extends ConfigEntityMapper {
/**
* Loaded entity instance to help produce the translation interface.
*
- * @var \Drupal\field\FieldInstanceConfigInterface
+ * @var \Drupal\field\FieldConfigInterface
*/
protected $entity;
diff --git a/core/modules/config_translation/src/Controller/ConfigTranslationFieldInstanceListBuilder.php b/core/modules/config_translation/src/Controller/ConfigTranslationFieldListBuilder.php
similarity index 94%
rename from core/modules/config_translation/src/Controller/ConfigTranslationFieldInstanceListBuilder.php
rename to core/modules/config_translation/src/Controller/ConfigTranslationFieldListBuilder.php
index ef3b50f..7721615 100644
--- a/core/modules/config_translation/src/Controller/ConfigTranslationFieldInstanceListBuilder.php
+++ b/core/modules/config_translation/src/Controller/ConfigTranslationFieldListBuilder.php
@@ -2,7 +2,7 @@
/**
* @file
- * Contains \Drupal\config_translation\Controller\ConfigTranslationFieldInstanceListBuilder.
+ * Contains \Drupal\config_translation\Controller\ConfigTranslationFieldListBuilder.
*/
namespace Drupal\config_translation\Controller;
@@ -18,7 +18,7 @@
/**
* Defines the config translation list builder for field instance entities.
*/
-class ConfigTranslationFieldInstanceListBuilder extends ConfigTranslationEntityListBuilder {
+class ConfigTranslationFieldListBuilder extends ConfigTranslationEntityListBuilder {
/**
* The name of the entity type the field instances are attached to.
@@ -61,7 +61,7 @@ public static function createInstance(ContainerInterface $container, EntityTypeI
}
/**
- * Constructs a new ConfigTranslationFieldInstanceListBuilder object.
+ * Constructs a new ConfigTranslationFieldListBuilder object.
*
* @param \Drupal\Core\Entity\EntityTypeInterface $entity_type
* The entity type definition.
@@ -91,7 +91,7 @@ public function setMapperDefinition($mapper_definition) {
public function load() {
// It is not possible to use the standard load method, because this needs
// all field instance entities only for the given baseEntityType.
- $ids = \Drupal::entityQuery('field_instance_config')
+ $ids = \Drupal::entityQuery('field_config')
->condition('id', $this->baseEntityType . '.', 'STARTS_WITH')
->execute();
return $this->storage->loadMultiple($ids);
diff --git a/core/modules/contact/src/Tests/Views/ContactFieldsTest.php b/core/modules/contact/src/Tests/Views/ContactFieldsTest.php
index e74ec90..8add71e 100644
--- a/core/modules/contact/src/Tests/Views/ContactFieldsTest.php
+++ b/core/modules/contact/src/Tests/Views/ContactFieldsTest.php
@@ -46,7 +46,7 @@ protected function setUp() {
'label' => 'Test contact category',
))->save();
- entity_create('field_instance_config', array(
+ entity_create('field_config', array(
'field_storage' => $this->field_storage,
'bundle' => 'contact_message',
))->save();
diff --git a/core/modules/content_translation/content_translation.admin.inc b/core/modules/content_translation/content_translation.admin.inc
index 6620477..a5a386f 100644
--- a/core/modules/content_translation/content_translation.admin.inc
+++ b/core/modules/content_translation/content_translation.admin.inc
@@ -11,7 +11,7 @@
use Drupal\Core\Form\FormStateInterface;
use Drupal\Core\Language\LanguageInterface;
use Drupal\Core\Render\Element;
-use Drupal\field\FieldInstanceConfigInterface;
+use Drupal\field\FieldConfigInterface;
/**
* Returns a form element to configure field synchronization.
@@ -111,7 +111,7 @@ function _content_translation_form_language_content_settings_form_alter(array &$
// Display the column translatability configuration widget.
// @todo Remove this special casing when arbitrary settings can be
// stored for any field. See https://drupal.org/node/2224761.
- if ($definition instanceof FieldInstanceConfigInterface) {
+ if ($definition instanceof FieldConfigInterface) {
$column_element = content_translation_field_sync_widget($definition);
if ($column_element) {
$form['settings'][$entity_type_id][$bundle]['columns'][$field_name] = $column_element;
@@ -313,7 +313,7 @@ function content_translation_form_language_content_settings_submit(array $form,
// a configurable bundle override. See
// https://drupal.org/node/2224761.
$definition = $definitions[$field_name];
- if ($definition instanceof FieldInstanceConfigInterface) {
+ if ($definition instanceof FieldConfigInterface) {
if ($definition->isTranslatable() != $translatable) {
$definition->setTranslatable($translatable);
$definition->save();
diff --git a/core/modules/content_translation/content_translation.install b/core/modules/content_translation/content_translation.install
index 06a355b..a154bf1 100644
--- a/core/modules/content_translation/content_translation.install
+++ b/core/modules/content_translation/content_translation.install
@@ -95,7 +95,7 @@ function content_translation_install() {
->set('settings.translation_sync', FALSE)
->save();
}
- $config_names = \Drupal::configFactory()->listAll('field.instance.');
+ $config_names = \Drupal::configFactory()->listAll('field.field.');
foreach ($config_names as $name) {
\Drupal::config($name)
->set('settings.translation_sync', FALSE)
@@ -129,7 +129,7 @@ function content_translation_uninstall() {
->clear('settings.translation_sync')
->save();
}
- $config_names = \Drupal::configFactory()->listAll('field.instance.');
+ $config_names = \Drupal::configFactory()->listAll('field.field.');
foreach ($config_names as $name) {
\Drupal::config($name)
->clear('settings.translation_sync')
diff --git a/core/modules/content_translation/content_translation.module b/core/modules/content_translation/content_translation.module
index 5ca5e2e..037d00c 100644
--- a/core/modules/content_translation/content_translation.module
+++ b/core/modules/content_translation/content_translation.module
@@ -12,8 +12,8 @@
use Drupal\Core\Form\FormStateInterface;
use Drupal\Core\Language\LanguageInterface;
use Drupal\Core\Routing\RouteMatchInterface;
-use Drupal\field\Entity\FieldInstanceConfig;
-use Drupal\field\FieldInstanceConfigInterface;
+use Drupal\field\Entity\FieldConfig;
+use Drupal\field\FieldConfigInterface;
use Drupal\node\NodeInterface;
/**
@@ -155,7 +155,7 @@ function content_translation_entity_bundle_field_info_alter(&$fields, EntityType
foreach ($settings as $name => $translatable) {
// Skip storable field definitions as those are supposed to have already
// been changed.
- if (!isset($fields[$name]) || !$fields[$name] instanceof FieldInstanceConfigInterface) {
+ if (!isset($fields[$name]) || !$fields[$name] instanceof FieldConfigInterface) {
// If we do not have a bundle definition for the current field and we
// have to override its translatability, we need to instantiate a new
// bundle field definition from the base one.
@@ -643,13 +643,13 @@ function content_translation_entity_extra_field_info() {
}
/**
- * Implements hook_form_FORM_ID_alter() for 'field_ui_instance_edit_form'.
+ * Implements hook_form_FORM_ID_alter() for 'field_ui_field_edit_form'.
*/
-function content_translation_form_field_ui_field_instance_edit_form_alter(array &$form, FormStateInterface $form_state) {
- $instance = $form_state['instance'];
+function content_translation_form_field_ui_field_edit_form_alter(array &$form, FormStateInterface $form_state) {
+ $instance = $form_state['field'];
$bundle_is_translatable = content_translation_enabled($instance->entity_type, $instance->bundle);
- $form['instance']['translatable'] = array(
+ $form['field']['translatable'] = array(
'#type' => 'checkbox',
'#title' => t('Users may translate this field.'),
'#default_value' => $instance->isTranslatable(),
@@ -663,7 +663,7 @@ function content_translation_form_field_ui_field_instance_edit_form_alter(array
$toggle_url = url('admin/config/regional/content-language', array(
'query' => drupal_get_destination(),
));
- $form['instance']['translatable']['#description'] = t('To configure translation for this field, enable language support for this type.', array(
+ $form['field']['translatable']['#description'] = t('To configure translation for this field, enable language support for this type.', array(
'@language-settings-url' => $toggle_url,
));
}
@@ -672,8 +672,8 @@ function content_translation_form_field_ui_field_instance_edit_form_alter(array
module_load_include('inc', 'content_translation', 'content_translation.admin');
$element = content_translation_field_sync_widget($instance);
if ($element) {
- $form['instance']['settings']['translation_sync'] = $element;
- $form['instance']['settings']['translation_sync']['#weight'] = -10;
+ $form['field']['settings']['translation_sync'] = $element;
+ $form['field']['settings']['translation_sync']['#weight'] = -10;
}
}
}
@@ -689,7 +689,7 @@ function content_translation_entity_presave(EntityInterface $entity) {
}
// Synchronization can be enabled per instance.
// @todo Replace with own storage in https://drupal.org/node/2224761
- if ($entity->getEntityTypeId() === 'field_instance_config') {
+ if ($entity->getEntityTypeId() === 'field_config') {
$entity->settings += array('translation_sync' => FALSE);
}
if ($entity instanceof ContentEntityInterface && $entity->isTranslatable()) {
@@ -852,7 +852,7 @@ function content_translation_save_settings($settings) {
// Store whether fields have translation enabled or not.
if (!empty($bundle_settings['columns'])) {
foreach ($bundle_settings['columns'] as $field_name => $column_settings) {
- $instance = FieldInstanceConfig::loadByName($entity_type, $bundle, $field_name);
+ $instance = FieldConfig::loadByName($entity_type, $bundle, $field_name);
if ($instance->isTranslatable()) {
$instance->settings['translation_sync'] = $column_settings;
}
diff --git a/core/modules/content_translation/src/Tests/ContentTranslationSettingsTest.php b/core/modules/content_translation/src/Tests/ContentTranslationSettingsTest.php
index 76fa6be..438b8fd 100644
--- a/core/modules/content_translation/src/Tests/ContentTranslationSettingsTest.php
+++ b/core/modules/content_translation/src/Tests/ContentTranslationSettingsTest.php
@@ -9,7 +9,7 @@
use Drupal\comment\Plugin\Field\FieldType\CommentItemInterface;
use Drupal\Core\Language\Language;
-use Drupal\field\Entity\FieldInstanceConfig;
+use Drupal\field\Entity\FieldConfig;
use Drupal\simpletest\WebTestBase;
/**
@@ -29,7 +29,7 @@ class ContentTranslationSettingsTest extends WebTestBase {
function setUp() {
parent::setUp();
- // Set up two content types to test field instances shared between different
+ // Set up two content types to test fields shared between different
// bundles.
$this->drupalCreateContentType(array('type' => 'article'));
$this->drupalCreateContentType(array('type' => 'page'));
@@ -166,17 +166,17 @@ function testSettingsUI() {
// Test that configurable field translatability is correctly switched.
$edit = array('settings[node][article][fields][body]' => $translatable);
$this->assertSettings('node', 'article', TRUE, $edit);
- $instance = FieldInstanceConfig::loadByName('node', 'article', 'body');
+ $instance = FieldConfig::loadByName('node', 'article', 'body');
$definitions = \Drupal::entityManager()->getFieldDefinitions('node', 'article');
$this->assertEqual($definitions['body']->isTranslatable(), $translatable, 'Field translatability correctly switched.');
$this->assertEqual($instance->isTranslatable(), $definitions['body']->isTranslatable(), 'Configurable field translatability correctly switched.');
// Test that also the Field UI form behaves correctly.
$translatable = !$translatable;
- $edit = array('instance[translatable]' => $translatable);
+ $edit = array('field[translatable]' => $translatable);
$this->drupalPostForm('admin/structure/types/manage/article/fields/node.article.body', $edit, t('Save settings'));
\Drupal::entityManager()->clearCachedFieldDefinitions();
- $instance = FieldInstanceConfig::loadByName('node', 'article', 'body');
+ $instance = FieldConfig::loadByName('node', 'article', 'body');
$definitions = \Drupal::entityManager()->getFieldDefinitions('node', 'article');
$this->assertEqual($definitions['body']->isTranslatable(), $translatable, 'Field translatability correctly switched.');
$this->assertEqual($instance->isTranslatable(), $definitions['body']->isTranslatable(), 'Configurable field translatability correctly switched.');
@@ -224,7 +224,7 @@ protected function assertSettings($entity_type, $bundle, $enabled, $edit) {
}
/**
- * Tests that field instance setting depends on bundle translatability.
+ * Tests that field setting depends on bundle translatability.
*/
function testFieldTranslatableSettingsUI() {
@@ -241,17 +241,17 @@ function testFieldTranslatableSettingsUI() {
'entity_type' => 'node',
'bundle' => 'article',
);
- entity_create('field_instance_config', $instance)->save();
+ entity_create('field_config', $instance)->save();
- // Tests that field instance doesn't have translatable setting if bundle
- // is not translatable.
+ // Tests that field doesn't have translatable setting if bundle is not
+ // translatable.
$path = 'admin/structure/types/manage/article/fields/node.article.body';
$this->drupalGet($path);
$this->assertText('To configure translation for this field, enable language support for this type.', 'No translatable setting for field.');
// Tests that field instance has translatable setting if bundle is
- // translatable. Note: this field instance is not translatable when
- // enable bundle translatability.
+ // translatable. Note: this field is not translatable when enable bundle
+ // translatability.
$edit = array(
'entity_types[node]' => TRUE,
'settings[node][article][settings][language][language_show]' => TRUE,
diff --git a/core/modules/content_translation/src/Tests/ContentTranslationSyncImageTest.php b/core/modules/content_translation/src/Tests/ContentTranslationSyncImageTest.php
index 0751bb6..52f345d 100644
--- a/core/modules/content_translation/src/Tests/ContentTranslationSyncImageTest.php
+++ b/core/modules/content_translation/src/Tests/ContentTranslationSyncImageTest.php
@@ -57,7 +57,7 @@ protected function setupTestFields() {
'translatable' => TRUE,
))->save();
- entity_create('field_instance_config', array(
+ entity_create('field_config', array(
'entity_type' => $this->entityTypeId,
'field_name' => $this->fieldName,
'bundle' => $this->entityTypeId,
@@ -87,11 +87,11 @@ function testImageFieldSync() {
// Check that the alt and title fields are enabled for the image field.
$this->drupalLogin($this->editor);
$this->drupalGet('entity_test_mul/structure/' . $this->entityTypeId . '/fields/' . $this->entityTypeId . '.' . $this->entityTypeId . '.' . $this->fieldName);
- $this->assertFieldChecked('edit-instance-settings-translation-sync-alt');
- $this->assertFieldChecked('edit-instance-settings-translation-sync-title');
+ $this->assertFieldChecked('edit-field-settings-translation-sync-alt');
+ $this->assertFieldChecked('edit-field-settings-translation-sync-title');
$edit = array(
- 'instance[settings][translation_sync][alt]' => FALSE,
- 'instance[settings][translation_sync][title]' => FALSE,
+ 'field[settings][translation_sync][alt]' => FALSE,
+ 'field[settings][translation_sync][title]' => FALSE,
);
$this->drupalPostForm(NULL, $edit, t('Save settings'));
diff --git a/core/modules/content_translation/src/Tests/ContentTranslationTestBase.php b/core/modules/content_translation/src/Tests/ContentTranslationTestBase.php
index bf6ea23..a237201 100644
--- a/core/modules/content_translation/src/Tests/ContentTranslationTestBase.php
+++ b/core/modules/content_translation/src/Tests/ContentTranslationTestBase.php
@@ -182,7 +182,7 @@ protected function setupTestFields() {
'cardinality' => 1,
'translatable' => TRUE,
))->save();
- entity_create('field_instance_config', array(
+ entity_create('field_config', array(
'entity_type' => $this->entityTypeId,
'field_name' => $this->fieldName,
'bundle' => $this->bundle,
diff --git a/core/modules/datetime/src/Tests/DateTimeFieldTest.php b/core/modules/datetime/src/Tests/DateTimeFieldTest.php
index eefd3c3..128ca01 100644
--- a/core/modules/datetime/src/Tests/DateTimeFieldTest.php
+++ b/core/modules/datetime/src/Tests/DateTimeFieldTest.php
@@ -35,7 +35,7 @@ class DateTimeFieldTest extends WebTestBase {
/**
* The instance used in this test class.
*
- * @var \Drupal\field\Entity\FieldInstanceConfig
+ * @var \Drupal\field\Entity\FieldConfig
*/
protected $instance;
@@ -59,7 +59,7 @@ function setUp() {
'settings' => array('datetime_type' => 'date'),
));
$this->fieldStorage->save();
- $this->instance = entity_create('field_instance_config', array(
+ $this->instance = entity_create('field_config', array(
'field_storage' => $this->fieldStorage,
'bundle' => 'entity_test',
'required' => TRUE,
@@ -297,7 +297,7 @@ function testDefaultValue() {
));
$field_storage->save();
- $instance = entity_create('field_instance_config', array(
+ $instance = entity_create('field_config', array(
'field_storage' => $field_storage,
'bundle' => 'date_content',
));
@@ -314,7 +314,7 @@ function testDefaultValue() {
$this->assertRaw('', 'The default value is selected in instance settings page');
// Check if default_date has been stored successfully.
- $config_entity = $this->container->get('config.factory')->get('field.instance.node.date_content.' . $field_storage->name)->get();
+ $config_entity = $this->container->get('config.factory')->get('field.field.node.date_content.' . $field_storage->name)->get();
$this->assertEqual($config_entity['default_value'][0]['default_date'], 'now', 'Default value has been stored successfully');
// Clear field cache in order to avoid stale cache values.
@@ -336,7 +336,7 @@ function testDefaultValue() {
$this->assertRaw('', 'The default value is selected in instance settings page');
// Check if default_date has been stored successfully.
- $config_entity = $this->container->get('config.factory')->get('field.instance.node.date_content.' . $field_storage->name)->get();
+ $config_entity = $this->container->get('config.factory')->get('field.field.node.date_content.' . $field_storage->name)->get();
$this->assertTrue(empty($config_entity['default_value']), 'Empty default value has been stored successfully');
// Clear field cache in order to avoid stale cache values.
diff --git a/core/modules/datetime/src/Tests/DateTimeItemTest.php b/core/modules/datetime/src/Tests/DateTimeItemTest.php
index cf76020..081cc6e 100644
--- a/core/modules/datetime/src/Tests/DateTimeItemTest.php
+++ b/core/modules/datetime/src/Tests/DateTimeItemTest.php
@@ -36,7 +36,7 @@ public function setUp() {
'settings' => array('datetime_type' => 'date'),
));
$field_storage->save();
- $instance = entity_create('field_instance_config', array(
+ $instance = entity_create('field_config', array(
'field_storage' => $field_storage,
'bundle' => 'entity_test',
'settings' => array(
diff --git a/core/modules/entity/src/EntityDisplayBase.php b/core/modules/entity/src/EntityDisplayBase.php
index ff6d40e..c895427 100644
--- a/core/modules/entity/src/EntityDisplayBase.php
+++ b/core/modules/entity/src/EntityDisplayBase.php
@@ -11,7 +11,7 @@
use Drupal\Core\Entity\EntityStorageInterface;
use Drupal\Core\Field\FieldDefinitionInterface;
use Drupal\Core\Entity\Display\EntityDisplayInterface;
-use Drupal\field\Entity\FieldInstanceConfig;
+use Drupal\field\Entity\FieldConfig;
/**
* Provides a common base class for entity view and form displays.
@@ -168,7 +168,7 @@ public function calculateDependencies() {
// Create dependencies on both hidden and visible fields.
$fields = $this->content + $this->hidden;
foreach ($fields as $field_name => $component) {
- $field_instance = FieldInstanceConfig::loadByName($this->targetEntityType, $this->bundle, $field_name);
+ $field_instance = FieldConfig::loadByName($this->targetEntityType, $this->bundle, $field_name);
if ($field_instance) {
$this->addDependency('entity', $field_instance->getConfigDependencyName());
}
diff --git a/core/modules/entity/src/Tests/EntityDisplayTest.php b/core/modules/entity/src/Tests/EntityDisplayTest.php
index 1e6d05d..21b84b7 100644
--- a/core/modules/entity/src/Tests/EntityDisplayTest.php
+++ b/core/modules/entity/src/Tests/EntityDisplayTest.php
@@ -147,7 +147,7 @@ public function testFieldComponent() {
'type' => 'test_field'
));
$field_storage->save();
- $instance = entity_create('field_instance_config', array(
+ $instance = entity_create('field_config', array(
'field_storage' => $field_storage,
'bundle' => 'entity_test',
));
@@ -196,7 +196,7 @@ public function testFieldComponent() {
// Check that the display has dependencies on the field and the module that
// provides the formatter.
$dependencies = $display->calculateDependencies();
- $this->assertEqual(array('entity' => array('field.instance.entity_test.entity_test.test_field'), 'module' => array('entity_test', 'field_test')), $dependencies);
+ $this->assertEqual(array('entity' => array('field.field.entity_test.entity_test.test_field'), 'module' => array('entity_test', 'field_test')), $dependencies);
}
/**
@@ -289,7 +289,7 @@ public function testRenameDeleteBundle() {
$this->assertEqual('node.article_rename.default', $new_form_display->id);
$expected_dependencies = array(
- 'entity' => array('field.instance.node.article_rename.body', 'node.type.article_rename'),
+ 'entity' => array('field.field.node.article_rename.body', 'node.type.article_rename'),
'module' => array('text')
);
// Check that the display has dependencies on the bundle, fields and the
@@ -313,7 +313,7 @@ public function testRenameDeleteBundle() {
/**
* Tests deleting field instance.
*/
- public function testDeleteFieldInstance() {
+ public function testDeleteField() {
$this->enableModules(array('field_test'));
$field_name = 'test_field';
@@ -324,7 +324,7 @@ public function testDeleteFieldInstance() {
'type' => 'test_field'
));
$field_storage->save();
- $instance = entity_create('field_instance_config', array(
+ $instance = entity_create('field_config', array(
'field_storage' => $field_storage,
'bundle' => 'entity_test',
));
diff --git a/core/modules/entity/src/Tests/EntityFormDisplayTest.php b/core/modules/entity/src/Tests/EntityFormDisplayTest.php
index ee7eb9d..5681ed7 100644
--- a/core/modules/entity/src/Tests/EntityFormDisplayTest.php
+++ b/core/modules/entity/src/Tests/EntityFormDisplayTest.php
@@ -57,7 +57,7 @@ public function testFieldComponent() {
'type' => 'test_field'
));
$field_storage->save();
- $instance = entity_create('field_instance_config', array(
+ $instance = entity_create('field_config', array(
'field_storage' => $field_storage,
'bundle' => 'entity_test',
));
@@ -176,7 +176,7 @@ public function testBaseFieldComponent() {
/**
* Tests deleting field instance.
*/
- public function testDeleteFieldInstance() {
+ public function testDeleteField() {
$this->enableModules(array('field_sql_storage', 'field_test'));
$field_name = 'test_field';
@@ -187,7 +187,7 @@ public function testDeleteFieldInstance() {
'type' => 'test_field'
));
$field_storage->save();
- $instance = entity_create('field_instance_config', array(
+ $instance = entity_create('field_config', array(
'field_storage' => $field_storage,
'bundle' => 'entity_test',
));
diff --git a/core/modules/entity_reference/entity_reference.module b/core/modules/entity_reference/entity_reference.module
index 75ab68c..18c2386 100644
--- a/core/modules/entity_reference/entity_reference.module
+++ b/core/modules/entity_reference/entity_reference.module
@@ -11,7 +11,7 @@
use Drupal\Core\Render\Element;
use Drupal\Core\Routing\RouteMatchInterface;
use Drupal\field\Entity\FieldStorageConfig;
-use Drupal\field\Entity\FieldInstanceConfig;
+use Drupal\field\Entity\FieldConfig;
use Drupal\field\FieldStorageConfigInterface;
/**
@@ -93,7 +93,7 @@ function entity_reference_field_storage_config_update(FieldStorageConfigInterfac
foreach ($field_storage->bundles() as $entity_type => $bundles) {
foreach ($bundles as $bundle) {
- $instance = FieldInstanceConfig::loadByName($entity_type, $bundle, $field_name);
+ $instance = FieldConfig::loadByName($entity_type, $bundle, $field_name);
$instance->settings['handler_settings'] = array();
$instance->save();
}
@@ -207,7 +207,7 @@ function entity_reference_query_entity_reference_alter(AlterableInterface $query
function entity_reference_create_instance($entity_type, $bundle, $field_name, $field_label, $target_entity_type, $selection_handler = 'default', $selection_handler_settings = array(), $cardinality = 1) {
// Look for or add the specified field to the requested entity bundle.
$field_storage = FieldStorageConfig::loadByName($entity_type, $field_name);
- $instance = FieldInstanceConfig::loadByName($entity_type, $bundle, $field_name);
+ $instance = FieldConfig::loadByName($entity_type, $bundle, $field_name);
if (empty($field_storage)) {
$field_storage = array(
@@ -233,7 +233,7 @@ function entity_reference_create_instance($entity_type, $bundle, $field_name, $f
'handler_settings' => $selection_handler_settings,
),
);
- entity_create('field_instance_config', $instance)->save();
+ entity_create('field_config', $instance)->save();
}
}
diff --git a/core/modules/entity_reference/src/ConfigurableEntityReferenceItem.php b/core/modules/entity_reference/src/ConfigurableEntityReferenceItem.php
index 047b806..de1d83a 100644
--- a/core/modules/entity_reference/src/ConfigurableEntityReferenceItem.php
+++ b/core/modules/entity_reference/src/ConfigurableEntityReferenceItem.php
@@ -45,10 +45,10 @@ public static function defaultSettings() {
/**
* {@inheritdoc}
*/
- public static function defaultInstanceSettings() {
+ public static function defaultFieldSettings() {
return array(
'handler_settings' => array(),
- ) + parent::defaultInstanceSettings();
+ ) + parent::defaultFieldSettings();
}
/**
@@ -177,8 +177,8 @@ public function settingsForm(array &$form, FormStateInterface $form_state, $has_
/**
* {@inheritdoc}
*/
- public function instanceSettingsForm(array $form, FormStateInterface $form_state) {
- $instance = $form_state['instance'];
+ public function fieldSettingsForm(array $form, FormStateInterface $form_state) {
+ $instance = $form_state['field'];
// Get all selection plugins for this entity type.
$selection_plugins = \Drupal::service('plugin.manager.entity_reference.selection')->getSelectionGroups($this->getSetting('target_type'));
@@ -203,7 +203,7 @@ public function instanceSettingsForm(array $form, FormStateInterface $form_state
'#process' => array(
'_entity_reference_field_instance_settings_ajax_process',
),
- '#element_validate' => array(array(get_class($this), 'instanceSettingsFormValidate')),
+ '#element_validate' => array(array(get_class($this), 'fieldSettingsFormValidate')),
);
$form['handler'] = array(
'#type' => 'details',
@@ -252,9 +252,9 @@ public function instanceSettingsForm(array $form, FormStateInterface $form_state
* The form state of the (entire) configuration form.
*/
public static function instanceSettingsFormValidate(array $form, FormStateInterface $form_state) {
- if ($form_state->hasValue('instance')) {
- $form_state->unsetValue(array('instance', 'settings', 'handler_submit'));
- $form_state['instance']->settings = $form_state->getValue(array('instance', 'settings'));
+ if ($form_state->hasValue('field')) {
+ $form_state->unsetValue(array('field', 'settings', 'handler_submit'));
+ $form_state['field']->settings = $form_state->getValue(array('field', 'settings'));
}
}
diff --git a/core/modules/entity_reference/src/EntityReferenceAutocomplete.php b/core/modules/entity_reference/src/EntityReferenceAutocomplete.php
index 63f8a00..e70fe86 100644
--- a/core/modules/entity_reference/src/EntityReferenceAutocomplete.php
+++ b/core/modules/entity_reference/src/EntityReferenceAutocomplete.php
@@ -11,7 +11,7 @@
use Drupal\Core\Entity\EntityManagerInterface;
use Drupal\Core\Field\FieldDefinitionInterface;
use Drupal\entity_reference\Plugin\Type\SelectionPluginManager;
-use Drupal\field\FieldInstanceConfigInterface;
+use Drupal\field\FieldConfigInterface;
use Symfony\Component\HttpKernel\Exception\AccessDeniedHttpException;
/**
diff --git a/core/modules/entity_reference/src/Tests/EntityReferenceAdminTest.php b/core/modules/entity_reference/src/Tests/EntityReferenceAdminTest.php
index 8846095..52c5e7f 100644
--- a/core/modules/entity_reference/src/Tests/EntityReferenceAdminTest.php
+++ b/core/modules/entity_reference/src/Tests/EntityReferenceAdminTest.php
@@ -62,39 +62,39 @@ public function testFieldAdminHandler() {
$this->drupalPostForm(NULL, array(), t('Save field settings'));
// The base handler should be selected by default.
- $this->assertFieldByName('instance[settings][handler]', 'default');
+ $this->assertFieldByName('field[settings][handler]', 'default');
// The base handler settings should be displayed.
$entity_type_id = 'node';
$bundles = entity_get_bundles($entity_type_id);
foreach ($bundles as $bundle_name => $bundle_info) {
- $this->assertFieldByName('instance[settings][handler_settings][target_bundles][' . $bundle_name . ']');
+ $this->assertFieldByName('field[settings][handler_settings][target_bundles][' . $bundle_name . ']');
}
reset($bundles);
// Test the sort settings.
// Option 0: no sort.
- $this->assertFieldByName('instance[settings][handler_settings][sort][field]', '_none');
- $this->assertNoFieldByName('instance[settings][handler_settings][sort][direction]');
+ $this->assertFieldByName('field[settings][handler_settings][sort][field]', '_none');
+ $this->assertNoFieldByName('field[settings][handler_settings][sort][direction]');
// Option 1: sort by field.
- $this->drupalPostAjaxForm(NULL, array('instance[settings][handler_settings][sort][field]' => 'nid'), 'instance[settings][handler_settings][sort][field]');
- $this->assertFieldByName('instance[settings][handler_settings][sort][direction]', 'ASC');
+ $this->drupalPostAjaxForm(NULL, array('field[settings][handler_settings][sort][field]' => 'nid'), 'field[settings][handler_settings][sort][field]');
+ $this->assertFieldByName('field[settings][handler_settings][sort][direction]', 'ASC');
// Test that a non-translatable base field is a sort option.
- $this->assertFieldByXPath("//select[@name='instance[settings][handler_settings][sort][field]']/option[@value='nid']");
+ $this->assertFieldByXPath("//select[@name='field[settings][handler_settings][sort][field]']/option[@value='nid']");
// Test that a translatable base field is a sort option.
- $this->assertFieldByXPath("//select[@name='instance[settings][handler_settings][sort][field]']/option[@value='title']");
+ $this->assertFieldByXPath("//select[@name='field[settings][handler_settings][sort][field]']/option[@value='title']");
// Test that a configurable field is a sort option.
- $this->assertFieldByXPath("//select[@name='instance[settings][handler_settings][sort][field]']/option[@value='body.value']");
+ $this->assertFieldByXPath("//select[@name='field[settings][handler_settings][sort][field]']/option[@value='body.value']");
// Set back to no sort.
- $this->drupalPostAjaxForm(NULL, array('instance[settings][handler_settings][sort][field]' => '_none'), 'instance[settings][handler_settings][sort][field]');
- $this->assertNoFieldByName('instance[settings][handler_settings][sort][direction]');
+ $this->drupalPostAjaxForm(NULL, array('field[settings][handler_settings][sort][field]' => '_none'), 'field[settings][handler_settings][sort][field]');
+ $this->assertNoFieldByName('field[settings][handler_settings][sort][direction]');
// Third step: confirm.
$this->drupalPostForm(NULL, array(
- 'instance[settings][handler_settings][target_bundles][' . key($bundles) . ']' => key($bundles),
+ 'field[settings][handler_settings][target_bundles][' . key($bundles) . ']' => key($bundles),
), t('Save settings'));
// Check that the field appears in the overview form.
diff --git a/core/modules/entity_reference/src/Tests/EntityReferenceAutoCreateTest.php b/core/modules/entity_reference/src/Tests/EntityReferenceAutoCreateTest.php
index 0014ca2..3566252 100644
--- a/core/modules/entity_reference/src/Tests/EntityReferenceAutoCreateTest.php
+++ b/core/modules/entity_reference/src/Tests/EntityReferenceAutoCreateTest.php
@@ -41,7 +41,7 @@ function setUp() {
'cardinality' => FieldStorageDefinitionInterface::CARDINALITY_UNLIMITED,
))->save();
- entity_create('field_instance_config', array(
+ entity_create('field_config', array(
'label' => 'Entity reference field',
'field_name' => 'test_field',
'entity_type' => 'node',
diff --git a/core/modules/entity_reference/src/Tests/EntityReferenceFieldDefaultValueTest.php b/core/modules/entity_reference/src/Tests/EntityReferenceFieldDefaultValueTest.php
index f34a7dd..91aa5c8 100644
--- a/core/modules/entity_reference/src/Tests/EntityReferenceFieldDefaultValueTest.php
+++ b/core/modules/entity_reference/src/Tests/EntityReferenceFieldDefaultValueTest.php
@@ -49,7 +49,7 @@ function testEntityReferenceDefaultValue() {
'settings' => array('target_type' => 'node'),
));
$this->fieldStorage->save();
- $this->instance = entity_create('field_instance_config', array(
+ $this->instance = entity_create('field_config', array(
'field_storage' => $this->fieldStorage,
'bundle' => 'reference_content',
'settings' => array(
@@ -73,7 +73,7 @@ function testEntityReferenceDefaultValue() {
$this->assertRaw('name="default_value_input[' . $this->fieldStorage->name . '][0][target_id]" value="' . $referenced_node->getTitle() .' (' .$referenced_node->id() . ')', 'The default value is selected in instance settings page');
// Check if the ID has been converted to UUID in config entity.
- $config_entity = $this->container->get('config.factory')->get('field.instance.node.reference_content.' . $this->fieldStorage->name)->get();
+ $config_entity = $this->container->get('config.factory')->get('field.field.node.reference_content.' . $this->fieldStorage->name)->get();
$this->assertTrue(isset($config_entity['default_value'][0]['target_uuid']), 'Default value contains target_uuid property');
$this->assertEqual($config_entity['default_value'][0]['target_uuid'], $referenced_node->uuid(), 'Content uuid and config entity uuid are the same');
diff --git a/core/modules/entity_reference/src/Tests/EntityReferenceFormatterTest.php b/core/modules/entity_reference/src/Tests/EntityReferenceFormatterTest.php
index 28919d5..0cc65b5 100644
--- a/core/modules/entity_reference/src/Tests/EntityReferenceFormatterTest.php
+++ b/core/modules/entity_reference/src/Tests/EntityReferenceFormatterTest.php
@@ -64,7 +64,7 @@ public function setUp() {
'type' => 'text',
'settings' => array(),
))->save();
- entity_create('field_instance_config', array(
+ entity_create('field_config', array(
'entity_type' => $this->entityType,
'bundle' => $this->bundle,
'field_name' => 'body',
diff --git a/core/modules/entity_reference/src/Tests/EntityReferenceSelectionAccessTest.php b/core/modules/entity_reference/src/Tests/EntityReferenceSelectionAccessTest.php
index 6b71da5..6929c88 100644
--- a/core/modules/entity_reference/src/Tests/EntityReferenceSelectionAccessTest.php
+++ b/core/modules/entity_reference/src/Tests/EntityReferenceSelectionAccessTest.php
@@ -68,7 +68,7 @@ public function testNodeHandler() {
'cardinality' => '1',
));
$field_storage->save();
- $instance = entity_create('field_instance_config', array(
+ $instance = entity_create('field_config', array(
'field_storage' => $field_storage,
'bundle' => 'test_bundle',
'settings' => array(
@@ -210,7 +210,7 @@ public function testUserHandler() {
'cardinality' => '1',
));
$field_storage->save();
- $instance = entity_create('field_instance_config', array(
+ $instance = entity_create('field_config', array(
'field_storage' => $field_storage,
'bundle' => 'test_bundle',
'settings' => array(
@@ -355,7 +355,7 @@ public function testCommentHandler() {
'cardinality' => '1',
));
$field_storage->save();
- $instance = entity_create('field_instance_config', array(
+ $instance = entity_create('field_config', array(
'field_storage' => $field_storage,
'bundle' => 'test_bundle',
'settings' => array(
diff --git a/core/modules/entity_reference/src/Tests/EntityReferenceSelectionSortTest.php b/core/modules/entity_reference/src/Tests/EntityReferenceSelectionSortTest.php
index 34dd67a..efb49825 100644
--- a/core/modules/entity_reference/src/Tests/EntityReferenceSelectionSortTest.php
+++ b/core/modules/entity_reference/src/Tests/EntityReferenceSelectionSortTest.php
@@ -38,7 +38,7 @@ public function testSort() {
'entity_types' => array('node'),
))->save();
- entity_create('field_instance_config', array(
+ entity_create('field_config', array(
'label' => 'Text Field',
'field_name' => 'field_text',
'entity_type' => 'node',
@@ -60,7 +60,7 @@ public function testSort() {
'cardinality' => 1,
));
$field_storage->save();
- $instance = entity_create('field_instance_config', array(
+ $instance = entity_create('field_config', array(
'field_storage' => $field_storage,
'entity_type' => 'entity_test',
'bundle' => 'test_bundle',
diff --git a/core/modules/entity_reference/src/Tests/Views/EntityReferenceRelationshipTest.php b/core/modules/entity_reference/src/Tests/Views/EntityReferenceRelationshipTest.php
index 3f9d7b1..f88a9a4 100644
--- a/core/modules/entity_reference/src/Tests/Views/EntityReferenceRelationshipTest.php
+++ b/core/modules/entity_reference/src/Tests/Views/EntityReferenceRelationshipTest.php
@@ -9,7 +9,7 @@
use Drupal\Core\Field\FieldStorageDefinitionInterface;
use Drupal\field\Entity\FieldStorageConfig;
-use Drupal\field\Entity\FieldInstanceConfig;
+use Drupal\field\Entity\FieldConfig;
use Drupal\views\Tests\ViewTestData;
use Drupal\views\Tests\ViewUnitTestBase;
use Drupal\views\Views;
@@ -64,7 +64,7 @@ protected function setUp() {
));
$field_storage->save();
- $instance = FieldInstanceConfig::create(array(
+ $instance = FieldConfig::create(array(
'entity_type' => 'entity_test',
'field_name' => 'field_test',
'bundle' => 'entity_test',
diff --git a/core/modules/entity_reference/src/Tests/Views/SelectionTest.php b/core/modules/entity_reference/src/Tests/Views/SelectionTest.php
index dbfe0f6..4510df8 100644
--- a/core/modules/entity_reference/src/Tests/Views/SelectionTest.php
+++ b/core/modules/entity_reference/src/Tests/Views/SelectionTest.php
@@ -45,7 +45,7 @@ public function testSelectionHandler() {
'cardinality' => '1',
));
$field_storage->save();
- $instance = entity_create('field_instance_config', array(
+ $instance = entity_create('field_config', array(
'field_storage' => $field_storage,
'bundle' => 'test_bundle',
'settings' => array(
diff --git a/core/modules/field/config/schema/field.schema.yml b/core/modules/field/config/schema/field.schema.yml
index ce97e19..55153f0 100644
--- a/core/modules/field/config/schema/field.schema.yml
+++ b/core/modules/field/config/schema/field.schema.yml
@@ -48,9 +48,9 @@ field.storage.*.*:
- type: ignore
label: 'Index'
-field.instance.*.*.*:
+field.field.*.*.*:
type: config_entity
- label: 'Field instance'
+ label: 'Field'
mapping:
id:
type: string
diff --git a/core/modules/field/field.module b/core/modules/field/field.module
index 8bcb693..e51fcab 100644
--- a/core/modules/field/field.module
+++ b/core/modules/field/field.module
@@ -185,14 +185,14 @@ function field_entity_bundle_field_info(EntityTypeInterface $entity_type, $bundl
if ($entity_type->isFieldable()) {
// Query by filtering on the ID as this is more efficient than filtering
// on the entity_type property directly.
- $ids = \Drupal::entityQuery('field_instance_config')
+ $ids = \Drupal::entityQuery('field_config')
->condition('id', $entity_type->id() . '.' . $bundle . '.', 'STARTS_WITH')
->execute();
// Fetch all fields and key them by field name.
- $field_instance_configs = entity_load_multiple('field_instance_config', $ids);
+ $field_configs = entity_load_multiple('field_config', $ids);
$result = array();
- foreach ($field_instance_configs as $field_instance) {
+ foreach ($field_configs as $field_instance) {
$result[$field_instance->getName()] = $field_instance;
}
return $result;
@@ -203,7 +203,7 @@ function field_entity_bundle_field_info(EntityTypeInterface $entity_type, $bundl
* Implements hook_entity_bundle_rename().
*/
function field_entity_bundle_rename($entity_type, $bundle_old, $bundle_new) {
- $instances = entity_load_multiple_by_properties('field_instance_config', array('entity_type' => $entity_type, 'bundle' => $bundle_old, 'include_deleted' => TRUE));
+ $instances = entity_load_multiple_by_properties('field_config', array('entity_type' => $entity_type, 'bundle' => $bundle_old, 'include_deleted' => TRUE));
foreach ($instances as $instance) {
$id_new = $instance->entity_type . '.' . $bundle_new . '.' . $instance->field_name;
$instance->set('id', $id_new);
@@ -216,9 +216,9 @@ function field_entity_bundle_rename($entity_type, $bundle_old, $bundle_new) {
// Update deleted instances directly in the state storage.
else {
$state = \Drupal::state();
- $deleted_instances = $state->get('field.instance.deleted') ?: array();
+ $deleted_instances = $state->get('field.field.deleted') ?: array();
$deleted_instances[$instance->uuid] = $instance->toArray();
- $state->set('field.instance.deleted', $deleted_instances);
+ $state->set('field.field.deleted', $deleted_instances);
}
}
}
@@ -237,7 +237,7 @@ function field_entity_bundle_delete($entity_type, $bundle) {
// Get the instances on the bundle. entity_load_multiple_by_properties() must
// be used here since field_info_instances() does not return instances for
// disabled entity types or bundles.
- $instances = entity_load_multiple_by_properties('field_instance_config', array('entity_type' => $entity_type, 'bundle' => $bundle));
+ $instances = entity_load_multiple_by_properties('field_config', array('entity_type' => $entity_type, 'bundle' => $bundle));
foreach ($instances as $instance) {
$instance->delete();
}
diff --git a/core/modules/field/field.purge.inc b/core/modules/field/field.purge.inc
index a17e6f2..a74bd44 100644
--- a/core/modules/field/field.purge.inc
+++ b/core/modules/field/field.purge.inc
@@ -80,7 +80,7 @@ function field_purge_batch($batch_size, $field_storage_uuid = NULL) {
if ($field_storage_uuid) {
$properties['field_storage_uuid'] = $field_storage_uuid;
}
- $instances = entity_load_multiple_by_properties('field_instance_config', $properties);
+ $instances = entity_load_multiple_by_properties('field_config', $properties);
$info = \Drupal::entityManager()->getDefinitions();
foreach ($instances as $instance) {
@@ -122,7 +122,7 @@ function field_purge_batch($batch_size, $field_storage_uuid = NULL) {
continue;
}
- $instances = entity_load_multiple_by_properties('field_instance_config', array('field_storage_uuid' => $field_storage->uuid(), 'include_deleted' => TRUE));
+ $instances = entity_load_multiple_by_properties('field_config', array('field_storage_uuid' => $field_storage->uuid(), 'include_deleted' => TRUE));
if (empty($instances)) {
field_purge_field_storage($field_storage);
}
@@ -140,9 +140,9 @@ function field_purge_batch($batch_size, $field_storage_uuid = NULL) {
*/
function field_purge_instance($instance) {
$state = \Drupal::state();
- $deleted_instances = $state->get('field.instance.deleted');
+ $deleted_instances = $state->get('field.field.deleted');
unset($deleted_instances[$instance->uuid()]);
- $state->set('field.instance.deleted', $deleted_instances);
+ $state->set('field.field.deleted', $deleted_instances);
// Invoke external hooks after the cache is cleared for API consistency.
\Drupal::moduleHandler()->invokeAll('field_purge_instance', array($instance));
@@ -158,7 +158,7 @@ function field_purge_instance($instance) {
* The field storage to purge.
*/
function field_purge_field_storage(FieldStorageConfigInterface $field_storage) {
- $instances = entity_load_multiple_by_properties('field_instance_config', array('field_storage_uuid' => $field_storage->uuid(), 'include_deleted' => TRUE));
+ $instances = entity_load_multiple_by_properties('field_config', array('field_storage_uuid' => $field_storage->uuid(), 'include_deleted' => TRUE));
if (count($instances) > 0) {
throw new FieldException(t('Attempt to purge a field storage @field_name that still has instances.', array('@field_name' => $field_storage->getName())));
}
diff --git a/core/modules/field/field.views.inc b/core/modules/field/field.views.inc
index 6968bec..4e7c0b4 100644
--- a/core/modules/field/field.views.inc
+++ b/core/modules/field/field.views.inc
@@ -9,7 +9,7 @@
use Drupal\Core\Entity\ContentEntityDatabaseStorage;
use Drupal\Core\Entity\EntityStorageInterface;
use Drupal\field\FieldStorageConfigInterface;
-use Drupal\field\FieldInstanceConfigInterface;
+use Drupal\field\FieldConfigInterface;
/**
* Implements hook_views_data().
@@ -82,7 +82,7 @@ function field_views_field_label($entity_type, $field_name) {
// Count the amount of instances per label per field.
foreach (array_keys(\Drupal::entityManager()->getBundleInfo($entity_type)) as $bundle) {
$bundle_instances = array_filter(\Drupal::entityManager()->getFieldDefinitions($entity_type, $bundle), function ($field_definition) {
- return $field_definition instanceof FieldInstanceConfigInterface;
+ return $field_definition instanceof FieldConfigInterface;
});
if (isset($bundle_instances[$field_name])) {
$instance = $bundle_instances[$field_name];
diff --git a/core/modules/field/src/Entity/FieldInstanceConfig.php b/core/modules/field/src/Entity/FieldConfig.php
similarity index 94%
rename from core/modules/field/src/Entity/FieldInstanceConfig.php
rename to core/modules/field/src/Entity/FieldConfig.php
index fb39fca..9a0cbc2 100644
--- a/core/modules/field/src/Entity/FieldInstanceConfig.php
+++ b/core/modules/field/src/Entity/FieldConfig.php
@@ -2,7 +2,7 @@
/**
* @file
- * Contains \Drupal\field\Entity\FieldInstanceConfig.
+ * Contains \Drupal\field\Entity\FieldConfig.
*/
namespace Drupal\field\Entity;
@@ -15,29 +15,29 @@
use Drupal\Core\Field\TypedData\FieldItemDataDefinition;
use Drupal\field\FieldException;
use Drupal\field\FieldStorageConfigInterface;
-use Drupal\field\FieldInstanceConfigInterface;
+use Drupal\field\FieldConfigInterface;
/**
- * Defines the Field instance entity.
+ * Defines the Field entity.
*
* @ConfigEntityType(
- * id = "field_instance_config",
- * label = @Translation("Field instance"),
+ * id = "field_config",
+ * label = @Translation("Field"),
* controllers = {
- * "access" = "Drupal\field\FieldInstanceConfigAccessControlHandler",
- * "storage" = "Drupal\field\FieldInstanceConfigStorage"
+ * "access" = "Drupal\field\FieldConfigAccessControlHandler",
+ * "storage" = "Drupal\field\FieldConfigStorage"
* },
- * config_prefix = "instance",
+ * config_prefix = "field",
* entity_keys = {
* "id" = "id",
* "label" = "label"
* }
* )
*/
-class FieldInstanceConfig extends ConfigEntityBase implements FieldInstanceConfigInterface {
+class FieldConfig extends ConfigEntityBase implements FieldConfigInterface {
/**
- * The instance ID.
+ * The field ID.
*
* The ID consists of 3 parts: the entity type, bundle and the field name.
*
@@ -207,10 +207,10 @@ class FieldInstanceConfig extends ConfigEntityBase implements FieldInstanceConfi
protected $itemDefinition;
/**
- * Constructs a FieldInstanceConfig object.
+ * Constructs a FieldConfig object.
*
* In most cases, Field instance entities are created via
- * entity_create('field_instance_config', $values), where $values is the same
+ * entity_create('field_config', $values), where $values is the same
* parameter as in this constructor.
*
* @param array $values
@@ -228,7 +228,7 @@ class FieldInstanceConfig extends ConfigEntityBase implements FieldInstanceConfi
*
* @see entity_create()
*/
- public function __construct(array $values, $entity_type = 'field_instance_config') {
+ public function __construct(array $values, $entity_type = 'field_config') {
// Allow either an injected FieldStorageConfig object, or a field_name and
// entity_type.
if (isset($values['field_storage'])) {
@@ -255,7 +255,7 @@ public function __construct(array $values, $entity_type = 'field_instance_config
// Discard the 'field_type' entry that is added in config records to ease
// schema generation and mapping settings from storage.
- // @see Drupal\field\Entity\FieldInstanceConfig::toArray().
+ // @see Drupal\field\Entity\FieldConfig::toArray().
unset($values['field_type']);
parent::__construct($values, $entity_type);
@@ -291,7 +291,7 @@ public function toArray() {
// Additionally, include the field type, that is needed to be able to
// generate the field-type-dependant parts of the config schema and to
// allow for mapping settings from storage by field type.
- // @see \Drupal\field\FieldInstanceConfigStorage::mapFromStorageRecords().
+ // @see \Drupal\field\FieldConfigStorage::mapFromStorageRecords().
$properties['field_type'] = $this->getType();
return $properties;
@@ -328,7 +328,7 @@ public function preSave(EntityStorageInterface $storage) {
if ($this->isNew()) {
// Set the default instance settings.
- $this->settings += $field_type_manager->getDefaultInstanceSettings($storage_definition->type);
+ $this->settings += $field_type_manager->getDefaultFieldSettings($storage_definition->type);
// Notify the entity storage.
$entity_manager->getStorage($this->entity_type)->onFieldDefinitionCreate($this);
}
@@ -344,7 +344,7 @@ public function preSave(EntityStorageInterface $storage) {
throw new FieldException("Cannot change an existing instance's storage.");
}
// Set the default instance settings.
- $this->settings += $field_type_manager->getDefaultInstanceSettings($storage_definition->type);
+ $this->settings += $field_type_manager->getDefaultFieldSettings($storage_definition->type);
// Notify the entity storage.
$entity_manager->getStorage($this->entity_type)->onFieldDefinitionUpdate($this, $this->original);
}
@@ -394,7 +394,7 @@ public static function preDelete(EntityStorageInterface $storage, array $instanc
// Keep the instance definitions in the state storage so we can use them
// later during field_purge_batch().
- $deleted_instances = $state->get('field.instance.deleted') ?: array();
+ $deleted_instances = $state->get('field.field.deleted') ?: array();
foreach ($instances as $instance) {
if (!$instance->deleted) {
$config = $instance->toArray();
@@ -403,7 +403,7 @@ public static function preDelete(EntityStorageInterface $storage, array $instanc
$deleted_instances[$instance->uuid()] = $config;
}
}
- $state->set('field.instance.deleted', $deleted_instances);
+ $state->set('field.field.deleted', $deleted_instances);
}
/**
@@ -523,7 +523,7 @@ public function setTranslatable($translatable) {
protected function linkTemplates() {
$link_templates = parent::linkTemplates();
if (\Drupal::moduleHandler()->moduleExists('field_ui')) {
- $link_templates['edit-form'] = 'field_ui.instance_edit_' . $this->entity_type;
+ $link_templates['edit-form'] = 'field_ui.field_edit_' . $this->entity_type;
$link_templates['storage-edit-form'] = 'field_ui.storage_edit_' . $this->entity_type;
$link_templates['delete-form'] = 'field_ui.delete_' . $this->entity_type;
@@ -733,7 +733,7 @@ public function isDeleted() {
* name, otherwise NULL.
*/
public static function loadByName($entity_type_id, $bundle, $field_name) {
- return \Drupal::entityManager()->getStorage('field_instance_config')->load($entity_type_id . '.' . $bundle . '.' . $field_name);
+ return \Drupal::entityManager()->getStorage('field_config')->load($entity_type_id . '.' . $bundle . '.' . $field_name);
}
}
diff --git a/core/modules/field/src/Entity/FieldStorageConfig.php b/core/modules/field/src/Entity/FieldStorageConfig.php
index 2c0e60b..6407752 100644
--- a/core/modules/field/src/Entity/FieldStorageConfig.php
+++ b/core/modules/field/src/Entity/FieldStorageConfig.php
@@ -364,10 +364,10 @@ public function postSave(EntityStorageInterface $storage, $update = TRUE) {
*/
public static function preDelete(EntityStorageInterface $storage, array $fields) {
$state = \Drupal::state();
- $instance_storage = \Drupal::entityManager()->getStorage('field_instance_config');
+ $instance_storage = \Drupal::entityManager()->getStorage('field_config');
// Delete instances first. Note: when deleting a field through
- // FieldInstanceConfig::postDelete(), the instances have been deleted already, so
+ // FieldConfig::postDelete(), the instances have been deleted already, so
// no instances will be found here.
$instance_ids = array();
foreach ($fields as $field) {
diff --git a/core/modules/field/src/FieldInstanceConfigAccessControlHandler.php b/core/modules/field/src/FieldConfigAccessControlHandler.php
similarity index 66%
rename from core/modules/field/src/FieldInstanceConfigAccessControlHandler.php
rename to core/modules/field/src/FieldConfigAccessControlHandler.php
index 6b21783..c502466 100644
--- a/core/modules/field/src/FieldInstanceConfigAccessControlHandler.php
+++ b/core/modules/field/src/FieldConfigAccessControlHandler.php
@@ -2,7 +2,7 @@
/**
* @file
- * Contains \Drupal\field\FieldInstanceConfigAccessControlHandler.
+ * Contains \Drupal\field\FieldConfigAccessControlHandler.
*/
namespace Drupal\field;
@@ -12,11 +12,11 @@
use Drupal\Core\Session\AccountInterface;
/**
- * Defines the access control handler for the field instance entity type.
+ * Defines the access control handler for the field entity type.
*
- * @see \Drupal\field\Entity\FieldInstanceConfig
+ * @see \Drupal\field\Entity\FieldConfig
*/
-class FieldInstanceConfigAccessControlHandler extends EntityAccessControlHandler {
+class FieldConfigAccessControlHandler extends EntityAccessControlHandler {
/**
* {@inheritdoc}
diff --git a/core/modules/field/src/FieldInstanceConfigInterface.php b/core/modules/field/src/FieldConfigInterface.php
similarity index 87%
rename from core/modules/field/src/FieldInstanceConfigInterface.php
rename to core/modules/field/src/FieldConfigInterface.php
index affcd49..8f7fa1a 100644
--- a/core/modules/field/src/FieldInstanceConfigInterface.php
+++ b/core/modules/field/src/FieldConfigInterface.php
@@ -2,7 +2,7 @@
/**
* @file
- * Contains \Drupal\field\FieldInstanceConfigInterface.
+ * Contains \Drupal\field\FieldConfigInterface.
*/
namespace Drupal\field;
@@ -13,7 +13,7 @@
/**
* Provides an interface defining a field instance entity.
*/
-interface FieldInstanceConfigInterface extends ConfigEntityInterface, FieldDefinitionInterface {
+interface FieldConfigInterface extends ConfigEntityInterface, FieldDefinitionInterface {
/**
* Returns the field entity for this instance.
diff --git a/core/modules/field/src/FieldInstanceConfigStorage.php b/core/modules/field/src/FieldConfigStorage.php
similarity index 93%
rename from core/modules/field/src/FieldInstanceConfigStorage.php
rename to core/modules/field/src/FieldConfigStorage.php
index 8ed7a5d..73a5f06 100644
--- a/core/modules/field/src/FieldInstanceConfigStorage.php
+++ b/core/modules/field/src/FieldConfigStorage.php
@@ -2,7 +2,7 @@
/**
* @file
- * Contains \Drupal\field\FieldInstanceConfigStorage.
+ * Contains \Drupal\field\FieldConfigStorage.
*/
namespace Drupal\field;
@@ -25,10 +25,10 @@
*
* Note: the class take no special care about importing instances after their
* field in importCreate(), since this is guaranteed by the alphabetical order
- * (field.field.* entries are processed before field.instance.* entries).
+ * (field.field.* entries are processed before field.field.* entries).
* @todo Revisit after http://drupal.org/node/1944368.
*/
-class FieldInstanceConfigStorage extends ConfigEntityStorage {
+class FieldConfigStorage extends ConfigEntityStorage {
/**
* The entity manager.
@@ -52,7 +52,7 @@ class FieldInstanceConfigStorage extends ConfigEntityStorage {
protected $fieldTypeManager;
/**
- * Constructs a FieldInstanceConfigStorage object.
+ * Constructs a FieldConfigStorage object.
*
* @param \Drupal\Core\Entity\EntityTypeInterface $entity_type
* The entity type definition.
@@ -131,7 +131,7 @@ public function loadByProperties(array $conditions = array()) {
// Merge deleted instances (stored in state) if needed.
if ($include_deleted || !empty($conditions['deleted'])) {
- $deleted_instances = $this->state->get('field.instance.deleted') ?: array();
+ $deleted_instances = $this->state->get('field.field.deleted') ?: array();
$deleted_storages = $this->state->get('field.storage.deleted') ?: array();
foreach ($deleted_instances as $id => $config) {
// If the field itself is deleted, inject it directly in the instance.
@@ -191,7 +191,7 @@ public function loadByProperties(array $conditions = array()) {
protected function mapFromStorageRecords(array $records) {
foreach ($records as &$record) {
$class = $this->fieldTypeManager->getPluginClass($record['field_type']);
- $record['settings'] = $class::instanceSettingsFromConfigData($record['settings']);
+ $record['settings'] = $class::fieldSettingsFromConfigData($record['settings']);
}
return parent::mapFromStorageRecords($records);
}
@@ -202,7 +202,7 @@ protected function mapFromStorageRecords(array $records) {
protected function mapToStorageRecord(EntityInterface $entity) {
$record = parent::mapToStorageRecord($entity);
$class = $this->fieldTypeManager->getPluginClass($record['field_type']);
- $record['settings'] = $class::instanceSettingsToConfigData($record['settings']);
+ $record['settings'] = $class::fieldSettingsToConfigData($record['settings']);
return $record;
}
}
diff --git a/core/modules/field/src/Tests/Boolean/BooleanFieldTest.php b/core/modules/field/src/Tests/Boolean/BooleanFieldTest.php
index f505e55..d495c28 100644
--- a/core/modules/field/src/Tests/Boolean/BooleanFieldTest.php
+++ b/core/modules/field/src/Tests/Boolean/BooleanFieldTest.php
@@ -8,7 +8,7 @@
namespace Drupal\field\Tests\Boolean;
use Drupal\field\Entity\FieldStorageConfig;
-use Drupal\field\Entity\FieldInstanceConfig;
+use Drupal\field\Entity\FieldConfig;
use Drupal\simpletest\WebTestBase;
/**
@@ -35,7 +35,7 @@ class BooleanFieldTest extends WebTestBase {
/**
* The instance used in this test class.
*
- * @var \Drupal\field\Entity\FieldInstanceConfig
+ * @var \Drupal\field\Entity\FieldConfig
*/
protected $instance;
@@ -74,7 +74,7 @@ function testBooleanField() {
),
));
$this->field->save();
- $this->instance = FieldInstanceConfig::create(array(
+ $this->instance = FieldConfig::create(array(
'field_name' => $field_name,
'entity_type' => 'entity_test',
'bundle' => 'entity_test',
diff --git a/core/modules/field/src/Tests/Boolean/BooleanItemTest.php b/core/modules/field/src/Tests/Boolean/BooleanItemTest.php
index 02760d5..43a5cc8 100644
--- a/core/modules/field/src/Tests/Boolean/BooleanItemTest.php
+++ b/core/modules/field/src/Tests/Boolean/BooleanItemTest.php
@@ -30,7 +30,7 @@ public function setUp() {
'entity_type' => 'entity_test',
'type' => 'boolean',
))->save();
- entity_create('field_instance_config', array(
+ entity_create('field_config', array(
'entity_type' => 'entity_test',
'field_name' => 'field_boolean',
'bundle' => 'entity_test',
diff --git a/core/modules/field/src/Tests/BulkDeleteTest.php b/core/modules/field/src/Tests/BulkDeleteTest.php
index ebfec70..36c8b94 100644
--- a/core/modules/field/src/Tests/BulkDeleteTest.php
+++ b/core/modules/field/src/Tests/BulkDeleteTest.php
@@ -9,7 +9,7 @@
use Drupal\Core\Entity\ContentEntityDatabaseStorage;
use Drupal\Core\Entity\EntityInterface;
-use Drupal\field\Entity\FieldInstanceConfig;
+use Drupal\field\Entity\FieldConfig;
/**
* Bulk delete fields and instances, and clean up afterwards.
@@ -127,7 +127,7 @@ function setUp() {
// entities with values for each field.
foreach ($this->bundles as $bundle) {
foreach ($this->fieldStorages as $field_storage) {
- entity_create('field_instance_config', array(
+ entity_create('field_config', array(
'field_storage' => $field_storage,
'bundle' => $bundle,
))->save();
@@ -155,7 +155,7 @@ function setUp() {
* This tests how EntityFieldQuery interacts with field instance deletion and
* could be moved to FieldCrudTestCase, but depends on this class's setUp().
*/
- function testDeleteFieldInstance() {
+ function testDeleteField() {
$bundle = reset($this->bundles);
$field_storage = reset($this->fieldStorages);
$field_name = $field_storage->name;
@@ -168,11 +168,11 @@ function testDeleteFieldInstance() {
$this->assertEqual(count($found), 10, 'Correct number of entities found before deleting');
// Delete the instance.
- $instance = FieldInstanceConfig::loadByName($this->entity_type, $bundle, $field_storage->name);
+ $instance = FieldConfig::loadByName($this->entity_type, $bundle, $field_storage->name);
$instance->delete();
// The instance still exists, deleted.
- $instances = entity_load_multiple_by_properties('field_instance_config', array('field_storage_uuid' => $field_storage->uuid(), 'deleted' => TRUE, 'include_deleted' => TRUE));
+ $instances = entity_load_multiple_by_properties('field_config', array('field_storage_uuid' => $field_storage->uuid(), 'deleted' => TRUE, 'include_deleted' => TRUE));
$this->assertEqual(count($instances), 1, 'There is one deleted instance');
$instance = $instances[$instance->uuid()];
$this->assertEqual($instance->bundle, $bundle, 'The deleted instance is for the correct bundle');
@@ -218,7 +218,7 @@ function testPurgeInstance() {
$field_storage = reset($this->fieldStorages);
// Delete the instance.
- $instance = FieldInstanceConfig::loadByName($this->entity_type, $bundle, $field_storage->name);
+ $instance = FieldConfig::loadByName($this->entity_type, $bundle, $field_storage->name);
$instance->delete();
// No field hooks were called.
@@ -250,14 +250,14 @@ function testPurgeInstance() {
$this->checkHooksInvocations($hooks, $actual_hooks);
// The instance still exists, deleted.
- $instances = entity_load_multiple_by_properties('field_instance_config', array('field_storage_uuid' => $field_storage->uuid(), 'deleted' => TRUE, 'include_deleted' => TRUE));
+ $instances = entity_load_multiple_by_properties('field_config', array('field_storage_uuid' => $field_storage->uuid(), 'deleted' => TRUE, 'include_deleted' => TRUE));
$this->assertEqual(count($instances), 1, 'There is one deleted instance');
// Purge the instance.
field_purge_batch($batch_size);
// The instance is gone.
- $instances = entity_load_multiple_by_properties('field_instance_config', array('field_storage_uuid' => $field_storage->uuid(), 'deleted' => TRUE, 'include_deleted' => TRUE));
+ $instances = entity_load_multiple_by_properties('field_config', array('field_storage_uuid' => $field_storage->uuid(), 'deleted' => TRUE, 'include_deleted' => TRUE));
$this->assertEqual(count($instances), 0, 'The instance is gone');
// The field storage still exists, not deleted, because it has a second
@@ -278,7 +278,7 @@ function testPurgeFieldStorage() {
// Delete the first instance.
$bundle = reset($this->bundles);
- $instance = FieldInstanceConfig::loadByName($this->entity_type, $bundle, $field_storage->name);
+ $instance = FieldConfig::loadByName($this->entity_type, $bundle, $field_storage->name);
$instance->delete();
// Assert that FieldItemInterface::delete() was not called yet.
@@ -300,14 +300,14 @@ function testPurgeFieldStorage() {
$this->checkHooksInvocations($hooks, $actual_hooks);
// The instance still exists, deleted.
- $instances = entity_load_multiple_by_properties('field_instance_config', array('uuid' => $instance->uuid(), 'include_deleted' => TRUE));
+ $instances = entity_load_multiple_by_properties('field_config', array('uuid' => $instance->uuid(), 'include_deleted' => TRUE));
$this->assertTrue(isset($instances[$instance->uuid()]) && $instances[$instance->uuid()]->deleted, 'The instance exists and is deleted');
// Purge again to purge the instance.
field_purge_batch(0);
// The instance is gone.
- $instances = entity_load_multiple_by_properties('field_instance_config', array('uuid' => $instance->uuid(), 'include_deleted' => TRUE));
+ $instances = entity_load_multiple_by_properties('field_config', array('uuid' => $instance->uuid(), 'include_deleted' => TRUE));
$this->assertEqual(count($instances), 0, 'The instance is purged.');
// The field storage still exists, not deleted.
$storages = entity_load_multiple_by_properties('field_storage_config', array('uuid' => $field_storage->uuid(), 'include_deleted' => TRUE));
@@ -315,7 +315,7 @@ function testPurgeFieldStorage() {
// Delete the second instance.
$bundle = next($this->bundles);
- $instance = FieldInstanceConfig::loadByName($this->entity_type, $bundle, $field_storage->name);
+ $instance = FieldConfig::loadByName($this->entity_type, $bundle, $field_storage->name);
$instance->delete();
// Assert that FieldItemInterface::delete() was not called yet.
@@ -335,7 +335,7 @@ function testPurgeFieldStorage() {
$this->checkHooksInvocations($hooks, $actual_hooks);
// The field storage and instance still exist, deleted.
- $instances = entity_load_multiple_by_properties('field_instance_config', array('uuid' => $instance->uuid(), 'include_deleted' => TRUE));
+ $instances = entity_load_multiple_by_properties('field_config', array('uuid' => $instance->uuid(), 'include_deleted' => TRUE));
$this->assertTrue(isset($instances[$instance->uuid()]) && $instances[$instance->uuid()]->deleted, 'The instance exists and is deleted');
$storages = entity_load_multiple_by_properties('field_storage_config', array('uuid' => $field_storage->uuid(), 'include_deleted' => TRUE));
$this->assertTrue(isset($storages[$field_storage->uuid()]) && $storages[$field_storage->uuid()]->deleted, 'The field storage exists and is deleted');
@@ -344,7 +344,7 @@ function testPurgeFieldStorage() {
field_purge_batch(0);
// The field storage and instance are gone.
- $instances = entity_load_multiple_by_properties('field_instance_config', array('uuid' => $instance->uuid(), 'include_deleted' => TRUE));
+ $instances = entity_load_multiple_by_properties('field_config', array('uuid' => $instance->uuid(), 'include_deleted' => TRUE));
$this->assertEqual(count($instances), 0, 'The instance is purged.');
$storages = entity_load_multiple_by_properties('field_storage_config', array('uuid' => $field_storage->uuid(), 'include_deleted' => TRUE));
$this->assertEqual(count($storages), 0, 'The field storage is purged.');
diff --git a/core/modules/field/src/Tests/CrudTest.php b/core/modules/field/src/Tests/CrudTest.php
index 1feb64f..d580221 100644
--- a/core/modules/field/src/Tests/CrudTest.php
+++ b/core/modules/field/src/Tests/CrudTest.php
@@ -218,7 +218,7 @@ function testRead() {
'entity_type' => 'entity_test',
'bundle' => 'entity_test',
);
- entity_create('field_instance_config', $instance_definition)->save();
+ entity_create('field_config', $instance_definition)->save();
}
/**
@@ -297,10 +297,10 @@ function testDelete() {
'entity_type' => 'entity_test',
'bundle' => 'entity_test',
);
- entity_create('field_instance_config', $instance_definition)->save();
+ entity_create('field_config', $instance_definition)->save();
$another_instance_definition = $instance_definition;
$another_instance_definition['field_name'] = $another_field['name'];
- entity_create('field_instance_config', $another_instance_definition)->save();
+ entity_create('field_config', $another_instance_definition)->save();
// Test that the first field is not deleted, and then delete it.
$field_storage = current(entity_load_multiple_by_properties('field_storage_config', array('field_name' => $field['name'], 'include_deleted' => TRUE)));
@@ -314,7 +314,7 @@ function testDelete() {
// Make sure that this field's instance is marked as deleted when it is
// specifically loaded.
- $instance = current(entity_load_multiple_by_properties('field_instance_config', array('entity_type' => 'entity_test', 'field_name' => $instance_definition['field_name'], 'bundle' => $instance_definition['bundle'], 'include_deleted' => TRUE)));
+ $instance = current(entity_load_multiple_by_properties('field_config', array('entity_type' => 'entity_test', 'field_name' => $instance_definition['field_name'], 'bundle' => $instance_definition['bundle'], 'include_deleted' => TRUE)));
$this->assertTrue(!empty($instance->deleted), 'An instance for a deleted field is marked for deletion.');
// Try to load the field normally and make sure it does not show up.
@@ -322,22 +322,22 @@ function testDelete() {
$this->assertTrue(empty($field_storage), 'A deleted field is not loaded by default.');
// Try to load the instance normally and make sure it does not show up.
- $instance = entity_load('field_instance_config', 'entity_test.' . '.' . $instance_definition['bundle'] . '.' . $instance_definition['field_name']);
+ $instance = entity_load('field_config', 'entity_test.' . '.' . $instance_definition['bundle'] . '.' . $instance_definition['field_name']);
$this->assertTrue(empty($instance), 'An instance for a deleted field is not loaded by default.');
// Make sure the other field (and its field instance) are not deleted.
$another_field_storage = entity_load('field_storage_config', 'entity_test.' . $another_field['name']);
$this->assertTrue(!empty($another_field_storage) && empty($another_field_storage->deleted), 'A non-deleted field is not marked for deletion.');
- $another_instance = entity_load('field_instance_config', 'entity_test.' . $another_instance_definition['bundle'] . '.' . $another_instance_definition['field_name']);
+ $another_instance = entity_load('field_config', 'entity_test.' . $another_instance_definition['bundle'] . '.' . $another_instance_definition['field_name']);
$this->assertTrue(!empty($another_instance) && empty($another_instance->deleted), 'An instance of a non-deleted field is not marked for deletion.');
// Try to create a new field the same name as a deleted field and
// write data into it.
entity_create('field_storage_config', $field)->save();
- entity_create('field_instance_config', $instance_definition)->save();
+ entity_create('field_config', $instance_definition)->save();
$field_storage = entity_load('field_storage_config', 'entity_test.' . $field['name']);
$this->assertTrue(!empty($field_storage) && empty($field_storage->deleted), 'A new field with a previously used name is created.');
- $instance = entity_load('field_instance_config', 'entity_test.' . $instance_definition['bundle'] . '.' . $instance_definition['field_name'] );
+ $instance = entity_load('field_config', 'entity_test.' . $instance_definition['bundle'] . '.' . $instance_definition['field_name'] );
$this->assertTrue(!empty($instance) && empty($instance->deleted), 'A new instance for a previously used field name is created.');
// Save an entity with data for the field
@@ -386,7 +386,7 @@ function testUpdate() {
'cardinality' => $cardinality,
));
$field_storage->save();
- $instance = entity_create('field_instance_config', array(
+ $instance = entity_create('field_config', array(
'field_storage' => $field_storage,
'entity_type' => 'entity_test',
'bundle' => 'entity_test',
diff --git a/core/modules/field/src/Tests/DisplayApiTest.php b/core/modules/field/src/Tests/DisplayApiTest.php
index 41189e4..6094b40 100644
--- a/core/modules/field/src/Tests/DisplayApiTest.php
+++ b/core/modules/field/src/Tests/DisplayApiTest.php
@@ -95,7 +95,7 @@ function setUp() {
);
entity_create('field_storage_config', $field_storage)->save();
- entity_create('field_instance_config', $instance)->save();
+ entity_create('field_config', $instance)->save();
// Create a display for the default view mode.
entity_get_display($instance['entity_type'], $instance['bundle'], 'default')
->setComponent($this->field_name, $this->display_options['default'])
diff --git a/core/modules/field/src/Tests/Email/EmailFieldTest.php b/core/modules/field/src/Tests/Email/EmailFieldTest.php
index 97c620f..b179707 100644
--- a/core/modules/field/src/Tests/Email/EmailFieldTest.php
+++ b/core/modules/field/src/Tests/Email/EmailFieldTest.php
@@ -33,7 +33,7 @@ class EmailFieldTest extends WebTestBase {
/**
* The instance used in this test class.
*
- * @var \Drupal\field\Entity\FieldInstanceConfig
+ * @var \Drupal\field\Entity\FieldConfig
*/
protected $instance;
@@ -60,7 +60,7 @@ function testEmailField() {
'type' => 'email',
));
$this->fieldStorage->save();
- $this->instance = entity_create('field_instance_config', array(
+ $this->instance = entity_create('field_config', array(
'field_storage' => $this->fieldStorage,
'bundle' => 'entity_test',
));
diff --git a/core/modules/field/src/Tests/Email/EmailItemTest.php b/core/modules/field/src/Tests/Email/EmailItemTest.php
index 20bb137..f59819b 100644
--- a/core/modules/field/src/Tests/Email/EmailItemTest.php
+++ b/core/modules/field/src/Tests/Email/EmailItemTest.php
@@ -34,7 +34,7 @@ public function setUp() {
'entity_type' => 'entity_test',
'type' => 'email',
))->save();
- entity_create('field_instance_config', array(
+ entity_create('field_config', array(
'entity_type' => 'entity_test',
'field_name' => 'field_email',
'bundle' => 'entity_test',
diff --git a/core/modules/field/src/Tests/FieldAccessTest.php b/core/modules/field/src/Tests/FieldAccessTest.php
index a981bc5..b77d429 100644
--- a/core/modules/field/src/Tests/FieldAccessTest.php
+++ b/core/modules/field/src/Tests/FieldAccessTest.php
@@ -56,7 +56,7 @@ function setUp() {
'entity_type' => 'node',
'bundle' => $content_type,
);
- entity_create('field_instance_config', $instance)->save();
+ entity_create('field_config', $instance)->save();
// Assign display properties for the 'default' and 'teaser' view modes.
foreach (array('default', 'teaser') as $view_mode) {
diff --git a/core/modules/field/src/Tests/FieldAttachStorageTest.php b/core/modules/field/src/Tests/FieldAttachStorageTest.php
index 53ba389..ebd2686 100644
--- a/core/modules/field/src/Tests/FieldAttachStorageTest.php
+++ b/core/modules/field/src/Tests/FieldAttachStorageTest.php
@@ -6,7 +6,7 @@
*/
namespace Drupal\field\Tests;
-use Drupal\field\Entity\FieldInstanceConfig;
+use Drupal\field\Entity\FieldConfig;
/**
* Tests storage-related Field Attach API functions.
@@ -102,7 +102,7 @@ function testFieldAttachLoadMultiple() {
$field_storage->save();
$field_ids[$i] = $field_storage->uuid();
foreach ($field_bundles_map[$i] as $bundle) {
- entity_create('field_instance_config', array(
+ entity_create('field_config', array(
'field_name' => $field_names[$i],
'entity_type' => $entity_type,
'bundle' => $bundles[$bundle],
@@ -287,7 +287,7 @@ function testEntityCreateRenameBundle() {
// Add an instance to that bundle.
$this->fieldTestData->instance_definition['bundle'] = $new_bundle;
- entity_create('field_instance_config', $this->fieldTestData->instance_definition)->save();
+ entity_create('field_config', $this->fieldTestData->instance_definition)->save();
// Save an entity with data in the field.
$entity = entity_create($entity_type, array('type' => $this->fieldTestData->instance->bundle));
@@ -303,7 +303,7 @@ function testEntityCreateRenameBundle() {
entity_test_rename_bundle($this->fieldTestData->instance_definition['bundle'], $new_bundle, $entity_type);
// Check that the instance definition has been updated.
- $this->fieldTestData->instance = FieldInstanceConfig::loadByName($entity_type, $new_bundle, $this->fieldTestData->field_name);
+ $this->fieldTestData->instance = FieldConfig::loadByName($entity_type, $new_bundle, $this->fieldTestData->field_name);
$this->assertIdentical($this->fieldTestData->instance->bundle, $new_bundle, "Bundle name has been updated in the instance.");
// Verify the field data is present on load.
@@ -326,7 +326,7 @@ function testEntityDeleteBundle() {
// Add an instance to that bundle.
$this->fieldTestData->instance_definition['bundle'] = $new_bundle;
- entity_create('field_instance_config', $this->fieldTestData->instance_definition)->save();
+ entity_create('field_config', $this->fieldTestData->instance_definition)->save();
// Create a second field for the test bundle
$field_name = drupal_strtolower($this->randomMachineName() . '_field_name');
@@ -345,7 +345,7 @@ function testEntityDeleteBundle() {
'description' => $this->randomMachineName() . '_description',
'weight' => mt_rand(0, 127),
);
- entity_create('field_instance_config', $instance)->save();
+ entity_create('field_config', $instance)->save();
// Save an entity with data for both fields
$entity = entity_create($entity_type, array('type' => $this->fieldTestData->instance->bundle));
@@ -370,8 +370,8 @@ function testEntityDeleteBundle() {
$this->assertTrue(empty($entity->{$field_name}), 'No data for second field');
// Verify that the instances are gone.
- $this->assertFalse(entity_load('field_instance_config', 'entity_test.' . $this->fieldTestData->instance->bundle . '.' . $this->fieldTestData->field_name), "First field is deleted");
- $this->assertFalse(entity_load('field_instance_config', 'entity_test.' . $instance['bundle']. '.' . $field_name), "Second field is deleted");
+ $this->assertFalse(entity_load('field_config', 'entity_test.' . $this->fieldTestData->instance->bundle . '.' . $this->fieldTestData->field_name), "First field is deleted");
+ $this->assertFalse(entity_load('field_config', 'entity_test.' . $instance['bundle']. '.' . $field_name), "Second field is deleted");
}
}
diff --git a/core/modules/field/src/Tests/FieldInstanceCrudTest.php b/core/modules/field/src/Tests/FieldCrudTest.php
similarity index 68%
rename from core/modules/field/src/Tests/FieldInstanceCrudTest.php
rename to core/modules/field/src/Tests/FieldCrudTest.php
index 715dc40..24f5e95 100644
--- a/core/modules/field/src/Tests/FieldInstanceCrudTest.php
+++ b/core/modules/field/src/Tests/FieldCrudTest.php
@@ -2,14 +2,14 @@
/**
* @file
- * Contains \Drupal\field\Tests\FieldInstanceCrudTest.
+ * Contains \Drupal\field\Tests\FieldCrudTest.
*/
namespace Drupal\field\Tests;
use Drupal\Core\Entity\EntityStorageException;
use Drupal\field\Entity\FieldStorageConfig;
-use Drupal\field\Entity\FieldInstanceConfig;
+use Drupal\field\Entity\FieldConfig;
use Drupal\field\FieldException;
/**
@@ -17,7 +17,7 @@
*
* @group field
*/
-class FieldInstanceCrudTest extends FieldUnitTestBase {
+class FieldCrudTest extends FieldUnitTestBase {
/**
* The field storage entity.
@@ -61,19 +61,19 @@ function setUp() {
// - a full fledged $instance structure, check that all the values are there
// - a minimal $instance structure, check all default values are set
// defer actual $instance comparison to a helper function, used for the two cases above,
- // and for testUpdateFieldInstance
+ // and for testUpdateField
/**
* Test the creation of a field instance.
*/
- function testCreateFieldInstance() {
- $instance = entity_create('field_instance_config', $this->instanceDefinition);
+ function testCreateField() {
+ $instance = entity_create('field_config', $this->instanceDefinition);
$instance->save();
// Read the configuration. Check against raw configuration data rather than
// the loaded ConfigEntity, to be sure we check that the defaults are
// applied on write.
- $config = \Drupal::config('field.instance.' . $instance->id())->get();
+ $config = \Drupal::config('field.field.' . $instance->id())->get();
$field_type_manager = \Drupal::service('plugin.manager.field.field_type');
// Check that default values are set.
@@ -82,14 +82,14 @@ function testCreateFieldInstance() {
$this->assertIdentical($config['description'], '', 'Description defaults to empty string.');
// Check that default settings are set.
- $this->assertEqual($config['settings'], $field_type_manager->getDefaultInstanceSettings($this->fieldStorageDefinition['type']) , 'Default instance settings have been written.');
+ $this->assertEqual($config['settings'], $field_type_manager->getDefaultFieldSettings($this->fieldStorageDefinition['type']) , 'Default instance settings have been written.');
// Check that the denormalized 'field_type' was properly written.
$this->assertEqual($config['field_type'], $this->fieldStorageDefinition['type']);
// Guarantee that the field/bundle combination is unique.
try {
- entity_create('field_instance_config', $this->instanceDefinition)->save();
+ entity_create('field_config', $this->instanceDefinition)->save();
$this->fail(t('Cannot create two instances with the same field / bundle combination.'));
}
catch (EntityStorageException $e) {
@@ -99,7 +99,7 @@ function testCreateFieldInstance() {
// Check that the specified field exists.
try {
$this->instanceDefinition['field_name'] = $this->randomMachineName();
- entity_create('field_instance_config', $this->instanceDefinition)->save();
+ entity_create('field_config', $this->instanceDefinition)->save();
$this->fail(t('Cannot create an instance of a non-existing field.'));
}
catch (FieldException $e) {
@@ -112,11 +112,11 @@ function testCreateFieldInstance() {
/**
* Test reading back an instance definition.
*/
- function testReadFieldInstance() {
- entity_create('field_instance_config', $this->instanceDefinition)->save();
+ function testReadField() {
+ entity_create('field_config', $this->instanceDefinition)->save();
// Read the instance back.
- $instance = entity_load('field_instance_config', 'entity_test.' . $this->instanceDefinition['bundle'] . '.' . $this->instanceDefinition['field_name']);
+ $instance = entity_load('field_config', 'entity_test.' . $this->instanceDefinition['bundle'] . '.' . $this->instanceDefinition['field_name']);
$this->assertTrue($this->instanceDefinition['field_name'] == $instance->getName(), 'The field was properly read.');
$this->assertTrue($this->instanceDefinition['entity_type'] == $instance->entity_type, 'The field was properly read.');
$this->assertTrue($this->instanceDefinition['bundle'] == $instance->bundle, 'The field was properly read.');
@@ -125,18 +125,18 @@ function testReadFieldInstance() {
/**
* Test the update of a field instance.
*/
- function testUpdateFieldInstance() {
- entity_create('field_instance_config', $this->instanceDefinition)->save();
+ function testUpdateField() {
+ entity_create('field_config', $this->instanceDefinition)->save();
// Check that basic changes are saved.
- $instance = entity_load('field_instance_config', 'entity_test.' . $this->instanceDefinition['bundle'] . '.' . $this->instanceDefinition['field_name']);
+ $instance = entity_load('field_config', 'entity_test.' . $this->instanceDefinition['bundle'] . '.' . $this->instanceDefinition['field_name']);
$instance->required = !$instance->isRequired();
$instance->label = $this->randomMachineName();
$instance->description = $this->randomMachineName();
$instance->settings['test_instance_setting'] = $this->randomMachineName();
$instance->save();
- $instance_new = entity_load('field_instance_config', 'entity_test.' . $this->instanceDefinition['bundle'] . '.' . $this->instanceDefinition['field_name']);
+ $instance_new = entity_load('field_config', 'entity_test.' . $this->instanceDefinition['bundle'] . '.' . $this->instanceDefinition['field_name']);
$this->assertEqual($instance->isRequired(), $instance_new->isRequired(), '"required" change is saved');
$this->assertEqual($instance->getLabel(), $instance_new->getLabel(), '"label" change is saved');
$this->assertEqual($instance->getDescription(), $instance_new->getDescription(), '"description" change is saved');
@@ -147,60 +147,60 @@ function testUpdateFieldInstance() {
/**
* Test the deletion of a field instance.
*/
- function testDeleteFieldInstance() {
+ function testDeleteField() {
// TODO: Test deletion of the data stored in the field also.
// Need to check that data for a 'deleted' field / instance doesn't get loaded
// Need to check data marked deleted is cleaned on cron (not implemented yet...)
// Create two instances for the same field so we can test that only one
// is deleted.
- entity_create('field_instance_config', $this->instanceDefinition)->save();
+ entity_create('field_config', $this->instanceDefinition)->save();
$another_instance_definition = $this->instanceDefinition;
$another_instance_definition['bundle'] .= '_another_bundle';
entity_test_create_bundle($another_instance_definition['bundle']);
- entity_create('field_instance_config', $another_instance_definition)->save();
+ entity_create('field_config', $another_instance_definition)->save();
// Test that the first instance is not deleted, and then delete it.
- $instance = current(entity_load_multiple_by_properties('field_instance_config', array('entity_type' => 'entity_test', 'field_name' => $this->instanceDefinition['field_name'], 'bundle' => $this->instanceDefinition['bundle'], 'include_deleted' => TRUE)));
+ $instance = current(entity_load_multiple_by_properties('field_config', array('entity_type' => 'entity_test', 'field_name' => $this->instanceDefinition['field_name'], 'bundle' => $this->instanceDefinition['bundle'], 'include_deleted' => TRUE)));
$this->assertTrue(!empty($instance) && empty($instance->deleted), 'A new field instance is not marked for deletion.');
$instance->delete();
// Make sure the instance is marked as deleted when the instance is
// specifically loaded.
- $instance = current(entity_load_multiple_by_properties('field_instance_config', array('entity_type' => 'entity_test', 'field_name' => $this->instanceDefinition['field_name'], 'bundle' => $this->instanceDefinition['bundle'], 'include_deleted' => TRUE)));
+ $instance = current(entity_load_multiple_by_properties('field_config', array('entity_type' => 'entity_test', 'field_name' => $this->instanceDefinition['field_name'], 'bundle' => $this->instanceDefinition['bundle'], 'include_deleted' => TRUE)));
$this->assertTrue(!empty($instance->deleted), 'A deleted field instance is marked for deletion.');
// Try to load the instance normally and make sure it does not show up.
- $instance = entity_load('field_instance_config', 'entity_test.' . '.' . $this->instanceDefinition['bundle'] . '.' . $this->instanceDefinition['field_name']);
+ $instance = entity_load('field_config', 'entity_test.' . '.' . $this->instanceDefinition['bundle'] . '.' . $this->instanceDefinition['field_name']);
$this->assertTrue(empty($instance), 'A deleted field instance is not loaded by default.');
// Make sure the other field instance is not deleted.
- $another_instance = entity_load('field_instance_config', 'entity_test.' . $another_instance_definition['bundle'] . '.' . $another_instance_definition['field_name']);
+ $another_instance = entity_load('field_config', 'entity_test.' . $another_instance_definition['bundle'] . '.' . $another_instance_definition['field_name']);
$this->assertTrue(!empty($another_instance) && empty($another_instance->deleted), 'A non-deleted field instance is not marked for deletion.');
}
/**
* Tests the cross deletion behavior between fields and instances.
*/
- function testDeleteFieldInstanceCrossDeletion() {
+ function testDeleteFieldCrossDeletion() {
$instance_definition_2 = $this->instanceDefinition;
$instance_definition_2['bundle'] .= '_another_bundle';
entity_test_create_bundle($instance_definition_2['bundle']);
// Check that deletion of a field deletes its instances.
$field_storage = $this->fieldStorage;
- entity_create('field_instance_config', $this->instanceDefinition)->save();
- entity_create('field_instance_config', $instance_definition_2)->save();
+ entity_create('field_config', $this->instanceDefinition)->save();
+ entity_create('field_config', $instance_definition_2)->save();
$field_storage->delete();
- $this->assertFalse(FieldInstanceConfig::loadByName('entity_test', $this->instanceDefinition['bundle'], $field_storage->name));
- $this->assertFalse(FieldInstanceConfig::loadByName('entity_test', $instance_definition_2['bundle'], $field_storage->name));
+ $this->assertFalse(FieldConfig::loadByName('entity_test', $this->instanceDefinition['bundle'], $field_storage->name));
+ $this->assertFalse(FieldConfig::loadByName('entity_test', $instance_definition_2['bundle'], $field_storage->name));
// Chack that deletion of the last instance deletes the field.
$field_storage = entity_create('field_storage_config', $this->fieldStorageDefinition);
$field_storage->save();
- $instance = entity_create('field_instance_config', $this->instanceDefinition);
+ $instance = entity_create('field_config', $this->instanceDefinition);
$instance->save();
- $instance_2 = entity_create('field_instance_config', $instance_definition_2);
+ $instance_2 = entity_create('field_config', $instance_definition_2);
$instance_2->save();
$instance->delete();
$this->assertTrue(FieldStorageConfig::loadByName('entity_test', $field_storage->name));
@@ -211,11 +211,11 @@ function testDeleteFieldInstanceCrossDeletion() {
// deletes the field.
$field_storage = entity_create('field_storage_config', $this->fieldStorageDefinition);
$field_storage->save();
- $instance = entity_create('field_instance_config', $this->instanceDefinition);
+ $instance = entity_create('field_config', $this->instanceDefinition);
$instance->save();
- $instance_2 = entity_create('field_instance_config', $instance_definition_2);
+ $instance_2 = entity_create('field_config', $instance_definition_2);
$instance_2->save();
- $this->container->get('entity.manager')->getStorage('field_instance_config')->delete(array($instance, $instance_2));
+ $this->container->get('entity.manager')->getStorage('field_config')->delete(array($instance, $instance_2));
$this->assertFalse(FieldStorageConfig::loadByName('entity_test', $field_storage->name));
}
diff --git a/core/modules/field/src/Tests/FieldDataCountTest.php b/core/modules/field/src/Tests/FieldDataCountTest.php
index 8e6e62e..4bac4ea 100644
--- a/core/modules/field/src/Tests/FieldDataCountTest.php
+++ b/core/modules/field/src/Tests/FieldDataCountTest.php
@@ -46,7 +46,7 @@ public function testEntityCountAndHasData() {
'cardinality' => 2,
));
$field_storage->save();
- entity_create('field_instance_config', array(
+ entity_create('field_config', array(
'field_storage' => $field_storage,
'bundle' => 'entity_test',
))->save();
diff --git a/core/modules/field/src/Tests/FieldImportChangeTest.php b/core/modules/field/src/Tests/FieldImportChangeTest.php
index fce8d0e..408cdb3 100644
--- a/core/modules/field/src/Tests/FieldImportChangeTest.php
+++ b/core/modules/field/src/Tests/FieldImportChangeTest.php
@@ -27,7 +27,7 @@ class FieldImportChangeTest extends FieldUnitTestBase {
function testImportChange() {
$field_id = 'field_test_import';
$instance_id = "entity_test.entity_test.$field_id";
- $instance_config_name = "field.instance.$instance_id";
+ $instance_config_name = "field.field.$instance_id";
// Import default config.
$this->installConfig(array('field_test_config'));
@@ -45,7 +45,7 @@ function testImportChange() {
$this->configImporter()->import();
// Check that the updated config was correctly imported.
- $instance = entity_load('field_instance_config', $instance_id);
+ $instance = entity_load('field_config', $instance_id);
$this->assertEqual($instance->getLabel(), $new_label, 'Instance label updated');
}
}
diff --git a/core/modules/field/src/Tests/FieldImportCreateTest.php b/core/modules/field/src/Tests/FieldImportCreateTest.php
index 4c56087..9625813 100644
--- a/core/modules/field/src/Tests/FieldImportCreateTest.php
+++ b/core/modules/field/src/Tests/FieldImportCreateTest.php
@@ -28,10 +28,10 @@ function testImportCreateDefault() {
// Check that the fields and instances do not exist yet.
$this->assertFalse(entity_load('field_storage_config', $field_id));
- $this->assertFalse(entity_load('field_instance_config', $instance_id));
+ $this->assertFalse(entity_load('field_config', $instance_id));
$this->assertFalse(entity_load('field_storage_config', $field_id_2));
- $this->assertFalse(entity_load('field_instance_config', $instance_id_2a));
- $this->assertFalse(entity_load('field_instance_config', $instance_id_2b));
+ $this->assertFalse(entity_load('field_config', $instance_id_2a));
+ $this->assertFalse(entity_load('field_config', $instance_id_2b));
// Create a second bundle for the 'Entity test' entity type.
entity_test_create_bundle('test_bundle');
@@ -43,7 +43,7 @@ function testImportCreateDefault() {
// A field with one instance.
$field_storage = entity_load('field_storage_config', $field_id);
$this->assertTrue($field_storage, 'The field was created.');
- $instance = entity_load('field_instance_config', $instance_id);
+ $instance = entity_load('field_config', $instance_id);
$this->assertTrue($instance, 'The field instance was deleted.');
// A field with multiple instances.
@@ -53,14 +53,14 @@ function testImportCreateDefault() {
$this->assertTrue($instance->bundle, 'test_bundle_2', 'The second field instance was created on bundle test_bundle_2.');
// Tests field instances.
- $ids = \Drupal::entityQuery('field_instance_config')
+ $ids = \Drupal::entityQuery('field_config')
->condition('entity_type', 'entity_test')
->condition('bundle', 'entity_test')
->execute();
$this->assertEqual(count($ids), 2);
$this->assertTrue(isset($ids['entity_test.entity_test.field_test_import']));
$this->assertTrue(isset($ids['entity_test.entity_test.field_test_import_2']));
- $ids = \Drupal::entityQuery('field_instance_config')
+ $ids = \Drupal::entityQuery('field_config')
->condition('entity_type', 'entity_test')
->condition('bundle', 'test_bundle')
->execute();
@@ -77,7 +77,7 @@ function testImportCreate() {
$field_id = "entity_test.$field_name";
$instance_id = "entity_test.entity_test.$field_name";
$field_storage_config_name = "field.storage.$field_id";
- $instance_config_name = "field.instance.$instance_id";
+ $instance_config_name = "field.field.$instance_id";
// One field with two field instances.
$field_name_2 = 'field_test_import_staging_2';
@@ -85,8 +85,8 @@ function testImportCreate() {
$instance_id_2a = "entity_test.test_bundle.$field_name_2";
$instance_id_2b = "entity_test.test_bundle_2.$field_name_2";
$field_storage_config_name_2 = "field.storage.$field_id_2";
- $instance_config_name_2a = "field.instance.$instance_id_2a";
- $instance_config_name_2b = "field.instance.$instance_id_2b";
+ $instance_config_name_2a = "field.field.$instance_id_2a";
+ $instance_config_name_2b = "field.field.$instance_id_2b";
$active = $this->container->get('config.storage');
$staging = $this->container->get('config.storage.staging');
@@ -107,13 +107,13 @@ function testImportCreate() {
// Check that the field and instance were created.
$field_storage = entity_load('field_storage_config', $field_id);
$this->assertTrue($field_storage, 'Test import field from staging exists');
- $instance = entity_load('field_instance_config', $instance_id);
+ $instance = entity_load('field_config', $instance_id);
$this->assertTrue($instance, 'Test import field instance from staging exists');
$field_storage = entity_load('field_storage_config', $field_id_2);
$this->assertTrue($field_storage, 'Test import field 2 from staging exists');
- $instance = entity_load('field_instance_config', $instance_id_2a);
+ $instance = entity_load('field_config', $instance_id_2a);
$this->assertTrue($instance, 'Test import field instance 2a from staging exists');
- $instance = entity_load('field_instance_config', $instance_id_2b);
+ $instance = entity_load('field_config', $instance_id_2b);
$this->assertTrue($instance, 'Test import field instance 2b from staging exists');
}
}
diff --git a/core/modules/field/src/Tests/FieldImportDeleteTest.php b/core/modules/field/src/Tests/FieldImportDeleteTest.php
index 4b077d3..e7050c3 100644
--- a/core/modules/field/src/Tests/FieldImportDeleteTest.php
+++ b/core/modules/field/src/Tests/FieldImportDeleteTest.php
@@ -31,9 +31,9 @@ public function testImportDelete() {
// storage.
// - field.storage.entity_test.field_test_import
// - field.storage.entity_test.field_test_import_2
- // - field.instance.entity_test.entity_test.field_test_import
- // - field.instance.entity_test.entity_test.field_test_import_2
- // - field.instance.entity_test.test_bundle.field_test_import_2
+ // - field.field.entity_test.entity_test.field_test_import
+ // - field.field.entity_test.entity_test.field_test_import_2
+ // - field.field.entity_test.test_bundle.field_test_import_2
$field_name = 'field_test_import';
$field_storage_id = "entity_test.$field_name";
@@ -44,9 +44,9 @@ public function testImportDelete() {
$instance_id_2b = "entity_test.test_bundle.$field_name_2";
$field_storage_config_name = "field.storage.$field_storage_id";
$field_storage_config_name_2 = "field.storage.$field_storage_id_2";
- $instance_config_name = "field.instance.$instance_id";
- $instance_config_name_2a = "field.instance.$instance_id_2a";
- $instance_config_name_2b = "field.instance.$instance_id_2b";
+ $instance_config_name = "field.field.$instance_id";
+ $instance_config_name_2a = "field.field.$instance_id_2a";
+ $instance_config_name_2b = "field.field.$instance_id_2b";
// Create a second bundle for the 'Entity test' entity type.
entity_test_create_bundle('test_bundle');
@@ -78,11 +78,11 @@ public function testImportDelete() {
$this->assertFalse($field_storage, 'The field was deleted.');
$field_storage_2 = entity_load('field_storage_config', $field_storage_id_2, TRUE);
$this->assertFalse($field_storage_2, 'The second field was deleted.');
- $instance = entity_load('field_instance_config', $instance_id, TRUE);
+ $instance = entity_load('field_config', $instance_id, TRUE);
$this->assertFalse($instance, 'The field instance was deleted.');
- $instance_2a = entity_load('field_instance_config', $instance_id_2a, TRUE);
+ $instance_2a = entity_load('field_config', $instance_id_2a, TRUE);
$this->assertFalse($instance_2a, 'The second field instance on test bundle was deleted.');
- $instance_2b = entity_load('field_instance_config', $instance_id_2b, TRUE);
+ $instance_2b = entity_load('field_config', $instance_id_2b, TRUE);
$this->assertFalse($instance_2b, 'The second field instance on test bundle 2 was deleted.');
// Check that all config files are gone.
diff --git a/core/modules/field/src/Tests/FieldImportDeleteUninstallTest.php b/core/modules/field/src/Tests/FieldImportDeleteUninstallTest.php
index c26d912..b822092 100644
--- a/core/modules/field/src/Tests/FieldImportDeleteUninstallTest.php
+++ b/core/modules/field/src/Tests/FieldImportDeleteUninstallTest.php
@@ -46,7 +46,7 @@ public function testImportDeleteUninstall() {
'type' => 'integer',
));
$unrelated_field_storage->save();
- entity_create('field_instance_config', array(
+ entity_create('field_config', array(
'field_storage' => $unrelated_field_storage,
'bundle' => 'entity_test',
))->save();
@@ -58,7 +58,7 @@ public function testImportDeleteUninstall() {
'type' => 'telephone',
));
$field_storage->save();
- entity_create('field_instance_config', array(
+ entity_create('field_config', array(
'field_storage' => $field_storage,
'bundle' => 'entity_test',
))->save();
@@ -92,7 +92,7 @@ public function testImportDeleteUninstall() {
// Stage the field deletion
$staging->delete('field.storage.entity_test.field_test');
- $staging->delete('field.instance.entity_test.entity_test.field_test');
+ $staging->delete('field.field.entity_test.entity_test.field_test');
$steps = $this->configImporter()->initialize();
$this->assertIdentical($steps[0], array('\Drupal\field\ConfigImporterFieldPurger', 'process'), 'The additional process configuration synchronization step has been added.');
@@ -120,7 +120,7 @@ public function testImportAlreadyDeletedUninstall() {
));
$field_storage->save();
$field_storage_uuid = $field_storage->uuid();
- entity_create('field_instance_config', array(
+ entity_create('field_config', array(
'field_storage' => $field_storage,
'bundle' => 'entity_test',
))->save();
diff --git a/core/modules/field/src/Tests/FieldImportDeleteUninstallUiTest.php b/core/modules/field/src/Tests/FieldImportDeleteUninstallUiTest.php
index bb333b0..8ddca9a 100644
--- a/core/modules/field/src/Tests/FieldImportDeleteUninstallUiTest.php
+++ b/core/modules/field/src/Tests/FieldImportDeleteUninstallUiTest.php
@@ -43,7 +43,7 @@ public function testImportDeleteUninstall() {
'type' => 'telephone',
));
$field_storage->save();
- entity_create('field_instance_config', array(
+ entity_create('field_config', array(
'field_storage' => $field_storage,
'bundle' => 'entity_test',
))->save();
@@ -55,7 +55,7 @@ public function testImportDeleteUninstall() {
'type' => 'text',
));
$text_field_storage->save();
- entity_create('field_instance_config', array(
+ entity_create('field_config', array(
'field_storage' => $text_field_storage,
'bundle' => 'entity_test',
))->save();
@@ -90,7 +90,7 @@ public function testImportDeleteUninstall() {
// Stage the field deletion
$staging->delete('field.storage.entity_test.field_tel');
- $staging->delete('field.instance.entity_test.entity_test.field_tel');
+ $staging->delete('field.field.entity_test.entity_test.field_tel');
$this->drupalGet('admin/config/development/configuration');
// Test that the message for one field being purged during a configuration
// synchronization is correct.
diff --git a/core/modules/field/src/Tests/FieldTypePluginManagerTest.php b/core/modules/field/src/Tests/FieldTypePluginManagerTest.php
index f079d3e..125ce3f 100644
--- a/core/modules/field/src/Tests/FieldTypePluginManagerTest.php
+++ b/core/modules/field/src/Tests/FieldTypePluginManagerTest.php
@@ -22,7 +22,7 @@ function testDefaultSettings() {
foreach (array('test_field', 'shape', 'hidden_test_field') as $type) {
$definition = $field_type_manager->getDefinition($type);
$this->assertIdentical($field_type_manager->getDefaultSettings($type), $definition['class']::defaultSettings(), format_string("field settings service returns %type's field settings", array('%type' => $type)));
- $this->assertIdentical($field_type_manager->getDefaultInstanceSettings($type), $definition['class']::defaultInstanceSettings(), format_string("field instance settings service returns %type's field instance settings", array('%type' => $type)));
+ $this->assertIdentical($field_type_manager->getDefaultFieldSettings($type), $definition['class']::defaultFieldSettings(), format_string("field instance settings service returns %type's field instance settings", array('%type' => $type)));
}
}
diff --git a/core/modules/field/src/Tests/FieldUnitTestBase.php b/core/modules/field/src/Tests/FieldUnitTestBase.php
index 9cf33d0..6f5cacb 100644
--- a/core/modules/field/src/Tests/FieldUnitTestBase.php
+++ b/core/modules/field/src/Tests/FieldUnitTestBase.php
@@ -96,7 +96,7 @@ protected function createFieldWithInstance($suffix = '', $entity_type = 'entity_
'test_instance_setting' => $this->randomMachineName(),
),
);
- $this->fieldTestData->$instance = entity_create('field_instance_config', $this->fieldTestData->$instance_definition);
+ $this->fieldTestData->$instance = entity_create('field_config', $this->fieldTestData->$instance_definition);
$this->fieldTestData->$instance->save();
entity_get_form_display($entity_type, $bundle, 'default')
diff --git a/core/modules/field/src/Tests/FormTest.php b/core/modules/field/src/Tests/FormTest.php
index ffdf25e..64cf6e2 100644
--- a/core/modules/field/src/Tests/FormTest.php
+++ b/core/modules/field/src/Tests/FormTest.php
@@ -94,7 +94,7 @@ function testFieldFormSingle() {
$field_name = $field_storage['name'];
$this->instance['field_name'] = $field_name;
entity_create('field_storage_config', $field_storage)->save();
- entity_create('field_instance_config', $this->instance)->save();
+ entity_create('field_config', $this->instance)->save();
entity_get_form_display($this->instance['entity_type'], $this->instance['bundle'], 'default')
->setComponent($field_name)
->save();
@@ -178,7 +178,7 @@ function testFieldFormDefaultValue() {
$default = rand(1, 127);
$this->instance['default_value'] = array(array('value' => $default));
entity_create('field_storage_config', $field_storage)->save();
- entity_create('field_instance_config', $this->instance)->save();
+ entity_create('field_config', $this->instance)->save();
entity_get_form_display($this->instance['entity_type'], $this->instance['bundle'], 'default')
->setComponent($field_name)
->save();
@@ -208,7 +208,7 @@ function testFieldFormSingleRequired() {
$this->instance['field_name'] = $field_name;
$this->instance['required'] = TRUE;
entity_create('field_storage_config', $field_storage)->save();
- entity_create('field_instance_config', $this->instance)->save();
+ entity_create('field_config', $this->instance)->save();
entity_get_form_display($this->instance['entity_type'], $this->instance['bundle'], 'default')
->setComponent($field_name)
->save();
@@ -248,7 +248,7 @@ function testFieldFormSingleRequired() {
// $field_name = $this->field['field_name'];
// $this->instance['field_name'] = $field_name;
// entity_create('field_storage_config', $this->field)->save();
-// entity_create('field_instance_config', $this->instance)->save();
+// entity_create('field_config', $this->instance)->save();
// }
function testFieldFormUnlimited() {
@@ -256,7 +256,7 @@ function testFieldFormUnlimited() {
$field_name = $field_storage['name'];
$this->instance['field_name'] = $field_name;
entity_create('field_storage_config', $field_storage)->save();
- entity_create('field_instance_config', $this->instance)->save();
+ entity_create('field_config', $this->instance)->save();
entity_get_form_display($this->instance['entity_type'], $this->instance['bundle'], 'default')
->setComponent($field_name)
->save();
@@ -342,7 +342,7 @@ function testFieldFormMultivalueWithRequiredRadio() {
$field_name = $field_storage['name'];
$this->instance['field_name'] = $field_name;
entity_create('field_storage_config', $field_storage)->save();
- entity_create('field_instance_config', $this->instance)->save();
+ entity_create('field_config', $this->instance)->save();
entity_get_form_display($this->instance['entity_type'], $this->instance['bundle'], 'default')
->setComponent($field_name)
->save();
@@ -362,7 +362,7 @@ function testFieldFormMultivalueWithRequiredRadio() {
'bundle' => 'entity_test',
'required' => TRUE,
);
- entity_create('field_instance_config', $instance)->save();
+ entity_create('field_config', $instance)->save();
entity_get_form_display($instance['entity_type'], $instance['bundle'], 'default')
->setComponent($instance['field_name'], array(
'type' => 'options_buttons',
@@ -389,7 +389,7 @@ function testFieldFormJSAddMore() {
$field_name = $field_storage['name'];
$this->instance['field_name'] = $field_name;
entity_create('field_storage_config', $field_storage)->save();
- entity_create('field_instance_config', $this->instance)->save();
+ entity_create('field_config', $this->instance)->save();
entity_get_form_display($this->instance['entity_type'], $this->instance['bundle'], 'default')
->setComponent($field_name)
->save();
@@ -450,7 +450,7 @@ function testFieldFormMultipleWidget() {
$field_name = $field_storage['name'];
$this->instance['field_name'] = $field_name;
entity_create('field_storage_config', $field_storage)->save();
- entity_create('field_instance_config', $this->instance)->save();
+ entity_create('field_config', $this->instance)->save();
entity_get_form_display($this->instance['entity_type'], $this->instance['bundle'], 'default')
->setComponent($field_name, array(
'type' => 'test_field_widget_multiple',
@@ -501,7 +501,7 @@ function testFieldFormAccess() {
$instance['entity_type'] = $entity_type;
$instance['bundle'] = $entity_type;
entity_create('field_storage_config', $field_storage)->save();
- entity_create('field_instance_config', $instance)->save();
+ entity_create('field_config', $instance)->save();
entity_get_form_display($entity_type, $entity_type, 'default')
->setComponent($field_name)
->save();
@@ -521,7 +521,7 @@ function testFieldFormAccess() {
'default_value' => array(0 => array('value' => 99)),
);
entity_create('field_storage_config', $field_storage_no_access)->save();
- entity_create('field_instance_config', $instance_no_access)->save();
+ entity_create('field_config', $instance_no_access)->save();
entity_get_form_display($instance_no_access['entity_type'], $instance_no_access['bundle'], 'default')
->setComponent($field_name_no_access)
->save();
@@ -590,7 +590,7 @@ function testHiddenField() {
$this->instance['entity_type'] = $entity_type;
$this->instance['bundle'] = $entity_type;
entity_create('field_storage_config', $field_storage)->save();
- $this->instance = entity_create('field_instance_config', $this->instance);
+ $this->instance = entity_create('field_config', $this->instance);
$this->instance->save();
// We explicitly do not assign a widget in a form display, so the field
// stays hidden in forms.
diff --git a/core/modules/field/src/Tests/NestedFormTest.php b/core/modules/field/src/Tests/NestedFormTest.php
index d6e4538..51a6584 100644
--- a/core/modules/field/src/Tests/NestedFormTest.php
+++ b/core/modules/field/src/Tests/NestedFormTest.php
@@ -61,13 +61,13 @@ function testNestedFieldForm() {
entity_create('field_storage_config', $this->fieldStorageUnlimited)->save();
$this->instance['field_name'] = 'field_single';
$this->instance['label'] = 'Single field';
- entity_create('field_instance_config', $this->instance)->save();
+ entity_create('field_config', $this->instance)->save();
entity_get_form_display($this->instance['entity_type'], $this->instance['bundle'], 'default')
->setComponent($this->instance['field_name'])
->save();
$this->instance['field_name'] = 'field_unlimited';
$this->instance['label'] = 'Unlimited field';
- entity_create('field_instance_config', $this->instance)->save();
+ entity_create('field_config', $this->instance)->save();
entity_get_form_display($this->instance['entity_type'], $this->instance['bundle'], 'default')
->setComponent($this->instance['field_name'])
->save();
diff --git a/core/modules/field/src/Tests/Number/NumberFieldTest.php b/core/modules/field/src/Tests/Number/NumberFieldTest.php
index bc02bf3..642efde 100644
--- a/core/modules/field/src/Tests/Number/NumberFieldTest.php
+++ b/core/modules/field/src/Tests/Number/NumberFieldTest.php
@@ -51,7 +51,7 @@ function testNumberDecimalField() {
'precision' => 8, 'scale' => 4, 'decimal_separator' => '.',
)
))->save();
- entity_create('field_instance_config', array(
+ entity_create('field_config', array(
'field_name' => $field_name,
'entity_type' => 'entity_test',
'bundle' => 'entity_test',
@@ -141,7 +141,7 @@ function testNumberIntegerField() {
'type' => 'integer',
))->save();
- entity_create('field_instance_config', array(
+ entity_create('field_config', array(
'field_name' => $field_name,
'entity_type' => 'entity_test',
'bundle' => 'entity_test',
@@ -245,7 +245,7 @@ function testNumberFloatField() {
'type' => 'float',
))->save();
- entity_create('field_instance_config', array(
+ entity_create('field_config', array(
'field_name' => $field_name,
'entity_type' => 'entity_test',
'bundle' => 'entity_test',
@@ -350,7 +350,7 @@ function testNumberFormatter() {
'type' => 'integer',
))->save();
- entity_create('field_instance_config', array(
+ entity_create('field_config', array(
'field_name' => $float_field,
'entity_type' => 'node',
'bundle' => $type,
@@ -360,7 +360,7 @@ function testNumberFormatter() {
),
))->save();
- entity_create('field_instance_config', array(
+ entity_create('field_config', array(
'field_name' => $integer_field,
'entity_type' => 'node',
'bundle' => $type,
diff --git a/core/modules/field/src/Tests/Number/NumberItemTest.php b/core/modules/field/src/Tests/Number/NumberItemTest.php
index 3121510..71b9469 100644
--- a/core/modules/field/src/Tests/Number/NumberItemTest.php
+++ b/core/modules/field/src/Tests/Number/NumberItemTest.php
@@ -35,7 +35,7 @@ public function setUp() {
'entity_type' => 'entity_test',
'type' => $type,
))->save();
- entity_create('field_instance_config', array(
+ entity_create('field_config', array(
'entity_type' => 'entity_test',
'field_name' => 'field_' . $type,
'bundle' => 'entity_test',
diff --git a/core/modules/field/src/Tests/ShapeItemTest.php b/core/modules/field/src/Tests/ShapeItemTest.php
index 19ce849..5d2b08b 100644
--- a/core/modules/field/src/Tests/ShapeItemTest.php
+++ b/core/modules/field/src/Tests/ShapeItemTest.php
@@ -40,7 +40,7 @@ public function setUp() {
'entity_type' => 'entity_test',
'type' => 'shape',
))->save();
- entity_create('field_instance_config', array(
+ entity_create('field_config', array(
'entity_type' => 'entity_test',
'field_name' => $this->field_name,
'bundle' => 'entity_test',
diff --git a/core/modules/field/src/Tests/TestItemTest.php b/core/modules/field/src/Tests/TestItemTest.php
index 348a1fc..840005c 100644
--- a/core/modules/field/src/Tests/TestItemTest.php
+++ b/core/modules/field/src/Tests/TestItemTest.php
@@ -41,7 +41,7 @@ public function setUp() {
'entity_type' => 'entity_test',
'type' => 'test_field',
))->save();
- entity_create('field_instance_config', array(
+ entity_create('field_config', array(
'entity_type' => 'entity_test',
'field_name' => $this->field_name,
'bundle' => 'entity_test',
diff --git a/core/modules/field/src/Tests/TranslationTest.php b/core/modules/field/src/Tests/TranslationTest.php
index f4dfb5f..d50ad59 100644
--- a/core/modules/field/src/Tests/TranslationTest.php
+++ b/core/modules/field/src/Tests/TranslationTest.php
@@ -66,7 +66,7 @@ class TranslationTest extends FieldUnitTestBase {
/**
* The field instance to use in this test.
*
- * @var \Drupal\field\Entity\FieldInstanceConfig
+ * @var \Drupal\field\Entity\FieldConfig
*/
protected $instance;
@@ -93,7 +93,7 @@ function setUp() {
'field_storage' => $this->fieldStorage,
'bundle' => 'entity_test',
);
- $this->instance = entity_create('field_instance_config', $this->instance_definition);
+ $this->instance = entity_create('field_config', $this->instance_definition);
$this->instance->save();
for ($i = 0; $i < 3; ++$i) {
@@ -148,7 +148,7 @@ function testTranslatableFieldSaveLoad() {
$instance_definition = $this->instance_definition;
$instance_definition['field_storage'] = $field_storage;
$instance_definition['default_value'] = array(array('value' => rand(1, 127)));
- $instance = entity_create('field_instance_config', $instance_definition);
+ $instance = entity_create('field_config', $instance_definition);
$instance->save();
$translation_langcodes = array_slice($available_langcodes, 0, 2);
diff --git a/core/modules/field/src/Tests/TranslationWebTest.php b/core/modules/field/src/Tests/TranslationWebTest.php
index 3a07147..d051987 100644
--- a/core/modules/field/src/Tests/TranslationWebTest.php
+++ b/core/modules/field/src/Tests/TranslationWebTest.php
@@ -47,7 +47,7 @@ class TranslationWebTest extends FieldTestBase {
/**
* The field instance to use in this test.
*
- * @var \Drupal\field\Entity\FieldInstanceConfig
+ * @var \Drupal\field\Entity\FieldConfig
*/
protected $instance;
@@ -70,8 +70,8 @@ function setUp() {
'field_storage' => $this->fieldStorage,
'bundle' => $this->entity_type,
);
- entity_create('field_instance_config', $instance)->save();
- $this->instance = entity_load('field_instance_config', $this->entity_type . '.' . $instance['bundle'] . '.' . $this->field_name);
+ entity_create('field_config', $instance)->save();
+ $this->instance = entity_load('field_config', $this->entity_type . '.' . $instance['bundle'] . '.' . $this->field_name);
entity_get_form_display($this->entity_type, $this->entity_type, 'default')
->setComponent($this->field_name)
diff --git a/core/modules/field/src/Tests/Views/ApiDataTest.php b/core/modules/field/src/Tests/Views/ApiDataTest.php
index dad9d20..558b6b2 100644
--- a/core/modules/field/src/Tests/Views/ApiDataTest.php
+++ b/core/modules/field/src/Tests/Views/ApiDataTest.php
@@ -26,7 +26,7 @@ function setUp() {
'entity_type' => 'node',
'bundle' => 'page',
);
- entity_create('field_instance_config', $instance)->save();
+ entity_create('field_config', $instance)->save();
// Now create some example nodes/users for the view result.
for ($i = 0; $i < 5; $i++) {
diff --git a/core/modules/field/src/Tests/Views/FieldTestBase.php b/core/modules/field/src/Tests/Views/FieldTestBase.php
index 43222e0..d6e220f 100644
--- a/core/modules/field/src/Tests/Views/FieldTestBase.php
+++ b/core/modules/field/src/Tests/Views/FieldTestBase.php
@@ -78,7 +78,7 @@ function setUpFields($amount = 3) {
function setUpInstances($bundle = 'page') {
foreach ($this->fieldStorages as $key => $field_storage) {
- $this->instances[$key] = entity_create('field_instance_config', array(
+ $this->instances[$key] = entity_create('field_config', array(
'field_storage' => $field_storage,
'bundle' => $bundle,
));
diff --git a/core/modules/field/src/Tests/reEnableModuleFieldTest.php b/core/modules/field/src/Tests/reEnableModuleFieldTest.php
index 752de05..b513c38 100644
--- a/core/modules/field/src/Tests/reEnableModuleFieldTest.php
+++ b/core/modules/field/src/Tests/reEnableModuleFieldTest.php
@@ -49,7 +49,7 @@ function testReEnabledField() {
'type' => 'telephone',
));
$field_storage->save();
- entity_create('field_instance_config', array(
+ entity_create('field_config', array(
'field_storage' => $field_storage,
'bundle' => 'article',
'label' => 'Telephone Number',
diff --git a/core/modules/field/tests/modules/field_test/src/Plugin/Field/FieldType/TestItem.php b/core/modules/field/tests/modules/field_test/src/Plugin/Field/FieldType/TestItem.php
index 5234964..b55b65b 100644
--- a/core/modules/field/tests/modules/field_test/src/Plugin/Field/FieldType/TestItem.php
+++ b/core/modules/field/tests/modules/field_test/src/Plugin/Field/FieldType/TestItem.php
@@ -39,11 +39,11 @@ public static function defaultSettings() {
/**
* {@inheritdoc}
*/
- public static function defaultInstanceSettings() {
+ public static function defaultFieldSettings() {
return array(
'test_instance_setting' => 'dummy test string',
'test_cached_data' => FALSE,
- ) + parent::defaultInstanceSettings();
+ ) + parent::defaultFieldSettings();
}
/**
@@ -92,7 +92,7 @@ public function settingsForm(array &$form, FormStateInterface $form_state, $has_
/**
* {@inheritdoc}
*/
- public function instanceSettingsForm(array $form, FormStateInterface $form_state) {
+ public function fieldSettingsForm(array $form, FormStateInterface $form_state) {
$form['test_instance_setting'] = array(
'#type' => 'textfield',
'#title' => t('Field test field instance setting'),
diff --git a/core/modules/field/tests/modules/field_test_config/config/install/field.instance.entity_test.entity_test.field_test_import.yml b/core/modules/field/tests/modules/field_test_config/config/install/field.field.entity_test.entity_test.field_test_import.yml
similarity index 100%
rename from core/modules/field/tests/modules/field_test_config/config/install/field.instance.entity_test.entity_test.field_test_import.yml
rename to core/modules/field/tests/modules/field_test_config/config/install/field.field.entity_test.entity_test.field_test_import.yml
diff --git a/core/modules/field/tests/modules/field_test_config/config/install/field.instance.entity_test.entity_test.field_test_import_2.yml b/core/modules/field/tests/modules/field_test_config/config/install/field.field.entity_test.entity_test.field_test_import_2.yml
similarity index 100%
rename from core/modules/field/tests/modules/field_test_config/config/install/field.instance.entity_test.entity_test.field_test_import_2.yml
rename to core/modules/field/tests/modules/field_test_config/config/install/field.field.entity_test.entity_test.field_test_import_2.yml
diff --git a/core/modules/field/tests/modules/field_test_config/config/install/field.instance.entity_test.test_bundle.field_test_import_2.yml b/core/modules/field/tests/modules/field_test_config/config/install/field.field.entity_test.test_bundle.field_test_import_2.yml
similarity index 100%
rename from core/modules/field/tests/modules/field_test_config/config/install/field.instance.entity_test.test_bundle.field_test_import_2.yml
rename to core/modules/field/tests/modules/field_test_config/config/install/field.field.entity_test.test_bundle.field_test_import_2.yml
diff --git a/core/modules/field/tests/modules/field_test_config/staging/field.instance.entity_test.entity_test.field_test_import_staging.yml b/core/modules/field/tests/modules/field_test_config/staging/field.field.entity_test.entity_test.field_test_import_staging.yml
similarity index 100%
rename from core/modules/field/tests/modules/field_test_config/staging/field.instance.entity_test.entity_test.field_test_import_staging.yml
rename to core/modules/field/tests/modules/field_test_config/staging/field.field.entity_test.entity_test.field_test_import_staging.yml
diff --git a/core/modules/field/tests/modules/field_test_config/staging/field.instance.entity_test.test_bundle.field_test_import_staging_2.yml b/core/modules/field/tests/modules/field_test_config/staging/field.field.entity_test.test_bundle.field_test_import_staging_2.yml
similarity index 100%
rename from core/modules/field/tests/modules/field_test_config/staging/field.instance.entity_test.test_bundle.field_test_import_staging_2.yml
rename to core/modules/field/tests/modules/field_test_config/staging/field.field.entity_test.test_bundle.field_test_import_staging_2.yml
diff --git a/core/modules/field/tests/modules/field_test_config/staging/field.instance.entity_test.test_bundle_2.field_test_import_staging_2.yml b/core/modules/field/tests/modules/field_test_config/staging/field.field.entity_test.test_bundle_2.field_test_import_staging_2.yml
similarity index 100%
rename from core/modules/field/tests/modules/field_test_config/staging/field.instance.entity_test.test_bundle_2.field_test_import_staging_2.yml
rename to core/modules/field/tests/modules/field_test_config/staging/field.field.entity_test.test_bundle_2.field_test_import_staging_2.yml
diff --git a/core/modules/field/tests/src/FieldInstanceConfigEntityUnitTest.php b/core/modules/field/tests/src/FieldConfigEntityUnitTest.php
similarity index 93%
rename from core/modules/field/tests/src/FieldInstanceConfigEntityUnitTest.php
rename to core/modules/field/tests/src/FieldConfigEntityUnitTest.php
index 76eae80..c01d0cb 100644
--- a/core/modules/field/tests/src/FieldInstanceConfigEntityUnitTest.php
+++ b/core/modules/field/tests/src/FieldConfigEntityUnitTest.php
@@ -2,21 +2,21 @@
/**
* @file
- * Contains \Drupal\field\Tests\FieldInstanceConfigEntityUnitTest.
+ * Contains \Drupal\field\Tests\FieldConfigEntityUnitTest.
*/
namespace Drupal\field\Tests;
use Drupal\Core\Language\LanguageInterface;
use Drupal\Core\DependencyInjection\ContainerBuilder;
-use Drupal\field\Entity\FieldInstanceConfig;
+use Drupal\field\Entity\FieldConfig;
use Drupal\Tests\UnitTestCase;
/**
- * @coversDefaultClass \Drupal\field\Entity\FieldInstanceConfig
+ * @coversDefaultClass \Drupal\field\Entity\FieldConfig
* @group field
*/
-class FieldInstanceConfigEntityUnitTest extends UnitTestCase {
+class FieldConfigEntityUnitTest extends UnitTestCase {
/**
* The entity type used for testing.
@@ -126,7 +126,7 @@ public function testCalculateDependencies() {
->will($this->returnValue('field.storage.test_entity_type.test_field'));
$values = array('field_name' => $this->fieldStorage->getName(), 'entity_type' => 'test_entity_type', 'bundle' => 'test_bundle');
- $entity = new FieldInstanceConfig($values, $this->entityTypeId);
+ $entity = new FieldConfig($values, $this->entityTypeId);
$dependencies = $entity->calculateDependencies();
$this->assertContains('field.storage.test_entity_type.test_field', $dependencies['entity']);
$this->assertContains('test.test_entity_type.id', $dependencies['entity']);
@@ -137,7 +137,7 @@ public function testCalculateDependencies() {
*/
public function testToArray() {
$values = array('field_name' => $this->fieldStorage->getName(), 'entity_type' => 'test_entity_type', 'bundle' => 'test_bundle');
- $instance = new FieldInstanceConfig($values, $this->entityTypeId);
+ $instance = new FieldConfig($values, $this->entityTypeId);
$expected = array(
'id' => 'test_entity_type.test_bundle.field_test',
diff --git a/core/modules/field_ui/field_ui.module b/core/modules/field_ui/field_ui.module
index 033832c..ca2ed47 100644
--- a/core/modules/field_ui/field_ui.module
+++ b/core/modules/field_ui/field_ui.module
@@ -109,8 +109,8 @@ function field_ui_element_info() {
*/
function field_ui_entity_type_build(array &$entity_types) {
/** @var $entity_types \Drupal\Core\Entity\EntityTypeInterface[] */
- $entity_types['field_instance_config']->setFormClass('delete', 'Drupal\field_ui\Form\FieldInstanceConfigDeleteForm');
- $entity_types['field_instance_config']->setListBuilderClass('Drupal\field_ui\FieldInstanceConfigListBuilder');
+ $entity_types['field_config']->setFormClass('delete', 'Drupal\field_ui\Form\FieldConfigDeleteForm');
+ $entity_types['field_config']->setListBuilderClass('Drupal\field_ui\FieldConfigListBuilder');
$entity_types['field_storage_config']->setListBuilderClass('Drupal\field_ui\FieldStorageConfigListBuilder');
foreach ($entity_types as $entity_type) {
diff --git a/core/modules/field_ui/src/DisplayOverviewBase.php b/core/modules/field_ui/src/DisplayOverviewBase.php
index 5e3b26f..7f14817 100644
--- a/core/modules/field_ui/src/DisplayOverviewBase.php
+++ b/core/modules/field_ui/src/DisplayOverviewBase.php
@@ -507,7 +507,7 @@ public function submitForm(array &$form, FormStateInterface $form_state) {
// Collect data for 'regular' fields.
foreach ($form['#fields'] as $field_name) {
- // Retrieve the stored instance settings to merge with the incoming
+ // Retrieve the stored field settings to merge with the incoming
// values.
$values = $form_values['fields'][$field_name];
@@ -715,7 +715,7 @@ protected function getExtraFields() {
* Returns the widget or formatter plugin for a field.
*
* @param \Drupal\Core\Field\FieldDefinitionInterface $field_definition
- * The field instance.
+ * The field.
* @param array $configuration
* The plugin configuration
*
diff --git a/core/modules/field_ui/src/FieldInstanceConfigListBuilder.php b/core/modules/field_ui/src/FieldConfigListBuilder.php
similarity index 79%
rename from core/modules/field_ui/src/FieldInstanceConfigListBuilder.php
rename to core/modules/field_ui/src/FieldConfigListBuilder.php
index 74252e0..f4f76b5 100644
--- a/core/modules/field_ui/src/FieldInstanceConfigListBuilder.php
+++ b/core/modules/field_ui/src/FieldConfigListBuilder.php
@@ -2,7 +2,7 @@
/**
* @file
- * Contains \Drupal\field_ui\FieldInstanceConfigListBuilder.
+ * Contains \Drupal\field_ui\FieldConfigListBuilder.
*/
namespace Drupal\field_ui;
@@ -14,9 +14,9 @@
use Symfony\Component\DependencyInjection\ContainerInterface;
/**
- * Provides lists of field instance config entities.
+ * Provides lists of field config entities.
*/
-class FieldInstanceConfigListBuilder extends ConfigEntityListBuilder {
+class FieldConfigListBuilder extends ConfigEntityListBuilder {
/**
* The entity manager.
@@ -49,7 +49,7 @@ public static function createInstance(ContainerInterface $container, EntityTypeI
* {@inheritdoc}
*/
public function render() {
- // The actual field instance config overview is rendered by
+ // The actual field config overview is rendered by
// \Drupal\field_ui\FieldOverview, so we should not use this class to build
// lists.
throw new \Exception('This class is only used for operations and not for building lists.');
@@ -59,16 +59,16 @@ public function render() {
* {@inheritdoc}
*/
public function getDefaultOperations(EntityInterface $entity) {
- /** @var \Drupal\field\FieldInstanceConfigInterface $entity */
+ /** @var \Drupal\field\FieldConfigInterface $entity */
$operations = parent::getDefaultOperations($entity);
$operations['storage-settings'] = array(
- 'title' => $this->t('Field settings'),
+ 'title' => $this->t('Storage settings'),
'weight' => 20,
- 'attributes' => array('title' => $this->t('Edit field settings.')),
+ 'attributes' => array('title' => $this->t('Edit storage settings.')),
) + $entity->urlInfo('storage-edit-form')->toArray();
- $operations['edit']['attributes']['title'] = $this->t('Edit instance settings.');
- $operations['delete']['attributes']['title'] = $this->t('Delete instance.');
+ $operations['edit']['attributes']['title'] = $this->t('Edit field settings.');
+ $operations['delete']['attributes']['title'] = $this->t('Delete field.');
return $operations;
}
diff --git a/core/modules/field_ui/src/FieldOverview.php b/core/modules/field_ui/src/FieldOverview.php
index 6d5f15f..a9f6718 100644
--- a/core/modules/field_ui/src/FieldOverview.php
+++ b/core/modules/field_ui/src/FieldOverview.php
@@ -17,7 +17,7 @@
use Drupal\field_ui\OverviewBase;
use Symfony\Component\DependencyInjection\ContainerInterface;
use Drupal\field\Entity\FieldStorageConfig;
-use Drupal\field\FieldInstanceConfigInterface;
+use Drupal\field\FieldConfigInterface;
/**
* Field UI field overview form.
@@ -83,7 +83,7 @@ public function buildForm(array $form, FormStateInterface $form_state, $entity_t
// Gather bundle information.
$instances = array_filter(\Drupal::entityManager()->getFieldDefinitions($this->entity_type, $this->bundle), function ($field_definition) {
- return $field_definition instanceof FieldInstanceConfigInterface;
+ return $field_definition instanceof FieldConfigInterface;
});
$field_types = $this->fieldTypeManager->getDefinitions();
@@ -120,7 +120,7 @@ public function buildForm(array $form, FormStateInterface $form_state, $entity_t
$field_storage = $instance->getFieldStorageDefinition();
$route_parameters = array(
$this->bundleEntityType => $this->bundle,
- 'field_instance_config' => $instance->id(),
+ 'field_config' => $instance->id(),
);
$table[$name] = array(
'#attributes' => array(
@@ -143,7 +143,7 @@ public function buildForm(array $form, FormStateInterface $form_state, $entity_t
$table[$name]['operations']['data'] = array(
'#type' => 'operations',
- '#links' => $this->entityManager->getListBuilder('field_instance_config')->getOperations($instance),
+ '#links' => $this->entityManager->getListBuilder('field_config')->getOperations($instance),
);
if (!empty($field_storage->locked)) {
@@ -387,7 +387,7 @@ public function submitForm(array &$form, FormStateInterface $form_state) {
// Create the field and instance.
try {
$this->entityManager->getStorage('field_storage_config')->create($field_storage)->save();
- $new_instance = $this->entityManager->getStorage('field_instance_config')->create($instance);
+ $new_instance = $this->entityManager->getStorage('field_config')->create($instance);
$new_instance->save();
// Make sure the field is displayed in the 'default' form mode (using
@@ -408,10 +408,10 @@ public function submitForm(array &$form, FormStateInterface $form_state) {
// configured for new fields.
$route_parameters = array(
$this->bundleEntityType => $this->bundle,
- 'field_instance_config' => $new_instance->id(),
+ 'field_config' => $new_instance->id(),
);
$destinations[] = array('route_name' => 'field_ui.storage_edit_' . $this->entity_type, 'route_parameters' => $route_parameters);
- $destinations[] = array('route_name' => 'field_ui.instance_edit_' . $this->entity_type, 'route_parameters' => $route_parameters);
+ $destinations[] = array('route_name' => 'field_ui.field_edit_' . $this->entity_type, 'route_parameters' => $route_parameters);
// Store new field information for any additional submit handlers.
$form_state['fields_added']['_add_new_field'] = $values['field_name'];
@@ -439,7 +439,7 @@ public function submitForm(array &$form, FormStateInterface $form_state) {
);
try {
- $new_instance = $this->entityManager->getStorage('field_instance_config')->create($instance);
+ $new_instance = $this->entityManager->getStorage('field_config')->create($instance);
$new_instance->save();
// Make sure the field is displayed in the 'default' form mode (using
@@ -457,10 +457,10 @@ public function submitForm(array &$form, FormStateInterface $form_state) {
->save();
$destinations[] = array(
- 'route_name' => 'field_ui.instance_edit_' . $this->entity_type,
+ 'route_name' => 'field_ui.field_edit_' . $this->entity_type,
'route_parameters' => array(
$this->bundleEntityType => $this->bundle,
- 'field_instance_config' => $new_instance->id(),
+ 'field_config' => $new_instance->id(),
),
);
// Store new field information for any additional submit handlers.
@@ -508,7 +508,7 @@ protected function getExistingFieldOptions() {
// Load the instances and build the list of options.
if ($instance_ids) {
$field_types = $this->fieldTypeManager->getDefinitions();
- $instances = $this->entityManager->getStorage('field_instance_config')->loadMultiple($instance_ids);
+ $instances = $this->entityManager->getStorage('field_config')->loadMultiple($instance_ids);
foreach ($instances as $instance) {
// Do not show:
// - locked fields,
diff --git a/core/modules/field_ui/src/Form/FieldInstanceConfigDeleteForm.php b/core/modules/field_ui/src/Form/FieldConfigDeleteForm.php
similarity index 89%
rename from core/modules/field_ui/src/Form/FieldInstanceConfigDeleteForm.php
rename to core/modules/field_ui/src/Form/FieldConfigDeleteForm.php
index 97470db..4599954 100644
--- a/core/modules/field_ui/src/Form/FieldInstanceConfigDeleteForm.php
+++ b/core/modules/field_ui/src/Form/FieldConfigDeleteForm.php
@@ -2,7 +2,7 @@
/**
* @file
- * Contains \Drupal\field_ui\Form\FieldInstanceConfigDeleteForm.
+ * Contains \Drupal\field_ui\Form\FieldConfigDeleteForm.
*/
namespace Drupal\field_ui\Form;
@@ -14,9 +14,9 @@
use Symfony\Component\DependencyInjection\ContainerInterface;
/**
- * Provides a form for removing a field instance from a bundle.
+ * Provides a form for removing a field from a bundle.
*/
-class FieldInstanceConfigDeleteForm extends EntityConfirmFormBase {
+class FieldConfigDeleteForm extends EntityConfirmFormBase {
/**
* The entity manager.
@@ -26,7 +26,7 @@ class FieldInstanceConfigDeleteForm extends EntityConfirmFormBase {
protected $entityManager;
/**
- * Constructs a new FieldInstanceConfigDeleteForm object.
+ * Constructs a new FieldConfigDeleteForm object.
*
* @param \Drupal\Core\Entity\EntityManagerInterface $entity_manager
* The entity manager.
@@ -88,7 +88,7 @@ public function submit(array $form, FormStateInterface $form_state) {
// purged. In the case that a field has minimal or no content, a single call
// to field_purge_batch() will remove it from the system. Call this with a
// low batch limit to avoid administrators having to wait for cron runs when
- // removing instances that meet this criteria.
+ // removing fields that meet this criteria.
field_purge_batch(10);
}
diff --git a/core/modules/field_ui/src/Form/FieldInstanceEditForm.php b/core/modules/field_ui/src/Form/FieldEditForm.php
similarity index 54%
rename from core/modules/field_ui/src/Form/FieldInstanceEditForm.php
rename to core/modules/field_ui/src/Form/FieldEditForm.php
index 4fc453c..017b450 100644
--- a/core/modules/field_ui/src/Form/FieldInstanceEditForm.php
+++ b/core/modules/field_ui/src/Form/FieldEditForm.php
@@ -2,7 +2,7 @@
/**
* @file
- * Contains \Drupal\field_ui\Form\FieldInstanceEditForm.
+ * Contains \Drupal\field_ui\Form\FieldEditForm.
*/
namespace Drupal\field_ui\Form;
@@ -11,21 +11,21 @@
use Drupal\Core\Form\FormBase;
use Drupal\Component\Utility\String;
use Drupal\Core\Form\FormStateInterface;
-use Drupal\field\FieldInstanceConfigInterface;
+use Drupal\field\FieldConfigInterface;
use Drupal\field_ui\FieldUI;
use Symfony\Component\DependencyInjection\ContainerInterface;
/**
- * Provides a form for the field instance settings form.
+ * Provides a form for the field settings form.
*/
-class FieldInstanceEditForm extends FormBase {
+class FieldEditForm extends FormBase {
/**
- * The field instance being edited.
+ * The field being edited.
*
- * @var \Drupal\field\FieldInstanceConfigInterface
+ * @var \Drupal\field\FieldConfigInterface
*/
- protected $instance;
+ protected $field;
/**
* The entity manager.
@@ -35,7 +35,7 @@ class FieldInstanceEditForm extends FormBase {
protected $entityManager;
/**
- * Constructs a new field instance form.
+ * Constructs a new field form.
*
* @param \Drupal\Core\Entity\EntityManagerInterface $entity_manager
* The entity manager.
@@ -57,86 +57,86 @@ public static function create(ContainerInterface $container) {
* {@inheritdoc}
*/
public function getFormId() {
- return 'field_ui_field_instance_edit_form';
+ return 'field_ui_field_edit_form';
}
/**
* {@inheritdoc}
*/
- public function buildForm(array $form, FormStateInterface $form_state, FieldInstanceConfigInterface $field_instance_config = NULL) {
- $this->instance = $form_state['instance'] = $field_instance_config;
+ public function buildForm(array $form, FormStateInterface $form_state, FieldConfigInterface $field_config = NULL) {
+ $this->field = $form_state['field'] = $field_config;
- $bundle = $this->instance->bundle;
- $entity_type = $this->instance->entity_type;
- $field_storage = $this->instance->getFieldStorageDefinition();
+ $bundle = $this->field->bundle;
+ $entity_type = $this->field->entity_type;
+ $field_storage = $this->field->getFieldStorageDefinition();
$bundles = entity_get_bundles();
- $form_title = $this->t('%instance settings for %bundle', array(
- '%instance' => $this->instance->getLabel(),
+ $form_title = $this->t('%field settings for %bundle', array(
+ '%field' => $this->field->getLabel(),
'%bundle' => $bundles[$entity_type][$bundle]['label'],
));
$form['#title'] = $form_title;
$form['#field'] = $field_storage;
// Create an arbitrary entity object (used by the 'default value' widget).
- $ids = (object) array('entity_type' => $this->instance->entity_type, 'bundle' => $this->instance->bundle, 'entity_id' => NULL);
+ $ids = (object) array('entity_type' => $this->field->entity_type, 'bundle' => $this->field->bundle, 'entity_id' => NULL);
$form['#entity'] = _field_create_entity_from_ids($ids);
- $items = $form['#entity']->get($this->instance->getName());
+ $items = $form['#entity']->get($this->field->getName());
if (!empty($field_storage->locked)) {
$form['locked'] = array(
- '#markup' => $this->t('The field %field is locked and cannot be edited.', array('%field' => $this->instance->getLabel())),
+ '#markup' => $this->t('The field %field is locked and cannot be edited.', array('%field' => $this->field->getLabel())),
);
return $form;
}
- // Create a form structure for the instance values.
- $form['instance'] = array(
+ // Create a form structure for the field values.
+ $form['field'] = array(
'#tree' => TRUE,
);
- // Build the non-configurable instance values.
- $form['instance']['field_name'] = array(
+ // Build the non-configurable field values.
+ $form['field']['field_name'] = array(
'#type' => 'value',
- '#value' => $this->instance->getName(),
+ '#value' => $this->field->getName(),
);
- $form['instance']['entity_type'] = array(
+ $form['field']['entity_type'] = array(
'#type' => 'value',
'#value' => $entity_type,
);
- $form['instance']['bundle'] = array(
+ $form['field']['bundle'] = array(
'#type' => 'value',
'#value' => $bundle,
);
- // Build the configurable instance values.
- $form['instance']['label'] = array(
+ // Build the configurable field values.
+ $form['field']['label'] = array(
'#type' => 'textfield',
'#title' => $this->t('Label'),
- '#default_value' => $this->instance->getLabel() ?: $field_storage->getName(),
+ '#default_value' => $this->field->getLabel() ?: $field_storage->getName(),
'#required' => TRUE,
'#weight' => -20,
);
- $form['instance']['description'] = array(
+ $form['field']['description'] = array(
'#type' => 'textarea',
'#title' => $this->t('Help text'),
- '#default_value' => $this->instance->getDescription(),
+ '#default_value' => $this->field->getDescription(),
'#rows' => 5,
'#description' => $this->t('Instructions to present to the user below this field on the editing form.
Allowed HTML tags: @tags', array('@tags' => _field_filter_xss_display_allowed_tags())) . '
' . $this->t('This field supports tokens.'),
'#weight' => -10,
);
- $form['instance']['required'] = array(
+ $form['field']['required'] = array(
'#type' => 'checkbox',
'#title' => $this->t('Required field'),
- '#default_value' => $this->instance->isRequired(),
+ '#default_value' => $this->field->isRequired(),
'#weight' => -5,
);
- // Add instance settings for the field type.
- $form['instance']['settings'] = $items[0]->instanceSettingsForm($form, $form_state);
- $form['instance']['settings']['#weight'] = 10;
+ // Add field settings for the field type.
+ $form['field']['settings'] = $items[0]->fieldSettingsForm($form, $form_state);
+ $form['field']['settings']['#weight'] = 10;
// Add handling for default value.
if ($element = $items->defaultValuesForm($form, $form_state)) {
@@ -146,7 +146,7 @@ public function buildForm(array $form, FormStateInterface $form_state, FieldInst
'#open' => TRUE,
'#description' => $this->t('The default value for this field, used when creating new content.'),
);
- $form['instance']['default_value'] = $element;
+ $form['field']['default_value'] = $element;
}
$form['actions'] = array('#type' => 'actions');
@@ -166,9 +166,9 @@ public function buildForm(array $form, FormStateInterface $form_state, FieldInst
* {@inheritdoc}
*/
public function validateForm(array &$form, FormStateInterface $form_state) {
- if (isset($form['instance']['default_value'])) {
- $items = $form['#entity']->get($this->instance->getName());
- $items->defaultValuesFormValidate($form['instance']['default_value'], $form, $form_state);
+ if (isset($form['field']['default_value'])) {
+ $items = $form['#entity']->get($this->field->getName());
+ $items->defaultValuesFormValidate($form['field']['default_value'], $form, $form_state);
}
}
@@ -178,19 +178,19 @@ public function validateForm(array &$form, FormStateInterface $form_state) {
public function submitForm(array &$form, FormStateInterface $form_state) {
// Handle the default value.
$default_value = array();
- if (isset($form['instance']['default_value'])) {
- $items = $form['#entity']->get($this->instance->getName());
- $default_value = $items->defaultValuesFormSubmit($form['instance']['default_value'], $form, $form_state);
+ if (isset($form['field']['default_value'])) {
+ $items = $form['#entity']->get($this->field->getName());
+ $default_value = $items->defaultValuesFormSubmit($form['field']['default_value'], $form, $form_state);
}
- $this->instance->default_value = $default_value;
+ $this->field->default_value = $default_value;
- // Merge incoming values into the instance.
- foreach ($form_state->getValue('instance') as $key => $value) {
- $this->instance->$key = $value;
+ // Merge incoming values into the field.
+ foreach ($form_state->getValue('field') as $key => $value) {
+ $this->field->$key = $value;
}
- $this->instance->save();
+ $this->field->save();
- drupal_set_message($this->t('Saved %label configuration.', array('%label' => $this->instance->getLabel())));
+ drupal_set_message($this->t('Saved %label configuration.', array('%label' => $this->field->getLabel())));
$request = $this->getRequest();
if (($destinations = $request->query->get('destinations')) && $next_destination = FieldUI::getNextDestination($destinations)) {
@@ -198,12 +198,12 @@ public function submitForm(array &$form, FormStateInterface $form_state) {
$form_state->setRedirectUrl($next_destination);
}
else {
- $form_state->setRedirectUrl(FieldUI::getOverviewRouteInfo($this->instance->entity_type, $this->instance->bundle));
+ $form_state->setRedirectUrl(FieldUI::getOverviewRouteInfo($this->field->entity_type, $this->field->bundle));
}
}
/**
- * Redirects to the field instance deletion form.
+ * Redirects to the field deletion form.
*/
public function delete(array &$form, FormStateInterface $form_state) {
$destination = array();
@@ -212,28 +212,28 @@ public function delete(array &$form, FormStateInterface $form_state) {
$destination = drupal_get_destination();
$request->query->remove('destination');
}
- $entity_type = $this->entityManager->getDefinition($this->instance->entity_type);
+ $entity_type = $this->entityManager->getDefinition($this->field->entity_type);
$form_state->setRedirect(
- 'field_ui.delete_' . $this->instance->entity_type,
+ 'field_ui.delete_' . $this->field->entity_type,
array(
- $entity_type->getBundleEntityType() => $this->instance->bundle,
- 'field_instance_config' => $this->instance->id(),
+ $entity_type->getBundleEntityType() => $this->field->bundle,
+ 'field_config' => $this->field->id(),
),
array('query' => $destination)
);
}
/**
- * The _title_callback for the field instance settings form.
+ * The _title_callback for the field settings form.
*
- * @param \Drupal\field\FieldInstanceConfigInterface $field_instance_config
- * The field instance.
+ * @param \Drupal\field\FieldConfigInterface $field_config
+ * The field.
*
* @return string
- * The label of the field instance.
+ * The label of the field.
*/
- public function getTitle(FieldInstanceConfigInterface $field_instance_config) {
- return String::checkPlain($field_instance_config->label());
+ public function getTitle(FieldConfigInterface $field_config) {
+ return String::checkPlain($field_config->label());
}
}
diff --git a/core/modules/field_ui/src/Form/FieldStorageEditForm.php b/core/modules/field_ui/src/Form/FieldStorageEditForm.php
index 903a614..7cdee13 100644
--- a/core/modules/field_ui/src/Form/FieldStorageEditForm.php
+++ b/core/modules/field_ui/src/Form/FieldStorageEditForm.php
@@ -12,7 +12,7 @@
use Drupal\Core\Form\FormBase;
use Drupal\Core\Form\FormStateInterface;
use Drupal\Core\TypedData\TypedDataManager;
-use Drupal\field\FieldInstanceConfigInterface;
+use Drupal\field\FieldConfigInterface;
use Drupal\field_ui\FieldUI;
use Symfony\Component\DependencyInjection\ContainerInterface;
@@ -24,7 +24,7 @@ class FieldStorageEditForm extends FormBase {
/**
* The field instance being edited.
*
- * @var \Drupal\field\FieldInstanceConfigInterface
+ * @var \Drupal\field\FieldConfigInterface
*/
protected $instance;
@@ -75,8 +75,8 @@ public static function create(ContainerInterface $container) {
/**
* {@inheritdoc}
*/
- public function buildForm(array $form, FormStateInterface $form_state, FieldInstanceConfigInterface $field_instance_config = NULL) {
- $this->instance = $form_state['instance'] = $field_instance_config;
+ public function buildForm(array $form, FormStateInterface $form_state, FieldConfigInterface $field_config = NULL) {
+ $this->instance = $form_state['instance'] = $field_config;
$form['#title'] = $this->instance->label();
$field_storage = $this->instance->getFieldStorageDefinition();
diff --git a/core/modules/field_ui/src/Plugin/Derivative/FieldUiLocalTask.php b/core/modules/field_ui/src/Plugin/Derivative/FieldUiLocalTask.php
index 35d0218..1d242fb 100644
--- a/core/modules/field_ui/src/Plugin/Derivative/FieldUiLocalTask.php
+++ b/core/modules/field_ui/src/Plugin/Derivative/FieldUiLocalTask.php
@@ -93,18 +93,18 @@ public function getDerivativeDefinitions($base_plugin_definition) {
'base_route' => "field_ui.overview_$entity_type_id",
);
- // Field instance edit tab.
- $this->derivatives["instance_edit_$entity_type_id"] = array(
- 'route_name' => "field_ui.instance_edit_$entity_type_id",
+ // Field edit tab.
+ $this->derivatives["field_edit_$entity_type_id"] = array(
+ 'route_name' => "field_ui.field_edit_$entity_type_id",
'title' => $this->t('Edit'),
- 'base_route' => "field_ui.instance_edit_$entity_type_id",
+ 'base_route' => "field_ui.field_edit_$entity_type_id",
);
// Field settings tab.
$this->derivatives["field_edit_$entity_type_id"] = array(
'route_name' => "field_ui.storage_edit_$entity_type_id",
'title' => $this->t('Field settings'),
- 'base_route' => "field_ui.instance_edit_$entity_type_id",
+ 'base_route' => "field_ui.field_edit_$entity_type_id",
);
// View and form modes secondary tabs.
diff --git a/core/modules/field_ui/src/Routing/RouteSubscriber.php b/core/modules/field_ui/src/Routing/RouteSubscriber.php
index 9820438..dd25004 100644
--- a/core/modules/field_ui/src/Routing/RouteSubscriber.php
+++ b/core/modules/field_ui/src/Routing/RouteSubscriber.php
@@ -56,28 +56,28 @@ protected function alterRoutes(RouteCollection $collection) {
}
$route = new Route(
- "$path/fields/{field_instance_config}",
+ "$path/fields/{field_config}",
array(
- '_form' => '\Drupal\field_ui\Form\FieldInstanceEditForm',
- '_title_callback' => '\Drupal\field_ui\Form\FieldInstanceEditForm::getTitle',
+ '_form' => '\Drupal\field_ui\Form\FieldEditForm',
+ '_title_callback' => '\Drupal\field_ui\Form\FieldEditForm::getTitle',
),
- array('_entity_access' => 'field_instance_config.update'),
+ array('_entity_access' => 'field_config.update'),
$options
);
- $collection->add("field_ui.instance_edit_$entity_type_id", $route);
+ $collection->add("field_ui.field_edit_$entity_type_id", $route);
$route = new Route(
- "$path/fields/{field_instance_config}/storage",
+ "$path/fields/{field_config}/storage",
array('_form' => '\Drupal\field_ui\Form\FieldStorageEditForm'),
- array('_entity_access' => 'field_instance_config.update'),
+ array('_entity_access' => 'field_config.update'),
$options
);
$collection->add("field_ui.storage_edit_$entity_type_id", $route);
$route = new Route(
- "$path/fields/{field_instance_config}/delete",
- array('_entity_form' => 'field_instance_config.delete'),
- array('_entity_access' => 'field_instance_config.delete'),
+ "$path/fields/{field_config}/delete",
+ array('_entity_form' => 'field_config.delete'),
+ array('_entity_access' => 'field_config.delete'),
$options
);
$collection->add("field_ui.delete_$entity_type_id", $route);
diff --git a/core/modules/field_ui/src/Tests/ManageFieldsTest.php b/core/modules/field_ui/src/Tests/ManageFieldsTest.php
index 207626c..21fe36b 100644
--- a/core/modules/field_ui/src/Tests/ManageFieldsTest.php
+++ b/core/modules/field_ui/src/Tests/ManageFieldsTest.php
@@ -10,7 +10,7 @@
use Drupal\Component\Utility\String;
use Drupal\Core\Field\FieldStorageDefinitionInterface;
use Drupal\Core\Language\LanguageInterface;
-use Drupal\field\Entity\FieldInstanceConfig;
+use Drupal\field\Entity\FieldConfig;
use Drupal\field\Entity\FieldStorageConfig;
/**
@@ -46,7 +46,7 @@ function setUp() {
'type' => 'taxonomy_term_reference',
))->save();
- entity_create('field_instance_config', array(
+ entity_create('field_config', array(
'field_name' => 'field_' . $vocabulary->id(),
'entity_type' => 'node',
'label' => 'Tags',
@@ -71,7 +71,7 @@ function testCRUDFields() {
$this->addExistingField();
$this->cardinalitySettings();
$this->fieldListAdminPage();
- $this->deleteFieldInstance();
+ $this->deleteField();
}
/**
@@ -142,7 +142,7 @@ function updateField() {
// Go to the field instance edit page.
$this->drupalGet('admin/structure/types/manage/' . $this->type . '/fields/' . $instance_id);
$edit = array(
- 'instance[settings][test_instance_setting]' => $string,
+ 'field[settings][test_instance_setting]' => $string,
);
$this->drupalPostForm(NULL, $edit, t('Save settings'));
@@ -214,9 +214,9 @@ function cardinalitySettings() {
}
/**
- * Tests deleting a field from the instance edit form.
+ * Tests deleting a field from the field edit form.
*/
- protected function deleteFieldInstance() {
+ protected function deleteField() {
// Delete the field instance.
$instance_id = 'node.' . $this->type . '.' . $this->field_name;
$this->drupalGet('admin/structure/types/manage/' . $this->type . '/fields/' . $instance_id);
@@ -242,7 +242,7 @@ function assertFieldSettings($bundle, $field_name, $string = 'dummy test string'
$this->assertTrue($field_storage->getSetting('test_field_storage_setting') == $string, 'Field storage settings were found.');
// Assert instance settings.
- $instance = FieldInstanceConfig::loadByName($entity_type, $bundle, $field_name);
+ $instance = FieldConfig::loadByName($entity_type, $bundle, $field_name);
$this->assertTrue($instance->getSetting('test_instance_setting') == $string, 'Field instance settings were found.');
}
@@ -287,7 +287,7 @@ function testDefaultValue() {
'entity_type' => 'node',
'type' => 'test_field'
))->save();
- $instance = entity_create('field_instance_config', array(
+ $instance = entity_create('field_config', array(
'field_name' => $field_name,
'entity_type' => 'node',
'bundle' => $this->type,
@@ -313,7 +313,7 @@ function testDefaultValue() {
$edit = array($element_name => '1');
$this->drupalPostForm($admin_path, $edit, t('Save settings'));
$this->assertText("Saved $field_name configuration", 'The form was successfully submitted.');
- $instance = FieldInstanceConfig::loadByName('node', $this->type, $field_name);
+ $instance = FieldConfig::loadByName('node', $this->type, $field_name);
$this->assertEqual($instance->default_value, array(array('value' => 1)), 'The default value was correctly saved.');
// Check that the default value shows up in the form
@@ -324,7 +324,7 @@ function testDefaultValue() {
$edit = array($element_name => '');
$this->drupalPostForm(NULL, $edit, t('Save settings'));
$this->assertText("Saved $field_name configuration", 'The form was successfully submitted.');
- $instance = FieldInstanceConfig::loadByName('node', $this->type, $field_name);
+ $instance = FieldConfig::loadByName('node', $this->type, $field_name);
$this->assertEqual($instance->default_value, NULL, 'The default value was correctly saved.');
// Check that the default widget is used when the field is hidden.
@@ -363,7 +363,7 @@ function testDeleteField() {
$this->fieldUIDeleteField($bundle_path1, "node.$this->type.$this->field_name", $this->field_label, $this->type);
// Check that the field instance was deleted.
- $this->assertNull(FieldInstanceConfig::loadByName('node', $this->type, $this->field_name), 'Field instance was deleted.');
+ $this->assertNull(FieldConfig::loadByName('node', $this->type, $this->field_name), 'Field instance was deleted.');
// Check that the field storage was not deleted
$this->assertNotNull(FieldStorageConfig::loadByName('node', $this->field_name), 'Field storage was not deleted.');
@@ -371,7 +371,7 @@ function testDeleteField() {
$this->fieldUIDeleteField($bundle_path2, "node.$type_name2.$this->field_name", $this->field_label, $type_name2);
// Check that the field instance was deleted.
- $this->assertNull(FieldInstanceConfig::loadByName('node', $type_name2, $this->field_name), 'Field instance was deleted.');
+ $this->assertNull(FieldConfig::loadByName('node', $type_name2, $this->field_name), 'Field instance was deleted.');
// Check that the field storage was deleted too.
$this->assertNull(FieldStorageConfig::loadByName('node', $this->field_name), 'Field storage was deleted.');
}
@@ -417,7 +417,7 @@ function testLockedField() {
'locked' => TRUE
));
$field_storage->save();
- entity_create('field_instance_config', array(
+ entity_create('field_config', array(
'field_storage' => $field_storage,
'bundle' => $this->type,
))->save();
@@ -462,11 +462,11 @@ function testHiddenFields() {
'entity_type' => 'node',
'label' => t('Hidden field'),
);
- entity_create('field_instance_config', $instance)->save();
+ entity_create('field_config', $instance)->save();
entity_get_form_display('node', $this->type, 'default')
->setComponent($field_name)
->save();
- $this->assertTrue(entity_load('field_instance_config', 'node.' . $this->type . '.' . $field_name), format_string('An instance of the field %field was created programmatically.', array('%field' => $field_name)));
+ $this->assertTrue(entity_load('field_config', 'node.' . $this->type . '.' . $field_name), format_string('An instance of the field %field was created programmatically.', array('%field' => $field_name)));
// Check that the newly added instance appears on the 'Manage Fields'
// screen.
@@ -538,7 +538,7 @@ function testDeleteTaxonomyField() {
$this->fieldUIDeleteField($bundle_path, "taxonomy_term.tags.$this->field_name", $this->field_label, 'Tags');
// Check that the field instance was deleted.
- $this->assertNull(FieldInstanceConfig::loadByName('taxonomy_term', 'tags', $this->field_name), 'Field instance was deleted.');
+ $this->assertNull(FieldConfig::loadByName('taxonomy_term', 'tags', $this->field_name), 'Field instance was deleted.');
// Check that the field storage was deleted too.
$this->assertNull(FieldStorageConfig::loadByName('taxonomy_term', $this->field_name), 'Field storage was deleted.');
}
@@ -554,7 +554,7 @@ function testHelpDescriptions() {
'type' => 'image',
))->save();
- entity_create('field_instance_config', array(
+ entity_create('field_config', array(
'field_name' => 'field_image',
'entity_type' => 'node',
'label' => 'Image',
@@ -564,12 +564,12 @@ function testHelpDescriptions() {
entity_get_form_display('node', 'article', 'default')->setComponent('field_image')->save();
$edit = array(
- 'instance[description]' => 'Test with an upload field.',
+ 'field[description]' => 'Test with an upload field.',
);
$this->drupalPostForm('admin/structure/types/manage/article/fields/node.article.field_image', $edit, t('Save settings'));
$edit = array(
- 'instance[description]' => 'Test with a non upload field.',
+ 'field[description]' => 'Test with a non upload field.',
);
$this->drupalPostForm('admin/structure/types/manage/article/fields/node.article.field_tags', $edit, t('Save settings'));
diff --git a/core/modules/file/src/Plugin/Field/FieldType/FileItem.php b/core/modules/file/src/Plugin/Field/FieldType/FileItem.php
index 9f80a6f..98d40e4 100644
--- a/core/modules/file/src/Plugin/Field/FieldType/FileItem.php
+++ b/core/modules/file/src/Plugin/Field/FieldType/FileItem.php
@@ -42,13 +42,13 @@ public static function defaultSettings() {
/**
* {@inheritdoc}
*/
- public static function defaultInstanceSettings() {
+ public static function defaultFieldSettings() {
return array(
'file_extensions' => 'txt',
'file_directory' => '',
'max_filesize' => '',
'description_field' => 0,
- ) + parent::defaultInstanceSettings();
+ ) + parent::defaultFieldSettings();
}
/**
@@ -149,7 +149,7 @@ public function settingsForm(array &$form, FormStateInterface $form_state, $has_
/**
* {@inheritdoc}
*/
- public function instanceSettingsForm(array $form, FormStateInterface $form_state) {
+ public function fieldSettingsForm(array $form, FormStateInterface $form_state) {
$element = array();
$settings = $this->getSettings();
diff --git a/core/modules/file/src/Tests/FileFieldTestBase.php b/core/modules/file/src/Tests/FileFieldTestBase.php
index b0efe1b..074493c 100644
--- a/core/modules/file/src/Tests/FileFieldTestBase.php
+++ b/core/modules/file/src/Tests/FileFieldTestBase.php
@@ -8,7 +8,7 @@
namespace Drupal\file\Tests;
use Drupal\field\Entity\FieldStorageConfig;
-use Drupal\field\Entity\FieldInstanceConfig;
+use Drupal\field\Entity\FieldConfig;
use Drupal\file\FileInterface;
use Drupal\simpletest\WebTestBase;
@@ -109,7 +109,7 @@ function attachFileField($name, $entity_type, $bundle, $instance_settings = arra
'settings' => array(),
);
$instance['settings'] = array_merge($instance['settings'], $instance_settings);
- entity_create('field_instance_config', $instance)->save();
+ entity_create('field_config', $instance)->save();
entity_get_form_display($entity_type, $bundle, 'default')
->setComponent($name, array(
@@ -123,7 +123,7 @@ function attachFileField($name, $entity_type, $bundle, $instance_settings = arra
* Updates an existing file field with new settings.
*/
function updateFileField($name, $type_name, $instance_settings = array(), $widget_settings = array()) {
- $instance = FieldInstanceConfig::loadByName('node', $type_name, $name);
+ $instance = FieldConfig::loadByName('node', $type_name, $name);
$instance->settings = array_merge($instance->settings, $instance_settings);
$instance->save();
diff --git a/core/modules/file/src/Tests/FileFieldValidateTest.php b/core/modules/file/src/Tests/FileFieldValidateTest.php
index 182ffad..b1bb955 100644
--- a/core/modules/file/src/Tests/FileFieldValidateTest.php
+++ b/core/modules/file/src/Tests/FileFieldValidateTest.php
@@ -8,7 +8,7 @@
namespace Drupal\file\Tests;
use Drupal\Core\Field\FieldStorageDefinitionInterface;
-use Drupal\field\Entity\FieldInstanceConfig;
+use Drupal\field\Entity\FieldConfig;
/**
* Tests validation functions such as file type, max file size, max size per
@@ -27,7 +27,7 @@ function testRequired() {
$type_name = 'article';
$field_name = strtolower($this->randomMachineName());
$field = $this->createFileField($field_name, 'node', $type_name, array(), array('required' => '1'));
- $instance = FieldInstanceConfig::loadByName('node', $type_name, $field_name);
+ $instance = FieldConfig::loadByName('node', $type_name, $field_name);
$test_file = $this->getTestFile('text');
diff --git a/core/modules/file/src/Tests/FileFieldWidgetTest.php b/core/modules/file/src/Tests/FileFieldWidgetTest.php
index 9ae0940..4099afd 100644
--- a/core/modules/file/src/Tests/FileFieldWidgetTest.php
+++ b/core/modules/file/src/Tests/FileFieldWidgetTest.php
@@ -8,7 +8,7 @@
namespace Drupal\file\Tests;
use Drupal\comment\Entity\Comment;
-use Drupal\field\Entity\FieldInstanceConfig;
+use Drupal\field\Entity\FieldConfig;
/**
* Tests the file field widget, single and multi-valued, with and without AJAX,
@@ -206,7 +206,7 @@ function testPrivateFileSetting() {
$type_name = 'article';
$field_name = strtolower($this->randomMachineName());
$this->createFileField($field_name, 'node', $type_name);
- $instance = FieldInstanceConfig::loadByName('node', $type_name, $field_name);
+ $instance = FieldConfig::loadByName('node', $type_name, $field_name);
$test_file = $this->getTestFile('text');
diff --git a/core/modules/file/src/Tests/FileItemTest.php b/core/modules/file/src/Tests/FileItemTest.php
index 21646e8..512e257 100644
--- a/core/modules/file/src/Tests/FileItemTest.php
+++ b/core/modules/file/src/Tests/FileItemTest.php
@@ -45,7 +45,7 @@ public function setUp() {
'type' => 'file',
'cardinality' => FieldStorageDefinitionInterface::CARDINALITY_UNLIMITED,
))->save();
- entity_create('field_instance_config', array(
+ entity_create('field_config', array(
'entity_type' => 'entity_test',
'field_name' => 'file_test',
'bundle' => 'entity_test',
diff --git a/core/modules/forum/config/install/field.instance.taxonomy_term.forums.forum_container.yml b/core/modules/forum/config/install/field.field.taxonomy_term.forums.forum_container.yml
similarity index 100%
rename from core/modules/forum/config/install/field.instance.taxonomy_term.forums.forum_container.yml
rename to core/modules/forum/config/install/field.field.taxonomy_term.forums.forum_container.yml
diff --git a/core/modules/forum/forum.install b/core/modules/forum/forum.install
index 2ebc79f..6dccc04 100644
--- a/core/modules/forum/forum.install
+++ b/core/modules/forum/forum.install
@@ -6,7 +6,7 @@
*/
use Drupal\comment\Plugin\Field\FieldType\CommentItemInterface;
-use Drupal\field\Entity\FieldInstanceConfig;
+use Drupal\field\Entity\FieldConfig;
use Drupal\field\Entity\FieldStorageConfig;
use Drupal\comment\CommentManagerInterface;
@@ -51,7 +51,7 @@ function forum_install() {
$term->save();
// Create the instance on the bundle.
- entity_create('field_instance_config', array(
+ entity_create('field_config', array(
'field_name' => 'taxonomy_forums',
'entity_type' => 'node',
'label' => 'Forums',
@@ -91,7 +91,7 @@ function forum_install() {
Drupal::service('comment.manager')->addDefaultField('node', 'forum', 'comment_forum', CommentItemInterface::OPEN, 'comment_forum');
// Add here because we don't have param in addDefaultField function.
- $instance = FieldInstanceConfig::loadByName('node', 'forum', 'comment_forum');
+ $instance = FieldConfig::loadByName('node', 'forum', 'comment_forum');
$instance->settings['default_mode'] = CommentManagerInterface::COMMENT_MODE_FLAT;
$instance->save();
diff --git a/core/modules/hal/src/Tests/NormalizerTestBase.php b/core/modules/hal/src/Tests/NormalizerTestBase.php
index 2ebff74..fb35fea 100644
--- a/core/modules/hal/src/Tests/NormalizerTestBase.php
+++ b/core/modules/hal/src/Tests/NormalizerTestBase.php
@@ -86,7 +86,7 @@ function setUp() {
'entity_type' => 'entity_test',
'type' => 'text',
))->save();
- entity_create('field_instance_config', array(
+ entity_create('field_config', array(
'entity_type' => 'entity_test',
'field_name' => 'field_test_text',
'bundle' => 'entity_test',
@@ -99,7 +99,7 @@ function setUp() {
'entity_type' => 'entity_test',
'type' => 'text',
))->save();
- entity_create('field_instance_config', array(
+ entity_create('field_config', array(
'entity_type' => 'entity_test',
'field_name' => 'field_test_translatable_text',
'bundle' => 'entity_test',
@@ -115,7 +115,7 @@ function setUp() {
'target_type' => 'entity_test',
),
))->save();
- entity_create('field_instance_config', array(
+ entity_create('field_config', array(
'entity_type' => 'entity_test',
'field_name' => 'field_test_entity_reference',
'bundle' => 'entity_test',
diff --git a/core/modules/image/image.module b/core/modules/image/image.module
index ba8c979..21ea4a7 100644
--- a/core/modules/image/image.module
+++ b/core/modules/image/image.module
@@ -9,7 +9,7 @@
use Drupal\Core\Routing\RouteMatchInterface;
use Drupal\file\Entity\File;
use Drupal\field\FieldStorageConfigInterface;
-use Drupal\field\FieldInstanceConfigInterface;
+use Drupal\field\FieldConfigInterface;
/**
* Image style constant for user presets in the database.
@@ -348,9 +348,9 @@ function image_filter_keyword($value, $current_pixels, $new_pixels) {
function image_entity_presave(EntityInterface $entity) {
$field_storage = FALSE;
$entity_type_id = $entity->getEntityTypeId();
- if ($entity_type_id == 'field_instance_config') {
+ if ($entity_type_id == 'field_config') {
$field_storage = $entity->getFieldStorageDefinition();
- $default_settings = \Drupal::service('plugin.manager.field.field_type')->getDefaultInstanceSettings('image');
+ $default_settings = \Drupal::service('plugin.manager.field.field_type')->getDefaultFieldSettings('image');
}
elseif ($entity_type_id == 'field_storage_config') {
$field_storage = $entity;
@@ -425,9 +425,9 @@ function image_field_storage_config_update(FieldStorageConfigInterface $field_st
}
/**
- * Implements hook_ENTITY_TYPE_update() for 'field_instance_config'.
+ * Implements hook_ENTITY_TYPE_update() for 'field_config'.
*/
-function image_field_instance_config_update(FieldInstanceConfigInterface $field_instance) {
+function image_field_config_update(FieldConfigInterface $field_instance) {
$field_storage = $field_instance->getFieldStorageDefinition();
if ($field_storage->type != 'image') {
// Only act on image fields.
@@ -479,9 +479,9 @@ function image_field_storage_config_delete(FieldStorageConfigInterface $field) {
}
/**
- * Implements hook_ENTITY_TYPE_delete() for 'field_instance_config'.
+ * Implements hook_ENTITY_TYPE_delete() for 'field_config'.
*/
-function image_field_instance_config_delete(FieldInstanceConfigInterface $field_instance) {
+function image_field_config_delete(FieldConfigInterface $field_instance) {
$field_storage = $field_instance->getFieldStorageDefinition();
if ($field_storage->type != 'image') {
// Only act on image fields.
diff --git a/core/modules/image/src/Plugin/Field/FieldFormatter/ImageFormatterBase.php b/core/modules/image/src/Plugin/Field/FieldFormatter/ImageFormatterBase.php
index e99d8eb..62bef76 100644
--- a/core/modules/image/src/Plugin/Field/FieldFormatter/ImageFormatterBase.php
+++ b/core/modules/image/src/Plugin/Field/FieldFormatter/ImageFormatterBase.php
@@ -7,7 +7,7 @@
namespace Drupal\image\Plugin\Field\FieldFormatter;
-use Drupal\field\FieldInstanceConfigInterface;
+use Drupal\field\FieldConfigInterface;
use Drupal\file\Plugin\Field\FieldFormatter\FileFormatterBase;
/**
@@ -28,7 +28,7 @@ public function prepareView(array $entities_items) {
$default_image = $this->getFieldSetting('default_image');
// If we are dealing with a configurable field, look in both
// instance-level and field-level settings.
- if (empty($default_image['fid']) && $this->fieldDefinition instanceof FieldInstanceConfigInterface) {
+ if (empty($default_image['fid']) && $this->fieldDefinition instanceof FieldConfigInterface) {
$default_image = $this->fieldDefinition->getFieldStorageDefinition()->getSetting('default_image');
}
diff --git a/core/modules/image/src/Plugin/Field/FieldType/ImageItem.php b/core/modules/image/src/Plugin/Field/FieldType/ImageItem.php
index a56f701..17dcfee 100644
--- a/core/modules/image/src/Plugin/Field/FieldType/ImageItem.php
+++ b/core/modules/image/src/Plugin/Field/FieldType/ImageItem.php
@@ -60,7 +60,7 @@ public static function defaultSettings() {
/**
* {@inheritdoc}
*/
- public static function defaultInstanceSettings() {
+ public static function defaultFieldSettings() {
$settings = array(
'file_extensions' => 'png gif jpg jpeg',
'alt_field' => 0,
@@ -76,7 +76,7 @@ public static function defaultInstanceSettings() {
'width' => NULL,
'height' => NULL,
),
- ) + parent::defaultInstanceSettings();
+ ) + parent::defaultFieldSettings();
unset($settings['description_field']);
return $settings;
@@ -183,9 +183,9 @@ public function settingsForm(array &$form, FormStateInterface $form_state, $has_
/**
* {@inheritdoc}
*/
- public function instanceSettingsForm(array $form, FormStateInterface $form_state) {
+ public function fieldSettingsForm(array $form, FormStateInterface $form_state) {
// Get base form from FileItem::instanceSettingsForm().
- $element = parent::instanceSettingsForm($form, $form_state);
+ $element = parent::fieldSettingsForm($form, $form_state);
$settings = $this->getSettings();
diff --git a/core/modules/image/src/Tests/ImageFieldDefaultImagesTest.php b/core/modules/image/src/Tests/ImageFieldDefaultImagesTest.php
index d0fabfa..3a6342c 100644
--- a/core/modules/image/src/Tests/ImageFieldDefaultImagesTest.php
+++ b/core/modules/image/src/Tests/ImageFieldDefaultImagesTest.php
@@ -66,7 +66,7 @@ public function testDefaultImages() {
// The instance default image id should be 2.
$this->assertEqual($instance->getSetting('default_image')['fid'], $default_images['instance']->id());
- // Also test \Drupal\field\Entity\FieldInstanceConfig::getSetting().
+ // Also test \Drupal\field\Entity\FieldConfig::getSetting().
$this->assertEqual($instance->getSettings()['default_image']['fid'], $default_images['instance']->id());
$field_storage = $instance->getFieldStorageDefinition();
@@ -78,7 +78,7 @@ public function testDefaultImages() {
$this->assertEqual($field_storage->getSettings()['default_image']['fid'], $default_images['field']->id());
// Add another instance with another default image to the page content type.
- $instance2 = entity_create('field_instance_config', array(
+ $instance2 = entity_create('field_config', array(
'field_storage' => $field_storage,
'bundle' => 'page',
'label' => $instance->label(),
@@ -117,7 +117,7 @@ public function testDefaultImages() {
// Confirm the defaults are present on the article field edit form.
$this->drupalGet("admin/structure/types/manage/article/fields/$instance_id");
$this->assertFieldByXpath(
- '//input[@name="instance[settings][default_image][fid][fids]"]',
+ '//input[@name="field[settings][default_image][fid][fids]"]',
$default_images['instance']->id(),
format_string(
'Article image field instance default equals expected file ID of @fid.',
@@ -139,7 +139,7 @@ public function testDefaultImages() {
$instance2_id = $instance2->id();
$this->drupalGet("admin/structure/types/manage/page/fields/$instance2_id");
$this->assertFieldByXpath(
- '//input[@name="instance[settings][default_image][fid][fids]"]',
+ '//input[@name="field[settings][default_image][fid][fids]"]',
$default_images['instance2']->id(),
format_string(
'Page image field instance default equals expected file ID of @fid.',
@@ -214,7 +214,7 @@ public function testDefaultImages() {
// admin form.
$this->drupalGet("admin/structure/types/manage/article/fields/$instance_id");
$this->assertFieldByXpath(
- '//input[@name="instance[settings][default_image][fid][fids]"]',
+ '//input[@name="field[settings][default_image][fid][fids]"]',
$default_images['instance_new']->id(),
format_string(
'Updated article image field instance default equals expected file ID of @fid.',
@@ -252,7 +252,7 @@ public function testDefaultImages() {
// Confirm the article field instance default has been removed.
$this->drupalGet("admin/structure/types/manage/article/fields/$instance_id");
$this->assertFieldByXpath(
- '//input[@name="instance[settings][default_image][fid][fids]"]',
+ '//input[@name="field[settings][default_image][fid][fids]"]',
'',
'Updated article image field instance default has been successfully removed.'
);
@@ -299,7 +299,7 @@ public function testInvalidDefaultImage() {
// The non-existent default image should not be saved.
$this->assertNull($settings['default_image']['fid']);
- $field_instance = entity_create('field_instance_config', array(
+ $field_instance = entity_create('field_config', array(
'field_storage' => $field_storage,
'bundle' => 'page',
'label' => $this->randomMachineName(),
diff --git a/core/modules/image/src/Tests/ImageFieldTestBase.php b/core/modules/image/src/Tests/ImageFieldTestBase.php
index 9ab5577..a8426ac 100644
--- a/core/modules/image/src/Tests/ImageFieldTestBase.php
+++ b/core/modules/image/src/Tests/ImageFieldTestBase.php
@@ -72,7 +72,7 @@ function createImageField($name, $type_name, $storage_settings = array(), $insta
'cardinality' => !empty($storage_settings['cardinality']) ? $storage_settings['cardinality'] : 1,
))->save();
- $field_instance_config = entity_create('field_instance_config', array(
+ $field_config = entity_create('field_config', array(
'field_name' => $name,
'label' => $name,
'entity_type' => 'node',
@@ -81,7 +81,7 @@ function createImageField($name, $type_name, $storage_settings = array(), $insta
'description' => !empty($instance_settings['description']) ? $instance_settings['description'] : '',
'settings' => $instance_settings,
));
- $field_instance_config->save();
+ $field_config->save();
entity_get_form_display('node', $type_name, 'default')
->setComponent($name, array(
@@ -94,7 +94,7 @@ function createImageField($name, $type_name, $storage_settings = array(), $insta
->setComponent($name)
->save();
- return $field_instance_config;
+ return $field_config;
}
diff --git a/core/modules/image/src/Tests/ImageItemTest.php b/core/modules/image/src/Tests/ImageItemTest.php
index 9fc9f71..08e0ad0 100644
--- a/core/modules/image/src/Tests/ImageItemTest.php
+++ b/core/modules/image/src/Tests/ImageItemTest.php
@@ -50,7 +50,7 @@ public function setUp() {
'type' => 'image',
'cardinality' => FieldStorageDefinitionInterface::CARDINALITY_UNLIMITED,
))->save();
- entity_create('field_instance_config', array(
+ entity_create('field_config', array(
'entity_type' => 'entity_test',
'field_name' => 'image_test',
'bundle' => 'entity_test',
diff --git a/core/modules/image/src/Tests/ImageThemeFunctionTest.php b/core/modules/image/src/Tests/ImageThemeFunctionTest.php
index 335f150..9817d34 100644
--- a/core/modules/image/src/Tests/ImageThemeFunctionTest.php
+++ b/core/modules/image/src/Tests/ImageThemeFunctionTest.php
@@ -45,7 +45,7 @@ public function setUp() {
'type' => 'image',
'cardinality' => FieldStorageDefinitionInterface::CARDINALITY_UNLIMITED,
))->save();
- entity_create('field_instance_config', array(
+ entity_create('field_config', array(
'entity_type' => 'entity_test',
'field_name' => 'image_test',
'bundle' => 'entity_test',
diff --git a/core/modules/link/src/Plugin/Field/FieldType/LinkItem.php b/core/modules/link/src/Plugin/Field/FieldType/LinkItem.php
index f8639bb..582851f 100644
--- a/core/modules/link/src/Plugin/Field/FieldType/LinkItem.php
+++ b/core/modules/link/src/Plugin/Field/FieldType/LinkItem.php
@@ -31,11 +31,11 @@ class LinkItem extends FieldItemBase implements LinkItemInterface {
/**
* {@inheritdoc}
*/
- public static function defaultInstanceSettings() {
+ public static function defaultFieldSettings() {
return array(
'title' => DRUPAL_OPTIONAL,
'link_type' => LinkItemInterface::LINK_GENERIC
- ) + parent::defaultInstanceSettings();
+ ) + parent::defaultFieldSettings();
}
/**
@@ -105,7 +105,7 @@ public static function schema(FieldStorageDefinitionInterface $field_definition)
/**
* {@inheritdoc}
*/
- public function instanceSettingsForm(array $form, FormStateInterface $form_state) {
+ public function fieldSettingsForm(array $form, FormStateInterface $form_state) {
$element = array();
$element['link_type'] = array(
diff --git a/core/modules/link/src/Tests/LinkFieldTest.php b/core/modules/link/src/Tests/LinkFieldTest.php
index 2b67ec3..f6cc11a 100644
--- a/core/modules/link/src/Tests/LinkFieldTest.php
+++ b/core/modules/link/src/Tests/LinkFieldTest.php
@@ -35,7 +35,7 @@ class LinkFieldTest extends WebTestBase {
/**
* The instance used in this test class.
*
- * @var \Drupal\field\Entity\FieldInstanceConfig
+ * @var \Drupal\field\Entity\FieldConfig
*/
protected $instance;
@@ -68,7 +68,7 @@ function testURLValidation() {
'type' => 'link',
));
$this->fieldStorage->save();
- $this->instance = entity_create('field_instance_config', array(
+ $this->instance = entity_create('field_config', array(
'field_storage' => $this->fieldStorage,
'bundle' => 'entity_test',
'settings' => array(
@@ -192,7 +192,7 @@ function testLinkTitle() {
'type' => 'link',
));
$this->fieldStorage->save();
- $this->instance = entity_create('field_instance_config', array(
+ $this->instance = entity_create('field_config', array(
'field_storage' => $this->fieldStorage,
'bundle' => 'entity_test',
'label' => 'Read more about this entity',
@@ -311,7 +311,7 @@ function testLinkFormatter() {
'cardinality' => 2,
));
$this->fieldStorage->save();
- entity_create('field_instance_config', array(
+ entity_create('field_config', array(
'field_storage' => $this->fieldStorage,
'label' => 'Read more about this entity',
'bundle' => 'entity_test',
@@ -453,7 +453,7 @@ function testLinkSeparateFormatter() {
'cardinality' => 2,
));
$this->fieldStorage->save();
- entity_create('field_instance_config', array(
+ entity_create('field_config', array(
'field_storage' => $this->fieldStorage,
'bundle' => 'entity_test',
'settings' => array(
diff --git a/core/modules/link/src/Tests/LinkItemTest.php b/core/modules/link/src/Tests/LinkItemTest.php
index 1033fff..b445321 100644
--- a/core/modules/link/src/Tests/LinkItemTest.php
+++ b/core/modules/link/src/Tests/LinkItemTest.php
@@ -35,7 +35,7 @@ public function setUp() {
'entity_type' => 'entity_test',
'type' => 'link',
))->save();
- entity_create('field_instance_config', array(
+ entity_create('field_config', array(
'entity_type' => 'entity_test',
'field_name' => 'field_test',
'bundle' => 'entity_test',
diff --git a/core/modules/migrate/src/Plugin/migrate/destination/EntityFieldInstance.php b/core/modules/migrate/src/Plugin/migrate/destination/EntityFieldInstance.php
index c02fef5..77297e8 100644
--- a/core/modules/migrate/src/Plugin/migrate/destination/EntityFieldInstance.php
+++ b/core/modules/migrate/src/Plugin/migrate/destination/EntityFieldInstance.php
@@ -11,7 +11,7 @@
/**
* @MigrateDestination(
- * id = "entity:field_instance_config"
+ * id = "entity:field_config"
* )
*/
class EntityFieldInstance extends EntityConfigBase {
diff --git a/core/modules/migrate_drupal/config/install/migrate.migration.d6_comment_field_instance.yml b/core/modules/migrate_drupal/config/install/migrate.migration.d6_comment_field_instance.yml
index c24eaba..6ec06f7 100644
--- a/core/modules/migrate_drupal/config/install/migrate.migration.d6_comment_field_instance.yml
+++ b/core/modules/migrate_drupal/config/install/migrate.migration.d6_comment_field_instance.yml
@@ -27,7 +27,7 @@ process:
'settings/form_location': comment_form_location
'settings/preview': comment_preview
destination:
- plugin: entity:field_instance_config
+ plugin: entity:field_config
migration_dependencies:
required:
- d6_comment_field
diff --git a/core/modules/migrate_drupal/config/install/migrate.migration.d6_field_instance.yml b/core/modules/migrate_drupal/config/install/migrate.migration.d6_field_instance.yml
index ce20ff5..0d8c394 100644
--- a/core/modules/migrate_drupal/config/install/migrate.migration.d6_field_instance.yml
+++ b/core/modules/migrate_drupal/config/install/migrate.migration.d6_field_instance.yml
@@ -44,7 +44,7 @@ process:
- widget_settings
destination:
- plugin: entity:field_instance_config
+ plugin: entity:field_config
migration_dependencies:
required:
- d6_node_type
diff --git a/core/modules/migrate_drupal/config/install/migrate.migration.d6_upload_field_instance.yml b/core/modules/migrate_drupal/config/install/migrate.migration.d6_upload_field_instance.yml
index f46b49b..42fadb2 100644
--- a/core/modules/migrate_drupal/config/install/migrate.migration.d6_upload_field_instance.yml
+++ b/core/modules/migrate_drupal/config/install/migrate.migration.d6_upload_field_instance.yml
@@ -17,7 +17,7 @@ process:
'settings/file_extensions': file_extensions
'settings/max_filesize': max_filesize
destination:
- plugin: entity:field_instance_config
+ plugin: entity:field_config
migration_dependencies:
required:
- d6_upload_field
diff --git a/core/modules/migrate_drupal/config/install/migrate.migration.d6_user_picture_field_instance.yml b/core/modules/migrate_drupal/config/install/migrate.migration.d6_user_picture_field_instance.yml
index ae4bfae..ef6c053 100644
--- a/core/modules/migrate_drupal/config/install/migrate.migration.d6_user_picture_field_instance.yml
+++ b/core/modules/migrate_drupal/config/install/migrate.migration.d6_user_picture_field_instance.yml
@@ -24,7 +24,7 @@ process:
'settings/max_filesize': max_filesize
'settings/max_resolution': max_resolution
destination:
- plugin: entity:field_instance_config
+ plugin: entity:field_config
migration_dependencies:
required:
- d6_user_picture_field
diff --git a/core/modules/migrate_drupal/config/install/migrate.migration.d6_user_profile_field_instance.yml b/core/modules/migrate_drupal/config/install/migrate.migration.d6_user_profile_field_instance.yml
index eb44225..ebf139e 100644
--- a/core/modules/migrate_drupal/config/install/migrate.migration.d6_user_profile_field_instance.yml
+++ b/core/modules/migrate_drupal/config/install/migrate.migration.d6_user_profile_field_instance.yml
@@ -15,7 +15,7 @@ process:
field_name: name
required: required
destination:
- plugin: entity:field_instance_config
+ plugin: entity:field_config
migration_dependencies:
required:
- d6_user_profile_field
diff --git a/core/modules/migrate_drupal/config/install/migrate.migration.d6_vocabulary_field_instance.yml b/core/modules/migrate_drupal/config/install/migrate.migration.d6_vocabulary_field_instance.yml
index 4d6c202..15d8186 100644
--- a/core/modules/migrate_drupal/config/install/migrate.migration.d6_vocabulary_field_instance.yml
+++ b/core/modules/migrate_drupal/config/install/migrate.migration.d6_vocabulary_field_instance.yml
@@ -15,7 +15,7 @@ process:
migration: d6_taxonomy_vocabulary
source: vid
destination:
- plugin: entity:field_instance_config
+ plugin: entity:field_config
migration_dependencies:
required:
- d6_vocabulary_field
diff --git a/core/modules/migrate_drupal/src/Tests/d6/MigrateCckFieldRevisionTest.php b/core/modules/migrate_drupal/src/Tests/d6/MigrateCckFieldRevisionTest.php
index 7dbe18d..2bc7cc1 100644
--- a/core/modules/migrate_drupal/src/Tests/d6/MigrateCckFieldRevisionTest.php
+++ b/core/modules/migrate_drupal/src/Tests/d6/MigrateCckFieldRevisionTest.php
@@ -33,7 +33,7 @@ protected function setUp() {
'name' => 'field_test',
'type' => 'text',
))->save();
- entity_create('field_instance_config', array(
+ entity_create('field_config', array(
'entity_type' => 'node',
'field_name' => 'field_test',
'bundle' => 'story',
@@ -44,7 +44,7 @@ protected function setUp() {
'type' => 'integer',
'cardinality' => -1,
))->save();
- entity_create('field_instance_config', array(
+ entity_create('field_config', array(
'entity_type' => 'node',
'field_name' => 'field_test_two',
'bundle' => 'story',
diff --git a/core/modules/migrate_drupal/src/Tests/d6/MigrateCckFieldValuesTest.php b/core/modules/migrate_drupal/src/Tests/d6/MigrateCckFieldValuesTest.php
index de5ce86..34efafa 100644
--- a/core/modules/migrate_drupal/src/Tests/d6/MigrateCckFieldValuesTest.php
+++ b/core/modules/migrate_drupal/src/Tests/d6/MigrateCckFieldValuesTest.php
@@ -34,7 +34,7 @@ protected function setUp() {
'name' => 'field_test',
'type' => 'text',
))->save();
- entity_create('field_instance_config', array(
+ entity_create('field_config', array(
'entity_type' => 'node',
'field_name' => 'field_test',
'bundle' => 'story',
@@ -45,7 +45,7 @@ protected function setUp() {
'type' => 'integer',
'cardinality' => -1,
))->save();
- entity_create('field_instance_config', array(
+ entity_create('field_config', array(
'entity_type' => 'node',
'field_name' => 'field_test_two',
'bundle' => 'story',
@@ -55,7 +55,7 @@ protected function setUp() {
'name' => 'field_test_three',
'type' => 'decimal',
))->save();
- entity_create('field_instance_config', array(
+ entity_create('field_config', array(
'entity_type' => 'node',
'field_name' => 'field_test_three',
'bundle' => 'story',
@@ -65,7 +65,7 @@ protected function setUp() {
'name' => 'field_test_integer_selectlist',
'type' => 'integer',
))->save();
- entity_create('field_instance_config', array(
+ entity_create('field_config', array(
'entity_type' => 'node',
'field_name' => 'field_test_integer_selectlist',
'bundle' => 'story',
diff --git a/core/modules/migrate_drupal/src/Tests/d6/MigrateCommentVariableDisplayBase.php b/core/modules/migrate_drupal/src/Tests/d6/MigrateCommentVariableDisplayBase.php
index 0a50b3e..d66f0c0 100644
--- a/core/modules/migrate_drupal/src/Tests/d6/MigrateCommentVariableDisplayBase.php
+++ b/core/modules/migrate_drupal/src/Tests/d6/MigrateCommentVariableDisplayBase.php
@@ -57,7 +57,7 @@ protected function setUp() {
))->save();
foreach ($this->types as $type) {
entity_create('node_type', array('type' => $type))->save();
- entity_create('field_instance_config', array(
+ entity_create('field_config', array(
'label' => 'Comments',
'description' => '',
'field_name' => 'comment',
diff --git a/core/modules/migrate_drupal/src/Tests/d6/MigrateFieldInstanceTest.php b/core/modules/migrate_drupal/src/Tests/d6/MigrateFieldInstanceTest.php
index 9399da8..c9056ab 100644
--- a/core/modules/migrate_drupal/src/Tests/d6/MigrateFieldInstanceTest.php
+++ b/core/modules/migrate_drupal/src/Tests/d6/MigrateFieldInstanceTest.php
@@ -83,14 +83,14 @@ public function setUp() {
public function testFieldInstanceSettings() {
$entity = entity_create('node', array('type' => 'story'));
// Test a text field.
- $field = entity_load('field_instance_config', 'node.story.field_test');
+ $field = entity_load('field_config', 'node.story.field_test');
$this->assertEqual($field->label(), 'Text Field');
$expected = array('max_length' => 255, 'text_processing' => 1);
$this->assertEqual($field->getSettings(), $expected);
$this->assertEqual('text for default value', $entity->field_test->value);
// Test a number field.
- $field = entity_load('field_instance_config', 'node.story.field_test_two');
+ $field = entity_load('field_config', 'node.story.field_test_two');
$this->assertEqual($field->label(), 'Integer Field');
$expected = array(
'min' => '10',
@@ -102,7 +102,7 @@ public function testFieldInstanceSettings() {
);
$this->assertEqual($field->getSettings(), $expected);
- $field = entity_load('field_instance_config', 'node.story.field_test_four');
+ $field = entity_load('field_config', 'node.story.field_test_four');
$this->assertEqual($field->label(), 'Float Field');
$expected = array(
'min' => 100,
@@ -113,12 +113,12 @@ public function testFieldInstanceSettings() {
$this->assertEqual($field->getSettings(), $expected);
// Test email field.
- $field = entity_load('field_instance_config', 'node.story.field_test_email');
+ $field = entity_load('field_config', 'node.story.field_test_email');
$this->assertEqual($field->label(), 'Email Field');
$this->assertEqual('benjy@example.com', $entity->field_test_email->value, 'Field field_test_email default_value is correct.');
// Test a filefield.
- $field = entity_load('field_instance_config', 'node.story.field_test_filefield');
+ $field = entity_load('field_config', 'node.story.field_test_filefield');
$this->assertEqual($field->label(), 'File Field');
$expected = array(
'file_extensions' => 'txt pdf doc',
@@ -137,7 +137,7 @@ public function testFieldInstanceSettings() {
$this->assertFalse(array_diff_assoc($expected, $field->getSettings()));
// Test a link field.
- $field = entity_load('field_instance_config', 'node.story.field_test_link');
+ $field = entity_load('field_config', 'node.story.field_test_link');
$this->assertEqual($field->label(), 'Link Field');
$expected = array('title' => 2, 'link_type' => LinkItemInterface::LINK_GENERIC);
$this->assertEqual($field->getSettings(), $expected);
diff --git a/core/modules/migrate_drupal/src/Tests/d6/MigrateNodeTypeTest.php b/core/modules/migrate_drupal/src/Tests/d6/MigrateNodeTypeTest.php
index b497e87..715a82a 100644
--- a/core/modules/migrate_drupal/src/Tests/d6/MigrateNodeTypeTest.php
+++ b/core/modules/migrate_drupal/src/Tests/d6/MigrateNodeTypeTest.php
@@ -7,7 +7,7 @@
namespace Drupal\migrate_drupal\Tests\d6;
-use Drupal\field\Entity\FieldInstanceConfig;
+use Drupal\field\Entity\FieldConfig;
use Drupal\migrate\MigrateExecutable;
use Drupal\migrate_drupal\Tests\MigrateDrupalTestBase;
@@ -62,7 +62,7 @@ public function testNodeType() {
$this->assertEqual(array('test_page'), $migration->getIdMap()->lookupDestinationID(array('test_page')));
// Test we have a body field.
- $instance = FieldInstanceConfig::loadByName('node', 'test_page', 'body');
+ $instance = FieldConfig::loadByName('node', 'test_page', 'body');
$this->assertEqual($instance->getLabel(), 'This is the body field label', 'Body field was found.');
// Test the test_story content type.
@@ -82,7 +82,7 @@ public function testNodeType() {
$this->assertEqual(array('test_story'), $migration->getIdMap()->lookupDestinationID(array('test_story')));
// Test we don't have a body field.
- $instance = FieldInstanceConfig::loadByName('node', 'test_story', 'body');
+ $instance = FieldConfig::loadByName('node', 'test_story', 'body');
$this->assertEqual($instance, NULL, 'No body field found');
// Test the test_event content type.
@@ -103,7 +103,7 @@ public function testNodeType() {
$this->assertEqual(array('test_event'), $migration->getIdMap()->lookupDestinationID(array('test_event')));
// Test we have a body field.
- $instance = FieldInstanceConfig::loadByName('node', 'test_event', 'body');
+ $instance = FieldConfig::loadByName('node', 'test_event', 'body');
$this->assertEqual($instance->getLabel(), 'Body', 'Body field was found.');
}
}
diff --git a/core/modules/migrate_drupal/src/Tests/d6/MigrateProfileValuesTest.php b/core/modules/migrate_drupal/src/Tests/d6/MigrateProfileValuesTest.php
index 158cfc9..e1caf65 100644
--- a/core/modules/migrate_drupal/src/Tests/d6/MigrateProfileValuesTest.php
+++ b/core/modules/migrate_drupal/src/Tests/d6/MigrateProfileValuesTest.php
@@ -90,7 +90,7 @@ protected function setUp() {
// Create the field instances.
foreach (Drupal6UserProfileFields::getData('profile_fields') as $field) {
- entity_create('field_instance_config', array(
+ entity_create('field_config', array(
'label' => $field['title'],
'description' => '',
'field_name' => $field['name'],
diff --git a/core/modules/migrate_drupal/src/Tests/d6/MigrateTermNodeTestBase.php b/core/modules/migrate_drupal/src/Tests/d6/MigrateTermNodeTestBase.php
index 47ea02e..6c77344 100644
--- a/core/modules/migrate_drupal/src/Tests/d6/MigrateTermNodeTestBase.php
+++ b/core/modules/migrate_drupal/src/Tests/d6/MigrateTermNodeTestBase.php
@@ -45,7 +45,7 @@ protected function setUp() {
),
),
))->save();
- entity_create('field_instance_config', array(
+ entity_create('field_config', array(
'field_name' => $name,
'entity_type' => 'node',
'bundle' => 'story',
diff --git a/core/modules/migrate_drupal/src/Tests/d6/MigrateUploadBase.php b/core/modules/migrate_drupal/src/Tests/d6/MigrateUploadBase.php
index bbe1997..0f1c3fc 100644
--- a/core/modules/migrate_drupal/src/Tests/d6/MigrateUploadBase.php
+++ b/core/modules/migrate_drupal/src/Tests/d6/MigrateUploadBase.php
@@ -58,7 +58,7 @@ public function setUp() {
'display_field' => TRUE,
),
))->save();
- entity_create('field_instance_config', array(
+ entity_create('field_config', array(
'field_name' => 'upload',
'entity_type' => 'node',
'bundle' => 'story',
diff --git a/core/modules/migrate_drupal/src/Tests/d6/MigrateUploadInstanceTest.php b/core/modules/migrate_drupal/src/Tests/d6/MigrateUploadInstanceTest.php
index 708268b..bcff1e5 100644
--- a/core/modules/migrate_drupal/src/Tests/d6/MigrateUploadInstanceTest.php
+++ b/core/modules/migrate_drupal/src/Tests/d6/MigrateUploadInstanceTest.php
@@ -64,18 +64,18 @@ protected function setUp() {
* Tests the Drupal 6 upload settings to Drupal 8 field instance migration.
*/
public function testUploadFieldInstance() {
- $field = entity_load('field_instance_config', 'node.page.upload');
+ $field = entity_load('field_config', 'node.page.upload');
$settings = $field->getSettings();
$this->assertEqual($field->id(), 'node.page.upload');
$this->assertEqual($settings['file_extensions'], 'jpg jpeg gif png txt doc xls pdf ppt pps odt ods odp');
$this->assertEqual($settings['max_filesize'], '1MB');
$this->assertEqual($settings['description_field'], TRUE);
- $field = entity_load('field_instance_config', 'node.story.upload');
+ $field = entity_load('field_config', 'node.story.upload');
$this->assertEqual($field->id(), 'node.story.upload');
// Shouldn't exist.
- $field = entity_load('field_instance_config', 'node.article.upload');
+ $field = entity_load('field_config', 'node.article.upload');
$this->assertTrue(is_null($field));
$this->assertEqual(array('node', 'page', 'upload'), entity_load('migration', 'd6_upload_field_instance')->getIdMap()->lookupDestinationID(array('page')));
diff --git a/core/modules/migrate_drupal/src/Tests/d6/MigrateUserPictureInstanceTest.php b/core/modules/migrate_drupal/src/Tests/d6/MigrateUserPictureInstanceTest.php
index 6e00978..f8d0010 100644
--- a/core/modules/migrate_drupal/src/Tests/d6/MigrateUserPictureInstanceTest.php
+++ b/core/modules/migrate_drupal/src/Tests/d6/MigrateUserPictureInstanceTest.php
@@ -52,7 +52,7 @@ public function setUp() {
* Tests the Drupal 6 user picture to Drupal 8 picture field instance migration.
*/
public function testUserPictureFieldInstance() {
- $field = entity_load('field_instance_config', 'user.user.user_picture');
+ $field = entity_load('field_config', 'user.user.user_picture');
$settings = $field->getSettings();
$this->assertEqual($settings['file_extensions'], 'png gif jpg jpeg');
$this->assertEqual($settings['file_directory'], 'pictures');
diff --git a/core/modules/migrate_drupal/src/Tests/d6/MigrateUserProfileEntityDisplayTest.php b/core/modules/migrate_drupal/src/Tests/d6/MigrateUserProfileEntityDisplayTest.php
index 8666cfa..8e46411 100644
--- a/core/modules/migrate_drupal/src/Tests/d6/MigrateUserProfileEntityDisplayTest.php
+++ b/core/modules/migrate_drupal/src/Tests/d6/MigrateUserProfileEntityDisplayTest.php
@@ -75,7 +75,7 @@ protected function setUp() {
))->save();
$field_data = Drupal6UserProfileFields::getData('profile_fields');
foreach ($field_data as $field) {
- entity_create('field_instance_config', array(
+ entity_create('field_config', array(
'label' => $field['title'],
'description' => '',
'field_name' => $field['name'],
diff --git a/core/modules/migrate_drupal/src/Tests/d6/MigrateUserProfileEntityFormDisplayTest.php b/core/modules/migrate_drupal/src/Tests/d6/MigrateUserProfileEntityFormDisplayTest.php
index 82503d6..415234c 100644
--- a/core/modules/migrate_drupal/src/Tests/d6/MigrateUserProfileEntityFormDisplayTest.php
+++ b/core/modules/migrate_drupal/src/Tests/d6/MigrateUserProfileEntityFormDisplayTest.php
@@ -70,7 +70,7 @@ protected function setUp() {
))->save();
$field_data = Drupal6UserProfileFields::getData('profile_fields');
foreach ($field_data as $field) {
- entity_create('field_instance_config', array(
+ entity_create('field_config', array(
'label' => $field['title'],
'description' => '',
'field_name' => $field['name'],
diff --git a/core/modules/migrate_drupal/src/Tests/d6/MigrateUserProfileFieldInstanceTest.php b/core/modules/migrate_drupal/src/Tests/d6/MigrateUserProfileFieldInstanceTest.php
index f1687b4..68fa8f4 100644
--- a/core/modules/migrate_drupal/src/Tests/d6/MigrateUserProfileFieldInstanceTest.php
+++ b/core/modules/migrate_drupal/src/Tests/d6/MigrateUserProfileFieldInstanceTest.php
@@ -49,44 +49,44 @@ protected function setUp() {
*/
public function testUserProfileFields() {
// Migrated a text field.
- $field = entity_load('field_instance_config', 'user.user.profile_color');
+ $field = entity_load('field_config', 'user.user.profile_color');
$this->assertEqual($field->label(), 'Favorite color');
$this->assertEqual($field->getDescription(), 'List your favorite color');
// Migrated a textarea.
- $field = entity_load('field_instance_config', 'user.user.profile_biography');
+ $field = entity_load('field_config', 'user.user.profile_biography');
$this->assertEqual($field->label(), 'Biography');
$this->assertEqual($field->getDescription(), 'Tell people a little bit about yourself');
// Migrated checkbox field.
- $field = entity_load('field_instance_config', 'user.user.profile_sell_address');
+ $field = entity_load('field_config', 'user.user.profile_sell_address');
$this->assertEqual($field->label(), 'Sell your email address?');
$this->assertEqual($field->getDescription(), "If you check this box, we'll sell your address to spammers to help line the pockets of our shareholders. Thanks!");
// Migrated selection field.
- $field = entity_load('field_instance_config', 'user.user.profile_sold_to');
+ $field = entity_load('field_config', 'user.user.profile_sold_to');
$this->assertEqual($field->label(), 'Sales Category');
$this->assertEqual($field->getDescription(), "Select the sales categories to which this user's address was sold.");
// Migrated list field.
- $field = entity_load('field_instance_config', 'user.user.profile_bands');
+ $field = entity_load('field_config', 'user.user.profile_bands');
$this->assertEqual($field->label(), 'Favorite bands');
$this->assertEqual($field->getDescription(), "Enter your favorite bands. When you've saved your profile, you'll be able to find other people with the same favorites.");
/*
// Migrated URL field.
- $field = entity_load('field_instance_config', 'user.user.profile_blog');
+ $field = entity_load('field_config', 'user.user.profile_blog');
$this->assertEqual($field->label(), 'Your blog');
$this->assertEqual($field->getDescription(), "Paste the full URL, including http://, of your personal blog.");
*/
// Migrated date field.
- $field = entity_load('field_instance_config', 'user.user.profile_birthdate');
+ $field = entity_load('field_config', 'user.user.profile_birthdate');
$this->assertEqual($field->label(), 'Birthdate');
$this->assertEqual($field->getDescription(), "Enter your birth date and we'll send you a coupon.");
// Another migrated checkbox field, with a different source visibility setting.
- $field = entity_load('field_instance_config', 'user.user.profile_love_migrations');
+ $field = entity_load('field_config', 'user.user.profile_love_migrations');
$this->assertEqual($field->label(), 'I love migrations');
$this->assertEqual($field->getDescription(), "If you check this box, you love migrations.");
}
diff --git a/core/modules/migrate_drupal/src/Tests/d6/MigrateUserTest.php b/core/modules/migrate_drupal/src/Tests/d6/MigrateUserTest.php
index 8bdbca1..71bfb4a 100644
--- a/core/modules/migrate_drupal/src/Tests/d6/MigrateUserTest.php
+++ b/core/modules/migrate_drupal/src/Tests/d6/MigrateUserTest.php
@@ -44,7 +44,7 @@ protected function setUp() {
'type' => 'image',
'translatable' => '0',
))->save();
- entity_create('field_instance_config', array(
+ entity_create('field_config', array(
'label' => 'User Picture',
'description' => '',
'field_name' => 'user_picture',
diff --git a/core/modules/migrate_drupal/src/Tests/d6/MigrateVocabularyEntityDisplayTest.php b/core/modules/migrate_drupal/src/Tests/d6/MigrateVocabularyEntityDisplayTest.php
index 475e26d..fa071bd 100644
--- a/core/modules/migrate_drupal/src/Tests/d6/MigrateVocabularyEntityDisplayTest.php
+++ b/core/modules/migrate_drupal/src/Tests/d6/MigrateVocabularyEntityDisplayTest.php
@@ -38,7 +38,7 @@ protected function setUp() {
foreach (array('page', 'article', 'story') as $type) {
entity_create('node_type', array('type' => $type))->save();
- entity_create('field_instance_config', array(
+ entity_create('field_config', array(
'label' => 'Tags',
'description' => '',
'field_name' => 'tags',
diff --git a/core/modules/migrate_drupal/src/Tests/d6/MigrateVocabularyEntityFormDisplayTest.php b/core/modules/migrate_drupal/src/Tests/d6/MigrateVocabularyEntityFormDisplayTest.php
index 25a7c81..a904068 100644
--- a/core/modules/migrate_drupal/src/Tests/d6/MigrateVocabularyEntityFormDisplayTest.php
+++ b/core/modules/migrate_drupal/src/Tests/d6/MigrateVocabularyEntityFormDisplayTest.php
@@ -38,7 +38,7 @@ protected function setUp() {
foreach (array('page', 'article', 'story') as $type) {
entity_create('node_type', array('type' => $type))->save();
- entity_create('field_instance_config', array(
+ entity_create('field_config', array(
'label' => 'Tags',
'description' => '',
'field_name' => 'tags',
diff --git a/core/modules/migrate_drupal/src/Tests/d6/MigrateVocabularyFieldInstanceTest.php b/core/modules/migrate_drupal/src/Tests/d6/MigrateVocabularyFieldInstanceTest.php
index 25a485a..0d78e73 100644
--- a/core/modules/migrate_drupal/src/Tests/d6/MigrateVocabularyFieldInstanceTest.php
+++ b/core/modules/migrate_drupal/src/Tests/d6/MigrateVocabularyFieldInstanceTest.php
@@ -83,12 +83,12 @@ protected function setUp() {
public function testVocabularyFieldInstance() {
// Test that the field exists.
$field_id = 'node.article.tags';
- $field = entity_load('field_instance_config', $field_id);
+ $field = entity_load('field_config', $field_id);
$this->assertEqual($field->id(), $field_id, 'Field instance exists on article bundle.');
// Test the page bundle as well.
$field_id = 'node.page.tags';
- $field = entity_load('field_instance_config', $field_id);
+ $field = entity_load('field_config', $field_id);
$this->assertEqual($field->id(), $field_id, 'Field instance exists on page bundle.');
$this->assertEqual(array('node', 'article', 'tags'), entity_load('migration', 'd6_vocabulary_field_instance')->getIdMap()->lookupDestinationID(array(4, 'article')));
diff --git a/core/modules/node/node.module b/core/modules/node/node.module
index 3cd3607..8cd3965 100644
--- a/core/modules/node/node.module
+++ b/core/modules/node/node.module
@@ -18,7 +18,7 @@
use Drupal\Core\Database\Query\AlterableInterface;
use Drupal\Core\Database\Query\SelectInterface;
use Drupal\field\Entity\FieldStorageConfig;
-use Drupal\field\Entity\FieldInstanceConfig;
+use Drupal\field\Entity\FieldConfig;
use Drupal\node\Entity\Node;
use Drupal\node\Entity\NodeType;
use Drupal\node\NodeTypeInterface;
@@ -359,7 +359,7 @@ function node_type_load($name) {
function node_add_body_field(NodeTypeInterface $type, $label = 'Body') {
// Add or remove the body field, as needed.
$field_storage = FieldStorageConfig::loadByName('node', 'body');
- $instance = FieldInstanceConfig::loadByName('node', $type->id(), 'body');
+ $instance = FieldConfig::loadByName('node', $type->id(), 'body');
if (empty($field_storage)) {
$field_storage = entity_create('field_storage_config', array(
'name' => 'body',
@@ -369,7 +369,7 @@ function node_add_body_field(NodeTypeInterface $type, $label = 'Body') {
$field_storage->save();
}
if (empty($instance)) {
- $instance = entity_create('field_instance_config', array(
+ $instance = entity_create('field_config', array(
'field_storage' => $field_storage,
'bundle' => $type->id(),
'label' => $label,
diff --git a/core/modules/node/src/Tests/Config/NodeImportCreateTest.php b/core/modules/node/src/Tests/Config/NodeImportCreateTest.php
index c0d5bc7..7075714 100644
--- a/core/modules/node/src/Tests/Config/NodeImportCreateTest.php
+++ b/core/modules/node/src/Tests/Config/NodeImportCreateTest.php
@@ -7,7 +7,7 @@
namespace Drupal\node\Tests\Config;
-use Drupal\field\Entity\FieldInstanceConfig;
+use Drupal\field\Entity\FieldConfig;
use Drupal\simpletest\DrupalUnitTestBase;
/**
@@ -73,7 +73,7 @@ public function testImportCreate() {
// Check that the content type was created.
$node_type = entity_load('node_type', $node_type_id);
$this->assertTrue($node_type, 'Import node type from staging was created.');
- $this->assertFalse(FieldInstanceConfig::loadByName('node', $node_type_id, 'body'));
+ $this->assertFalse(FieldConfig::loadByName('node', $node_type_id, 'body'));
}
}
diff --git a/core/modules/node/src/Tests/MultiStepNodeFormBasicOptionsTest.php b/core/modules/node/src/Tests/MultiStepNodeFormBasicOptionsTest.php
index 33375fa..0391e5b 100644
--- a/core/modules/node/src/Tests/MultiStepNodeFormBasicOptionsTest.php
+++ b/core/modules/node/src/Tests/MultiStepNodeFormBasicOptionsTest.php
@@ -39,7 +39,7 @@ function testMultiStepNodeFormBasicOptions() {
))->save();
// Attach an instance of the field to the page content type.
- entity_create('field_instance_config', array(
+ entity_create('field_config', array(
'field_name' => $this->field_name,
'entity_type' => 'node',
'bundle' => 'page',
diff --git a/core/modules/node/src/Tests/NodeAccessFieldTest.php b/core/modules/node/src/Tests/NodeAccessFieldTest.php
index b8ebed3..14206e6 100644
--- a/core/modules/node/src/Tests/NodeAccessFieldTest.php
+++ b/core/modules/node/src/Tests/NodeAccessFieldTest.php
@@ -58,7 +58,7 @@ public function setUp() {
'entity_type' => 'node',
'type' => 'text'
))->save();
- entity_create('field_instance_config', array(
+ entity_create('field_config', array(
'field_name' => $this->field_name,
'entity_type' => 'node',
'bundle' => 'page',
diff --git a/core/modules/node/src/Tests/NodeAccessLanguageAwareCombinationTest.php b/core/modules/node/src/Tests/NodeAccessLanguageAwareCombinationTest.php
index cd78a80..0b8bb7d 100644
--- a/core/modules/node/src/Tests/NodeAccessLanguageAwareCombinationTest.php
+++ b/core/modules/node/src/Tests/NodeAccessLanguageAwareCombinationTest.php
@@ -65,7 +65,7 @@ public function setUp() {
));
$field_storage->save();
- entity_create('field_instance_config', array(
+ entity_create('field_config', array(
'field_storage' => $field_storage,
'bundle' => 'page',
'widget' => array(
diff --git a/core/modules/node/src/Tests/NodeAccessLanguageAwareTest.php b/core/modules/node/src/Tests/NodeAccessLanguageAwareTest.php
index 7a4e3e2..85de61e 100644
--- a/core/modules/node/src/Tests/NodeAccessLanguageAwareTest.php
+++ b/core/modules/node/src/Tests/NodeAccessLanguageAwareTest.php
@@ -56,7 +56,7 @@ public function setUp() {
));
$field_storage->save();
- entity_create('field_instance_config', array(
+ entity_create('field_config', array(
'field_storage' => $field_storage,
'bundle' => 'page',
'widget' => array(
diff --git a/core/modules/node/src/Tests/NodeTypeRenameConfigImportTest.php b/core/modules/node/src/Tests/NodeTypeRenameConfigImportTest.php
index ca6e476..24d19be 100644
--- a/core/modules/node/src/Tests/NodeTypeRenameConfigImportTest.php
+++ b/core/modules/node/src/Tests/NodeTypeRenameConfigImportTest.php
@@ -74,7 +74,7 @@ public function testConfigurationRename() {
'entity.form_display.node.' . $active_type . '.default::entity.form_display.node.' . $staged_type . '.default',
'entity.view_display.node.' . $active_type . '.default::entity.view_display.node.' . $staged_type . '.default',
'entity.view_display.node.' . $active_type . '.teaser::entity.view_display.node.' . $staged_type . '.teaser',
- 'field.instance.node.' . $active_type . '.body::field.instance.node.' . $staged_type . '.body',
+ 'field.field.node.' . $active_type . '.body::field.field.node.' . $staged_type . '.body',
);
$renames = $this->configImporter()->getUnprocessedConfiguration('rename');
$this->assertIdentical($expected, $renames);
diff --git a/core/modules/node/src/Tests/NodeTypeTest.php b/core/modules/node/src/Tests/NodeTypeTest.php
index 10bfbb9..34a1369 100644
--- a/core/modules/node/src/Tests/NodeTypeTest.php
+++ b/core/modules/node/src/Tests/NodeTypeTest.php
@@ -6,7 +6,7 @@
*/
namespace Drupal\node\Tests;
-use Drupal\field\Entity\FieldInstanceConfig;
+use Drupal\field\Entity\FieldConfig;
/**
* Ensures that node type functions work correctly.
@@ -78,7 +78,7 @@ function testNodeTypeEditing() {
$web_user = $this->drupalCreateUser(array('bypass node access', 'administer content types', 'administer node fields'));
$this->drupalLogin($web_user);
- $instance = FieldInstanceConfig::loadByName('node', 'page', 'body');
+ $instance = FieldConfig::loadByName('node', 'page', 'body');
$this->assertEqual($instance->getLabel(), 'Body', 'Body field was found.');
// Verify that title and body fields are displayed.
diff --git a/core/modules/node/src/Tests/PagePreviewTest.php b/core/modules/node/src/Tests/PagePreviewTest.php
index d160c8b..711ba7d 100644
--- a/core/modules/node/src/Tests/PagePreviewTest.php
+++ b/core/modules/node/src/Tests/PagePreviewTest.php
@@ -75,7 +75,7 @@ function setUp() {
),
'cardinality' => '-1',
))->save();
- entity_create('field_instance_config', array(
+ entity_create('field_config', array(
'field_name' => $this->field_name,
'entity_type' => 'node',
'bundle' => 'page',
diff --git a/core/modules/node/tests/modules/node_access_test/node_access_test.module b/core/modules/node/tests/modules/node_access_test/node_access_test.module
index 797cf25..2416bd9 100644
--- a/core/modules/node/tests/modules/node_access_test/node_access_test.module
+++ b/core/modules/node/tests/modules/node_access_test/node_access_test.module
@@ -20,7 +20,7 @@
*/
use Drupal\field\Entity\FieldStorageConfig;
-use Drupal\field\Entity\FieldInstanceConfig;
+use Drupal\field\Entity\FieldConfig;
use Drupal\node\NodeTypeInterface;
use Drupal\node\NodeInterface;
@@ -140,7 +140,7 @@ function node_access_test_add_field(NodeTypeInterface $type) {
'type' => 'integer',
));
$field_storage->save();
- $instance = FieldInstanceConfig::create(array(
+ $instance = FieldConfig::create(array(
'field_name' => 'private',
'entity_type' => 'node',
'bundle' => $type->id(),
diff --git a/core/modules/options/src/Tests/OptionsDynamicValuesTestBase.php b/core/modules/options/src/Tests/OptionsDynamicValuesTestBase.php
index ddb22ad..9f8a0c9 100644
--- a/core/modules/options/src/Tests/OptionsDynamicValuesTestBase.php
+++ b/core/modules/options/src/Tests/OptionsDynamicValuesTestBase.php
@@ -41,7 +41,7 @@ function setUp() {
'allowed_values_function' => 'options_test_dynamic_values_callback',
),
))->save();
- $this->instance = entity_create('field_instance_config', array(
+ $this->instance = entity_create('field_config', array(
'field_name' => $this->field_name,
'entity_type' => 'entity_test_rev',
'bundle' => 'entity_test_rev',
diff --git a/core/modules/options/src/Tests/OptionsFieldTest.php b/core/modules/options/src/Tests/OptionsFieldTest.php
index 8832326..89e428e 100644
--- a/core/modules/options/src/Tests/OptionsFieldTest.php
+++ b/core/modules/options/src/Tests/OptionsFieldTest.php
@@ -76,7 +76,7 @@ function testUpdateAllowedValues() {
// Options are reset when a new field with the same name is created.
$this->fieldStorage->delete();
entity_create('field_storage_config', $this->fieldStorageDefinition)->save();
- entity_create('field_instance_config', array(
+ entity_create('field_config', array(
'field_name' => $this->fieldName,
'entity_type' => 'entity_test',
'bundle' => 'entity_test',
diff --git a/core/modules/options/src/Tests/OptionsFieldUITest.php b/core/modules/options/src/Tests/OptionsFieldUITest.php
index 969ce8e..7643806 100644
--- a/core/modules/options/src/Tests/OptionsFieldUITest.php
+++ b/core/modules/options/src/Tests/OptionsFieldUITest.php
@@ -252,7 +252,7 @@ protected function createOptionsField($type) {
'entity_type' => 'node',
'type' => $type,
))->save();
- entity_create('field_instance_config', array(
+ entity_create('field_config', array(
'field_name' => $this->field_name,
'entity_type' => 'node',
'bundle' => $this->type,
diff --git a/core/modules/options/src/Tests/OptionsFieldUnitTestBase.php b/core/modules/options/src/Tests/OptionsFieldUnitTestBase.php
index ef8eb06..d45e94b 100644
--- a/core/modules/options/src/Tests/OptionsFieldUnitTestBase.php
+++ b/core/modules/options/src/Tests/OptionsFieldUnitTestBase.php
@@ -46,7 +46,7 @@
/**
* The list field instance used in the test.
*
- * @var \Drupal\field\Entity\FieldInstanceConfig
+ * @var \Drupal\field\Entity\FieldConfig
*/
protected $instance;
@@ -69,7 +69,7 @@ public function setUp() {
$this->fieldStorage = entity_create('field_storage_config', $this->fieldStorageDefinition);
$this->fieldStorage->save();
- $this->instance = entity_create('field_instance_config', array(
+ $this->instance = entity_create('field_config', array(
'field_storage' => $this->fieldStorage,
'bundle' => 'entity_test',
));
diff --git a/core/modules/options/src/Tests/OptionsWidgetsTest.php b/core/modules/options/src/Tests/OptionsWidgetsTest.php
index f9c4287..118f391 100644
--- a/core/modules/options/src/Tests/OptionsWidgetsTest.php
+++ b/core/modules/options/src/Tests/OptionsWidgetsTest.php
@@ -96,7 +96,7 @@ function setUp() {
*/
function testRadioButtons() {
// Create an instance of the 'single value' field.
- $instance = entity_create('field_instance_config', array(
+ $instance = entity_create('field_config', array(
'field_storage' => $this->card_1,
'bundle' => 'entity_test',
));
@@ -153,7 +153,7 @@ function testRadioButtons() {
*/
function testCheckBoxes() {
// Create an instance of the 'multiple values' field.
- $instance = entity_create('field_instance_config', array(
+ $instance = entity_create('field_config', array(
'field_storage' => $this->card_2,
'bundle' => 'entity_test',
));
@@ -242,7 +242,7 @@ function testCheckBoxes() {
*/
function testSelectListSingle() {
// Create an instance of the 'single value' field.
- $instance = entity_create('field_instance_config', array(
+ $instance = entity_create('field_config', array(
'field_storage' => $this->card_1,
'bundle' => 'entity_test',
'required' => TRUE,
@@ -342,7 +342,7 @@ function testSelectListSingle() {
*/
function testSelectListMultiple() {
// Create an instance of the 'multiple values' field.
- $instance = entity_create('field_instance_config', array(
+ $instance = entity_create('field_config', array(
'field_storage' => $this->card_2,
'bundle' => 'entity_test',
));
diff --git a/core/modules/quickedit/src/Tests/QuickEditAutocompleteTermTest.php b/core/modules/quickedit/src/Tests/QuickEditAutocompleteTermTest.php
index 7e91724..4f4e4d8 100644
--- a/core/modules/quickedit/src/Tests/QuickEditAutocompleteTermTest.php
+++ b/core/modules/quickedit/src/Tests/QuickEditAutocompleteTermTest.php
@@ -89,7 +89,7 @@ protected function setUp() {
),
),
))->save();
- entity_create('field_instance_config', array(
+ entity_create('field_config', array(
'field_name' => $this->field_name,
'entity_type' => 'node',
'label' => 'Tags',
diff --git a/core/modules/quickedit/src/Tests/QuickEditTestBase.php b/core/modules/quickedit/src/Tests/QuickEditTestBase.php
index 4f4ece7..18b16c2 100644
--- a/core/modules/quickedit/src/Tests/QuickEditTestBase.php
+++ b/core/modules/quickedit/src/Tests/QuickEditTestBase.php
@@ -78,7 +78,7 @@ protected function createFieldWithInstance($field_name, $type, $cardinality, $la
$this->fields->$field_storage->save();
$instance = $field_name . '_instance';
- $this->fields->$instance = entity_create('field_instance_config', array(
+ $this->fields->$instance = entity_create('field_config', array(
'field_storage' => $this->fields->$field_storage,
'bundle' => 'entity_test',
'label' => $label,
diff --git a/core/modules/rdf/src/Tests/Field/FieldRdfaTestBase.php b/core/modules/rdf/src/Tests/Field/FieldRdfaTestBase.php
index 9a26aca..dad9355 100644
--- a/core/modules/rdf/src/Tests/Field/FieldRdfaTestBase.php
+++ b/core/modules/rdf/src/Tests/Field/FieldRdfaTestBase.php
@@ -111,7 +111,7 @@ protected function createTestField() {
'entity_type' => 'entity_test',
'type' => $this->fieldType,
))->save();
- entity_create('field_instance_config', array(
+ entity_create('field_config', array(
'entity_type' => 'entity_test',
'field_name' => $this->fieldName,
'bundle' => 'entity_test',
diff --git a/core/modules/rdf/src/Tests/Field/TaxonomyTermReferenceRdfaTest.php b/core/modules/rdf/src/Tests/Field/TaxonomyTermReferenceRdfaTest.php
index 98d086a..cb97417 100644
--- a/core/modules/rdf/src/Tests/Field/TaxonomyTermReferenceRdfaTest.php
+++ b/core/modules/rdf/src/Tests/Field/TaxonomyTermReferenceRdfaTest.php
@@ -68,7 +68,7 @@ public function setUp() {
),
),
))->save();
- entity_create('field_instance_config', array(
+ entity_create('field_config', array(
'entity_type' => 'entity_test',
'field_name' => $this->fieldName,
'bundle' => 'entity_test',
diff --git a/core/modules/rdf/src/Tests/TaxonomyTermFieldAttributesTest.php b/core/modules/rdf/src/Tests/TaxonomyTermFieldAttributesTest.php
index c814460..c68665c 100644
--- a/core/modules/rdf/src/Tests/TaxonomyTermFieldAttributesTest.php
+++ b/core/modules/rdf/src/Tests/TaxonomyTermFieldAttributesTest.php
@@ -163,7 +163,7 @@ protected function createTaxonomyTermReferenceField($field_name, $vocabulary) {
),
),
))->save();
- entity_create('field_instance_config', array(
+ entity_create('field_config', array(
'field_name' => $field_name,
'entity_type' => 'node',
'bundle' => 'article',
diff --git a/core/modules/search/src/Tests/SearchCommentTest.php b/core/modules/search/src/Tests/SearchCommentTest.php
index a9d343f..b8ef5f6 100644
--- a/core/modules/search/src/Tests/SearchCommentTest.php
+++ b/core/modules/search/src/Tests/SearchCommentTest.php
@@ -9,7 +9,7 @@
use Drupal\comment\Plugin\Field\FieldType\CommentItemInterface;
use Drupal\Component\Utility\String;
-use Drupal\field\Entity\FieldInstanceConfig;
+use Drupal\field\Entity\FieldConfig;
/**
* Tests integration searching comments.
@@ -74,7 +74,7 @@ function testSearchResultsComment() {
$comment_body = 'Test comment body';
// Make preview optional.
- $instance = FieldInstanceConfig::loadByName('node', 'article', 'comment');
+ $instance = FieldConfig::loadByName('node', 'article', 'comment');
$instance->settings['preview'] = DRUPAL_OPTIONAL;
$instance->save();
@@ -146,7 +146,7 @@ function testSearchResultsCommentAccess() {
// Create a node.
// Make preview optional.
- $instance = FieldInstanceConfig::loadByName('node', 'article', 'comment');
+ $instance = FieldConfig::loadByName('node', 'article', 'comment');
$instance->settings['preview'] = DRUPAL_OPTIONAL;
$instance->save();
$this->node = $this->drupalCreateNode(array('type' => 'article'));
diff --git a/core/modules/serialization/src/Tests/EntityResolverTest.php b/core/modules/serialization/src/Tests/EntityResolverTest.php
index db65692..d3cd12c 100644
--- a/core/modules/serialization/src/Tests/EntityResolverTest.php
+++ b/core/modules/serialization/src/Tests/EntityResolverTest.php
@@ -41,7 +41,7 @@ protected function setUp() {
))->save();
// Create the test field instance.
- entity_create('field_instance_config', array(
+ entity_create('field_config', array(
'entity_type' => 'entity_test_mulrev',
'field_name' => 'field_test_entity_reference',
'bundle' => 'entity_test_mulrev',
diff --git a/core/modules/serialization/src/Tests/NormalizerTestBase.php b/core/modules/serialization/src/Tests/NormalizerTestBase.php
index 8d5bf5c..531c53d 100644
--- a/core/modules/serialization/src/Tests/NormalizerTestBase.php
+++ b/core/modules/serialization/src/Tests/NormalizerTestBase.php
@@ -34,7 +34,7 @@ protected function setUp() {
'cardinality' => 1,
'translatable' => FALSE,
))->save();
- entity_create('field_instance_config', array(
+ entity_create('field_config', array(
'entity_type' => 'entity_test_mulrev',
'field_name' => 'field_test_text',
'bundle' => 'entity_test_mulrev',
diff --git a/core/modules/simpletest/src/Tests/KernelTestBaseTest.php b/core/modules/simpletest/src/Tests/KernelTestBaseTest.php
index 288cf4d..421489a 100644
--- a/core/modules/simpletest/src/Tests/KernelTestBaseTest.php
+++ b/core/modules/simpletest/src/Tests/KernelTestBaseTest.php
@@ -256,7 +256,7 @@ function testEnableModulesFixedList() {
'type' => 'test_field'
));
$field_storage->save();
- entity_create('field_instance_config', array(
+ entity_create('field_config', array(
'field_storage' => $field_storage,
'bundle' => 'entity_test',
))->save();
diff --git a/core/modules/system/src/Tests/Ajax/MultiFormTest.php b/core/modules/system/src/Tests/Ajax/MultiFormTest.php
index 44de1a2..3019cfd 100644
--- a/core/modules/system/src/Tests/Ajax/MultiFormTest.php
+++ b/core/modules/system/src/Tests/Ajax/MultiFormTest.php
@@ -37,7 +37,7 @@ function setUp() {
'type' => 'text',
'cardinality' => FieldStorageDefinitionInterface::CARDINALITY_UNLIMITED,
))->save();
- entity_create('field_instance_config', array(
+ entity_create('field_config', array(
'field_name' => $field_name,
'entity_type' => 'node',
'bundle' => 'page',
diff --git a/core/modules/system/src/Tests/Entity/EntityCacheTagsTestBase.php b/core/modules/system/src/Tests/Entity/EntityCacheTagsTestBase.php
index aec60b5..079d18a 100644
--- a/core/modules/system/src/Tests/Entity/EntityCacheTagsTestBase.php
+++ b/core/modules/system/src/Tests/Entity/EntityCacheTagsTestBase.php
@@ -66,7 +66,7 @@ public function setUp() {
// this configurable field in later tests to ensure that modifications to
// field (instance) configuration invalidate render cache entries.
if ($this->entity->getEntityType()->isFieldable()) {
- // Add field, so we can modify the Field and FieldInstance entities to
+ // Add field, so we can modify the Field and Field entities to
// verify that changes to those indeed clear cache tags.
entity_create('field_storage_config', array(
'name' => 'configurable_field',
@@ -74,7 +74,7 @@ public function setUp() {
'type' => 'test_field',
'settings' => array(),
))->save();
- entity_create('field_instance_config', array(
+ entity_create('field_config', array(
'entity_type' => $this->entity->getEntityTypeId(),
'bundle' => $this->entity->bundle(),
'field_name' => 'configurable_field',
@@ -193,7 +193,7 @@ protected function createReferenceTestEntities($referenced_entity) {
'target_type' => $referenced_entity->getEntityTypeId(),
),
))->save();
- entity_create('field_instance_config', array(
+ entity_create('field_config', array(
'field_name' => $field_name,
'entity_type' => $entity_type,
'bundle' => $bundle,
@@ -418,7 +418,7 @@ public function testReferencedEntity() {
// entity, there is a cache miss.
$this->pass("Test modification of referenced entity's configurable field instance.", 'Debug');
$field_instance_name = $this->entity->getEntityTypeId() . '.' . $this->entity->bundle() . '.configurable_field';
- $field_instance = entity_load('field_instance_config', $field_instance_name);
+ $field_instance = entity_load('field_config', $field_instance_name);
$field_instance->save();
$this->verifyPageCache($referencing_entity_path, 'MISS');
$this->verifyPageCache($listing_path, 'MISS');
diff --git a/core/modules/system/src/Tests/Entity/EntityFieldTest.php b/core/modules/system/src/Tests/Entity/EntityFieldTest.php
index 2371957..f1aedb5 100644
--- a/core/modules/system/src/Tests/Entity/EntityFieldTest.php
+++ b/core/modules/system/src/Tests/Entity/EntityFieldTest.php
@@ -17,7 +17,7 @@
use Drupal\Core\TypedData\DataDefinitionInterface;
use Drupal\Core\TypedData\Type\StringInterface;
use Drupal\Core\TypedData\TypedDataInterface;
-use Drupal\field\Entity\FieldInstanceConfig;
+use Drupal\field\Entity\FieldConfig;
use Drupal\node\Entity\NodeType;
/**
@@ -615,7 +615,7 @@ public function testComputedProperties() {
*/
protected function assertComputedProperties($entity_type) {
// Make the test text field processed.
- $instance = FieldInstanceConfig::loadByName($entity_type, $entity_type, 'field_test_text');
+ $instance = FieldConfig::loadByName($entity_type, $entity_type, 'field_test_text');
$instance->settings['text_processing'] = 1;
$instance->save();
diff --git a/core/modules/system/src/Tests/Entity/EntityLanguageTestBase.php b/core/modules/system/src/Tests/Entity/EntityLanguageTestBase.php
index 19cf1ad..9e75c75 100644
--- a/core/modules/system/src/Tests/Entity/EntityLanguageTestBase.php
+++ b/core/modules/system/src/Tests/Entity/EntityLanguageTestBase.php
@@ -8,7 +8,7 @@
namespace Drupal\system\Tests\Entity;
use Drupal\Core\Language\Language;
-use Drupal\field\Entity\FieldInstanceConfig;
+use Drupal\field\Entity\FieldConfig;
/**
* Base class for language-aware entity tests.
@@ -76,13 +76,13 @@ function setUp() {
'type' => 'text',
'cardinality' => 4,
))->save();
- entity_create('field_instance_config', array(
+ entity_create('field_config', array(
'field_name' => $this->field_name,
'entity_type' => $entity_type,
'bundle' => $entity_type,
'translatable' => TRUE,
))->save();
- $this->instance[$entity_type] = entity_load('field_instance_config', $entity_type . '.' . $entity_type . '.' . $this->field_name);
+ $this->instance[$entity_type] = entity_load('field_config', $entity_type . '.' . $entity_type . '.' . $this->field_name);
entity_create('field_storage_config', array(
'name' => $this->untranslatable_field_name,
@@ -90,7 +90,7 @@ function setUp() {
'type' => 'text',
'cardinality' => 4,
))->save();
- entity_create('field_instance_config', array(
+ entity_create('field_config', array(
'field_name' => $this->untranslatable_field_name,
'entity_type' => $entity_type,
'bundle' => $entity_type,
@@ -127,11 +127,11 @@ function setUp() {
protected function toggleFieldTranslatability($entity_type, $bundle) {
$fields = array($this->field_name, $this->untranslatable_field_name);
foreach ($fields as $field_name) {
- $instance = FieldInstanceConfig::loadByName($entity_type, $bundle, $field_name);
+ $instance = FieldConfig::loadByName($entity_type, $bundle, $field_name);
$translatable = !$instance->isTranslatable();
$instance->set('translatable', $translatable);
$instance->save();
- $instance = FieldInstanceConfig::loadByName($entity_type, $bundle, $field_name);
+ $instance = FieldConfig::loadByName($entity_type, $bundle, $field_name);
$this->assertEqual($instance->isTranslatable(), $translatable, 'Field translatability changed.');
}
\Drupal::cache('entity')->deleteAll();
diff --git a/core/modules/system/src/Tests/Entity/EntityQueryAggregateTest.php b/core/modules/system/src/Tests/Entity/EntityQueryAggregateTest.php
index 9cf3bcd..a2af69d 100644
--- a/core/modules/system/src/Tests/Entity/EntityQueryAggregateTest.php
+++ b/core/modules/system/src/Tests/Entity/EntityQueryAggregateTest.php
@@ -57,7 +57,7 @@ public function setUp() {
'type' => 'integer',
'cardinality' => 2,
))->save();
- entity_create('field_instance_config', array(
+ entity_create('field_config', array(
'field_name' => $field_name,
'entity_type' => 'entity_test',
'bundle' => 'entity_test',
diff --git a/core/modules/system/src/Tests/Entity/EntityQueryRelationshipTest.php b/core/modules/system/src/Tests/Entity/EntityQueryRelationshipTest.php
index cce7128..a1758a0 100644
--- a/core/modules/system/src/Tests/Entity/EntityQueryRelationshipTest.php
+++ b/core/modules/system/src/Tests/Entity/EntityQueryRelationshipTest.php
@@ -83,7 +83,7 @@ public function setUp() {
entity_create('field_storage_config', $field)->save();
entity_test_create_bundle('test_bundle');
// Third, create the instance.
- entity_create('field_instance_config', array(
+ entity_create('field_config', array(
'entity_type' => 'entity_test',
'field_name' => $this->fieldName,
'bundle' => 'test_bundle',
diff --git a/core/modules/system/src/Tests/Entity/EntityQueryTest.php b/core/modules/system/src/Tests/Entity/EntityQueryTest.php
index 478068e..4bd0049 100644
--- a/core/modules/system/src/Tests/Entity/EntityQueryTest.php
+++ b/core/modules/system/src/Tests/Entity/EntityQueryTest.php
@@ -78,7 +78,7 @@ function setUp() {
} while ($bundles && strtolower($bundles[0]) >= strtolower($bundle));
entity_test_create_bundle($bundle);
foreach ($field_storages as $field_storage) {
- entity_create('field_instance_config', array(
+ entity_create('field_config', array(
'field_storage' => $field_storage,
'bundle' => $bundle,
))->save();
@@ -434,7 +434,7 @@ protected function testCount() {
));
$field_storage->save();
$bundle = $this->randomMachineName();
- entity_create('field_instance_config', array(
+ entity_create('field_config', array(
'field_storage' => $field_storage,
'bundle' => $bundle,
))->save();
diff --git a/core/modules/system/src/Tests/Entity/EntityTranslationTest.php b/core/modules/system/src/Tests/Entity/EntityTranslationTest.php
index 7ee45c2..44e718283 100644
--- a/core/modules/system/src/Tests/Entity/EntityTranslationTest.php
+++ b/core/modules/system/src/Tests/Entity/EntityTranslationTest.php
@@ -429,7 +429,7 @@ function testEntityTranslationAPI() {
// Check that per-language defaults are properly populated.
$entity = $this->reloadEntity($entity);
$instance_id = implode('.', array($entity->getEntityTypeId(), $entity->bundle(), $this->field_name));
- $instance = $this->entityManager->getStorage('field_instance_config')->load($instance_id);
+ $instance = $this->entityManager->getStorage('field_config')->load($instance_id);
$instance->default_value_function = 'entity_test_field_default_value';
$instance->save();
$translation = $entity->addTranslation($langcode2);
diff --git a/core/modules/system/src/Tests/Entity/EntityWithUriCacheTagsTestBase.php b/core/modules/system/src/Tests/Entity/EntityWithUriCacheTagsTestBase.php
index 6f1d7a8..58d0850 100644
--- a/core/modules/system/src/Tests/Entity/EntityWithUriCacheTagsTestBase.php
+++ b/core/modules/system/src/Tests/Entity/EntityWithUriCacheTagsTestBase.php
@@ -98,7 +98,7 @@ public function testEntityUri() {
// entity, there is a cache miss.
$this->pass("Test modification of entity's configurable field instance.", 'Debug');
$field_instance_name = $this->entity->getEntityTypeId() . '.' . $this->entity->bundle() . '.configurable_field';
- $field_instance = entity_load('field_instance_config', $field_instance_name);
+ $field_instance = entity_load('field_config', $field_instance_name);
$field_instance->save();
$this->verifyPageCache($entity_path, 'MISS');
diff --git a/core/modules/system/src/Tests/Entity/FieldSqlStorageTest.php b/core/modules/system/src/Tests/Entity/FieldSqlStorageTest.php
index 2ae87fc..abbad9a 100644
--- a/core/modules/system/src/Tests/Entity/FieldSqlStorageTest.php
+++ b/core/modules/system/src/Tests/Entity/FieldSqlStorageTest.php
@@ -46,7 +46,7 @@ class FieldSqlStorageTest extends EntityUnitTestBase {
/**
* A field instance to use in this test class.
*
- * @var \Drupal\field\Entity\FieldInstanceConfig
+ * @var \Drupal\field\Entity\FieldConfig
*/
protected $instance;
@@ -72,7 +72,7 @@ function setUp() {
'cardinality' => $this->field_cardinality,
));
$this->fieldStorage->save();
- $this->instance = entity_create('field_instance_config', array(
+ $this->instance = entity_create('field_config', array(
'field_storage' => $this->fieldStorage,
'bundle' => $entity_type
));
@@ -265,7 +265,7 @@ function testLongNames() {
'entity_type' => $entity_type,
'type' => 'test_field',
))->save();
- entity_create('field_instance_config', array(
+ entity_create('field_config', array(
'field_name' => $field_names[$i],
'entity_type' => $entity_type,
'bundle' => $bundle,
@@ -297,7 +297,7 @@ function testUpdateFieldSchemaWithData() {
'settings' => array('precision' => 5, 'scale' => 2),
));
$field_storage->save();
- $instance = entity_create('field_instance_config', array(
+ $instance = entity_create('field_config', array(
'field_storage' => $field_storage,
'bundle' => $entity_type,
));
@@ -363,7 +363,7 @@ function testFieldUpdateIndexesWithData() {
'type' => 'text',
));
$field_storage->save();
- $instance = entity_create('field_instance_config', array(
+ $instance = entity_create('field_config', array(
'field_storage' => $field_storage,
'bundle' => $entity_type,
));
diff --git a/core/modules/system/src/Tests/Form/ArbitraryRebuildTest.php b/core/modules/system/src/Tests/Form/ArbitraryRebuildTest.php
index a922ca6..bea47ab 100644
--- a/core/modules/system/src/Tests/Form/ArbitraryRebuildTest.php
+++ b/core/modules/system/src/Tests/Form/ArbitraryRebuildTest.php
@@ -34,7 +34,7 @@ function setUp() {
'cardinality' => -1,
'translatable' => FALSE,
))->save();
- entity_create('field_instance_config', array(
+ entity_create('field_config', array(
'entity_type' => 'user',
'field_name' => 'test_multiple',
'bundle' => 'user',
diff --git a/core/modules/system/src/Tests/Form/RebuildTest.php b/core/modules/system/src/Tests/Form/RebuildTest.php
index 7e5a39b..623b5c5 100644
--- a/core/modules/system/src/Tests/Form/RebuildTest.php
+++ b/core/modules/system/src/Tests/Form/RebuildTest.php
@@ -71,7 +71,7 @@ function testPreserveFormActionAfterAJAX() {
'type' => 'text',
'cardinality' => FieldStorageDefinitionInterface::CARDINALITY_UNLIMITED,
))->save();
- entity_create('field_instance_config', array(
+ entity_create('field_config', array(
'field_name' => $field_name,
'entity_type' => 'node',
'bundle' => 'page',
diff --git a/core/modules/system/tests/modules/entity_test/entity_test.install b/core/modules/system/tests/modules/entity_test/entity_test.install
index 4dfd09b..541191d 100644
--- a/core/modules/system/tests/modules/entity_test/entity_test.install
+++ b/core/modules/system/tests/modules/entity_test/entity_test.install
@@ -23,7 +23,7 @@ function entity_test_install() {
'type' => 'text',
'cardinality' => 1,
))->save();
- entity_create('field_instance_config', array(
+ entity_create('field_config', array(
'entity_type' => $entity_type,
'field_name' => 'field_test_text',
'bundle' => $entity_type,
diff --git a/core/modules/system/tests/modules/entity_test/entity_test.module b/core/modules/system/tests/modules/entity_test/entity_test.module
index 6b293d1..26afb60 100644
--- a/core/modules/system/tests/modules/entity_test/entity_test.module
+++ b/core/modules/system/tests/modules/entity_test/entity_test.module
@@ -428,7 +428,7 @@ function entity_test_entity_test_mul_translation_delete(EntityInterface $transla
* An array of default values, in the same format as the $default_value
* property.
*
- * @see \Drupal\field\Entity\FieldInstanceConfig::$default_value
+ * @see \Drupal\field\Entity\FieldConfig::$default_value
*/
function entity_test_field_default_value(ContentEntityInterface $entity, FieldDefinitionInterface $definition) {
return array(array('value' => $definition->getName() . '_' . $entity->language()->id));
diff --git a/core/modules/taxonomy/src/Plugin/Field/FieldType/TaxonomyTermReferenceItem.php b/core/modules/taxonomy/src/Plugin/Field/FieldType/TaxonomyTermReferenceItem.php
index c58a631..5ec5ddd 100644
--- a/core/modules/taxonomy/src/Plugin/Field/FieldType/TaxonomyTermReferenceItem.php
+++ b/core/modules/taxonomy/src/Plugin/Field/FieldType/TaxonomyTermReferenceItem.php
@@ -152,7 +152,7 @@ public function settingsForm(array &$form, FormStateInterface $form_state, $has_
/**
* {@inheritdoc}
*/
- public function instanceSettingsForm(array $form, FormStateInterface $form_state) {
+ public function fieldSettingsForm(array $form, FormStateInterface $form_state) {
return array();
}
diff --git a/core/modules/taxonomy/src/Tests/LegacyTest.php b/core/modules/taxonomy/src/Tests/LegacyTest.php
index 4c90598..bf5e313 100644
--- a/core/modules/taxonomy/src/Tests/LegacyTest.php
+++ b/core/modules/taxonomy/src/Tests/LegacyTest.php
@@ -49,7 +49,7 @@ function setUp() {
),
),
))->save();
- entity_create('field_instance_config', array(
+ entity_create('field_config', array(
'entity_type' => 'node',
'field_name' => $field_name,
'bundle' => 'article',
diff --git a/core/modules/taxonomy/src/Tests/RssTest.php b/core/modules/taxonomy/src/Tests/RssTest.php
index a4805b1..c969ea7 100644
--- a/core/modules/taxonomy/src/Tests/RssTest.php
+++ b/core/modules/taxonomy/src/Tests/RssTest.php
@@ -47,7 +47,7 @@ function setUp() {
),
));
$this->fieldStorage->save();
- entity_create('field_instance_config', array(
+ entity_create('field_config', array(
'field_storage' => $this->fieldStorage,
'bundle' => 'article',
))->save();
diff --git a/core/modules/taxonomy/src/Tests/TaxonomyImageTest.php b/core/modules/taxonomy/src/Tests/TaxonomyImageTest.php
index 7d8589e..c5f66cc 100644
--- a/core/modules/taxonomy/src/Tests/TaxonomyImageTest.php
+++ b/core/modules/taxonomy/src/Tests/TaxonomyImageTest.php
@@ -46,7 +46,7 @@ public function setUp() {
'uri_scheme' => 'private',
),
))->save();
- entity_create('field_instance_config', array(
+ entity_create('field_config', array(
'field_name' => $name,
'entity_type' => $entity_type,
'bundle' => $this->vocabulary->id(),
diff --git a/core/modules/taxonomy/src/Tests/TaxonomyTermReferenceItemTest.php b/core/modules/taxonomy/src/Tests/TaxonomyTermReferenceItemTest.php
index b2072f2..8b96f4a 100644
--- a/core/modules/taxonomy/src/Tests/TaxonomyTermReferenceItemTest.php
+++ b/core/modules/taxonomy/src/Tests/TaxonomyTermReferenceItemTest.php
@@ -59,7 +59,7 @@ public function setUp() {
),
),
))->save();
- entity_create('field_instance_config', array(
+ entity_create('field_config', array(
'entity_type' => 'entity_test',
'field_name' => 'field_test_taxonomy',
'bundle' => 'entity_test',
diff --git a/core/modules/taxonomy/src/Tests/TermFieldMultipleVocabularyTest.php b/core/modules/taxonomy/src/Tests/TermFieldMultipleVocabularyTest.php
index 41ad77b..32f45ef 100644
--- a/core/modules/taxonomy/src/Tests/TermFieldMultipleVocabularyTest.php
+++ b/core/modules/taxonomy/src/Tests/TermFieldMultipleVocabularyTest.php
@@ -55,7 +55,7 @@ function setUp() {
),
)
))->save();
- entity_create('field_instance_config', array(
+ entity_create('field_config', array(
'field_name' => $this->field_name,
'entity_type' => 'entity_test',
'bundle' => 'entity_test',
diff --git a/core/modules/taxonomy/src/Tests/TermFieldTest.php b/core/modules/taxonomy/src/Tests/TermFieldTest.php
index 96cd6d8..d982b2f 100644
--- a/core/modules/taxonomy/src/Tests/TermFieldTest.php
+++ b/core/modules/taxonomy/src/Tests/TermFieldTest.php
@@ -61,7 +61,7 @@ function setUp() {
)
));
$this->field_storage->save();
- entity_create('field_instance_config', array(
+ entity_create('field_config', array(
'field_storage' => $this->field_storage,
'bundle' => 'entity_test',
))->save();
@@ -134,7 +134,7 @@ function testTaxonomyTermFieldWidgets() {
/**
* No php error message on the field setting page for autocomplete widget.
*/
- function testTaxonomyTermFieldInstanceSettingsAutocompleteWidget() {
+ function testTaxonomyTermFieldSettingsAutocompleteWidget() {
entity_get_form_display('entity_test', 'entity_test', 'default')
->setComponent($this->field_name, array(
'type' => 'taxonomy_autocomplete',
diff --git a/core/modules/taxonomy/src/Tests/TermIndexTest.php b/core/modules/taxonomy/src/Tests/TermIndexTest.php
index bc7b098..271a238 100644
--- a/core/modules/taxonomy/src/Tests/TermIndexTest.php
+++ b/core/modules/taxonomy/src/Tests/TermIndexTest.php
@@ -42,7 +42,7 @@ function setUp() {
),
),
))->save();
- entity_create('field_instance_config', array(
+ entity_create('field_config', array(
'field_name' => $this->field_name_1,
'bundle' => 'article',
'entity_type' => 'node',
@@ -73,7 +73,7 @@ function setUp() {
),
),
))->save();
- entity_create('field_instance_config', array(
+ entity_create('field_config', array(
'field_name' => $this->field_name_2,
'bundle' => 'article',
'entity_type' => 'node',
diff --git a/core/modules/taxonomy/src/Tests/TermTest.php b/core/modules/taxonomy/src/Tests/TermTest.php
index 8886654..c1b1764 100644
--- a/core/modules/taxonomy/src/Tests/TermTest.php
+++ b/core/modules/taxonomy/src/Tests/TermTest.php
@@ -42,7 +42,7 @@ function setUp() {
),
))->save();
- $this->instance = entity_create('field_instance_config', array(
+ $this->instance = entity_create('field_config', array(
'field_name' => $field_name,
'bundle' => 'article',
'entity_type' => 'node',
diff --git a/core/modules/taxonomy/src/Tests/TokenReplaceTest.php b/core/modules/taxonomy/src/Tests/TokenReplaceTest.php
index fac60e3..e51f79d 100644
--- a/core/modules/taxonomy/src/Tests/TokenReplaceTest.php
+++ b/core/modules/taxonomy/src/Tests/TokenReplaceTest.php
@@ -40,7 +40,7 @@ function setUp() {
),
))->save();
- entity_create('field_instance_config', array(
+ entity_create('field_config', array(
'field_name' => $this->field_name,
'bundle' => 'article',
'entity_type' => 'node',
diff --git a/core/modules/taxonomy/src/Tests/Views/TaxonomyTestBase.php b/core/modules/taxonomy/src/Tests/Views/TaxonomyTestBase.php
index 9aaff51..8206bb1 100644
--- a/core/modules/taxonomy/src/Tests/Views/TaxonomyTestBase.php
+++ b/core/modules/taxonomy/src/Tests/Views/TaxonomyTestBase.php
@@ -93,7 +93,7 @@ protected function mockStandardInstall() {
),
),
))->save();
- entity_create('field_instance_config', array(
+ entity_create('field_config', array(
'field_name' => $this->field_name,
'entity_type' => 'node',
'label' => 'Tags',
diff --git a/core/modules/taxonomy/src/Tests/VocabularyCrudTest.php b/core/modules/taxonomy/src/Tests/VocabularyCrudTest.php
index f63325f..6f50f43 100644
--- a/core/modules/taxonomy/src/Tests/VocabularyCrudTest.php
+++ b/core/modules/taxonomy/src/Tests/VocabularyCrudTest.php
@@ -7,7 +7,7 @@
namespace Drupal\taxonomy\Tests;
-use Drupal\field\Entity\FieldInstanceConfig;
+use Drupal\field\Entity\FieldConfig;
/**
* Tests loading, saving and deleting vocabularies.
@@ -146,7 +146,7 @@ function testTaxonomyVocabularyChangeMachineName() {
'entity_type' => 'taxonomy_term',
'type' => 'test_field',
))->save();
- entity_create('field_instance_config', array(
+ entity_create('field_config', array(
'field_name' => 'field_test',
'entity_type' => 'taxonomy_term',
'bundle' => $this->vocabulary->id(),
@@ -164,7 +164,7 @@ function testTaxonomyVocabularyChangeMachineName() {
$this->assertTrue(isset($info[$new_name]), 'The new bundle name appears in entity_get_bundles().');
// Check that the field instance is still attached to the vocabulary.
- $this->assertTrue(FieldInstanceConfig::loadByName('taxonomy_term', $new_name, 'field_test'), 'The bundle name was updated correctly.');
+ $this->assertTrue(FieldConfig::loadByName('taxonomy_term', $new_name, 'field_test'), 'The bundle name was updated correctly.');
}
/**
@@ -187,7 +187,7 @@ function testUninstallReinstall() {
'bundle' => $this->vocabulary->id(),
'label' => $this->randomMachineName() . '_label',
);
- entity_create('field_instance_config', $instance_definition)->save();
+ entity_create('field_config', $instance_definition)->save();
require_once DRUPAL_ROOT . '/core/includes/install.inc';
$this->container->get('module_handler')->uninstall(array('taxonomy'));
@@ -200,6 +200,6 @@ function testUninstallReinstall() {
$this->vocabulary->enforceIsNew();
$this->vocabulary->save();
entity_create('field_storage_config', $storage_definition)->save();
- entity_create('field_instance_config', $instance_definition)->save();
+ entity_create('field_config', $instance_definition)->save();
}
}
diff --git a/core/modules/telephone/src/Tests/TelephoneFieldTest.php b/core/modules/telephone/src/Tests/TelephoneFieldTest.php
index 002073e..aa919c0 100644
--- a/core/modules/telephone/src/Tests/TelephoneFieldTest.php
+++ b/core/modules/telephone/src/Tests/TelephoneFieldTest.php
@@ -51,7 +51,7 @@ function testTelephoneField() {
'entity_type' => 'node',
'type' => 'telephone',
))->save();
- entity_create('field_instance_config', array(
+ entity_create('field_config', array(
'field_name' => 'field_telephone',
'label' => 'Telephone Number',
'entity_type' => 'node',
diff --git a/core/modules/telephone/src/Tests/TelephoneItemTest.php b/core/modules/telephone/src/Tests/TelephoneItemTest.php
index 13fc7c8..dbda707 100644
--- a/core/modules/telephone/src/Tests/TelephoneItemTest.php
+++ b/core/modules/telephone/src/Tests/TelephoneItemTest.php
@@ -34,7 +34,7 @@ public function setUp() {
'entity_type' => 'entity_test',
'type' => 'telephone',
))->save();
- entity_create('field_instance_config', array(
+ entity_create('field_config', array(
'entity_type' => 'entity_test',
'field_name' => 'field_test',
'bundle' => 'entity_test',
diff --git a/core/modules/text/src/Plugin/Field/FieldType/TextItem.php b/core/modules/text/src/Plugin/Field/FieldType/TextItem.php
index 3b7285d..d61a050 100644
--- a/core/modules/text/src/Plugin/Field/FieldType/TextItem.php
+++ b/core/modules/text/src/Plugin/Field/FieldType/TextItem.php
@@ -98,7 +98,7 @@ public function settingsForm(array &$form, FormStateInterface $form_state, $has_
/**
* {@inheritdoc}
*/
- public function instanceSettingsForm(array $form, FormStateInterface $form_state) {
+ public function fieldSettingsForm(array $form, FormStateInterface $form_state) {
$element = array();
$element['text_processing'] = array(
diff --git a/core/modules/text/src/Plugin/Field/FieldType/TextItemBase.php b/core/modules/text/src/Plugin/Field/FieldType/TextItemBase.php
index ca1769d..80e36c4 100644
--- a/core/modules/text/src/Plugin/Field/FieldType/TextItemBase.php
+++ b/core/modules/text/src/Plugin/Field/FieldType/TextItemBase.php
@@ -19,8 +19,8 @@
/**
* {@inheritdoc}
*/
- public static function defaultInstanceSettings() {
- $settings = parent::defaultInstanceSettings();
+ public static function defaultFieldSettings() {
+ $settings = parent::defaultFieldSettings();
$settings['text_processing'] = 0;
return $settings;
}
diff --git a/core/modules/text/src/Plugin/Field/FieldType/TextLongItem.php b/core/modules/text/src/Plugin/Field/FieldType/TextLongItem.php
index 1c74a41..3308ae2 100644
--- a/core/modules/text/src/Plugin/Field/FieldType/TextLongItem.php
+++ b/core/modules/text/src/Plugin/Field/FieldType/TextLongItem.php
@@ -49,7 +49,7 @@ public static function schema(FieldStorageDefinitionInterface $field_definition)
/**
* {@inheritdoc}
*/
- public function instanceSettingsForm(array $form, FormStateInterface $form_state) {
+ public function fieldSettingsForm(array $form, FormStateInterface $form_state) {
$element = array();
$element['text_processing'] = array(
diff --git a/core/modules/text/src/Plugin/Field/FieldType/TextWithSummaryItem.php b/core/modules/text/src/Plugin/Field/FieldType/TextWithSummaryItem.php
index 7ffcd64..9b0fffe 100644
--- a/core/modules/text/src/Plugin/Field/FieldType/TextWithSummaryItem.php
+++ b/core/modules/text/src/Plugin/Field/FieldType/TextWithSummaryItem.php
@@ -27,11 +27,11 @@ class TextWithSummaryItem extends TextItemBase {
/**
* {@inheritdoc}
*/
- public static function defaultInstanceSettings() {
+ public static function defaultFieldSettings() {
return array(
'text_processing' => 1,
'display_summary' => 0,
- ) + parent::defaultInstanceSettings();
+ ) + parent::defaultFieldSettings();
}
/**
@@ -92,7 +92,7 @@ public function isEmpty() {
/**
* {@inheritdoc}
*/
- public function instanceSettingsForm(array $form, FormStateInterface $form_state) {
+ public function fieldSettingsForm(array $form, FormStateInterface $form_state) {
$element = array();
$settings = $this->getSettings();
diff --git a/core/modules/text/src/Tests/Formatter/TextFormatterTest.php b/core/modules/text/src/Tests/Formatter/TextFormatterTest.php
index 4d99767..f015649 100644
--- a/core/modules/text/src/Tests/Formatter/TextFormatterTest.php
+++ b/core/modules/text/src/Tests/Formatter/TextFormatterTest.php
@@ -61,7 +61,7 @@ public function setUp() {
'type' => 'text',
'settings' => array(),
))->save();
- entity_create('field_instance_config', array(
+ entity_create('field_config', array(
'entity_type' => $this->entityType,
'bundle' => $this->bundle,
'field_name' => 'processed_text',
@@ -76,7 +76,7 @@ public function setUp() {
'type' => 'text',
'settings' => array(),
))->save();
- entity_create('field_instance_config', array(
+ entity_create('field_config', array(
'entity_type' => $this->entityType,
'bundle' => $this->bundle,
'field_name' => 'unprocessed_text',
diff --git a/core/modules/text/src/Tests/Formatter/TextPlainUnitTest.php b/core/modules/text/src/Tests/Formatter/TextPlainUnitTest.php
index 167bcec..ca3e7cf 100644
--- a/core/modules/text/src/Tests/Formatter/TextPlainUnitTest.php
+++ b/core/modules/text/src/Tests/Formatter/TextPlainUnitTest.php
@@ -62,7 +62,7 @@ function setUp() {
));
$this->fieldStorage->save();
- $this->instance = entity_create('field_instance_config', array(
+ $this->instance = entity_create('field_config', array(
'field_storage' => $this->fieldStorage,
'bundle' => $this->bundle,
'label' => $this->randomMachineName(),
diff --git a/core/modules/text/src/Tests/TextFieldTest.php b/core/modules/text/src/Tests/TextFieldTest.php
index efc29fa..3e3aa3b 100644
--- a/core/modules/text/src/Tests/TextFieldTest.php
+++ b/core/modules/text/src/Tests/TextFieldTest.php
@@ -53,7 +53,7 @@ function testTextFieldValidation() {
)
));
$field_storage->save();
- entity_create('field_instance_config', array(
+ entity_create('field_config', array(
'field_storage' => $field_storage,
'bundle' => 'entity_test',
))->save();
@@ -92,7 +92,7 @@ function _testTextfieldWidgets($field_type, $widget_type) {
'type' => $field_type
));
$field_storage->save();
- entity_create('field_instance_config', array(
+ entity_create('field_config', array(
'field_storage' => $field_storage,
'bundle' => 'entity_test',
'label' => $this->randomMachineName() . '_label',
@@ -158,7 +158,7 @@ function _testTextfieldWidgetsFormatted($field_type, $widget_type) {
'type' => $field_type
));
$field_storage->save();
- entity_create('field_instance_config', array(
+ entity_create('field_config', array(
'field_storage' => $field_storage,
'bundle' => 'entity_test',
'label' => $this->randomMachineName() . '_label',
diff --git a/core/modules/text/src/Tests/TextWithSummaryItemTest.php b/core/modules/text/src/Tests/TextWithSummaryItemTest.php
index d741246..f66ff77 100644
--- a/core/modules/text/src/Tests/TextWithSummaryItemTest.php
+++ b/core/modules/text/src/Tests/TextWithSummaryItemTest.php
@@ -35,7 +35,7 @@ class TextWithSummaryItemTest extends FieldUnitTestBase {
/**
* Field instance.
*
- * @var \Drupal\field\Entity\FieldInstanceConfig
+ * @var \Drupal\field\Entity\FieldConfig
*/
protected $instance;
@@ -112,7 +112,7 @@ protected function createField($entity_type) {
)
));
$this->fieldStorage->save();
- $this->instance = entity_create('field_instance_config', array(
+ $this->instance = entity_create('field_config', array(
'field_storage' => $this->fieldStorage,
'bundle' => $entity_type,
'settings' => array(
diff --git a/core/modules/user/src/Tests/UserCreateTest.php b/core/modules/user/src/Tests/UserCreateTest.php
index 48c0705..48cef75 100644
--- a/core/modules/user/src/Tests/UserCreateTest.php
+++ b/core/modules/user/src/Tests/UserCreateTest.php
@@ -46,7 +46,7 @@ protected function testUserAdd() {
),
))->save();
- entity_create('field_instance_config', array(
+ entity_create('field_config', array(
'field_name' => $field_name,
'entity_type' => 'user',
'label' => 'Picture',
diff --git a/core/modules/user/src/Tests/UserEntityReferenceTest.php b/core/modules/user/src/Tests/UserEntityReferenceTest.php
index 81f7b09..79dce6c 100644
--- a/core/modules/user/src/Tests/UserEntityReferenceTest.php
+++ b/core/modules/user/src/Tests/UserEntityReferenceTest.php
@@ -6,7 +6,7 @@
namespace Drupal\user\Tests;
-use Drupal\field\Entity\FieldInstanceConfig;
+use Drupal\field\Entity\FieldConfig;
use Drupal\system\Tests\Entity\EntityUnitTestBase;
/**
@@ -58,7 +58,7 @@ function setUp() {
* Tests user selection by roles.
*/
function testUserSelectionByRole() {
- $field_definition = FieldInstanceConfig::loadByName('user', 'user', 'user_reference');
+ $field_definition = FieldConfig::loadByName('user', 'user', 'user_reference');
$field_definition->settings['handler_settings']['filter']['role'] = array(
$this->role1->id() => $this->role1->id(),
$this->role2->id() => 0,
diff --git a/core/modules/user/src/Tests/UserRegistrationTest.php b/core/modules/user/src/Tests/UserRegistrationTest.php
index cc025c8..63e4765 100644
--- a/core/modules/user/src/Tests/UserRegistrationTest.php
+++ b/core/modules/user/src/Tests/UserRegistrationTest.php
@@ -199,7 +199,7 @@ function testRegistrationWithUserFields() {
'cardinality' => 1,
));
$field_storage->save();
- $instance = entity_create('field_instance_config', array(
+ $instance = entity_create('field_config', array(
'field_storage' => $field_storage,
'label' => 'Some user field',
'bundle' => 'user',
diff --git a/core/modules/views/src/Tests/DefaultViewsTest.php b/core/modules/views/src/Tests/DefaultViewsTest.php
index c0feff5..fd1728a 100644
--- a/core/modules/views/src/Tests/DefaultViewsTest.php
+++ b/core/modules/views/src/Tests/DefaultViewsTest.php
@@ -70,7 +70,7 @@ protected function setUp() {
),
)
))->save();
- entity_create('field_instance_config', array(
+ entity_create('field_config', array(
'field_name' => $this->field_name,
'entity_type' => 'node',
'bundle' => 'page',
diff --git a/core/modules/views/src/Tests/Wizard/TaggedWithTest.php b/core/modules/views/src/Tests/Wizard/TaggedWithTest.php
index 0c7252d..477b378 100644
--- a/core/modules/views/src/Tests/Wizard/TaggedWithTest.php
+++ b/core/modules/views/src/Tests/Wizard/TaggedWithTest.php
@@ -72,7 +72,7 @@ function setUp() {
'field_storage' => $this->tag_field_storage,
'bundle' => $this->node_type_with_tags->type,
);
- entity_create('field_instance_config', $this->tag_instance)->save();
+ entity_create('field_config', $this->tag_instance)->save();
entity_get_form_display('node', $this->node_type_with_tags->type, 'default')
->setComponent('field_views_testing_tags', array(
@@ -183,7 +183,7 @@ function testTaggedWithByNodeType() {
// "tagged with" form element should not appear for it too.
$instance = $this->tag_instance;
$instance['bundle'] = $this->node_type_without_tags->type;
- entity_create('field_instance_config', $instance)->save();
+ entity_create('field_config', $instance)->save();
entity_get_form_display('node', $this->node_type_without_tags->type, 'default')
->setComponent('field_views_testing_tags', array(
'type' => 'taxonomy_autocomplete',
diff --git a/core/modules/views/views.module b/core/modules/views/views.module
index 3294836..3f5f83f 100644
--- a/core/modules/views/views.module
+++ b/core/modules/views/views.module
@@ -22,7 +22,7 @@
use Drupal\Component\Plugin\Exception\PluginException;
use Drupal\views\Entity\View;
use Drupal\views\Views;
-use Drupal\field\FieldInstanceConfigInterface;
+use Drupal\field\FieldConfigInterface;
/**
* Implements hook_help().
@@ -509,25 +509,25 @@ function views_language_list($field = 'name', $flags = LanguageInterface::STATE_
}
/**
- * Implements hook_ENTITY_TYPE_create() for 'field_instance_config'.
+ * Implements hook_ENTITY_TYPE_create() for 'field_config'.
*/
-function views_field_instance_config_create(FieldInstanceConfigInterface $field_instance) {
+function views_field_config_create(FieldConfigInterface $field_instance) {
// @todo: Is this necessary? Use cache tags to only delete Views' cache data?
\Drupal::cache('discovery')->deleteAll();
}
/**
- * Implements hook_ENTITY_TYPE_update() for 'field_instance_config'.
+ * Implements hook_ENTITY_TYPE_update() for 'field_config'.
*/
-function views_field_instance_config_update(FieldInstanceConfigInterface $field_instance) {
+function views_field_config_update(FieldConfigInterface $field_instance) {
Cache::deleteTags(array('extension' => 'views'));
\Drupal::cache('render')->deleteAll();
}
/**
- * Implements hook_ENTITY_TYPE_delete() for 'field_instance_config'.
+ * Implements hook_ENTITY_TYPE_delete() for 'field_config'.
*/
-function views_field_instance_config_delete(FieldInstanceConfigInterface $field_instance) {
+function views_field_config_delete(FieldConfigInterface $field_instance) {
Cache::deleteTags(array('extension' => 'views'));
\Drupal::cache('render')->deleteAll();
}
diff --git a/core/profiles/standard/config/install/entity.form_display.node.article.default.yml b/core/profiles/standard/config/install/entity.form_display.node.article.default.yml
index 359aa18..cf16fc4 100644
--- a/core/profiles/standard/config/install/entity.form_display.node.article.default.yml
+++ b/core/profiles/standard/config/install/entity.form_display.node.article.default.yml
@@ -39,10 +39,10 @@ hidden: { }
status: true
dependencies:
entity:
- - field.instance.node.article.body
- - field.instance.node.article.comment
- - field.instance.node.article.field_image
- - field.instance.node.article.field_tags
+ - field.field.node.article.body
+ - field.field.node.article.comment
+ - field.field.node.article.field_image
+ - field.field.node.article.field_tags
- node.type.article
module:
- comment
diff --git a/core/profiles/standard/config/install/entity.view_display.node.article.default.yml b/core/profiles/standard/config/install/entity.view_display.node.article.default.yml
index 1599151..a0da43b 100644
--- a/core/profiles/standard/config/install/entity.view_display.node.article.default.yml
+++ b/core/profiles/standard/config/install/entity.view_display.node.article.default.yml
@@ -26,9 +26,9 @@ content:
third_party_settings: { }
dependencies:
entity:
- - field.instance.node.article.body
- - field.instance.node.article.field_image
- - field.instance.node.article.field_tags
+ - field.field.node.article.body
+ - field.field.node.article.field_image
+ - field.field.node.article.field_tags
- node.type.article
module:
- comment
diff --git a/core/profiles/standard/config/install/entity.view_display.node.article.teaser.yml b/core/profiles/standard/config/install/entity.view_display.node.article.teaser.yml
index d22ab13..22dcce7 100644
--- a/core/profiles/standard/config/install/entity.view_display.node.article.teaser.yml
+++ b/core/profiles/standard/config/install/entity.view_display.node.article.teaser.yml
@@ -28,9 +28,9 @@ content:
dependencies:
entity:
- entity.view_mode.node.teaser
- - field.instance.node.article.body
- - field.instance.node.article.field_image
- - field.instance.node.article.field_tags
+ - field.field.node.article.body
+ - field.field.node.article.field_image
+ - field.field.node.article.field_tags
- node.type.article
module:
- image
diff --git a/core/profiles/standard/config/install/field.instance.node.article.field_image.yml b/core/profiles/standard/config/install/field.field.node.article.field_image.yml
similarity index 100%
rename from core/profiles/standard/config/install/field.instance.node.article.field_image.yml
rename to core/profiles/standard/config/install/field.field.node.article.field_image.yml
diff --git a/core/profiles/standard/config/install/field.instance.node.article.field_tags.yml b/core/profiles/standard/config/install/field.field.node.article.field_tags.yml
similarity index 100%
rename from core/profiles/standard/config/install/field.instance.node.article.field_tags.yml
rename to core/profiles/standard/config/install/field.field.node.article.field_tags.yml
diff --git a/core/profiles/standard/config/install/field.instance.user.user.user_picture.yml b/core/profiles/standard/config/install/field.field.user.user.user_picture.yml
similarity index 100%
rename from core/profiles/standard/config/install/field.instance.user.user.user_picture.yml
rename to core/profiles/standard/config/install/field.field.user.user.user_picture.yml
diff --git a/core/tests/Drupal/Tests/Core/Config/StorageComparerTest.php b/core/tests/Drupal/Tests/Core/Config/StorageComparerTest.php
index b3c7fc5..a60090a 100644
--- a/core/tests/Drupal/Tests/Core/Config/StorageComparerTest.php
+++ b/core/tests/Drupal/Tests/Core/Config/StorageComparerTest.php
@@ -63,7 +63,7 @@ protected function getConfigData() {
'uuid' => $uuid->generate(),
),
// Config entity which requires another config entity.
- 'field.instance.node.article.body' => array(
+ 'field.field.node.article.body' => array(
'id' => 'node.article.body',
'uuid' => $uuid->generate(),
'dependencies' => array(
@@ -141,7 +141,7 @@ public function testCreateChangelistNoChange() {
public function testCreateChangelistCreate() {
$target_data = $source_data = $this->getConfigData();
unset($target_data['field.storage.node.body']);
- unset($target_data['field.instance.node.article.body']);
+ unset($target_data['field.field.node.article.body']);
unset($target_data['views.view.test_view']);
$this->sourceStorage->expects($this->once())
@@ -170,7 +170,7 @@ public function testCreateChangelistCreate() {
$expected = array(
'field.storage.node.body',
'views.view.test_view',
- 'field.instance.node.article.body',
+ 'field.field.node.article.body',
);
$this->assertEquals($expected, $this->storageComparer->getChangelist('create'));
$this->assertEmpty($this->storageComparer->getChangelist('delete'));
@@ -183,7 +183,7 @@ public function testCreateChangelistCreate() {
public function testCreateChangelistDelete() {
$target_data = $source_data = $this->getConfigData();
unset($source_data['field.storage.node.body']);
- unset($source_data['field.instance.node.article.body']);
+ unset($source_data['field.field.node.article.body']);
unset($source_data['views.view.test_view']);
$this->sourceStorage->expects($this->once())
@@ -210,7 +210,7 @@ public function testCreateChangelistDelete() {
$this->storageComparer->createChangelist();
$expected = array(
- 'field.instance.node.article.body',
+ 'field.field.node.article.body',
'views.view.test_view',
'field.storage.node.body',
);
@@ -225,7 +225,7 @@ public function testCreateChangelistDelete() {
public function testCreateChangelistUpdate() {
$target_data = $source_data = $this->getConfigData();
$source_data['system.site']['title'] = 'Drupal New!';
- $source_data['field.instance.node.article.body']['new_config_key'] = 'new data';
+ $source_data['field.field.node.article.body']['new_config_key'] = 'new data';
$source_data['field.storage.node.body']['new_config_key'] = 'new data';
$this->sourceStorage->expects($this->once())
@@ -254,7 +254,7 @@ public function testCreateChangelistUpdate() {
$expected = array(
'field.storage.node.body',
'system.site',
- 'field.instance.node.article.body',
+ 'field.field.node.article.body',
);
$this->assertEquals($expected, $this->storageComparer->getChangelist('update'));
$this->assertEmpty($this->storageComparer->getChangelist('create'));
diff --git a/core/tests/Drupal/Tests/Core/Entity/ContentEntityBaseUnitTest.php b/core/tests/Drupal/Tests/Core/Entity/ContentEntityBaseUnitTest.php
index aeee601..db387d1 100644
--- a/core/tests/Drupal/Tests/Core/Entity/ContentEntityBaseUnitTest.php
+++ b/core/tests/Drupal/Tests/Core/Entity/ContentEntityBaseUnitTest.php
@@ -146,7 +146,7 @@ public function setUp() {
->method('getDefaultSettings')
->will($this->returnValue(array()));
$this->fieldTypePluginManager->expects($this->any())
- ->method('getDefaultInstanceSettings')
+ ->method('getDefaultFieldSettings')
->will($this->returnValue(array()));
$container = new ContainerBuilder();
diff --git a/core/tests/Drupal/Tests/Core/Entity/ContentEntityDatabaseStorageTest.php b/core/tests/Drupal/Tests/Core/Entity/ContentEntityDatabaseStorageTest.php
index 849d063..7b0ce96 100644
--- a/core/tests/Drupal/Tests/Core/Entity/ContentEntityDatabaseStorageTest.php
+++ b/core/tests/Drupal/Tests/Core/Entity/ContentEntityDatabaseStorageTest.php
@@ -969,7 +969,7 @@ public function testFieldSqlSchemaForEntityWithStringIdentifier() {
->method('getDefaultSettings')
->will($this->returnValue(array()));
$field_type_manager->expects($this->exactly(2))
- ->method('getDefaultInstanceSettings')
+ ->method('getDefaultFieldSettings')
->will($this->returnValue(array()));
$this->fieldDefinitions['id'] = FieldDefinition::create('string')
diff --git a/core/tests/Drupal/Tests/Core/Entity/FieldDefinitionTest.php b/core/tests/Drupal/Tests/Core/Entity/FieldDefinitionTest.php
index e206077..37c4a35 100644
--- a/core/tests/Drupal/Tests/Core/Entity/FieldDefinitionTest.php
+++ b/core/tests/Drupal/Tests/Core/Entity/FieldDefinitionTest.php
@@ -64,7 +64,7 @@ public function setUp() {
->with($this->fieldType)
->will($this->returnValue($this->fieldTypeDefinition['settings']));
$field_type_manager->expects($this->any())
- ->method('getDefaultInstanceSettings')
+ ->method('getDefaultFieldSettings')
->with($this->fieldType)
->will($this->returnValue($this->fieldTypeDefinition['instance_settings']));