Bugfix: get service (#43)

Closes: #42
christophlehmann · May 19, 2020 · b8a8a60 · b8a8a60
1 parent 88a9d6f
commit b8a8a60
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 10 deletions.
diff --git a/Classes/EventListener/AbstractEventListener.php b/Classes/EventListener/AbstractEventListener.php
@@ -6,13 +6,8 @@
 
 class AbstractEventListener
 {
-    /**
-     * @var OptimizeImageService
-     */
-    protected $service;
-
-    public function __construct()
+    public function getService(): OptimizeImageService
     {
-        $service = GeneralUtility::makeInstance(OptimizeImageService::class);
+        return GeneralUtility::makeInstance(OptimizeImageService::class);
     }
 }
diff --git a/Classes/EventListener/AfterFileProcessing.php b/Classes/EventListener/AfterFileProcessing.php
@@ -8,7 +8,7 @@ class AfterFileProcessing extends AbstractEventListener
     public function __invoke(AfterFileProcessingEvent $event): void
     {
         if ($event->getProcessedFile()->isUpdated() && !$event->getProcessedFile()->usesOriginalFile()) {
-            $this->service->process(
+            $this->getService()->process(
                 $event->getProcessedFile()->getPublicUrl(true),
                 $event->getProcessedFile()->getExtension()
             );

diff --git a/Classes/EventListener/BeforeFileAdded.php b/Classes/EventListener/BeforeFileAdded.php
@@ -7,7 +7,7 @@ class BeforeFileAdded extends AbstractEventListener
 {
     public function __invoke(BeforeFileAddedEvent $event): void
     {
-        $this->service->process(
+        $this->getService()->process(
             $event->getSourceFilePath(),
             pathinfo($event->getFileName(), PATHINFO_EXTENSION),
             true

diff --git a/Classes/EventListener/BeforeFileReplaced.php b/Classes/EventListener/BeforeFileReplaced.php
@@ -7,7 +7,7 @@ class BeforeFileReplaced extends AbstractEventListener
 {
     public function __invoke(BeforeFileReplacedEvent $event): void
     {
-        $this->service->process(
+        $this->getService()->process(
             $event->getLocalFilePath(),
             $event->getFile()->getExtension(),
             true