Merge branch 'master' into dev

vinjiang · vinjiang · commit 4138bfc4c694 · 2022-09-02T09:53:48.000+08:00
diff --git a/azure-storage-blob/ChangeLog.md b/azure-storage-blob/ChangeLog.md
@@ -1,3 +1,6 @@
+2022.08 - version 1.5.4
+* Check `$copyProgress` is not null before using it in `strpos`.
+
 2021.09 - version 1.5.3
 * Upgraded dependency for `azure-storage-common` to version 1.5.2.
 * Resolved some interface inconsistency between `IBlob`/`BlobRestProxy`.
diff --git a/azure-storage-blob/composer.json b/azure-storage-blob/composer.json
@@ -1,6 +1,6 @@
 {
     "name": "microsoft/azure-storage-blob",
-    "version": "1.5.3",
+    "version": "1.5.4",
     "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/azure-storage-blob/src/Blob/Internal/BlobResources.php b/azure-storage-blob/src/Blob/Internal/BlobResources.php
@@ -41,7 +41,7 @@ class BlobResources extends Resources
 {
     // @codingStandardsIgnoreStart
 
-    const BLOB_SDK_VERSION = '1.5.3';
+    const BLOB_SDK_VERSION = '1.5.4';
     const STORAGE_API_LATEST_VERSION = '2017-11-09';
 
     // Error messages
diff --git a/azure-storage-table/ChangeLog.md b/azure-storage-table/ChangeLog.md
@@ -1,3 +1,6 @@
+2022.08 - version 1.1.6
+* Removed EOL from Content-Type header in batch API.
+
 2021.09 - version 1.1.5
 * Upgraded dependency for `azure-storage-common` to version 1.5.2.
 * Fixed a bug where `QueryEnttitiesResult` with a null `NextRowKey` won't work.
diff --git a/azure-storage-table/composer.json b/azure-storage-table/composer.json
@@ -1,6 +1,6 @@
 {
     "name": "microsoft/azure-storage-table",
-    "version": "1.1.5",
+    "version": "1.1.6",
     "description": "This project provides a set of PHP client libraries that make it easy to access Microsoft Azure Storage Table APIs.",
     "keywords": [ "php", "azure", "storage", "sdk", "table" ],
     "license": "MIT",
diff --git a/azure-storage-table/src/Table/Internal/TableResources.php b/azure-storage-table/src/Table/Internal/TableResources.php
@@ -41,7 +41,7 @@ class TableResources extends Resources
 {
     // @codingStandardsIgnoreStart
 
-    const TABLE_SDK_VERSION = '1.1.5';
+    const TABLE_SDK_VERSION = '1.1.6';
     const STORAGE_API_LATEST_VERSION = '2016-05-31';
 
     const DATA_SERVICE_VERSION_VALUE = '3.0';

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "microsoft/azure-storage-blob",`
`3`		`- "version": "1.5.3",`
	`3`	`+ "version": "1.5.4",`
`4`	`4`	`"description": "This project provides a set of PHP client libraries that make it easy to access Microsoft Azure Storage Blob APIs.",`
`5`	`5`	`"keywords": [ "php", "azure", "storage", "sdk", "blob" ],`
`6`	`6`	`"license": "MIT",`
Original file line number	Diff line number	Diff line change
`@@ -41,7 +41,7 @@ class BlobResources extends Resources`
`41`	`41`	`{`
`42`	`42`	`// @codingStandardsIgnoreStart`
`43`	`43`
`44`		`- const BLOB_SDK_VERSION = '1.5.3';`
	`44`	`+ const BLOB_SDK_VERSION = '1.5.4';`
`45`	`45`	`const STORAGE_API_LATEST_VERSION = '2017-11-09';`
`46`	`46`
`47`	`47`	`// Error messages`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "microsoft/azure-storage-table",`
`3`		`- "version": "1.1.5",`
	`3`	`+ "version": "1.1.6",`
`4`	`4`	`"description": "This project provides a set of PHP client libraries that make it easy to access Microsoft Azure Storage Table APIs.",`
`5`	`5`	`"keywords": [ "php", "azure", "storage", "sdk", "table" ],`
`6`	`6`	`"license": "MIT",`
Original file line number	Diff line number	Diff line change
`@@ -41,7 +41,7 @@ class TableResources extends Resources`
`41`	`41`	`{`
`42`	`42`	`// @codingStandardsIgnoreStart`
`43`	`43`
`44`		`- const TABLE_SDK_VERSION = '1.1.5';`
	`44`	`+ const TABLE_SDK_VERSION = '1.1.6';`
`45`	`45`	`const STORAGE_API_LATEST_VERSION = '2016-05-31';`
`46`	`46`
`47`	`47`	`const DATA_SERVICE_VERSION_VALUE = '3.0';`