Merge pull request #3 from eldor/master

Switch to league/flysystem-azure-blob-storage
matthewbdaly · Sep 11, 2018 · f26f8a7 · f26f8a7
2 parents 2747051 + fb3b41a
commit f26f8a7
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 5 deletions.
diff --git a/composer.json b/composer.json
@@ -4,7 +4,7 @@
     "type": "library",
     "keywords": ["storage","laravel","azure"],
     "require": {
-        "league/flysystem-azure": "^1.0"
+        "league/flysystem-azure-blob-storage": "^0.1.4"
     },
     "require-dev": {
         "orchestra/testbench": "^3.5",

diff --git a/src/AzureStorageServiceProvider.php b/src/AzureStorageServiceProvider.php
@@ -5,8 +5,8 @@
 use Storage;
 use League\Flysystem\Filesystem;
 use Illuminate\Support\ServiceProvider;
-use League\Flysystem\Azure\AzureAdapter;
-use MicrosoftAzure\Storage\Common\ServicesBuilder;
+use MicrosoftAzure\Storage\Blob\BlobRestProxy;
+use League\Flysystem\AzureBlobStorage\AzureBlobStorageAdapter;
 
 /**
  * Service provider for Azure Blob Storage
@@ -26,8 +26,9 @@ public function boot()
                 $config['name'],
                 $config['key']
             );
-            $blobRestProxy = ServicesBuilder::getInstance()->createBlobService($endpoint);
-            return new Filesystem(new AzureAdapter($blobRestProxy, "/".$config['container']));
+            $client = BlobRestProxy::createBlobService($endpoint);
+            $adapter = new AzureBlobStorageAdapter($client, $config['container']);
+            return new Filesystem($adapter);
         });
     }