Merge pull request #564 from KnpLabs/merge-master-into-1.x

Merge master into 1.x

CHANGELOG.md

@@ -1,3 +1,15 @@
+v0.6
+====
+
+## Changes
+- Add support for major release of Azure Blob Storage SDK [#558](https://github.com/KnpLabs/Gaufrette/pull/558)
+
+## Fixes
+- Fix Dockerfile for php 7.0 [aaa66dc](https://github.com/KnpLabs/Gaufrette/commit/aaa66dcf298d313e7ae3f525714923fcfd787e94)
+- Fix appveyor build [#562](https://github.com/KnpLabs/Gaufrette/pull/562)
+
+Thank you @nicolasmure, @NiR- and @z38 for your contributions!
+
 v0.5
 ====
 

composer.json

@@ -34,8 +34,7 @@
         "mikey179/vfsStream": "~1.2.0",
         "league/flysystem": "~1.0",
         "mongodb/mongodb": "^1.1",
-        "microsoft/windowsazure": "~0.4",
-        "microsoft/azure-storage": "~0.15.0",
+        "microsoft/azure-storage-blob": "^1.0",
         "akeneo/phpspec-skip-example-extension": "^3.0",
         "liuggio/fastest": "^1.6"
     },

doc/adapters/azure-blob-storage.md

@@ -4,15 +4,11 @@ currentMenu: azure-blob-storage
 
 # AzureBlobStorage
 
-First, you will need to install the adapter:
+Azure Blob Storage is the storage service provided by Microsoft Windows Azure cloud environment. First, you will need to install the adapter:
 ```bash
 composer require gaufrette/azure-blob-storage-adapter
 ```
 
-Azure Blob Storage is the storage service provided by Microsoft Windows Azure cloud environment. To use this adapter
-you need to install the [Azure SDK for php](http://www.windowsazure.com/en-us/develop/php/common-tasks/download-php-sdk/)
-into your project.
-
 To instantiate the `AzureBlobStorage` adapter you need a `BlobProxyFactoryInterface` instance (you can use the default
 `BlobProxyFactory` class) and a connection string. The connection string should follow this prototype:
 

src/Gaufrette/Adapter/AzureBlobStorage.php

@@ -9,6 +9,7 @@
 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;
 
@@ -181,7 +182,12 @@ public function write($key, $content)
         $this->init();
         list($containerName, $key) = $this->tokenizeKey($key);
 
-        $options = new CreateBlobOptions();
+        if (class_exists(CreateBlockBlobOptions::class)) {
+            $options = new CreateBlockBlobOptions();
+        } else {
+            // for microsoft/azure-storage < 1.0
+            $options = new CreateBlobOptions();
+        }
 
         if ($this->detectContentType) {
             $contentType = $this->guessContentType($content);

src/Gaufrette/Adapter/AzureBlobStorage/BlobProxyFactory.php

@@ -2,6 +2,7 @@
 
 namespace Gaufrette\Adapter\AzureBlobStorage;
 
+use MicrosoftAzure\Storage\Blob\BlobRestProxy;
 use MicrosoftAzure\Storage\Common\ServicesBuilder;
 
 /**
@@ -29,6 +30,11 @@ public function __construct($connectionString)
      */
     public function create()
     {
-        return ServicesBuilder::getInstance()->createBlobService($this->connectionString);
+        if (class_exists(ServicesBuilder::class)) {
+            // for microsoft/azure-storage < 1.0
+            return ServicesBuilder::getInstance()->createBlobService($this->connectionString);
+        } else {
+            return BlobRestProxy::createBlobService($this->connectionString);
+        }
     }
 }

tests/Gaufrette/Functional/Adapter/AzureMultiContainerBlobStorageTest.php

@@ -212,7 +212,7 @@ public function shouldKeepFileObjectInRegister()
      * @test
      * @group functional
      */
-    public function shouldWrtieToSameFile()
+    public function shouldWriteToSameFile()
     {
         $path = $this->createUniqueContainerName('container') . '/somefile';
 
@@ -222,7 +222,7 @@ public function shouldWrtieToSameFile()
         $FileObjectB = $this->filesystem->createFile($path);
         $FileObjectB->setContent('DEF');
 
-        $this->assertEquals('DEF', $FileObjectB->getContent());
+        $this->assertEquals('DEF', $FileObjectA->getContent());
     }
 
     private function createUniqueContainerName($prefix)

tests/Gaufrette/Functional/Adapter/FunctionalTestCase.php

@@ -179,6 +179,6 @@ public function shouldWriteToSameFile()
         $FileObjectB = $this->filesystem->createFile('somefile');
         $FileObjectB->setContent('DEF');
 
-        $this->assertEquals('DEF', $FileObjectB->getContent());
+        $this->assertEquals('DEF', $FileObjectA->getContent());
     }
 }