diff --git a/typo3/sysext/backend/Classes/ViewHelpers/ThumbnailViewHelper.php b/typo3/sysext/backend/Classes/ViewHelpers/ThumbnailViewHelper.php index 0b7219c6c24e633c400df3824f8c812c18589e96..45f9c9b9e4bc537abdbd6a773f3e9ef5b44199ae 100644 --- a/typo3/sysext/backend/Classes/ViewHelpers/ThumbnailViewHelper.php +++ b/typo3/sysext/backend/Classes/ViewHelpers/ThumbnailViewHelper.php @@ -85,7 +85,7 @@ class ThumbnailViewHelper extends ImageViewHelper } try { - $image = $this->getImageService()->getImage((string)$this->arguments['src'], $this->arguments['image'], (bool)$this->arguments['treatIdAsReference']); + $image = $this->imageService->getImage((string)$this->arguments['src'], $this->arguments['image'], (bool)$this->arguments['treatIdAsReference']); $cropString = $this->arguments['crop']; if ($cropString === null && $image->hasProperty('crop') && $image->getProperty('crop')) { diff --git a/typo3/sysext/fluid/Classes/ViewHelpers/ImageViewHelper.php b/typo3/sysext/fluid/Classes/ViewHelpers/ImageViewHelper.php index fa95be3ba36ad48c5ff5c8964635449d91f7ca34..1f6a12c80eeaafa1e1b30441a70c0d1ab8691977 100644 --- a/typo3/sysext/fluid/Classes/ViewHelpers/ImageViewHelper.php +++ b/typo3/sysext/fluid/Classes/ViewHelpers/ImageViewHelper.php @@ -95,6 +95,14 @@ class ImageViewHelper extends AbstractTagBasedViewHelper */ protected $tagName = 'img'; + protected ImageService $imageService; + + public function __construct() + { + parent::__construct(); + $this->imageService = GeneralUtility::makeInstance(ImageService::class); + } + /** * Initialize arguments. */ @@ -155,8 +163,7 @@ class ImageViewHelper extends AbstractTagBasedViewHelper } } else { try { - $imageService = $this->getImageService(); - $image = $imageService->getImage($src, $this->arguments['image'], (bool)$this->arguments['treatIdAsReference']); + $image = $this->imageService->getImage($src, $this->arguments['image'], (bool)$this->arguments['treatIdAsReference']); $cropString = $this->arguments['crop']; if ($cropString === null && $image->hasProperty('crop') && $image->getProperty('crop')) { $cropString = $image->getProperty('crop'); @@ -176,8 +183,8 @@ class ImageViewHelper extends AbstractTagBasedViewHelper if (!empty($this->arguments['fileExtension'] ?? '')) { $processingInstructions['fileExtension'] = $this->arguments['fileExtension']; } - $processedImage = $imageService->applyProcessingInstructions($image, $processingInstructions); - $imageUri = $imageService->getImageUri($processedImage, $this->arguments['absolute']); + $processedImage = $this->imageService->applyProcessingInstructions($image, $processingInstructions); + $imageUri = $this->imageService->getImageUri($processedImage, $this->arguments['absolute']); if (!$this->tag->hasAttribute('data-focus-area')) { $focusArea = $cropVariantCollection->getFocusArea($cropVariant); @@ -214,9 +221,4 @@ class ImageViewHelper extends AbstractTagBasedViewHelper } return $this->tag->render(); } - - protected function getImageService(): ImageService - { - return GeneralUtility::makeInstance(ImageService::class); - } }