Commit 62e59a00 authored by catch's avatar catch
Browse files

Issue #2981025 by msankhala, barthje, Stockticker, penyaskito, alexpott:...

Issue #2981025 by msankhala, barthje, Stockticker, penyaskito, alexpott: Replace injection of deprecated entity.manager service with entity_type.manager in \Drupal\Core\Field\Plugin\Field\FieldFormatter\StringFormatter and LanguageFormatter
parent 5e4ce076
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
namespace Drupal\Core\Field\Plugin\Field\FieldFormatter; namespace Drupal\Core\Field\Plugin\Field\FieldFormatter;
use Drupal\Core\Entity\EntityManagerInterface; use Drupal\Core\Entity\EntityTypeManagerInterface;
use Drupal\Core\Field\FieldDefinitionInterface; use Drupal\Core\Field\FieldDefinitionInterface;
use Drupal\Core\Field\FieldItemInterface; use Drupal\Core\Field\FieldItemInterface;
use Drupal\Core\Form\FormStateInterface; use Drupal\Core\Form\FormStateInterface;
...@@ -47,13 +47,13 @@ class LanguageFormatter extends StringFormatter { ...@@ -47,13 +47,13 @@ class LanguageFormatter extends StringFormatter {
* The view mode. * The view mode.
* @param array $third_party_settings * @param array $third_party_settings
* Any third party settings settings. * Any third party settings settings.
* @param \Drupal\Core\Entity\EntityManagerInterface $entity_manager * @param \Drupal\Core\Entity\EntityTypeManagerInterface $entity_type_manager
* The entity manager. * The entity type manager.
* @param \Drupal\Core\Language\LanguageManagerInterface $language_manager * @param \Drupal\Core\Language\LanguageManagerInterface $language_manager
* The language manager. * The language manager.
*/ */
public function __construct($plugin_id, $plugin_definition, FieldDefinitionInterface $field_definition, array $settings, $label, $view_mode, array $third_party_settings, EntityManagerInterface $entity_manager, LanguageManagerInterface $language_manager) { public function __construct($plugin_id, $plugin_definition, FieldDefinitionInterface $field_definition, array $settings, $label, $view_mode, array $third_party_settings, EntityTypeManagerInterface $entity_type_manager, LanguageManagerInterface $language_manager) {
parent::__construct($plugin_id, $plugin_definition, $field_definition, $settings, $label, $view_mode, $third_party_settings, $entity_manager); parent::__construct($plugin_id, $plugin_definition, $field_definition, $settings, $label, $view_mode, $third_party_settings, $entity_type_manager);
$this->languageManager = $language_manager; $this->languageManager = $language_manager;
} }
...@@ -70,7 +70,7 @@ public static function create(ContainerInterface $container, array $configuratio ...@@ -70,7 +70,7 @@ public static function create(ContainerInterface $container, array $configuratio
$configuration['label'], $configuration['label'],
$configuration['view_mode'], $configuration['view_mode'],
$configuration['third_party_settings'], $configuration['third_party_settings'],
$container->get('entity.manager'), $container->get('entity_type.manager'),
$container->get('language_manager') $container->get('language_manager')
); );
} }
......
...@@ -3,7 +3,7 @@ ...@@ -3,7 +3,7 @@
namespace Drupal\Core\Field\Plugin\Field\FieldFormatter; namespace Drupal\Core\Field\Plugin\Field\FieldFormatter;
use Drupal\Core\Entity\EntityInterface; use Drupal\Core\Entity\EntityInterface;
use Drupal\Core\Entity\EntityManagerInterface; use Drupal\Core\Entity\EntityTypeManagerInterface;
use Drupal\Core\Field\FieldDefinitionInterface; use Drupal\Core\Field\FieldDefinitionInterface;
use Drupal\Core\Field\FieldItemInterface; use Drupal\Core\Field\FieldItemInterface;
use Drupal\Core\Field\FormatterBase; use Drupal\Core\Field\FormatterBase;
...@@ -29,6 +29,13 @@ ...@@ -29,6 +29,13 @@
*/ */
class StringFormatter extends FormatterBase implements ContainerFactoryPluginInterface { class StringFormatter extends FormatterBase implements ContainerFactoryPluginInterface {
/**
* The entity type manager.
*
* @var \Drupal\Core\Entity\EntityTypeManagerInterface
*/
protected $entityTypeManager;
/** /**
* Constructs a StringFormatter instance. * Constructs a StringFormatter instance.
* *
...@@ -46,13 +53,13 @@ class StringFormatter extends FormatterBase implements ContainerFactoryPluginInt ...@@ -46,13 +53,13 @@ class StringFormatter extends FormatterBase implements ContainerFactoryPluginInt
* The view mode. * The view mode.
* @param array $third_party_settings * @param array $third_party_settings
* Any third party settings settings. * Any third party settings settings.
* @param \Drupal\Core\Entity\EntityManagerInterface $entity_manager * @param \Drupal\Core\Entity\EntityTypeManagerInterface $entity_type_manager
* The entity manager. * The entity type manager.
*/ */
public function __construct($plugin_id, $plugin_definition, FieldDefinitionInterface $field_definition, array $settings, $label, $view_mode, array $third_party_settings, EntityManagerInterface $entity_manager) { public function __construct($plugin_id, $plugin_definition, FieldDefinitionInterface $field_definition, array $settings, $label, $view_mode, array $third_party_settings, EntityTypeManagerInterface $entity_type_manager) {
parent::__construct($plugin_id, $plugin_definition, $field_definition, $settings, $label, $view_mode, $third_party_settings); parent::__construct($plugin_id, $plugin_definition, $field_definition, $settings, $label, $view_mode, $third_party_settings);
$this->entityManager = $entity_manager; $this->entityTypeManager = $entity_type_manager;
} }
/** /**
...@@ -67,7 +74,7 @@ public static function create(ContainerInterface $container, array $configuratio ...@@ -67,7 +74,7 @@ public static function create(ContainerInterface $container, array $configuratio
$configuration['label'], $configuration['label'],
$configuration['view_mode'], $configuration['view_mode'],
$configuration['third_party_settings'], $configuration['third_party_settings'],
$container->get('entity.manager') $container->get('entity_type.manager')
); );
} }
...@@ -87,7 +94,7 @@ public static function defaultSettings() { ...@@ -87,7 +94,7 @@ public static function defaultSettings() {
public function settingsForm(array $form, FormStateInterface $form_state) { public function settingsForm(array $form, FormStateInterface $form_state) {
$form = parent::settingsForm($form, $form_state); $form = parent::settingsForm($form, $form_state);
$entity_type = $this->entityManager->getDefinition($this->fieldDefinition->getTargetEntityTypeId()); $entity_type = $this->entityTypeManager->getDefinition($this->fieldDefinition->getTargetEntityTypeId());
$form['link_to_entity'] = [ $form['link_to_entity'] = [
'#type' => 'checkbox', '#type' => 'checkbox',
...@@ -104,7 +111,7 @@ public function settingsForm(array $form, FormStateInterface $form_state) { ...@@ -104,7 +111,7 @@ public function settingsForm(array $form, FormStateInterface $form_state) {
public function settingsSummary() { public function settingsSummary() {
$summary = []; $summary = [];
if ($this->getSetting('link_to_entity')) { if ($this->getSetting('link_to_entity')) {
$entity_type = $this->entityManager->getDefinition($this->fieldDefinition->getTargetEntityTypeId()); $entity_type = $this->entityTypeManager->getDefinition($this->fieldDefinition->getTargetEntityTypeId());
$summary[] = $this->t('Linked to the @entity_label', ['@entity_label' => $entity_type->getLabel()]); $summary[] = $this->t('Linked to the @entity_label', ['@entity_label' => $entity_type->getLabel()]);
} }
return $summary; return $summary;
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment