Make compatible with microsoft/azure-storage ~0.19.1

composer.json

@@ -11,7 +11,7 @@
     "require": {
         "php": ">=5.5.0",
         "league/flysystem": "~1.0",
-        "microsoft/azure-storage": "~0.10.1"
+        "microsoft/azure-storage": "~0.19.1"
     },
     "require-dev": {
         "phpunit/phpunit": "~4.8.36",

src/AzureAdapter.php

@@ -13,7 +13,7 @@
 use MicrosoftAzure\Storage\Blob\Models\CreateBlobOptions;
 use MicrosoftAzure\Storage\Blob\Models\ListBlobsOptions;
 use MicrosoftAzure\Storage\Blob\Models\ListBlobsResult;
-use MicrosoftAzure\Storage\Common\ServiceException;
+use MicrosoftAzure\Storage\Common\Exceptions\ServiceException;
 
 class AzureAdapter extends AbstractAdapter
 {

tests/AzureTests.php

@@ -2,13 +2,15 @@
 
 namespace League\Flysystem\Azure;
 
+use GuzzleHttp\Psr7\Response;
+use GuzzleHttp\Psr7\Stream;
 use League\Flysystem\Config;
 use Mockery;
 use MicrosoftAzure\Storage\Blob\Models\CopyBlobResult;
 use MicrosoftAzure\Storage\Blob\Models\CreateBlobOptions;
 use MicrosoftAzure\Storage\Blob\Models\GetBlobResult;
 use MicrosoftAzure\Storage\Common\Internal\Resources;
-use MicrosoftAzure\Storage\Common\ServiceException;
+use MicrosoftAzure\Storage\Common\Exceptions\ServiceException;
 use PHPUnit\Framework\TestCase;
 
 class AzureTests extends TestCase
@@ -35,7 +37,7 @@ protected function getReadBlobResult($lastModified, $contentString)
         return GetBlobResult::create([
             Resources::LAST_MODIFIED => $lastModified,
             Resources::CONTENT_LENGTH => strlen($contentString),
-        ], $contentString, []);
+        ], new Stream($this->getStreamFromString($contentString)), []);
     }
 
     protected function getStreamFromString($string)
@@ -187,17 +189,17 @@ public function testHasWhenFileExists()
 
     public function testHasWhenFileDoesNotExist()
     {
-        $this->azure->shouldReceive('getBlobMetadata')->andThrow(new ServiceException(404));
+        $this->azure->shouldReceive('getBlobMetadata')->andThrow(new ServiceException(new Response(404)));
 
         $this->assertFalse($this->adapter->has('foo.txt'));
     }
 
     /**
-     * @expectedException MicrosoftAzure\Storage\Common\ServiceException
+     * @expectedException \MicrosoftAzure\Storage\Common\Exceptions\ServiceException
      */
     public function testHasWhenError()
     {
-        $this->azure->shouldReceive('getBlobMetadata')->andThrow(new ServiceException(500));
+        $this->azure->shouldReceive('getBlobMetadata')->andThrow(new ServiceException(new Response(500)));
 
         $this->adapter->has('foo.txt');
     }
@@ -367,7 +369,7 @@ public function testConfigShouldNotBeIgnored()
         $settings = [
             'ContentType' => 'someContentType',
             'CacheControl' => 'someCacheControl',
-            'Metadata' => 'someMetadata',
+            'Metadata' => ['someMetadata'],
             'ContentLanguage' => 'someContentLanguage',
             'ContentEncoding' => 'someContentEncoding',
         ];