Converted thumbnail response to psr7. MediaRequestHandler is fully psr7 now.

Author: hparadiz

src/Controllers/MediaRequestHandler.php

@@ -342,6 +342,25 @@ public function respondWithMedia(Media $Media, $variant, $responseID, $responseD
         return $response;
     }
 
+    public function respondWithThumbnail(Media $Media, $variant, $responseID, $responseData = []): ResponseInterface
+    {
+        if ($this->responseBuilder != MediaBuilder::class) {
+            throw new Exception('Media responses require MediaBuilder for putting together a response.');
+        }
+        $className = $this->responseBuilder;
+        $responseBuilder = new $className($responseID, $responseData);
+
+        $responseBuilder->setContentType($Media->ThumbnailMIMEType);
+
+        $response = new MediaResponse($responseBuilder);
+        $response = $this->setCache($response);
+
+        $response = $response->withHeader('ETag', "media-$Media->ID-$variant")
+            ->withHeader('Content-Length', filesize($responseID));
+
+        return $response;
+    }
+
     public function respondEmpty($responseID, $responseData = [])
     {
         if ($this->responseBuilder != EmptyBuilder::class) {
@@ -550,22 +569,6 @@ public function handleDeleteRequest(ActiveRecord $Record): ResponseInterface
 
     public function handleThumbnailRequest(Media $Media = null): ResponseInterface
     {
-        // send caching headers
-        if (!headers_sent()) {
-            // @codeCoverageIgnoreStart
-            $expires = 60*60*24*365;
-            header("Cache-Control: public, max-age=$expires");
-            header('Expires: '.gmdate('D, d M Y H:i:s \G\M\T', time()+$expires));
-            header('Pragma: public');
-            // @codeCoverageIgnoreEnd
-        }
-
-        // thumbnails are immutable for a given URL, so no need to actually check anything if the browser wants to revalidate its cache
-        if (!empty($_SERVER['HTTP_IF_NONE_MATCH']) || !empty($_SERVER['HTTP_IF_MODIFIED_SINCE'])) {
-            header('HTTP/1.0 304 Not Modified');
-            exit();
-        }
-
         // get media
         if (!$Media) {
             if (!$mediaID = $this->shiftPath()) {
@@ -575,6 +578,17 @@ public function handleThumbnailRequest(Media $Media = null): ResponseInterface
             }
         }
 
+        $_server = $this->request->getServerParams();
+
+        // thumbnails are immutable for a given URL, so no need to actually check anything if the browser wants to revalidate its cache
+        if (!empty($_server['HTTP_IF_NONE_MATCH']) || !empty($_server['HTTP_IF_MODIFIED_SINCE'])) {
+            $this->responseBuilder = EmptyBuilder::class;
+            $response = $this->respondEmpty($Media->ID);
+            $response->withDefaults(304);
+
+            return $response;
+        }
+
         // get format
         if (preg_match('/^(\d+)x(\d+)(x([0-9A-F]{6})?)?$/i', $this->peekPath(), $matches)) {
             $this->shiftPath();
@@ -597,20 +611,13 @@ public function handleThumbnailRequest(Media $Media = null): ResponseInterface
         // get thumbnail media
         try {
             $thumbPath = $Media->getThumbnail($maxWidth, $maxHeight, $fillColor, $cropped);
+
+            $this->responseBuilder = MediaBuilder::class;
+            $response = $this->respondWithThumbnail($Media, "$maxWidth-$maxHeight-$fillColor-$cropped", $thumbPath);
+            return $response;
         } catch (Exception $e) {
             return $this->throwNotFoundError();
         }
-
-        // emit
-        if (!headers_sent()) {
-            // @codeCoverageIgnoreStart
-            header("ETag: media-$Media->ID-$maxWidth-$maxHeight-$fillColor-$cropped");
-            header("Content-Type: $Media->ThumbnailMIMEType");
-            header('Content-Length: '.filesize($thumbPath));
-            readfile($thumbPath);
-            // @codeCoverageIgnoreEnd
-        }
-        exit();
     }
 
 

src/Models/Media/Media.php

@@ -311,7 +311,18 @@ public function getThumbnail($maxWidth, $maxHeight, $fillColor = false, $cropped
         return $thumbPath;
     }
 
-    public function createThumbnailImage($thumbPath, $maxWidth, $maxHeight, $fillColor = false, $cropped = false)
+    /**
+     * Creates a thumbnail using the gd php extension.
+     * Keeps aspect ratio.
+     *
+     * @param string $thumbPath
+     * @param int $maxWidth
+     * @param int $maxHeight
+     * @param boolean|int $fillColor Background canvas color. See gd documentation.
+     * @param boolean $cropped If cropped is enable the image will instead fill the smaller of width or height and cut the edges off.
+     * @return void
+     */
+    public function createThumbnailImage($thumbPath, $maxWidth, $maxHeight, $fillColor = false, $cropped = false): void
     {
         $thumbWidth = $maxWidth;
         $thumbHeight = $maxHeight;
@@ -430,7 +441,6 @@ public function createThumbnailImage($thumbPath, $maxWidth, $maxHeight, $fillCol
         }
 
         chmod($thumbPath, static::$newFilePermissions);
-        return true;
     }
 
     // static methods