Merge pull request #1 from Flowframe/refactor/clean-up

refactor: clean up

Author: Larsklopstra

src/CachingStrategies/BaseCachingStrategy.php

@@ -3,10 +3,11 @@
 namespace Flowframe\Drift\CachingStrategies;
 
 use Flowframe\Drift\Config;
+use Flowframe\Drift\Contracts\CachingStrategy;
 use Illuminate\Support\Facades\Storage;
 use Intervention\Image\Image;
 
-class FilesystemCachingStrategy extends BaseCachingStrategy
+class FilesystemCachingStrategy implements CachingStrategy
 {
     public function validate(string $path, string $signature, Config $config): bool
     {

src/CachingStrategies/FilesystemCachingStrategy.php

@@ -3,9 +3,10 @@
 namespace Flowframe\Drift\CachingStrategies;
 
 use Flowframe\Drift\Config;
+use Flowframe\Drift\Contracts\CachingStrategy;
 use Intervention\Image\Image;
 
-class NullCachingStrategy extends BaseCachingStrategy
+class NullCachingStrategy implements CachingStrategy
 {
     public function validate(string $path, string $signature, Config $config): bool
     {

src/CachingStrategies/NullCachingStrategy.php

@@ -0,0 +1,15 @@
+<?php
+
+namespace Flowframe\Drift\Contracts;
+
+use Flowframe\Drift\Config;
+use Intervention\Image\Image;
+
+interface CachingStrategy
+{
+    public function validate(string $path, string $signature, Config $config): bool;
+
+    public function resolve(string $path, string $signature, Config $config): string;
+
+    public function cache(string $path, string $signature, Image $image, Config $config): void;
+}

src/Contracts/CachingStrategy.php

@@ -10,6 +10,12 @@
 
 class ImagesController
 {
+    public function __construct(
+        public DriftManager $driftManager,
+        public ManipulationsTransformer $manipulationsTransformer,
+    ) {
+    }
+
     public function __invoke(
         string $configName,
         string $manipulations,
@@ -18,7 +24,7 @@ public function __invoke(
         $signature = request('signature');
 
         /** @var \Flowframe\Drift\Config|null $config */
-        $config = app(DriftManager::class)
+        $config = $this->driftManager
             ->configs()
             ->firstWhere('name', $configName);
 
@@ -28,8 +34,8 @@ public function __invoke(
             'Config not found',
         );
 
-        /** @var \Flowframe\Drift\CachingStrategies\BaseCachingStrategy $cachingStrategy */
-        $cachingStrategy = app($config->cachingStrategy);
+        /** @var \Flowframe\Drift\Contracts\CachingStrategy $cachingStrategy */
+        $cachingStrategy = new $config->cachingStrategy();
 
         if ($cachingStrategy->validate($path, $signature, $config)) {
             $cachedImage = $cachingStrategy->resolve($path, $signature, $config);
@@ -51,10 +57,7 @@ public function __invoke(
             Storage::disk($config->filesystemDisk)->get($path),
         );
 
-        /** @var \Flowframe\Drift\ManipulationsTransformer $transformer */
-        $transformer = app(ManipulationsTransformer::class);
-
-        foreach ($transformer->decode($manipulations) as $method => $arguments) {
+        foreach ($this->manipulationsTransformer->decode($manipulations) as $method => $arguments) {
             is_array($arguments)
                 ? $image->{$method}(...$arguments)
                 : $image->{$method}($arguments);

src/Http/Controllers/ImagesController.php

@@ -6,13 +6,18 @@
 
 class UrlBuilder
 {
+    public function __construct(
+        public ManipulationsTransformer $manipulationsTransformer,
+    ) {
+    }
+
     public function url(string $configName, string $path, array $manipulations = []): string
     {
         if (! isset($manipulations['encode'])) {
             $manipulations['encode'] = 'webp';
         }
 
-        $encodedManipulations = app(ManipulationsTransformer::class)->encode($manipulations);
+        $encodedManipulations = $this->manipulationsTransformer->encode($manipulations);
 
         return URL::signedRoute('__images.manipulate', [
             $configName,