Skip to content
Snippets Groups Projects
Commit 7ce4967e authored by John Franklin's avatar John Franklin
Browse files

Remove unused ImageFactory service; fix a variable naming issue.

parent 0f1a7423
No related branches found
No related tags found
1 merge request!73484416-addressed-pipelines-issues: Fixed the issues.
...@@ -9,7 +9,6 @@ use Drupal\Core\Field\FieldDefinitionInterface; ...@@ -9,7 +9,6 @@ use Drupal\Core\Field\FieldDefinitionInterface;
use Drupal\Core\Field\FieldItemListInterface; use Drupal\Core\Field\FieldItemListInterface;
use Drupal\Core\File\FileUrlGeneratorInterface; use Drupal\Core\File\FileUrlGeneratorInterface;
use Drupal\Core\Form\FormStateInterface; use Drupal\Core\Form\FormStateInterface;
use Drupal\Core\Image\ImageFactory;
use Drupal\Core\Logger\LoggerChannelTrait; use Drupal\Core\Logger\LoggerChannelTrait;
use Drupal\Core\Plugin\ContainerFactoryPluginInterface; use Drupal\Core\Plugin\ContainerFactoryPluginInterface;
use Drupal\Core\Routing\UrlGeneratorInterface; use Drupal\Core\Routing\UrlGeneratorInterface;
...@@ -40,13 +39,6 @@ class BgImgFieldFormatter extends ResponsiveImageFormatter implements ContainerF ...@@ -40,13 +39,6 @@ class BgImgFieldFormatter extends ResponsiveImageFormatter implements ContainerF
use LoggerChannelTrait; use LoggerChannelTrait;
/**
* The image factory service.
*
* @var \Drupal\Core\Image\ImageFactory
*/
protected $imageFactory;
/** /**
* The token service. * The token service.
* *
...@@ -110,8 +102,6 @@ class BgImgFieldFormatter extends ResponsiveImageFormatter implements ContainerF ...@@ -110,8 +102,6 @@ class BgImgFieldFormatter extends ResponsiveImageFormatter implements ContainerF
* The current user. * The current user.
* @param \Drupal\breakpoint\BreakpointManagerInterface $breakpoint_manager * @param \Drupal\breakpoint\BreakpointManagerInterface $breakpoint_manager
* The breakpoint manager service. * The breakpoint manager service.
* @param \Drupal\Core\Image\ImageFactory $imageFactory
* The image factory.
* @param \Drupal\token\TokenServiceInterface $token_service * @param \Drupal\token\TokenServiceInterface $token_service
* The token service used to generate tokens. * The token service used to generate tokens.
* @param \Symfony\Component\HttpFoundation\RequestStack $request_stack * @param \Symfony\Component\HttpFoundation\RequestStack $request_stack
...@@ -134,7 +124,6 @@ class BgImgFieldFormatter extends ResponsiveImageFormatter implements ContainerF ...@@ -134,7 +124,6 @@ class BgImgFieldFormatter extends ResponsiveImageFormatter implements ContainerF
LinkGeneratorInterface $link_generator, LinkGeneratorInterface $link_generator,
AccountInterface $current_user, AccountInterface $current_user,
BreakpointManagerInterface $breakpoint_manager, BreakpointManagerInterface $breakpoint_manager,
ImageFactory $imageFactory,
Token $token_service, Token $token_service,
RequestStack $request_stack, RequestStack $request_stack,
UrlGeneratorInterface $url_generator, UrlGeneratorInterface $url_generator,
...@@ -155,7 +144,6 @@ class BgImgFieldFormatter extends ResponsiveImageFormatter implements ContainerF ...@@ -155,7 +144,6 @@ class BgImgFieldFormatter extends ResponsiveImageFormatter implements ContainerF
); );
$this->breakpointManager = $breakpoint_manager; $this->breakpointManager = $breakpoint_manager;
$this->imageFactory = $imageFactory;
$this->tokenService = $token_service; $this->tokenService = $token_service;
$this->requestStack = $request_stack; $this->requestStack = $request_stack;
$this->urlGenerator = $url_generator; $this->urlGenerator = $url_generator;
...@@ -377,10 +365,9 @@ class BgImgFieldFormatter extends ResponsiveImageFormatter implements ContainerF ...@@ -377,10 +365,9 @@ class BgImgFieldFormatter extends ResponsiveImageFormatter implements ContainerF
} }
if ($mapping['image_mapping'] == "_original image_") { if ($mapping['image_mapping'] == "_original image_") {
$url = $this->fileUrlGenerator->generateAbsoluteString($image->getFileUri()); $url = $this->fileUrlGenerator->generateAbsoluteString($file->getFileUri());
} }
else { else {
// Use image style URL generation instead of ImageFactory->load()
$image_style = $this->imageStyleStorage->load($mapping['image_mapping']); $image_style = $this->imageStyleStorage->load($mapping['image_mapping']);
$url = $image_style->buildUrl($file->getFileUri()); $url = $image_style->buildUrl($file->getFileUri());
} }
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment