Added new Testing, added bypassing of finals

Author: le0daniel

composer.json

@@ -34,6 +34,7 @@
   },
   "require-dev": {
     "phpunit/phpunit": "^9.2",
-    "phpspec/prophecy-phpunit": "^2.0"
+    "phpspec/prophecy-phpunit": "^2.0",
+    "dg/bypass-finals": "^1.2"
   }
 }

src/Http/Controllers/ImageController.php

@@ -14,6 +14,7 @@
 use le0daniel\Laravel\ImageEngine\Image\ImageEngine;
 use le0daniel\Laravel\ImageEngine\Utility\SignatureException;
 use le0daniel\Laravel\ImageEngine\Utility\Signatures;
+use Symfony\Component\HttpFoundation\BinaryFileResponse;
 
 class ImageController extends BaseController
 {
@@ -48,8 +49,9 @@ public function image(string $folder, string $path, string $extension)
                 false
             );
 
-            return response()->file(
-                $absoluteImagePath,
+            return new BinaryFileResponse(
+                new \SplFileInfo($absoluteImagePath),
+                200,
                 $imageRepresentation->cacheControlHeaders()
             );
         } catch (SignatureException $signatureException) {

src/Image/ImageRepresentation.php

@@ -93,7 +93,7 @@ private function getValue(string $name, $value)
         switch ($name) {
             case 'timestamp':
                 return $this->expires;
-            case 'disk':
+            case 'diskName':
                 return $value ?? self::DEFAULT_DISK_NAME;
             case 'extension':
                 return pathinfo($this->filePath, PATHINFO_EXTENSION);

tests/Http/Controllers/ImageControllerTest.php

@@ -0,0 +1,49 @@
+<?php
+
+namespace le0daniel\Tests\Laravel\ImageEngine\Http\Controllers;
+
+use Intervention\Image\ImageManager;
+use le0daniel\Laravel\ImageEngine\Http\Controllers\ImageController;
+use le0daniel\Laravel\ImageEngine\Image\ImageEngine;
+use le0daniel\Laravel\ImageEngine\Image\ImageRepresentation;
+use PHPUnit\Framework\TestCase;
+use Prophecy\Argument;
+use Prophecy\PhpUnit\ProphecyTrait;
+use Symfony\Component\HttpFoundation\BinaryFileResponse;
+
+final class ImageControllerTest extends TestCase
+{
+    use ProphecyTrait;
+
+    private const SECRET = 'asdfasdf!?';
+    private $imageEngine;
+    private ImageController $imageController;
+
+    protected function setUp(): void
+    {
+        $this->imageEngine = $this->prophesize(ImageEngine::class);
+        $this->imageController = new ImageController(
+            $this->imageEngine->reveal()
+        );
+    }
+
+    public function testImage()
+    {
+        $this->imageEngine->getImageFromSignedString('folder::string')->willReturn(
+            ImageRepresentation::from('path', 'medium')
+        );
+
+        $this
+            ->imageEngine
+            ->render(Argument::type(ImageRepresentation::class), 'jpg', false)
+            ->willReturn(test_files('image.jpg'))
+        ;
+
+        /** @var BinaryFileResponse $binaryFileResponse */
+        $binaryFileResponse = $this->imageController->image('folder', 'string', 'jpg');
+        $this->assertSame(
+            test_files('image.jpg'),
+            $binaryFileResponse->getFile()->getRealPath()
+        );
+    }
+}

tests/bootstrap.php

@@ -1,7 +1,11 @@
 <?php
 
+use DG\BypassFinals;
+
 define('PHP_UNIT_TEST_MODE', true);
 
+BypassFinals::enable();
+
 function test_files(string $filePath, bool $ensureCreated = false): string
 {
     $file = __DIR__ . "/static_files/$filePath";