source code copied from azure-storage-php for v1.5.2-blob release

Azure · Dec 29, 2020 · 2475330 · 2475330
1 parent 44f9268
commit 2475330
Show file tree

Hide file tree

Showing 6 changed files with 9 additions and 4 deletions.
diff --git a/ChangeLog.md b/ChangeLog.md
@@ -1,3 +1,7 @@
+2020.12 - version 1.5.2
+* Resolved an issue where access condition does not work for large block blob uploads.
+* Guzzle version is now updated to support both 6.x and 7.x.
+
 2020.08 - version 1.5.1
 * Lower case query parameter names.
 

diff --git a/composer.json b/composer.json
@@ -1,6 +1,6 @@
 {
     "name": "microsoft/azure-storage-blob",
-    "version": "1.5.1",
+    "version": "1.5.2",
     "description": "This project provides a set of PHP client libraries that make it easy to access Microsoft Azure Storage Blob APIs.",
     "keywords": [ "php", "azure", "storage", "sdk", "blob" ],
     "license": "MIT",

diff --git a/src/Blob/Internal/BlobResources.php b/src/Blob/Internal/BlobResources.php
@@ -41,7 +41,7 @@ class BlobResources extends Resources
 {
     // @codingStandardsIgnoreStart
 
-    const BLOB_SDK_VERSION = '1.5.1';
+    const BLOB_SDK_VERSION = '1.5.2';
     const STORAGE_API_LATEST_VERSION = '2017-11-09';
 
     // Error messages

diff --git a/src/Blob/Models/BlobProperties.php b/src/Blob/Models/BlobProperties.php
@@ -866,7 +866,7 @@ private function setCommonBlobProperties(array $clean)
             Utilities::tryGetValue($clean, Resources::CONTENT_LANGUAGE)
         );
         $this->setContentType(
-            Utilities::tryGetValue($clean, Resources::CONTENT_TYPE)
+            Utilities::tryGetValue($clean, Resources::CONTENT_TYPE_LOWER_CASE)
         );
 
         if (Utilities::tryGetValue($clean, Resources::CONTENT_MD5) &&

diff --git a/src/Blob/Models/CommitBlobBlocksOptions.php b/src/Blob/Models/CommitBlobBlocksOptions.php
@@ -217,6 +217,7 @@ public static function create($options)
         $result->setContentDisposition($options->getContentDisposition());
         $result->setMetadata($options->getMetadata());
         $result->setLeaseId($options->getLeaseId());
+        $result->setAccessConditions($options->getAccessConditions());
 
         return $result;
     }

diff --git a/src/Blob/Models/ListBlobBlocksResult.php b/src/Blob/Models/ListBlobBlocksResult.php
@@ -104,7 +104,7 @@ public static function create(array $headers, array $parsed)
             )
         );
         $result->setContentType(
-            Utilities::tryGetValue($clean, Resources::CONTENT_TYPE)
+            Utilities::tryGetValue($clean, Resources::CONTENT_TYPE_LOWER_CASE)
         );
 
         $result->uncommittedBlocks = self::getEntries(