fix: remove usage of database connection in constructs (#33)

fixes #31

Author: tinect

src/Service/ThumbnailUrlTemplate.php

@@ -6,27 +6,41 @@
 
 class ThumbnailUrlTemplate implements ThumbnailUrlTemplateInterface
 {
-    /** @var string */
+    /** @var string|null */
     private $pattern;
 
+    /**
+     * @var SystemConfigService
+     */
+    private $systemConfigService;
+
     public function __construct(SystemConfigService $systemConfigService)
     {
-        $patternConfig = $systemConfigService->get('FroshPlatformThumbnailProcessor.config.ThumbnailPattern');
-
-        if ($patternConfig && is_string($patternConfig)) {
-            $this->pattern = $patternConfig;
-        } else {
-            $this->pattern = '{mediaUrl}/{mediaPath}?width={width}';
-        }
+        $this->systemConfigService = $systemConfigService;
     }
 
     public function getUrl(string $mediaUrl, string $mediaPath, string $width, string $height = ''): string
     {
-        $result = $this->pattern;
         return str_replace(
             ['{mediaUrl}', '{mediaPath}', '{width}', '{height}'],
             [$mediaUrl, $mediaPath, $width, ''],
-            $result
+            $this->getPattern()
         );
     }
+
+    private function getPattern(): string
+    {
+        if ($this->pattern) {
+            return $this->pattern;
+        }
+
+        $pattern = $this->systemConfigService->get('FroshPlatformThumbnailProcessor.config.ThumbnailPattern');
+        if ($pattern && is_string($pattern)) {
+            $this->pattern = $pattern;
+        } else {
+            $this->pattern = '{mediaUrl}/{mediaPath}?width={width}';
+        }
+
+        return $this->pattern;
+    }
 }

src/Service/UrlGeneratorDecorator.php

@@ -32,15 +32,20 @@ class UrlGeneratorDecorator implements UrlGeneratorInterface
     private $thumbnailUrlTemplate;
 
     /**
-     * @var bool
+     * @var bool|null
      */
     private $processSVG;
 
     /**
-     * @var bool
+     * @var bool|null
      */
     private $processOriginalImages;
 
+    /**
+     * @var SystemConfigService
+     */
+    private $systemConfigService;
+
     public function __construct(
         UrlGeneratorInterface $decoratedService,
         ThumbnailUrlTemplateInterface $thumbnailUrlTemplate,
@@ -55,8 +60,7 @@ public function __construct(
         $this->baseUrl = $this->normalizeBaseUrl($baseUrl);
 
         $this->thumbnailUrlTemplate = $thumbnailUrlTemplate;
-        $this->processSVG = (bool)$systemConfigService->get('FroshPlatformThumbnailProcessor.config.ProcessSVG');
-        $this->processOriginalImages = (bool)$systemConfigService->get('FroshPlatformThumbnailProcessor.config.ProcessOriginalImages');
+        $this->systemConfigService = $systemConfigService;
     }
 
     public function getAbsoluteMediaUrl(MediaEntity $media): string
@@ -65,11 +69,11 @@ public function getAbsoluteMediaUrl(MediaEntity $media): string
             return $this->decoratedService->getAbsoluteMediaUrl($media);
         }
 
-        if (!$this->processOriginalImages) {
+        if (!$this->canProcessOriginalImages()) {
             return $this->decoratedService->getAbsoluteMediaUrl($media);
         }
 
-        if (!$this->processSVG && $media->getFileExtension() === 'svg') {
+        if (!$this->canProcessSVG() && $media->getFileExtension() === 'svg') {
             return $this->decoratedService->getAbsoluteMediaUrl($media);
         }
 
@@ -88,7 +92,7 @@ public function getRelativeMediaUrl(MediaEntity $media): string
 
     public function getAbsoluteThumbnailUrl(MediaEntity $media, MediaThumbnailEntity $thumbnail): string
     {
-        if (!$this->processSVG && $media->getFileExtension() === 'svg') {
+        if (!$this->canProcessSVG() && $media->getFileExtension() === 'svg') {
             return $this->decoratedService->getAbsoluteMediaUrl($media);
         }
 
@@ -133,4 +137,24 @@ private function createFallbackUrl(): string
 
         return '';
     }
+
+    private function canProcessSVG(): bool
+    {
+        if ($this->processSVG !== null) {
+            return $this->processSVG;
+        }
+
+        $this->processSVG = (bool)$this->systemConfigService->get('FroshPlatformThumbnailProcessor.config.ProcessSVG');
+        return $this->processSVG;
+    }
+
+    private function canProcessOriginalImages(): bool
+    {
+        if ($this->processOriginalImages !== null) {
+            return $this->processOriginalImages;
+        }
+
+        $this->processOriginalImages = (bool)$this->systemConfigService->get('FroshPlatformThumbnailProcessor.config.ProcessOriginalImages');
+        return $this->processOriginalImages;
+    }
 }