diff -u b/core/lib/Drupal/Core/Field/FieldItemBase.php b/core/lib/Drupal/Core/Field/FieldItemBase.php --- b/core/lib/Drupal/Core/Field/FieldItemBase.php +++ b/core/lib/Drupal/Core/Field/FieldItemBase.php @@ -36,7 +36,7 @@ /** * {@inheritdoc} */ - public static function storageSettingsSummary(FieldStorageDefinitionInterface $field_storage) { + public static function storageSettingsSummary(FieldStorageDefinitionInterface $field_definition) { return []; } @@ -44,12 +44,9 @@ * {@inheritdoc} */ public static function fieldSettingsSummary(FieldDefinitionInterface $field_definition) { - $definitions = \Drupal::service('plugin.manager.field.field_type')->getDefinitions(); - return [ - t('@type', [ - '@type' => $definitions[$field_definition->getFieldStorageDefinition()->getType()]['label'], - ]), - ]; + $definition = \Drupal::service('plugin.manager.field.field_type') + ->getDefinition($field_definition->getType())['label']; + return [t('@type', ['@type' => $definition])]; } /** diff -u b/core/lib/Drupal/Core/Field/FieldItemInterface.php b/core/lib/Drupal/Core/Field/FieldItemInterface.php --- b/core/lib/Drupal/Core/Field/FieldItemInterface.php +++ b/core/lib/Drupal/Core/Field/FieldItemInterface.php @@ -262,13 +262,13 @@ /** * Returns a short summary for the storage-level settings. * - * @param \Drupal\Core\Field\FieldStorageDefinitionInterface $field_storage + * @param \Drupal\Core\Field\FieldStorageDefinitionInterface $field_definition * The field storage definition. * * @return array * A renderable array for the storage-level settings. */ - public static function storageSettingsSummary(FieldStorageDefinitionInterface $field_storage); + public static function storageSettingsSummary(FieldStorageDefinitionInterface $field_definition); /** * Returns a short summary for the field-level settings. diff -u b/core/lib/Drupal/Core/Field/FieldTypePluginManager.php b/core/lib/Drupal/Core/Field/FieldTypePluginManager.php --- b/core/lib/Drupal/Core/Field/FieldTypePluginManager.php +++ b/core/lib/Drupal/Core/Field/FieldTypePluginManager.php @@ -126,11 +126,11 @@ */ public function getStorageSettingsSummary(FieldStorageDefinitionInterface $field_definition) { $plugin_definition = $this->getDefinition($field_definition->getType(), FALSE); - if (empty($plugin_definition['class'])) { - return []; + if (!empty($plugin_definition['class'])) { + $plugin_class = DefaultFactory::getPluginClass($field_definition->getType(), $plugin_definition); + return $plugin_class::storageSettingsSummary($field_definition); } - $plugin_class = DefaultFactory::getPluginClass($field_definition->getType(), $plugin_definition); - return $plugin_class::storageSettingsSummary($field_definition); + return []; } /** @@ -138,11 +138,11 @@ */ public function getFieldSettingsSummary(FieldDefinitionInterface $field_definition) { $plugin_definition = $this->getDefinition($field_definition->getType(), FALSE); - if (empty($plugin_definition['class'])) { - return []; + if (!empty($plugin_definition['class'])) { + $plugin_class = DefaultFactory::getPluginClass($field_definition->getType(), $plugin_definition); + return $plugin_class::fieldSettingsSummary($field_definition); } - $plugin_class = DefaultFactory::getPluginClass($field_definition->getType(), $plugin_definition); - return $plugin_class::fieldSettingsSummary($field_definition); + return []; } /** diff -u b/core/lib/Drupal/Core/Field/Plugin/Field/FieldType/EntityReferenceItem.php b/core/lib/Drupal/Core/Field/Plugin/Field/FieldType/EntityReferenceItem.php --- b/core/lib/Drupal/Core/Field/Plugin/Field/FieldType/EntityReferenceItem.php +++ b/core/lib/Drupal/Core/Field/Plugin/Field/FieldType/EntityReferenceItem.php @@ -105,13 +105,13 @@ /** * {@inheritdoc} */ - public static function storageSettingsSummary(FieldStorageDefinitionInterface $field_storage) { - $summary = parent::storageSettingsSummary($field_storage); - $target_entity_type_id = $field_storage->getSetting('target_type'); - $entities = \Drupal::entityTypeManager()->getDefinitions(); - if (!empty($entities[$target_entity_type_id])) { + public static function storageSettingsSummary(FieldStorageDefinitionInterface $field_definition) { + $summary = parent::storageSettingsSummary($field_definition); + $target_type = $field_definition->getSetting('target_type'); + $target_type_info = \Drupal::entityTypeManager()->getDefinition($target_type); + if (!empty($target_type_info)) { $summary[] = t('Referenced entity type: @entity_type', [ - '@entity_type' => $entities[$target_entity_type_id]->getLabel(), + '@entity_type' => $target_type_info->getLabel(), ]); } return $summary; @@ -122,11 +122,11 @@ */ public static function fieldSettingsSummary(FieldDefinitionInterface $field_definition) { $summary = parent::fieldSettingsSummary($field_definition); - $target_entity_type_id = $field_definition->getFieldStorageDefinition()->getSetting('target_type'); - $entities = \Drupal::entityTypeManager()->getDefinitions(); - if (!empty($entities[$target_entity_type_id])) { + $target_type = $field_definition->getFieldStorageDefinition()->getSetting('target_type'); + $target_type_info = \Drupal::entityTypeManager()->getDefinition($target_type); + if (!empty($target_type_info)) { $summary[] = t('Referenced entity type: @entity_type', [ - '@entity_type' => $entities[$target_entity_type_id]->getLabel(), + '@entity_type' => $target_type_info->getLabel(), ]); } return $summary; diff -u b/core/modules/field_ui/src/FieldConfigListBuilder.php b/core/modules/field_ui/src/FieldConfigListBuilder.php --- b/core/modules/field_ui/src/FieldConfigListBuilder.php +++ b/core/modules/field_ui/src/FieldConfigListBuilder.php @@ -152,17 +152,14 @@ ] + FieldUI::getRouteBundleParameter($this->entityTypeManager->getDefinition($this->targetEntityTypeId), $this->targetBundle); $summary = $this->fieldTypeManager->getFieldSettingsSummary($field_config); - $settings_summary = ''; - if (!empty($summary)) { - $settings_summary = [ - 'data' => [ - '#type' => 'inline_template', - '#template' => '
{{ summary|safe_join("
") }}
', - '#context' => ['summary' => $summary], - '#cell_attributes' => ['class' => ['field-plugin-summary-cell']], - ], - ]; - } + $settings_summary = empty($summary) ? '' : [ + 'data' => [ + '#type' => 'inline_template', + '#template' => '
{{ summary|safe_join("
") }}
', + '#context' => ['summary' => $summary], + '#cell_attributes' => ['class' => ['field-plugin-summary-cell']], + ], + ]; $row = [ 'id' => Html::getClass($field_config->getName()), diff -u b/core/modules/field_ui/src/FieldStorageConfigListBuilder.php b/core/modules/field_ui/src/FieldStorageConfigListBuilder.php --- b/core/modules/field_ui/src/FieldStorageConfigListBuilder.php +++ b/core/modules/field_ui/src/FieldStorageConfigListBuilder.php @@ -135,18 +135,14 @@ '#context' => ['list_style' => 'comma-list'], ]; $summary = $this->fieldTypeManager->getStorageSettingsSummary($field_storage); - $settings_summary = ''; - if (!empty($summary)) { - $settings_summary = [ - 'data' => [ - '#type' => 'inline_template', - '#template' => '
{{ summary|safe_join("
") }}
', - '#context' => ['summary' => $summary], - '#cell_attributes' => ['class' => ['field-plugin-summary-cell']], - ], - ]; - } - $row['data']['settings_summary'] = $settings_summary; + $row['data']['settings_summary'] = empty($summary) ? '' : [ + 'data' => [ + '#type' => 'inline_template', + '#template' => '
{{ summary|safe_join("
") }}
', + '#context' => ['summary' => $summary], + '#cell_attributes' => ['class' => ['field-plugin-summary-cell']], + ], + ]; return $row; }