Upgrade to Glide 2 (Flysystem 2).

Author: ADmad

README.md

@@ -55,7 +55,7 @@ Router::scope('/images', function ($routes) {
             'base_url' => '/images/',
 
             // Response class for serving images. If unset (default) an instance of
-            // \ADmad\Glide\Responses\PsrResponseFactory() will be used.
+            // \ADmad\Glide\Response\PsrResponseFactory() will be used.
             // http://glide.thephpleague.com/1.0/config/responses/
             'response' => null,
         ],

composer.json

@@ -29,7 +29,7 @@
     },
     "require": {
         "cakephp/cakephp": "^4.0.2",
-        "league/glide": "^1.6"
+        "league/glide": "^2.0"
     },
     "require-dev": {
         "phpunit/phpunit": "^8.5 || ^9.3"

src/Middleware/GlideMiddleware.php

@@ -5,7 +5,7 @@
 
 use ADmad\Glide\Exception\ResponseException;
 use ADmad\Glide\Exception\SignatureException;
-use ADmad\Glide\Responses\PsrResponseFactory;
+use ADmad\Glide\Response\PsrResponseFactory;
 use Cake\Core\InstanceConfigTrait;
 use Cake\Event\EventDispatcherInterface;
 use Cake\Event\EventDispatcherTrait;
@@ -180,7 +180,7 @@ protected function _checkModified(ServerRequestInterface $request, Server $serve
         try {
             /** @var int|string|false $modifiedTime */
             $modifiedTime = $server->getSource()
-                ->getTimestamp($server->getSourcePath($this->_path));
+                ->lastModified($server->getSourcePath($this->_path));
         } catch (Exception $exception) {
             return $this->_handleException($request, $exception);
         }
@@ -254,13 +254,10 @@ protected function _passThrough(ServerRequestInterface $request, Server $server)
         $path = $server->getSourcePath($this->_path);
 
         $resource = $source->readStream($path);
-        if ($resource === false) {
-            throw new ResponseException();
-        }
         $stream = new Stream($resource);
 
-        $contentType = $source->getMimetype($path);
-        $contentLength = $source->getSize($path);
+        $contentType = $source->mimeType($path);
+        $contentLength = $source->fileSize($path);
 
         /** @psalm-suppress PossiblyFalseArgument */
         return (new Response())->withBody($stream)

src/Responses/PsrResponseFactory.php src/Response/PsrResponseFactory.phpsrc/Responses/PsrResponseFactory.php renamed to src/Response/PsrResponseFactory.php

@@ -1,42 +1,33 @@
 <?php
 declare(strict_types=1);
 
-namespace ADmad\Glide\Responses;
+namespace ADmad\Glide\Response;
 
 use ADmad\Glide\Exception\ResponseException;
 use Cake\Http\Response;
 use Laminas\Diactoros\Stream;
-use League\Flysystem\FilesystemInterface;
-use League\Glide\Filesystem\FilesystemException;
+use League\Flysystem\FilesystemOperator;
 use League\Glide\Responses\ResponseFactoryInterface;
 
 class PsrResponseFactory implements ResponseFactoryInterface
 {
     /**
      * Create response.
      *
-     * @param \League\Flysystem\FilesystemInterface $cache Cache file system.
+     * @param \League\Flysystem\FilesystemOperator $cache Cache file system.
      * @param string $path Cached file path.
      * @return \Psr\Http\Message\ResponseInterface Response object.
      */
-    public function create(FilesystemInterface $cache, $path)
+    public function create(FilesystemOperator $cache, $path)
     {
         $resource = $cache->readStream($path);
         if ($resource === false) {
             throw new ResponseException();
         }
         $stream = new Stream($resource);
 
-        $contentType = $cache->getMimetype($path);
-        $contentLength = $cache->getSize($path);
-
-        if ($contentType === false) {
-            throw new FilesystemException('Unable to determine the image content type.');
-        }
-
-        if ($contentLength === false) {
-            throw new FilesystemException('Unable to determine the image content length.');
-        }
+        $contentType = $cache->mimeType($path);
+        $contentLength = $cache->fileSize($path);
 
         return (new Response())->withBody($stream)
             ->withHeader('Content-Type', $contentType)