增加ETag的兼容逻辑

Author: tuuna

CHANGELOG.md

@@ -1,5 +1,9 @@
 cos-php-sdk-v5 Upgrade Guide
 ====================
+2.5.2 to 2.5.3
+---------
+- 增加ETag的兼容逻辑，防止因为特殊框架或者网关规则导致etag undefined
+
 2.5.1 to 2.5.2
 ---------
 - 修复预签名中Headers参数无效的问题

src/Client.php

@@ -124,7 +124,7 @@
  * @see \Qcloud\Cos\Service::getService()
  */
 class Client extends GuzzleClient {
-    const VERSION = '2.5.2';
+    const VERSION = '2.5.3';
 
     public $httpClient;
 

src/MultipartUpload.php

@@ -100,7 +100,15 @@ public function uploadParts($uploadId) {
                 $index = $index + 1;
                 $partNumber = $this->partNumberList[$index]['PartNumber'];
                 $partSize = $this->partNumberList[$index]['PartSize'];
-                $etag = $response->getHeaders()["ETag"][0];
+
+                //兼容两种写法，防止index为undefined
+                if (array_key_exists('etag', $response->getHeaders())) {
+                    $etag = $response->getHeaders()["etag"][0];
+                }
+
+                if (array_key_exists('ETag', $response->getHeaders())) {
+                    $etag = $response->getHeaders()["ETag"][0];
+                }
                 $part = array('PartNumber' => $partNumber, 'ETag' => $etag);
                 $this->parts[$partNumber] = $part;
                 $this->uploadedSize += $partSize;