Merge pull request #1900 from area17/aws

[2.x] Support multiple aws adapters.
area17 · Nov 9, 2022 · 36984fb · 36984fb
2 parents 09ab479 + a92a022
commit 36984fb
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 3 deletions.
diff --git a/composer.json b/composer.json
@@ -33,7 +33,7 @@
     "imgix/imgix-php": "^3.0",
     "laravel/framework": "~5.6|~5.7|~5.8|^6.0|^7.0|^8.0|^9.0",
     "laravel/socialite": "^4.2|^5.0",
-    "laravel/ui": "^1.0|^2.0|^3.0",
+    "laravel/ui": "^1.0|^2.0|^3.0|^4.0",
     "league/flysystem-aws-s3-v3": "^1.0|^2.0|^3.0",
     "league/glide-laravel": "^1.0",
     "matthewbdaly/laravel-azure-storage": "^1.3|^2.0",

diff --git a/src/Services/Cloud/Aws.php b/src/Services/Cloud/Aws.php
@@ -5,7 +5,6 @@
 use Aws\S3\S3Client;
 use Illuminate\Support\Str;
 use League\Flysystem\Filesystem;
-use League\Flysystem\AwsS3v3\AwsS3Adapter;
 
 class Aws
 {
@@ -15,7 +14,15 @@ public function filesystemFactory($source)
 
         $client = new S3Client($config);
 
-        $adapter = new AwsS3Adapter($client, $config['bucket'], $config['root']);
+        if (class_exists($class = \League\Flysystem\AwsS3v3\AwsS3Adapter::class)) {
+            $adapter = new $class($client, $config['bucket'], $config['root']);
+        }
+        else if (class_exists($class = \League\Flysystem\AwsS3V3\AwsS3V3Adapter::class)) {
+            $adapter = new $class($client, $config['bucket'], $config['root']);
+        }
+        else {
+            throw new \Exception('Missing compatible aws adapter.');
+        }
 
         return new Filesystem($adapter);
     }