backup-manager · Nyholm · Oct 11, 2020 · Oct 11, 2020 · Jul 5, 2022 · Jul 5, 2022
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -8,7 +8,7 @@ jobs:
     strategy:
       max-parallel: 10
       matrix:
-        php: [ '7.4', '8.0', '8.1']
+        php: ['8.0', '8.1']
 
     steps:
       - name: Set up PHP

diff --git a/README.md b/README.md
@@ -77,7 +77,7 @@ This package provides a framework-agnostic database backup manager for dumping t
     'root' => '/path/to/working/directory',
 ],
 's3' => [
-    'type' => 'AwsS3',
+    'type' => 'AwsS3', // AsyncAws is also supported with type 'AsyncAwsS3'
     'key'    => '',
     'secret' => '',
     'region' => 'us-east-1',
@@ -207,11 +207,14 @@ Then, you'll need to select the appropriate packages for the adapters that you w
 # to support s3
 composer require league/flysystem-aws-s3-v3
 
+# to support AsyncAwsS3
+composer require async-aws/flysystem-s3
+
 # to support b2
 composer require mhetreramesh/flysystem-backblaze
 
 # to support google cs
-composer require league/flysystem-aws-s3-v2
+composer require superbalist/flysystem-google-storage
 
 # to install the preferred dropbox v2 driver
 composer required spatie/flysystem-dropbox

diff --git a/composer.json b/composer.json
@@ -15,20 +15,17 @@
     }
   ],
   "require": {
-    "php": ">=7.4",
+    "php": ">=8.0",
     "league/flysystem": "^1.1.4 || ^2.1.1 || ^3.0",
     "symfony/process": "^5.4 || ^6.0"
   },
   "require-dev": {
-    "aws/aws-sdk-php": "^3.133.20",
-    "league/flysystem-aws-s3-v3": "^1.0.24",
-    "league/flysystem-rackspace": "^1.0",
-    "league/flysystem-sftp": "^1.0",
-    "league/flysystem-webdav": "^1.0",
+    "league/flysystem-async-aws-s3": "^2.0.6 || ^3.0",
+    "league/flysystem-aws-s3-v3": "^1.0.24 || ^2.0 || ^3.0",
+    "league/flysystem-sftp": "^1.1 || ^2.0 || ^3.0",
+    "league/flysystem-webdav": "^1.0.10 || ^3.0",
     "phpspec/phpspec": "^7.2",
-    "spatie/flysystem-dropbox": "^1.2",
-    "srmklive/flysystem-dropbox-v2": "^1.0",
-    "superbalist/flysystem-google-storage": "^7.2"
+    "spatie/flysystem-dropbox": "^2.0"
   },
   "suggest": {
     "league/flysystem-aws-s3-v3": "AWS S3 adapter support.",

diff --git a/spec/Filesystems/AsyncAwsS3FilesystemSpec.php b/spec/Filesystems/AsyncAwsS3FilesystemSpec.php
@@ -0,0 +1,36 @@
+<?php
+
+namespace spec\BackupManager\Filesystems;
+
+use PhpSpec\ObjectBehavior;
+
+class AsyncAwsS3FilesystemSpec extends ObjectBehavior {
+
+    function it_is_initializable() {
+        $this->shouldHaveType('BackupManager\Filesystems\AsyncAwsS3Filesystem');
+    }
+
+    function it_should_recognize_its_type_with_case_insensitivity() {
+        foreach (['asyncawss3', 'AsyncAWSS3', 'AsyncAwsS3', 'async-awss3', 'async-aws-s3'] as $type) {
+            $this->handles($type)->shouldBe(true);
+        }
+
+        foreach ([null, 'foo'] as $type) {
+            $this->handles($type)->shouldBe(false);
+        }
+    }
+
+    function it_should_provide_an_instance_of_an_s3_filesystem() {
+        $this->get($this->getConfig())->getAdapter()->shouldHaveType('League\Flysystem\AsyncAwsS3\AsyncAwsS3Adapter');
+    }
+
+    function getConfig() {
+        return [
+            'key'    => 'key',
+            'secret' => 'secret',
+            'region' => 'us-east-1',
+            'bucket' => 'bucket',
+            'root'   => 'prefix',
+        ];
+    }
+}
diff --git a/spec/Filesystems/FlysystemFilesystemSpec.php b/spec/Filesystems/FlysystemFilesystemSpec.php
@@ -3,7 +3,7 @@
 namespace spec\BackupManager\Filesystems;
 
 use BackupManager\Filesystems\FlysystemFilesystem;
-use League\Flysystem\FilesystemInterface;
+use League\Flysystem\FilesystemAdapter;
 use League\Flysystem\MountManager;
 use PhpSpec\ObjectBehavior;
 use Prophecy\Argument;
@@ -26,18 +26,18 @@ public function it_should_recognize_its_type_with_case_insensitivity()
         }
     }
 
-    public function it_should_provide_an_instance_of_an_flysystem_filesystem(FilesystemInterface $filesystem)
+    public function it_should_provide_an_instance_of_an_flysystem_filesystem(FilesystemAdapter $filesystem)
     {
         $name = 's3_backup';
         $this->beConstructedWith([$name => $filesystem]);
-        $this->get(['name' => $name])->shouldHaveType(FilesystemInterface::class);
+        $this->get(['name' => $name])->shouldHaveType(FilesystemAdapter::class);
     }
 
-    public function it_should_provide_an_instance_of_an_flysystem_filesystem_in_mount_manager(MountManager $manager, FilesystemInterface $filesystem)
+    public function it_should_provide_an_instance_of_an_flysystem_filesystem_in_mount_manager(MountManager $manager, FilesystemAdapter $filesystem)
     {
         $prefix = 'upload';
         $manager->getFilesystem(Argument::exact($prefix))->willReturn($filesystem);
         $this->beConstructedWith([], $manager);
-        $this->get(['prefix' => $prefix])->shouldHaveType(FilesystemInterface::class);
+        $this->get(['prefix' => $prefix])->shouldHaveType(FilesystemAdapter::class);
     }
 }
diff --git a/src/Filesystems/AsyncAwsS3Filesystem.php b/src/Filesystems/AsyncAwsS3Filesystem.php
@@ -0,0 +1,51 @@
+<?php namespace BackupManager\Filesystems;
+
+use AsyncAws\S3\S3Client;
+use League\Flysystem\AsyncAwsS3\AsyncAwsS3Adapter;
+use League\Flysystem\Filesystem as Flysystem;
+
+/**
+ * @package BackupManager\Filesystems
+ */
+class AsyncAwsS3Filesystem implements Filesystem
+{
+    /**
+     * @param $type
+     * @return bool
+     */
+    public function handles($type)
+    {
+        $type = strtolower($type);
+
+        return $type == 'asyncawss3' || $type == 'async-awss3' || $type == 'async-aws-s3';
+    }
+
+    /**
+     * @param array $config
+     * @return Flysystem
+     */
+    public function get(array $config)
+    {
+        $clientConfig = [
+            'pathStyleEndpoint' => isset($config['use_path_style_endpoint']) ? $config['use_path_style_endpoint'] : false
+        ];
+
+        if (null !== $config['key']) {
+            $clientConfig['accessKeyId'] = $config['key'];
+        }
+
+        if (null !== $config['secret']) {
+            $clientConfig['accessKeySecret'] = $config['secret'];
+        }
+
+        if (null !== $config['region']) {
+            $clientConfig['region'] = $config['region'];
+        }
+
+        if (null !== $config['endpoint']) {
+            $clientConfig['endpoint'] = $config['endpoint'];
+        }
+
+        return new Flysystem(new AsyncAwsS3Adapter(new S3Client($clientConfig), $config['bucket'], $config['root']));
+    }
+}