Issue #2191709 by andypost, Berdir: Remove the configurable flag on field types.

core/lib/Drupal/Core/Entity/FieldableEntityStorageControllerBase.php

@@ -166,7 +166,7 @@ protected function loadFieldItems(array $entities) {
           foreach ($entity->getTranslationLanguages() as $langcode => $language) {
             $translation = $entity->getTranslation($langcode);
             foreach ($translation as $field_name => $items) {
-              if ($items->getFieldDefinition()->isConfigurable() && !$items->isEmpty()) {
+              if ($items->getFieldDefinition() instanceof FieldInstanceConfigInterface && !$items->isEmpty()) {
                 foreach ($items as $delta => $item) {
                   // If the field item needs to prepare the cache data, call the
                   // corresponding method, otherwise use the values as cache

core/lib/Drupal/Core/Field/Annotation/FieldType.php

@@ -100,13 +100,6 @@ class FieldType extends DataType {
    */
   public $default_formatter;
 
-  /**
-   * A boolean stating that fields of this type are configurable.
-   *
-   * @var boolean
-   */
-  public $configurable = TRUE;
-
   /**
    * A boolean stating that fields of this type cannot be created through the UI.
    *

core/lib/Drupal/Core/Field/FieldDefinition.php

@@ -303,13 +303,6 @@ public function isDisplayConfigurable($display_context) {
     return isset($this->definition['display'][$display_context]['configurable']) ? $this->definition['display'][$display_context]['configurable'] : FALSE;
   }
 
-  /**
-   * {@inheritdoc}
-   */
-  public function isConfigurable() {
-    return FALSE;
-  }
-
   /**
    * {@inheritdoc}
    */

core/lib/Drupal/Core/Field/FieldDefinitionInterface.php

@@ -111,14 +111,6 @@ public function getSetting($setting_name);
    */
   public function isTranslatable();
 
-  /**
-   * Returns whether the field is configurable via field.module.
-   *
-   * @return bool
-   *   TRUE if the field is configurable.
-   */
-  public function isConfigurable();
-
   /**
    * Returns whether the display for the field can be configured.
    *

core/lib/Drupal/Core/Field/FieldTypePluginManager.php

@@ -73,10 +73,10 @@ public function getDefaultInstanceSettings($type) {
   /**
    * {@inheritdoc}
    */
-  public function getConfigurableDefinitions() {
+  public function getUiDefinitions() {
     $definitions = $this->getDefinitions();
     return array_filter($definitions, function ($definition) {
-      return $definition['configurable'];
+      return empty($definition['no_ui']) && !empty($definition['default_formatter']) && !empty($definition['default_widget']);
     });
   }
 

core/lib/Drupal/Core/Field/FieldTypePluginManagerInterface.php

@@ -39,11 +39,11 @@ public function getDefaultInstanceSettings($type);
   public function getDefaultSettings($type);
 
   /**
-   * Gets the definition of all field types that are configurable.
+   * Gets the definition of all field types that can be added via UI.
    *
    * @return array
    *   An array of field type definitions.
    */
-  public function getConfigurableDefinitions();
+  public function getUiDefinitions();
 
 }

core/lib/Drupal/Core/Field/FormatterPluginManager.php

@@ -95,8 +95,8 @@ public function createInstance($plugin_id, array $configuration = array()) {
    *     - settings: (array) Settings specific to the formatter. Each setting
    *       defaults to the default value specified in the formatter definition.
    *
-   * @return \Drupal\Core\Field\FormatterInterface
-   *   A formatter object.
+   * @return \Drupal\Core\Field\FormatterInterface|null
+   *   A formatter object or NULL when plugin is not found.
    */
   public function getInstance(array $options) {
     $configuration = $options['configuration'];
@@ -117,6 +117,9 @@ public function getInstance(array $options) {
     if (!isset($definition['class']) || !in_array($field_type, $definition['field_types'])) {
       // Grab the default widget for the field type.
       $field_type_definition = $this->fieldTypeManager->getDefinition($field_type);
+      if (empty($field_type_definition['default_formatter'])) {
+        return NULL;
+      }
       $plugin_id = $field_type_definition['default_formatter'];
     }
 

core/lib/Drupal/Core/Field/Plugin/Field/FieldType/BooleanItem.php

@@ -18,7 +18,7 @@
  *   id = "boolean",
  *   label = @Translation("Boolean"),
  *   description = @Translation("An entity field containing a boolean value."),
- *   configurable = FALSE
+ *   no_ui = TRUE
  * )
  */
 class BooleanItem extends FieldItemBase {

core/lib/Drupal/Core/Field/Plugin/Field/FieldType/DateItem.php

@@ -18,7 +18,7 @@
  *   id = "date",
  *   label = @Translation("Date"),
  *   description = @Translation("An entity field containing a date value."),
- *   configurable = FALSE
+ *   no_ui = TRUE
  * )
  */
 class DateItem extends FieldItemBase {

core/lib/Drupal/Core/Field/Plugin/Field/FieldType/EntityReferenceItem.php

@@ -26,7 +26,7 @@
  *   id = "entity_reference",
  *   label = @Translation("Entity reference"),
  *   description = @Translation("An entity field containing an entity reference."),
- *   configurable = FALSE,
+ *   no_ui = TRUE,
  *   constraints = {"ValidReference" = {}}
  * )
  */
@@ -225,4 +225,5 @@ public function preSave() {
   public function hasUnsavedEntity() {
     return $this->target_id === NULL && ($entity = $this->entity) && $entity->isNew();
   }
+
 }

core/lib/Drupal/Core/Field/Plugin/Field/FieldType/LanguageItem.php

@@ -20,7 +20,7 @@
  *   id = "language",
  *   label = @Translation("Language"),
  *   description = @Translation("An entity field referencing a language."),
- *   configurable = FALSE,
+ *   no_ui = TRUE,
  *   constraints = {
  *     "ComplexData" = {
  *       "value" = {"Length" = {"max" = 12}}

core/lib/Drupal/Core/Field/Plugin/Field/FieldType/MapItem.php

@@ -18,7 +18,7 @@
  *   id = "map",
  *   label = @Translation("Map"),
  *   description = @Translation("An entity field for storing a serialized array of values."),
- *   configurable = FALSE
+ *   no_ui = TRUE
  * )
  */
 class MapItem extends FieldItemBase {

core/lib/Drupal/Core/Field/Plugin/Field/FieldType/StringItem.php

@@ -21,7 +21,7 @@
  *   settings = {
  *     "max_length" = "255"
  *   },
- *   configurable = FALSE,
+ *   no_ui = TRUE,
  *   default_widget = "string",
  *   default_formatter = "string"
  * )

core/lib/Drupal/Core/Field/Plugin/Field/FieldType/StringLongItem.php

@@ -16,7 +16,7 @@
  *   id = "string_long",
  *   label = @Translation("Long string"),
  *   description = @Translation("An entity field containing a long string value."),
- *   configurable = FALSE
+ *   no_ui = FALSE
  * )
  */
 class StringLongItem extends StringItem {

core/lib/Drupal/Core/Field/Plugin/Field/FieldType/UriItem.php

@@ -24,7 +24,7 @@
  *   settings = {
  *     "max_length" = "2048"
  *   },
- *   configurable = FALSE
+ *   no_ui = TRUE
  * )
  */
 class UriItem extends StringItem {

core/lib/Drupal/Core/Field/Plugin/Field/FieldType/UuidItem.php

@@ -19,7 +19,7 @@
  *   settings = {
  *     "max_length" = "128"
  *   },
- *   configurable = FALSE
+ *   no_ui = TRUE
  * )
  */
 class UuidItem extends StringItem {

core/lib/Drupal/Core/Field/WidgetPluginManager.php

@@ -75,8 +75,8 @@ public function __construct(\Traversable $namespaces, CacheBackendInterface $cac
    *     - settings: (array) Settings specific to the widget. Each setting
    *       defaults to the default value specified in the widget definition.
    *
-   * @return \Drupal\Core\Field\WidgetInterface
-   *   A Widget object.
+   * @return \Drupal\Core\Field\WidgetInterface|null
+   *   A Widget object or NULL when plugin is not found.
    */
   public function getInstance(array $options) {
     // Fill in defaults for missing properties.
@@ -103,6 +103,9 @@ public function getInstance(array $options) {
     if (!isset($definition['class']) || !in_array($field_type, $definition['field_types'])) {
       // Grab the default widget for the field type.
       $field_type_definition = $this->fieldTypeManager->getDefinition($field_type);
+      if (empty($field_type_definition['default_widget'])) {
+        return NULL;
+      }
       $plugin_id = $field_type_definition['default_widget'];
     }
 

core/modules/content_translation/content_translation.admin.inc

@@ -6,10 +6,10 @@
  */
 
 use Drupal\Component\Utility\String;
-use Drupal\Core\Entity\EntityInterface;
 use Drupal\Core\Field\FieldDefinitionInterface;
 use Drupal\Core\Language\Language;
 use Drupal\field\Field as FieldService;
+use Drupal\field\FieldInstanceConfigInterface;
 
 /**
  * Returns a form element to configure field synchronization.
@@ -102,14 +102,13 @@ function _content_translation_form_language_content_settings_form_alter(array &$
             // translation.
             // @todo Remove this special casing as soon as configurable and
             //   base field definitions are "unified".
-            if ($definition->isConfigurable() && ($field = FieldService::fieldInfo()->getField($entity_type_id, $field_name))) {
-              $instance = FieldService::fieldInfo()->getInstance($entity_type_id, $bundle, $field_name);
+            if ($definition instanceof FieldInstanceConfigInterface) {
               $form['settings'][$entity_type_id][$bundle]['fields'][$field_name] = array(
-                '#label' => $instance->getLabel(),
+                '#label' => $definition->getLabel(),
                 '#type' => 'checkbox',
                 '#default_value' => $translatable,
               );
-              $column_element = content_translation_field_sync_widget($instance);
+              $column_element = content_translation_field_sync_widget($definition);
               if ($column_element) {
                 $form['settings'][$entity_type_id][$bundle]['columns'][$field_name] = $column_element;
 

core/modules/entity_reference/entity_reference.module

@@ -40,7 +40,7 @@ function entity_reference_help($path, $arg) {
  */
 function entity_reference_field_info_alter(&$info) {
   // Make the entity reference field configurable.
-  $info['entity_reference']['configurable'] = TRUE;
+  $info['entity_reference']['no_ui'] = FALSE;
   $info['entity_reference']['class'] = '\Drupal\entity_reference\ConfigurableEntityReferenceItem';
   $info['entity_reference']['list_class'] = '\Drupal\entity_reference\Plugin\Field\FieldType\ConfigurableEntityReferenceFieldItemList';
   $info['entity_reference']['settings']['target_type'] = \Drupal::moduleHandler()->moduleExists('node') ? 'node' : 'user';

core/modules/field/field.deprecated.inc

@@ -335,8 +335,7 @@ function field_attach_form(EntityInterface $entity, &$form, &$form_state, $langc
 function field_attach_form_validate(ContentEntityInterface $entity, $form, &$form_state, array $options = array()) {
   $has_violations = FALSE;
   foreach ($entity as $field_name => $field) {
-    $definition = $field->getFieldDefinition();
-    if ($definition->isConfigurable() && (empty($options['field_name']) || $options['field_name'] == $field_name)) {
+    if (empty($options['field_name']) || $options['field_name'] == $field_name) {
       $field_violations = $field->validate();
       if (count($field_violations)) {
         $has_violations = TRUE;

core/modules/field/field.module

@@ -97,7 +97,7 @@ function field_help($path, $arg) {
       $items = array();
       $info = system_get_info('module');
       $field_widgets = \Drupal::service('plugin.manager.field.widget')->getDefinitions();
-      $field_types = \Drupal::service('plugin.manager.field.field_type')->getConfigurableDefinitions();
+      $field_types = \Drupal::service('plugin.manager.field.field_type')->getUiDefinitions();
       $providers = array();
       foreach (array_merge($field_types, $field_widgets) as $plugin) {
         $providers[] = $plugin['provider'];

core/modules/field/lib/Drupal/field/Entity/FieldConfig.php

@@ -621,13 +621,6 @@ public function isLocked() {
    */
   public function getDefaultValue(EntityInterface $entity) { }
 
-  /**
-   * {@inheritdoc}
-   */
-  public function isConfigurable() {
-    return TRUE;
-  }
-
   /**
    * {@inheritdoc}
    */

core/modules/field/lib/Drupal/field/Entity/FieldInstanceConfig.php

@@ -577,13 +577,6 @@ public function getDefaultValue(EntityInterface $entity) {
     }
   }
 
-  /**
-   * {@inheritdoc}
-   */
-  public function isConfigurable() {
-    return TRUE;
-  }
-
   /**
    * {@inheritdoc}
    */

core/modules/field/lib/Drupal/field/Tests/FieldInfoTest.php

@@ -26,7 +26,7 @@ function testFieldInfo() {
     // Test that field_test module's fields, widgets, and formatters show up.
 
     $field_test_info = $this->getExpectedFieldTypeDefinition();
-    $entity_type = \Drupal::service('plugin.manager.field.field_type')->getConfigurableDefinitions();
+    $entity_type = \Drupal::service('plugin.manager.field.field_type')->getDefinitions();
     foreach ($field_test_info as $t_key => $field_type) {
       foreach ($field_type as $key => $val) {
         $this->assertEqual($entity_type[$t_key][$key], $val, format_string('Field type %t_key key %key is %value', array('%t_key' => $t_key, '%key' => $key, '%value' => print_r($val, TRUE))));

core/modules/field_ui/lib/Drupal/field_ui/DisplayOverview.php

@@ -169,7 +169,7 @@ protected function getPluginOptions($field_type) {
    * {@inheritdoc}
    */
   protected function getDefaultPlugin($field_type) {
-    return $this->fieldTypes[$field_type]['default_formatter'];
+    return isset($this->fieldTypes[$field_type]['default_formatter']) ? $this->fieldTypes[$field_type]['default_formatter'] : NULL;
   }
 
   /**

core/modules/field_ui/lib/Drupal/field_ui/FieldConfigListBuilder.php

@@ -66,7 +66,7 @@ public function __construct(EntityTypeInterface $entity_type, EntityManagerInter
     $this->entityManager = $entity_manager;
     $this->bundles = entity_get_bundles();
     $this->fieldTypeManager = $field_type_manager;
-    $this->fieldTypes = $this->fieldTypeManager->getConfigurableDefinitions();
+    $this->fieldTypes = $this->fieldTypeManager->getDefinitions();
   }
 
   /**

core/modules/field_ui/lib/Drupal/field_ui/FieldOverview.php

@@ -89,7 +89,7 @@ public function buildForm(array $form, array &$form_state, $entity_type_id = NUL
 
     // Gather bundle information.
     $instances = field_info_instances($this->entity_type, $this->bundle);
-    $field_types = $this->fieldTypeManager->getConfigurableDefinitions();
+    $field_types = $this->fieldTypeManager->getDefinitions();
 
     // Field prefix.
     $field_prefix = \Drupal::config('field_ui.settings')->get('field_prefix');

core/modules/field_ui/lib/Drupal/field_ui/FormDisplayOverview.php

@@ -136,7 +136,7 @@ protected function getPluginOptions($field_type) {
    * {@inheritdoc}
    */
   protected function getDefaultPlugin($field_type) {
-    return $this->fieldTypes[$field_type]['default_widget'];
+    return isset($this->fieldTypes[$field_type]['default_widget']) ? $this->fieldTypes[$field_type]['default_widget'] : NULL;
   }
 
   /**

core/modules/field_ui/lib/Drupal/field_ui/Tests/ManageFieldsTest.php

@@ -489,7 +489,7 @@ function testHiddenFields() {
     // Check that non-configurable fields are not available.
     $field_types = \Drupal::service('plugin.manager.field.field_type')->getDefinitions();
     foreach ($field_types as $field_type => $definition) {
-      if ($definition['configurable'] && empty($definition['no_ui'])) {
+      if (empty($definition['no_ui'])) {
         $this->assertTrue($this->xpath('//select[@id="edit-fields-add-new-field-type"]//option[@value=:field_type]', array(':field_type' => $field_type)), String::format('Configurable field type @field_type is available.', array('@field_type' => $field_type)));
       }
       else {

core/modules/path/lib/Drupal/path/Plugin/Field/FieldType/PathItem.php

@@ -18,7 +18,7 @@
  *   id = "path",
  *   label = @Translation("Path"),
  *   description = @Translation("An entity field containing a path alias and related data."),
- *   configurable = FALSE
+ *   no_ui = TRUE
  * )
  */
 class PathItem extends FieldItemBase {

core/tests/Drupal/Tests/Core/Entity/FieldDefinitionTest.php

@@ -194,12 +194,4 @@ public function testFieldRequired() {
     $this->assertFalse($definition->isRequired());
   }
 
-  /**
-   * Tests configurable.
-   */
-  public function testFieldConfigurable() {
-    $definition = FieldDefinition::create($this->fieldType);
-    $this->assertFalse($definition->isConfigurable());
-  }
-
 }