提交的内容

vendor/aliyuncs/oss-sdk-php/src/OSS/Credentials/EnvironmentVariableCredentialsProvider.php

@@ -0,0 +1,20 @@
+<?php
+namespace OSS\Credentials;
+
+use OSS\Core\OssException;
+
+class EnvironmentVariableCredentialsProvider implements CredentialsProvider
+{
+
+    /**
+     * @return Credentials
+     * @throws OssException
+     */
+    public function getCredentials()
+    {
+        $ak= getenv('OSS_ACCESS_KEY_ID');
+        $sk = getenv('OSS_ACCESS_KEY_SECRET');
+        $token =  getenv('OSS_SESSION_TOKEN');
+        return new Credentials($ak, $sk, $token);
+    }
+}

vendor/aliyuncs/oss-sdk-php/src/OSS/Http/RequestCore.php

@@ -170,7 +170,7 @@ class RequestCore
     public $registered_streaming_write_callback = null;
 
     /**
-     * The request timeout time, which is 5,184,000 seconds,that is, 6 days by default
+     * The request timeout time, which is 5,184,000 seconds,that is, 60 days by default
      *
      * @var int
      */

vendor/aliyuncs/oss-sdk-php/src/OSS/Model/CorsConfig.php

@@ -45,10 +45,26 @@ class CorsConfig implements XmlConfig
         }
         $this->rules[] = $rule;
     }
+    /**
+     * @param boolean $value
+     */
+    public function setResponseVary($value)
+    {
+        $this->responseVary = $value;
+    }
+
+    /**
+     * @return boolean
+     */
+    public function getResponseVary(){
+        if (isset($this->responseVary)) {
+            return $this->responseVary;
+        }
+        return false;
+    }
 
     /**
      * Parse CorsConfig from the xml.
-     *
      * @param string $strXml
      * @throws OssException
      * @return null
@@ -56,6 +72,10 @@ class CorsConfig implements XmlConfig
     public function parseFromXml($strXml)
     {
         $xml = simplexml_load_string($strXml);
+        if(isset($xml->ResponseVary)){
+            $this->responseVary =
+            (strval($xml->ResponseVary) === 'TRUE' || strval($xml->ResponseVary) === 'true') ? true : false;
+        }
         if (!isset($xml->CORSRule)) return;
         foreach ($xml->CORSRule as $rule) {
             $corsRule = new CorsRule();
@@ -74,7 +94,6 @@ class CorsConfig implements XmlConfig
             }
             $this->addRule($corsRule);
         }
-        return;
     }
 
     /**
@@ -89,6 +108,13 @@ class CorsConfig implements XmlConfig
             $xmlRule = $xml->addChild('CORSRule');
             $rule->appendToXml($xmlRule);
         }
+        if(isset($this->responseVary)){
+            if ($this->responseVary) {
+                $xml->addChild('ResponseVary', 'true');
+            } else {
+                $xml->addChild('ResponseVary', 'false');
+            }
+        }
         return $xml->asXML();
     }
 
@@ -110,4 +136,5 @@ class CorsConfig implements XmlConfig
      * @var CorsRule[]
      */
     private $rules = array();
+    private $responseVary;
 }

vendor/aliyuncs/oss-sdk-php/src/OSS/Model/ObjectInfo.php

@@ -24,8 +24,10 @@ class ObjectInfo
      * @param string $type
      * @param string $size
      * @param string $storageClass
+     * @param Owner|null $owner
+     * @param null $restoreInfo
      */
-    public function __construct($key, $lastModified, $eTag, $type, $size, $storageClass)
+    public function __construct($key, $lastModified, $eTag, $type, $size, $storageClass,$owner=null,$restoreInfo=null)
     {
         $this->key = $key;
         $this->lastModified = $lastModified;
@@ -33,6 +35,8 @@ class ObjectInfo
         $this->type = $type;
         $this->size = $size;
         $this->storageClass = $storageClass;
+        $this->owner = $owner;
+        $this->restoreInfo = $restoreInfo;
     }
 
     /**
@@ -94,10 +98,32 @@ class ObjectInfo
         return $this->storageClass;
     }
 
+    /**
+     * @return string
+     */
+    public function getRestoreInfo()
+    {
+        return $this->restoreInfo;
+    }
+
+
+    /**
+     * @return Owner|null
+     */
+    public function getOwner()
+    {
+        return $this->owner;
+    }
+
     private $key = "";
     private $lastModified = "";
     private $eTag = "";
     private $type = "";
     private $size = "0";
     private $storageClass = "";
+    /**
+     * @var Owner
+     */
+    private $owner;
+    private $restoreInfo;
 }

vendor/aliyuncs/oss-sdk-php/src/OSS/Model/ObjectVersionListInfo.php

@@ -22,7 +22,7 @@ class ObjectVersionListInfo
      * @param string $nextVersionIdMarker
      * @param string $maxKeys
      * @param string $delimiter
-     * @param null $isTruncated
+     * @param null|string $isTruncated
      * @param array $objectversionList
      * @param array $deleteMarkerList
      * @param array $prefixList
@@ -151,7 +151,7 @@ class ObjectVersionListInfo
     private $prefix = "";
     private $keyMarker = "";
     private $nextKeyMarker = "";
-    private $versionIdmarker = "";
+    private $versionIdMarker = "";
     private $nextVersionIdMarker = "";
     private $maxKeys = 0;
     private $delimiter = "";

vendor/aliyuncs/oss-sdk-php/src/OSS/Model/Owner.php

@@ -0,0 +1,46 @@
+<?php
+
+
+namespace OSS\Model;
+
+/**
+ * Class Owner
+ *
+ * ListObjects return owner list of classes
+ * The returned data contains two arrays
+ * One is to get the list of objects【Can be understood as the corresponding file system file list】
+ * One is to get owner list
+ *
+ */
+class Owner
+{
+    /**
+     * OwnerInfo constructor.
+     * @param $id string
+     * @param $displayName string
+     */
+    public function __construct($id, $displayName)
+    {
+        $this->id = $id;
+        $this->displayName = $displayName;
+    }
+
+    /**
+     * @return string
+     */
+    public function getId()
+    {
+        return $this->id;
+    }
+
+    /**
+     * @return string
+     */
+    public function getDisplayName()
+    {
+        return $this->displayName;
+    }
+
+    private $id;
+    private $displayName;
+}

vendor/aliyuncs/oss-sdk-php/src/OSS/Result/CreateBucketCnameTokenResult.php

@@ -7,7 +7,7 @@ use OSS\Model\CnameTokenInfo;
 class CreateBucketCnameTokenResult extends Result
 {
     /**
-     * @return CnameConfig
+     * @return CnameTokenInfo
      */
     protected function parseDataFromResponse()
     {

vendor/aliyuncs/oss-sdk-php/src/OSS/Result/GetBucketInfoResult.php

@@ -16,7 +16,7 @@ class GetBucketInfoResult extends Result
     /**
      * Parse data from response
      * 
-     * @return string
+     * @return BucketInfo
      * @throws OssException
      */
     protected function parseDataFromResponse()

vendor/aliyuncs/oss-sdk-php/src/OSS/Result/GetLiveChannelHistoryResult.php

@@ -7,7 +7,7 @@ use OSS\Model\GetLiveChannelHistory;
 class GetLiveChannelHistoryResult extends Result
 {
     /**
-     * @return
+     * @return GetLiveChannelHistory
      */
     protected function parseDataFromResponse()
     {

vendor/aliyuncs/oss-sdk-php/src/OSS/Result/GetLiveChannelInfoResult.php

@@ -7,7 +7,7 @@ use OSS\Model\GetLiveChannelInfo;
 class GetLiveChannelInfoResult extends Result
 {
     /**
-     * @return
+     * @return GetLiveChannelInfo
      */
     protected function parseDataFromResponse()
     {

vendor/aliyuncs/oss-sdk-php/src/OSS/Result/ListObjectVersionsResult.php

@@ -2,6 +2,7 @@
 
 namespace OSS\Result;
 
+use OSS\Core\OssException;
 use OSS\Core\OssUtil;
 use OSS\Model\ObjectVersionInfo;
 use OSS\Model\ObjectVersionListInfo;
@@ -17,11 +18,12 @@ class ListObjectVersionsResult extends Result
     /**
      * Parse the xml data returned by the ListObjectVersions interface
      *
-     * return ObjectVersionListInfo
+     * @return ObjectVersionListInfo
+     * @throws OssException
      */
     protected function parseDataFromResponse()
     {
-        $xml = simplexml_load_string($this->rawResponse->body); 
+        $xml = simplexml_load_string($this->rawResponse->body);
         $encodingType = isset($xml->EncodingType) ? strval($xml->EncodingType) : "";
         $objectVersionList = $this->parseObjecVersionList($xml, $encodingType);
         $deleteMarkerList = $this->parseDeleteMarkerList($xml, $encodingType);
@@ -40,8 +42,8 @@ class ListObjectVersionsResult extends Result
         $delimiter = OssUtil::decodeKey($delimiter, $encodingType);
         $isTruncated = isset($xml->IsTruncated) ? strval($xml->IsTruncated) : "";
 
-        return new ObjectVersionListInfo($bucketName, $prefix, $keyMarker, $nextKeyMarker, 
-            $versionIdMarker, $nextVersionIdMarker,$maxKeys, $delimiter, $isTruncated,
+        return new ObjectVersionListInfo($bucketName, $prefix, $keyMarker, $nextKeyMarker,
+            $versionIdMarker, $nextVersionIdMarker, $maxKeys, $delimiter, $isTruncated,
             $objectVersionList, $deleteMarkerList, $prefixList);
     }
 

vendor/aliyuncs/oss-sdk-php/src/OSS/Result/ListObjectsResult.php

@@ -2,9 +2,11 @@
 
 namespace OSS\Result;
 
+use OSS\Core\OssException;
 use OSS\Core\OssUtil;
 use OSS\Model\ObjectInfo;
 use OSS\Model\ObjectListInfo;
+use OSS\Model\Owner;
 use OSS\Model\PrefixInfo;
 
 /**
@@ -16,7 +18,8 @@ class ListObjectsResult extends Result
     /**
      * Parse the xml data returned by the ListObjects interface
      *
-     * return ObjectListInfo
+     * @return ObjectListInfo
+     * @throws OssException
      */
     protected function parseDataFromResponse()
     {
@@ -50,7 +53,13 @@ class ListObjectsResult extends Result
                 $type = isset($content->Type) ? strval($content->Type) : "";
                 $size = isset($content->Size) ? strval($content->Size) : "0";
                 $storageClass = isset($content->StorageClass) ? strval($content->StorageClass) : "";
-                $retList[] = new ObjectInfo($key, $lastModified, $eTag, $type, $size, $storageClass);
+                if(isset($content->Owner)){
+                    $owner = new Owner(strval($content->Owner->ID),strval($content->Owner->DisplayName));
+                }else{
+                    $owner = null;
+                }
+                $restoreInfo= isset($content->RestoreInfo) ? strval($content->RestoreInfo) : null;
+                $retList[] = new ObjectInfo($key, $lastModified, $eTag, $type, $size, $storageClass,$owner,$restoreInfo);
             }
         }
         return $retList;

vendor/aliyuncs/oss-sdk-php/src/OSS/Result/ListObjectsV2Result.php

@@ -2,9 +2,11 @@
 
 namespace OSS\Result;
 
+use OSS\Core\OssException;
 use OSS\Core\OssUtil;
 use OSS\Model\ObjectInfo;
 use OSS\Model\ObjectListInfoV2;
+use OSS\Model\Owner;
 use OSS\Model\PrefixInfo;
 
 /**
@@ -16,7 +18,8 @@ class ListObjectsV2Result extends Result
     /**
      * Parse the xml data returned by the ListObjectsV2 interface
      *
-     * return ObjectListInfoV2
+     * @return ObjectListInfoV2
+     * @throws OssException
      */
     protected function parseDataFromResponse()
     {
@@ -34,7 +37,7 @@ class ListObjectsV2Result extends Result
         $continuationToken = isset($xml->ContinuationToken) ? strval($xml->ContinuationToken) : "";
         $nextContinuationToken = isset($xml->NextContinuationToken) ? strval($xml->NextContinuationToken) : "";
         $startAfter = isset($xml->StartAfter) ? strval($xml->StartAfter) : "";
-        $startAfter =  OssUtil::decodeKey($startAfter, $encodingType);
+        $startAfter = OssUtil::decodeKey($startAfter, $encodingType);
         $keyCount = isset($xml->KeyCount) ? intval($xml->KeyCount) : 0;
         return new ObjectListInfoV2($bucketName, $prefix, $maxKeys, $delimiter, $isTruncated, $objectList, $prefixList, $continuationToken, $nextContinuationToken, $startAfter, $keyCount);
     }
@@ -51,7 +54,13 @@ class ListObjectsV2Result extends Result
                 $type = isset($content->Type) ? strval($content->Type) : "";
                 $size = isset($content->Size) ? strval($content->Size) : "0";
                 $storageClass = isset($content->StorageClass) ? strval($content->StorageClass) : "";
-                $retList[] = new ObjectInfo($key, $lastModified, $eTag, $type, $size, $storageClass);
+                if(isset($content->Owner)){
+                    $owner = new Owner(strval($content->Owner->ID),strval($content->Owner->DisplayName));
+                }else{
+                    $owner = null;
+                }
+                $restoreInfo= isset($content->RestoreInfo) ? strval($content->RestoreInfo) : null;
+                $retList[] = new ObjectInfo($key, $lastModified, $eTag, $type, $size, $storageClass,$owner,$restoreInfo);
             }
         }
         return $retList;

vendor/aliyuncs/oss-sdk-php/src/OSS/Result/Result.php

@@ -109,10 +109,29 @@ abstract class Result
         if (empty($body) || false === strpos($body, '<?xml')) {
             return '';
         }
-        $xml = simplexml_load_string($body);
-        if (isset($xml->Message)) {
-            return strval($xml->Message);
+        $flag = false;
+        try {
+            $xml = simplexml_load_string($body);
+            if (isset($xml->Message)) {
+                return strval($xml->Message);
+            }
+            $flag = true;
+        } catch (\Exception $e) {
+            $flag = true;
         }
+        if ($flag === true) {
+            $start = strpos($body, '<Message>');
+            if ($start === false) {
+                return '';
+            }
+            $start += 9;
+            $end = strpos($body, '</Message>', $start);
+            if ($end === false) {
+                return '';
+            }
+            return substr($body, $start, $end - $start);
+        }
+
         return '';
     }
 
@@ -127,10 +146,29 @@ abstract class Result
         if (empty($body) || false === strpos($body, '<?xml')) {
             return '';
         }
-        $xml = simplexml_load_string($body);
-        if (isset($xml->Code)) {
-            return strval($xml->Code);
+        $flag = false;
+        try {
+            $xml = simplexml_load_string($body);
+            if (isset($xml->Code)) {
+                return strval($xml->Code);
+            }
+            $flag = true;
+        } catch (\Exception $e) {
+            $flag = true;
         }
+        if ($flag === true) {
+            $start = strpos($body, '<Code>');
+            if ($start === false) {
+                return '';
+            }
+            $start += 6;
+            $end = strpos($body, '</Code>', $start);
+            if ($end === false) {
+                return '';
+            }
+            return substr($body, $start, $end - $start);
+        }
+
         return '';
     }