diff --git a/src/Plugin/Field/FieldFormatter/BgImgFieldFormatter.php b/src/Plugin/Field/FieldFormatter/BgImgFieldFormatter.php index a76f0fe23dfb6454c796b6ffb85fdf605a8611a4..9c683fd356603d6445dde6acf6d2471a485b7fe5 100644 --- a/src/Plugin/Field/FieldFormatter/BgImgFieldFormatter.php +++ b/src/Plugin/Field/FieldFormatter/BgImgFieldFormatter.php @@ -5,7 +5,6 @@ namespace Drupal\bg_img_field\Plugin\Field\FieldFormatter; use Drupal\Core\Cache\Cache; use Drupal\Core\Entity\EntityInterface; use Drupal\Core\Entity\EntityStorageInterface; -use Drupal\Core\Entity\EntityTypeManagerInterface; use Drupal\Core\Field\FieldDefinitionInterface; use Drupal\Core\Field\FieldItemListInterface; use Drupal\Core\File\FileUrlGeneratorInterface; @@ -83,13 +82,6 @@ class BgImgFieldFormatter extends ResponsiveImageFormatter implements ContainerF */ protected $fileUrlGenerator; - /** - * The entityTypeManager service. - * - * @var \Drupal\Core\Entity\EntityTypeManagerInterface - */ - protected $entityTypeManager; - /** * Constructor for the Background Image Formatter. * @@ -128,8 +120,6 @@ class BgImgFieldFormatter extends ResponsiveImageFormatter implements ContainerF * The URL generator for generating URLs for routes. * @param \Drupal\Core\File\FileUrlGeneratorInterface $file_url_generator * The file URL generator to generate absolute file URLs. - * @param \Drupal\Core\Entity\EntityTypeManagerInterface $entityTypeManager - * The entity type manager. */ public function __construct( $plugin_id, @@ -149,7 +139,6 @@ class BgImgFieldFormatter extends ResponsiveImageFormatter implements ContainerF RequestStack $request_stack, UrlGeneratorInterface $url_generator, FileUrlGeneratorInterface $file_url_generator, - EntityTypeManagerInterface $entityTypeManager, ) { parent::__construct( $plugin_id, @@ -165,14 +154,12 @@ class BgImgFieldFormatter extends ResponsiveImageFormatter implements ContainerF $current_user ); - $this->entityTypeManager = $entityTypeManager; - $this->entityTypeManager = $entityTypeManager; + $this->breakpointManager = $breakpoint_manager; $this->imageFactory = $imageFactory; $this->tokenService = $token_service; $this->requestStack = $request_stack; $this->urlGenerator = $url_generator; $this->fileUrlGenerator = $file_url_generator; - $this->breakpointManager = $breakpoint_manager; } /** @@ -197,8 +184,7 @@ class BgImgFieldFormatter extends ResponsiveImageFormatter implements ContainerF $container->get('token'), $container->get('request_stack'), $container->get('url_generator'), - $container->get('file_url_generator'), - $container->get('entity_type.manager') + $container->get('file_url_generator') ); } @@ -395,7 +381,7 @@ class BgImgFieldFormatter extends ResponsiveImageFormatter implements ContainerF } else { // Use image style URL generation instead of ImageFactory->load() - $image_style = $this->entityTypeManager->getStorage('image_style')->load($mapping['image_mapping']); + $image_style = $this->imageStyleStorage->load($mapping['image_mapping']); $url = $image_style->buildUrl($file->getFileUri()); }