refactor: use property to define adapter class

Author: innocenzi

src/Tempest/Storage/src/Config/AzureStorageConfig.php

@@ -3,10 +3,13 @@
 namespace Tempest\Storage\Config;
 
 use League\Flysystem\AzureBlobStorage\AzureBlobStorageAdapter;
+use League\Flysystem\FilesystemAdapter;
 use MicrosoftAzure\Storage\Blob\BlobRestProxy;
 
 final class AzureStorageConfig implements StorageConfig
 {
+    public string $adapter = AzureBlobStorageAdapter::class;
+
     public function __construct(
         /**
          * Connection string to the Azure Blob Storage account.
@@ -29,7 +32,7 @@ public function __construct(
         public bool $readonly = false,
     ) {}
 
-    public function createAdapter(): AzureBlobStorageAdapter
+    public function createAdapter(): FilesystemAdapter
     {
         return new AzureBlobStorageAdapter(
             client: BlobRestProxy::createBlobService($this->dsn),

src/Tempest/Storage/src/Config/FTPStorageConfig.php

@@ -2,11 +2,14 @@
 
 namespace Tempest\Storage\Config;
 
+use League\Flysystem\FilesystemAdapter;
 use League\Flysystem\Ftp\FtpAdapter;
 use League\Flysystem\Ftp\FtpConnectionOptions;
 
 final class FTPStorageConfig implements StorageConfig
 {
+    public string $adapter = FtpAdapter::class;
+
     public const string WINDOWS = 'windows';
 
     public const string UNIX = 'UNIX';
@@ -29,7 +32,7 @@ public function __construct(
         public bool $readonly = false,
     ) {}
 
-    public function createAdapter(): FtpAdapter
+    public function createAdapter(): FilesystemAdapter
     {
         return new FtpAdapter(
             connectionOptions: FtpConnectionOptions::fromArray([

src/Tempest/Storage/src/Config/GoogleCloudStorageConfig.php

@@ -3,12 +3,13 @@
 namespace Tempest\Storage\Config;
 
 use Google\Cloud\Storage\StorageClient;
-use League\Flysystem\AzureBlobStorage\AzureBlobStorageAdapter;
+use League\Flysystem\FilesystemAdapter;
 use League\Flysystem\GoogleCloudStorage\GoogleCloudStorageAdapter;
-use MicrosoftAzure\Storage\Blob\BlobRestProxy;
 
 final class GoogleCloudStorageConfig implements StorageConfig
 {
+    public string $adapter = GoogleCloudStorageAdapter::class;
+
     public function __construct(
         /**
          * Name of the bucket to use.
@@ -46,7 +47,7 @@ public function __construct(
         public bool $readonly = false,
     ) {}
 
-    public function createAdapter(): GoogleCloudStorageAdapter
+    public function createAdapter(): FilesystemAdapter
     {
         $client = new StorageClient($this->buildClientConfig());
 

src/Tempest/Storage/src/Config/InMemoryStorageConfig.php

@@ -2,18 +2,21 @@
 
 namespace Tempest\Storage\Config;
 
+use League\Flysystem\FilesystemAdapter;
 use League\Flysystem\InMemory\InMemoryFilesystemAdapter;
 
 final class InMemoryStorageConfig implements StorageConfig
 {
+    public string $adapter = InMemoryFilesystemAdapter::class;
+
     public function __construct(
         /**
          * Whether the storage is read-only.
          */
         public bool $readonly = false,
     ) {}
 
-    public function createAdapter(): InMemoryFilesystemAdapter
+    public function createAdapter(): FilesystemAdapter
     {
         return new InMemoryFilesystemAdapter();
     }

src/Tempest/Storage/src/Config/LocalStorageConfig.php

@@ -7,6 +7,8 @@
 
 final class LocalStorageConfig implements StorageConfig
 {
+    public string $adapter = LocalFilesystemAdapter::class;
+
     public function __construct(
         /**
          * Absolute path to the storage directory.
@@ -19,7 +21,7 @@ public function __construct(
         public bool $readonly = false,
     ) {}
 
-    public function createAdapter(): LocalFilesystemAdapter
+    public function createAdapter(): FilesystemAdapter
     {
         return new LocalFilesystemAdapter(
             location: $this->path,

src/Tempest/Storage/src/Config/S3StorageConfig.php

@@ -4,9 +4,12 @@
 
 use Aws\S3\S3Client;
 use League\Flysystem\AwsS3V3\AwsS3V3Adapter;
+use League\Flysystem\FilesystemAdapter;
 
 final class S3StorageConfig implements StorageConfig
 {
+    public string $adapter = AwsS3V3Adapter::class;
+
     public function __construct(
         /**
          * Name of the bucket.
@@ -57,14 +60,15 @@ public function __construct(
          * Other options.
          */
         public array $options = [],
-    ) {}
+    ) {
+    }
 
-    public function createAdapter(): AwsS3V3Adapter
+    public function createAdapter(): FilesystemAdapter
     {
         return new AwsS3V3Adapter(
             client: new S3Client($this->buildClientConfig()),
             bucket: $this->bucket,
-            prefix: $this->prefix,
+            prefix: $this->prefix ?? '',
         );
     }
 

src/Tempest/Storage/src/Config/SFTPStorageConfig.php

@@ -2,11 +2,14 @@
 
 namespace Tempest\Storage\Config;
 
+use League\Flysystem\FilesystemAdapter;
 use League\Flysystem\PhpseclibV3\SftpAdapter;
 use League\Flysystem\PhpseclibV3\SftpConnectionProvider;
 
 final class SFTPStorageConfig implements StorageConfig
 {
+    public string $adapter = SftpAdapter::class;
+
     public function __construct(
         public string $host,
         public string $root,
@@ -22,7 +25,7 @@ public function __construct(
         public bool $readonly = false,
     ) {}
 
-    public function createAdapter(): SftpAdapter
+    public function createAdapter(): FilesystemAdapter
     {
         return new SftpAdapter(
             connectionProvider: new SftpConnectionProvider(

src/Tempest/Storage/src/Config/StorageConfig.php

@@ -14,6 +14,13 @@ interface StorageConfig
         set;
     }
 
+    /**
+     * The adapter class.
+     */
+    public string $adapter {
+        get;
+    }
+
     /**
      * Creates the adapter.
      */

src/Tempest/Storage/src/Config/ZipArchiveStorageConfig.php

@@ -9,6 +9,8 @@
 
 final class ZipArchiveStorageConfig implements StorageConfig
 {
+    public string $adapter = ZipArchiveAdapter::class;
+
     public function __construct(
         /**
          * Absolute path to the zip file.
@@ -26,7 +28,7 @@ public function __construct(
         public bool $readonly = false,
     ) {}
 
-    public function createAdapter(): ZipArchiveAdapter
+    public function createAdapter(): FilesystemAdapter
     {
         return new ZipArchiveAdapter(
             zipArchiveProvider: new FilesystemZipArchiveProvider($this->path),

src/Tempest/Storage/src/GenericStorage.php

@@ -7,8 +7,6 @@
 use League\Flysystem\FilesystemAdapter;
 use League\Flysystem\ReadOnly\ReadOnlyFilesystemAdapter;
 use League\Flysystem\UrlGeneration\TemporaryUrlGenerator;
-use ReflectionMethod;
-use Tempest\Reflection\MethodReflector;
 use Tempest\Storage\Config\StorageConfig;
 
 final class GenericStorage implements Storage
@@ -155,9 +153,7 @@ public function list(string $location = '', bool $deep = false): DirectoryListin
 
     private function createAdapter(): FilesystemAdapter
     {
-        $this->assertAdapterInstalled(
-            new ReflectionMethod($this->storageConfig, 'createAdapter')->getReturnType()->getName(), // @phpstan-ignore method.notFound
-        );
+        $this->assertAdapterInstalled($this->storageConfig->adapter);
 
         $adapter = $this->storageConfig->createAdapter();