Merge pull request #565 from KnpLabs/feature/drop-azure-storage-bc

drop azure storage BC
KnpLabs · Mar 26, 2018 · 60f9634 · 60f9634
2 parents 8649be2 + f57d69a
commit 60f9634
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 14 deletions.
diff --git a/src/Gaufrette/Adapter/AzureBlobStorage.php b/src/Gaufrette/Adapter/AzureBlobStorage.php
@@ -8,7 +8,6 @@
 use Gaufrette\Exception\StorageFailure;
 use Gaufrette\Adapter\AzureBlobStorage\BlobProxyFactoryInterface;
 use MicrosoftAzure\Storage\Blob\Models\Blob;
-use MicrosoftAzure\Storage\Blob\Models\CreateBlobOptions;
 use MicrosoftAzure\Storage\Blob\Models\CreateBlockBlobOptions;
 use MicrosoftAzure\Storage\Blob\Models\CreateContainerOptions;
 use MicrosoftAzure\Storage\Common\Exceptions\ServiceException;
@@ -182,12 +181,7 @@ public function write($key, $content)
         $this->init();
         list($containerName, $key) = $this->tokenizeKey($key);
 
-        if (class_exists(CreateBlockBlobOptions::class)) {
-            $options = new CreateBlockBlobOptions();
-        } else {
-            // for microsoft/azure-storage < 1.0
-            $options = new CreateBlobOptions();
-        }
+        $options = new CreateBlockBlobOptions();
 
         if ($this->detectContentType) {
             $contentType = $this->guessContentType($content);

diff --git a/src/Gaufrette/Adapter/AzureBlobStorage/BlobProxyFactory.php b/src/Gaufrette/Adapter/AzureBlobStorage/BlobProxyFactory.php
@@ -3,7 +3,6 @@
 namespace Gaufrette\Adapter\AzureBlobStorage;
 
 use MicrosoftAzure\Storage\Blob\BlobRestProxy;
-use MicrosoftAzure\Storage\Common\ServicesBuilder;
 
 /**
  * Basic implementation for a Blob proxy factory.
@@ -30,11 +29,6 @@ public function __construct($connectionString)
      */
     public function create()
     {
-        if (class_exists(ServicesBuilder::class)) {
-            // for microsoft/azure-storage < 1.0
-            return ServicesBuilder::getInstance()->createBlobService($this->connectionString);
-        } else {
-            return BlobRestProxy::createBlobService($this->connectionString);
-        }
+        return BlobRestProxy::createBlobService($this->connectionString);
     }
 }