[TASK] Remove ObjectManager from avatar provider

TYPO3GmbH · May 12, 2023 · e9ad4ca · e9ad4ca
1 parent 8587ea1
commit e9ad4ca
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 6 deletions.
diff --git a/Classes/AvatarProvider/GravatarProvider.php b/Classes/AvatarProvider/GravatarProvider.php
@@ -24,7 +24,6 @@
 use TYPO3\CMS\Core\Utility\GeneralUtility;
 use TYPO3\CMS\Core\Utility\PathUtility;
 use TYPO3\CMS\Extbase\Configuration\ConfigurationManagerInterface;
-use TYPO3\CMS\Extbase\Object\ObjectManager;
 
 class GravatarProvider implements AvatarProviderInterface, SingletonInterface
 {
@@ -62,8 +61,7 @@ final public function __construct()
 
     public function getAvatarUrl(Author $author, int $size): string
     {
-        $objectManager = GeneralUtility::makeInstance(ObjectManager::class);
-        $configurationManager = $objectManager->get(ConfigurationManagerInterface::class);
+        $configurationManager = GeneralUtility::makeInstance(ConfigurationManagerInterface::class);
         $settings = $configurationManager->getConfiguration(ConfigurationManagerInterface::CONFIGURATION_TYPE_SETTINGS, 'blog');
 
         $rating = empty($rating = (string)($settings['authors']['avatar']['provider']['rating'] ?? '')) ? null : $rating;

diff --git a/Classes/AvatarProvider/ImageProvider.php b/Classes/AvatarProvider/ImageProvider.php
@@ -14,7 +14,6 @@
 use TYPO3\CMS\Core\Imaging\ImageManipulation\CropVariantCollection;
 use TYPO3\CMS\Core\Utility\GeneralUtility;
 use TYPO3\CMS\Extbase\Domain\Model\FileReference;
-use TYPO3\CMS\Extbase\Object\ObjectManager;
 use TYPO3\CMS\Extbase\Service\ImageService;
 
 class ImageProvider implements AvatarProviderInterface
@@ -23,8 +22,7 @@ public function getAvatarUrl(Author $author, int $size): string
     {
         $image = $author->getImage();
         if ($image instanceof FileReference) {
-            $objectManager = GeneralUtility::makeInstance(ObjectManager::class);
-            $imageService = $objectManager->get(ImageService::class);
+            $imageService = GeneralUtility::makeInstance(ImageService::class);
             $image = $imageService->getImage('', $image, false);
 
             if ($image->hasProperty('crop') && $image->getProperty('crop')) {