diff --git a/display_fields.module b/display_fields.module index ec4ad89..619f925 100644 --- a/display_fields.module +++ b/display_fields.module @@ -88,7 +88,7 @@ function display_fields_entity_view_alter(&$build, EntityInterface $entity, Enti */ function display_fields_get_entity_view_settings($entity_type, $bundle, $view_mode) { // Try loading the display from configuration. - $display = entity_load('display_fields_view', $entity_type . '.' . $bundle . '.' . $view_mode); + $display = \Drupal::service('entity_type.manager')->getStorage('display_fields_view')->load($entity_type . '.' . $bundle . '.' . $view_mode); // If not found, create a fresh display object. We do not preemptively create // new entity_view_display configuration entries for each existing entity type @@ -96,7 +96,7 @@ function display_fields_get_entity_view_settings($entity_type, $bundle, $view_mo // configuration entries are only created when a display object is explicitly // configured and saved. if (!$display) { - $display = entity_create('display_fields_view', array( + $display = \Drupal::service('entity_type.manager')->getStorage('display_fields_view')->create(array( 'targetEntityType' => $entity_type, 'bundle' => $bundle, 'mode' => $view_mode, diff --git a/includes/display_fields.field_ui.inc b/includes/display_fields.field_ui.inc index e2bde6a..cfd78ef 100644 --- a/includes/display_fields.field_ui.inc +++ b/includes/display_fields.field_ui.inc @@ -1,5 +1,7 @@ getStorage('display_fields_config')->load($entity_type . '.' . $bundle); // If not found, create a fresh display object. We do not preemptively create // configuration entries for each existing entity type @@ -99,7 +99,7 @@ class DisplayFields { // configuration entries are only created when a display object is explicitly // configured and saved. if (!$display_fields_config) { - $display_fields_config = entity_create('display_fields_config',array( + $display_fields_config = \Drupal::service('entity_type.manager')->getStorage('display_fields_config')->create(array( 'targetEntityType' => $entity_type, 'bundle' => $bundle, 'status' => TRUE, diff --git a/src/Element/EntityFieldSelect.php b/src/Element/EntityFieldSelect.php index deb05f0..f04282a 100644 --- a/src/Element/EntityFieldSelect.php +++ b/src/Element/EntityFieldSelect.php @@ -275,14 +275,14 @@ class EntityFieldSelect extends FormElement { $current_field_name = $values['field_name']; if ($current_bundle == '*') { - $bundles = \Drupal::entityManager()->getBundleInfo($current_entity_type); + $bundles = \Drupal::service('entity_type.bundle.info')->getBundleInfo($current_entity_type); $fields = array(); foreach ($bundles as $bundle_name => $bundle) { - $fields = array_merge($fields, \Drupal::entityManager()->getFieldDefinitions($current_entity_type, $bundle_name)); + $fields = array_merge($fields, \Drupal::service('entity_field.manager')->getFieldDefinitions($current_entity_type, $bundle_name)); } } else { - $fields = \Drupal::entityManager()->getFieldDefinitions($current_entity_type, $current_bundle); + $fields = \Drupal::service('entity_field.manager')->getFieldDefinitions($current_entity_type, $current_bundle); } $fields_options = array(); foreach ($fields as $field_name => $field) { @@ -302,12 +302,12 @@ class EntityFieldSelect extends FormElement { $field_settings = $field->getSettings(); $target_entity_type = $field_settings['target_type']; - $targetEntityType = \Drupal::entityManager()->getDefinition($target_entity_type); + $targetEntityType = \Drupal::service('entity_type.manager')->getDefinition($target_entity_type); // If this is a content entity. if ($targetEntityType->isSubClassOf('\Drupal\Core\Entity\ContentEntityInterface')) { $target_entity_type_bundles = EntityFieldSelect::getReferenceFieldsAllowedBundles($field->getType(), $field_settings); - $target_bundles_infos = \Drupal::entityManager()->getBundleInfo($target_entity_type); + $target_bundles_infos = \Drupal::service('entity_type.bundle.info')->getBundleInfo($target_entity_type); if (empty($target_entity_type_bundles)) { // Empty target_bundles means all bundles. Get those. $target_entity_type_bundles = array_keys($target_bundles_infos); @@ -400,7 +400,7 @@ class EntityFieldSelect extends FormElement { } if (strpos($field_name, '|') !== FALSE) { $field_name_infos = explode('|', $field_name); - $fields = \Drupal::entityManager()->getFieldDefinitions($current_entity_type, $current_bundle); + $fields = \Drupal::service('entity_field.manager')->getFieldDefinitions($current_entity_type, $current_bundle); $field = $fields[$field_name_infos[0]]; $current_entity_type = $field_name_infos[1]; $breadcumb_desc = $field->getLabel(); @@ -411,7 +411,7 @@ class EntityFieldSelect extends FormElement { } else { - $fields = \Drupal::entityManager()->getFieldDefinitions($current_entity_type, $current_bundle); + $fields = \Drupal::service('entity_field.manager')->getFieldDefinitions($current_entity_type, $current_bundle); if (isset($fields[$field_name])) { $field = $fields[$field_name]; $breadcumb_desc = $field->getLabel(); @@ -420,7 +420,7 @@ class EntityFieldSelect extends FormElement { } } - $source_bundles = \Drupal::entityManager()->getBundleInfo($source_entity_type); + $source_bundles = \Drupal::service('entity_type.bundle.info')->getBundleInfo($source_entity_type); $bundle_label = $source_bundles[$source_bundle]['label']; return $bundle_label . '
' . implode('
', $breadcrumb); } diff --git a/src/Plugin/DisplayFieldsField/FieldEmbedView.php b/src/Plugin/DisplayFieldsField/FieldEmbedView.php index 3da67b0..b5f2f21 100644 --- a/src/Plugin/DisplayFieldsField/FieldEmbedView.php +++ b/src/Plugin/DisplayFieldsField/FieldEmbedView.php @@ -105,7 +105,7 @@ class FieldEmbedView extends Field { // Build the view arguments. $args = array(); if (!empty($display_settings['settings']['arguments'])) { - $view_object = entity_load('view', $display_field['settings']['embed_view']); + $view_object = \Drupal::service('entity_type.manager')->getStorage('view')->load($display_field['settings']['embed_view']); $view_display = $view_object->getDisplay($view_display); foreach ($view_display['display_options']['arguments'] as $argument) { if (isset($display_settings['settings']['arguments'][$argument['id']])) { @@ -409,7 +409,7 @@ class FieldEmbedView extends Field { public function fieldRowSettingsForm($form, FormStateInterface $form_state, $field, $field_display_settings) { $display_settings = !empty($field_display_settings['settings']) ? $field_display_settings['settings'] : array(); $embed_view = $field['settings']['embed_view']; - $view = entity_load('view', $embed_view); + $view = \Drupal::service('entity_type.manager')->getStorage('view')->load($embed_view); $display_options = array(); if (!empty($display_settings['view_display'])) { @@ -483,7 +483,7 @@ class FieldEmbedView extends Field { */ public function fieldRowSettingsSummary($form, FormStateInterface $form_state, $field, $field_display_settings) { $embed_view = $field['settings']['embed_view']; - $view = entity_load('view', $embed_view); + $view = \Drupal::service('entity_type.manager')->getStorage('view')->load($embed_view); $field_display_settings['settings']['view_display'] = !empty($field_display_settings['settings']['view_display']) ? $field_display_settings['settings']['view_display'] : 'default'; diff --git a/src/Plugin/DisplayFieldsField/FieldReference.php b/src/Plugin/DisplayFieldsField/FieldReference.php index 4a3cb0b..6d518fa 100644 --- a/src/Plugin/DisplayFieldsField/FieldReference.php +++ b/src/Plugin/DisplayFieldsField/FieldReference.php @@ -74,7 +74,7 @@ class FieldReference extends Field { foreach ($entities as $delta => $entity) { if ($entity->hasField($current_key)) { // Get infos about this - $field_definitions = \Drupal::entityManager()->getFieldDefinitions($entity->getEntityTypeId(), $entity->bundle()); + $field_definitions = \Drupal::service('entity_field.manager')->getFieldDefinitions($entity->getEntityTypeId(), $entity->bundle()); $field_definition = $field_definitions[$current_key]; $plugin = \Drupal::service('plugin.manager.field.formatter')->getInstance(array( 'field_definition' => $field_definition, @@ -134,7 +134,7 @@ class FieldReference extends Field { $row = parent::buildFieldFormRow($field_name, $field, $field_display_settings, $view_mode, $form_state, $complete_form); $display_field_config = $field['settings']['display_fields_field']; - $field_definitions = \Drupal::entityManager()->getFieldDefinitions($display_field_config['entity_type'], $display_field_config['bundle']); + $field_definitions = \Drupal::service('entity_field.manager')->getFieldDefinitions($display_field_config['entity_type'], $display_field_config['bundle']); $field_definition = $field_definitions[$display_field_config['field_name']]; // Check the currently selected plugin, and merge persisted values for its