Remade the whole system to be up to date with laravel 7

Author: le0daniel

src/Commands/FilesystemClear.php

@@ -10,6 +10,7 @@
 
 
 use Illuminate\Console\Command;
+use le0daniel\Laravel\ImageEngine\Utility\Directories;
 use Symfony\Component\Finder\Exception\DirectoryNotFoundException;
 use Symfony\Component\Finder\Finder;
 
@@ -152,7 +153,7 @@ public function handle()
 
         foreach ($this->recreateDirectories() as $directory) {
             if (!file_exists($directory) && !is_dir($directory)) {
-                mkdir($directory, 0777, true);
+                Directories::makeRecursive($directory);
                 $this->line('Made directory: <info>' . $directory . '</info>');
             }
         }
@@ -208,4 +209,4 @@ protected function cleanFinder(Finder $finder, int $maxAgeInSeconds)
             }
         }
     }
-}
+}

src/Commands/ImageUrl.php

@@ -13,6 +13,7 @@
 use Illuminate\Console\Command;
 use Illuminate\Support\Facades\Storage;
 use le0daniel\Laravel\ImageEngine\Image\Image;
+use le0daniel\Laravel\ImageEngine\Image\ImageRepresentation;
 
 class ImageUrl extends Command
 {
@@ -34,15 +35,16 @@ public function handle()
         $disk = $this->argument('disk');
         $extension = $this->argument('extension');
 
-        $image = new Image(
+        $image = ImageRepresentation::from(
             $path,
             $size,
             Carbon::now()->addMinutes(10),
             $disk
         );
 
-        if (!Storage::disk($disk)->exists($path)) {
-            return $this->line('Image not found. Path ' . $path . ' on disk ' . $disk, 'error');
+        if (!$image->disk()->exists($path)) {
+            $this->line('Image not found. Path ' . $path . ' on disk ' . $disk, 'error');
+            return;
         }
 
         if (!$extension) {
@@ -60,4 +62,4 @@ public function handle()
 
     }
 
-}
+}

src/Http/Controllers/ImageController.php

@@ -8,79 +8,66 @@
 
 namespace le0daniel\Laravel\ImageEngine\Http\Controllers;
 
-use Illuminate\Http\Request;
 use Illuminate\Routing\Controller as BaseController;
-use le0daniel\Laravel\ImageEngine\Image\Image;
+use Illuminate\Support\Facades\Log;
 use le0daniel\Laravel\ImageEngine\Image\ImageException;
-use le0daniel\Laravel\ImageEngine\Image\Renderer;
-use le0daniel\Laravel\ImageEngine\Image\Signer;
+use le0daniel\Laravel\ImageEngine\Image\ImageEngine;
+use le0daniel\Laravel\ImageEngine\Utility\SignatureException;
 
 class ImageController extends BaseController
 {
-    /**
-     * @var Signer
-     */
-    protected $signer;
+    private ImageEngine $imageEngine;
 
-    /**
-     * @var Renderer
-     */
-    protected $renderer;
-
-    /**
-     * ImageController constructor.
-     * @param Signer $signer
-     * @param Renderer $renderer
-     */
-    public function __construct(Signer $signer, Renderer $renderer)
+    public function __construct(ImageEngine $imageEngine)
     {
-        $this->signer = $signer;
-        $this->renderer = $renderer;
+        $this->imageEngine = $imageEngine;
     }
 
+    private function expired()
+    {
+        return response()->json(
+            [
+                'error' => 'Expired'
+            ],
+            410
+        );
+    }
 
-    /**
-     * @param string $unverifiedPayload
-     * @param string $signature
-     * @param string $extension
-     * @return \Illuminate\Http\JsonResponse|\Symfony\Component\HttpFoundation\BinaryFileResponse
-     * @throws \Exception
-     */
-    public function image(string $unverifiedPayload, string $signature, string $extension)
+    public function image(string $folder, string $path, string $extension)
     {
         try {
-            $payload = $this->signer->verifyAndUnpack($unverifiedPayload, $signature);
-        } catch (\Exception $error) {
-            return response()->json([
-                'error' => 'Invalid signature.'
-            ], 403);
-        }
-
-        $image = Image::createFromPayload($payload);
+            $imageRepresentation = $this->imageEngine->getImageSignedString($folder . $path);
+            if ($imageRepresentation->isExpired) {
+                return $this->expired();
+            }
 
-        // Check if expired
-        if ($image->isExpired()) {
-            response()->json([
-                'error' => 'Expired'
-            ], 403);
-        }
+            $absoluteImagePath = $this->imageEngine->render(
+                $imageRepresentation,
+                $extension,
+                false
+            );
 
-        try {
             return response()->file(
-                $this->renderer->render($image, $extension),
-                $image->cacheControlHeaders()
+                $absoluteImagePath,
+                $imageRepresentation->cacheControlHeaders()
+            );
+        } catch (SignatureException $signatureException) {
+            Log::error('Image Rendering: ' . $signatureException->getMessage());
+            return response()->json(
+                [
+                    'Error' => 'Invalid signature provided',
+                ],
+                422
+            );
+        } catch (ImageException $error) {
+            Log::error('Image Rendering: ' . $error->getMessage() . ' => ' . $error->getHint());
+            return response()->json(
+                [
+                    'Error' => 'Internal rendering error',
+                ],
+                500
             );
-        } catch (ImageException $exception) {
-            if (config('app.debug') === true) {
-                return response()->json([
-                    'error' => $exception->getMessage(),
-                    'hint' => $exception->getHint(),
-                ], 500);
-            }
-            return response()->json([
-                'error' => 'Invalid request. Forbidden'
-            ], 403);
         }
     }
 
-}
+}