From dacec255a8dbefb15633620f30e1a80d6d7e18db Mon Sep 17 00:00:00 2001 From: sy-records <52o@qq52o.cn> Date: Sat, 31 Jul 2021 20:18:29 +0800 Subject: [PATCH] Upgrade oss sdk --- sdk/composer.lock | 16 +- sdk/vendor/aliyuncs/oss-sdk-php/CHANGELOG.md | 6 + sdk/vendor/aliyuncs/oss-sdk-php/composer.json | 4 +- .../oss-sdk-php/src/OSS/Core/OssUtil.php | 3 +- .../oss-sdk-php/src/OSS/Http/RequestCore.php | 9 +- .../oss-sdk-php/src/OSS/OssClient.php | 22 ++- .../tests/OSS/Tests/AclResultTest.php | 2 +- .../tests/OSS/Tests/BodyResultTest.php | 2 +- .../tests/OSS/Tests/BucketCnameTest.php | 6 +- .../tests/OSS/Tests/BucketInfoTest.php | 2 +- .../tests/OSS/Tests/BucketLiveChannelTest.php | 6 +- .../tests/OSS/Tests/CallbackTest.php | 2 +- .../tests/OSS/Tests/CnameConfigTest.php | 2 +- .../tests/OSS/Tests/CopyObjectResult.php | 4 +- .../tests/OSS/Tests/CorsConfigTest.php | 2 +- .../Tests/DeleteObjectVersionsResultTest.php | 2 +- .../tests/OSS/Tests/ExistResultTest.php | 4 +- .../Tests/GetBucketEncryptionResultTest.php | 2 +- .../GetBucketRequestPaymentResultTest.php | 2 +- .../OSS/Tests/GetBucketStatResultTest.php | 2 +- .../OSS/Tests/GetBucketTagsResultTest.php | 2 +- .../OSS/Tests/GetBucketWormResultTest.php | 22 +-- .../tests/OSS/Tests/GetCorsResultTest.php | 6 +- .../OSS/Tests/GetLifecycleResultTest.php | 6 +- .../tests/OSS/Tests/GetLoggingResultTest.php | 6 +- .../tests/OSS/Tests/GetRefererResultTest.php | 6 +- .../tests/OSS/Tests/GetWebsiteResultTest.php | 6 +- .../tests/OSS/Tests/HeaderResultTest.php | 2 +- .../oss-sdk-php/tests/OSS/Tests/HttpTest.php | 4 +- .../InitiateMultipartUploadResultTest.php | 4 +- .../tests/OSS/Tests/LifecycleConfigTest.php | 2 +- .../tests/OSS/Tests/ListBucketsResultTest.php | 2 +- .../Tests/ListMultipartUploadResultTest.php | 2 +- .../Tests/ListObjectVersionsResultTest.php | 4 +- .../tests/OSS/Tests/ListObjectsResultTest.php | 2 +- .../tests/OSS/Tests/ListPartsResultTest.php | 2 +- .../tests/OSS/Tests/LiveChannelXmlTest.php | 2 +- .../tests/OSS/Tests/LoggingConfigTest.php | 2 +- .../tests/OSS/Tests/MimeTypesTest.php | 2 +- .../tests/OSS/Tests/OssClientBucketTest.php | 4 +- .../tests/OSS/Tests/OssClientImageTest.php | 4 +- .../OSS/Tests/OssClientListObjectsTest.php | 4 +- .../Tests/OssClientMultipartUploadTest.php | 3 + .../OssClientObjectRequestPaymentTest.php | 5 +- .../tests/OSS/Tests/OssClientObjectTest.php | 185 ++++++++++++++---- .../Tests/OssClientObjectVersioningTest.php | 4 +- .../OSS/Tests/OssClientRestoreObjectTest.php | 4 +- .../OSS/Tests/OssClientSignatureTest.php | 4 +- .../tests/OSS/Tests/OssClientTest.php | 7 +- .../tests/OSS/Tests/OssExceptionTest.php | 2 +- .../tests/OSS/Tests/OssUtilTest.php | 10 +- .../OSS/Tests/PutSetDeleteResultTest.php | 8 +- .../tests/OSS/Tests/RefererConfigTest.php | 2 +- .../OSS/Tests/StorageCapacityConfigTest.php | 2 +- .../tests/OSS/Tests/StorageCapacityTest.php | 10 +- .../tests/OSS/Tests/TestOssClientBase.php | 6 +- .../tests/OSS/Tests/UploadPartResultTest.php | 2 +- .../tests/OSS/Tests/WebsiteConfigTest.php | 2 +- sdk/vendor/composer/ClassLoader.php | 34 ++++ sdk/vendor/composer/InstalledVersions.php | 136 ++++++++++--- sdk/vendor/composer/autoload_real.php | 2 +- sdk/vendor/composer/installed.json | 18 +- sdk/vendor/composer/installed.php | 10 +- 63 files changed, 449 insertions(+), 203 deletions(-) diff --git a/sdk/composer.lock b/sdk/composer.lock index 0f5805e..8f44974 100644 --- a/sdk/composer.lock +++ b/sdk/composer.lock @@ -8,16 +8,16 @@ "packages": [ { "name": "aliyuncs/oss-sdk-php", - "version": "v2.4.1", + "version": "v2.4.2", "source": { "type": "git", "url": "https://github.com/aliyun/aliyun-oss-php-sdk.git", - "reference": "492866331b7bafaac09506cf42f351b7e9e63766" + "reference": "0c9d902c33847c07efc66c4cdf823deaea8fc2b6" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/aliyun/aliyun-oss-php-sdk/zipball/492866331b7bafaac09506cf42f351b7e9e63766", - "reference": "492866331b7bafaac09506cf42f351b7e9e63766", + "url": "https://api.github.com/repos/aliyun/aliyun-oss-php-sdk/zipball/0c9d902c33847c07efc66c4cdf823deaea8fc2b6", + "reference": "0c9d902c33847c07efc66c4cdf823deaea8fc2b6", "shasum": "", "mirrors": [ { @@ -30,8 +30,8 @@ "php": ">=5.3" }, "require-dev": { - "phpunit/phpunit": "~4.0", - "satooshi/php-coveralls": "~1.0" + "phpunit/phpunit": "*", + "satooshi/php-coveralls": "*" }, "type": "library", "autoload": { @@ -53,9 +53,9 @@ "homepage": "http://www.aliyun.com/product/oss/", "support": { "issues": "https://github.com/aliyun/aliyun-oss-php-sdk/issues", - "source": "https://github.com/aliyun/aliyun-oss-php-sdk/tree/v2.4.1" + "source": "https://github.com/aliyun/aliyun-oss-php-sdk/tree/v2.4.2" }, - "time": "2020-09-29T06:23:57+00:00" + "time": "2021-06-04T06:55:06+00:00" } ], "packages-dev": [], diff --git a/sdk/vendor/aliyuncs/oss-sdk-php/CHANGELOG.md b/sdk/vendor/aliyuncs/oss-sdk-php/CHANGELOG.md index 5d8e847..50274fa 100644 --- a/sdk/vendor/aliyuncs/oss-sdk-php/CHANGELOG.md +++ b/sdk/vendor/aliyuncs/oss-sdk-php/CHANGELOG.md @@ -1,5 +1,11 @@ # ChangeLog - Aliyun OSS SDK for PHP +## v2.4.2 / 2021-06-04 +* Compatible with PHP8. +* Fixed: compatible with PHP5.4. +* Fixed: the signature is incorrect in some scenarios +* Update: change $requestUrl from a member variable to a local variable. + ## v2.4.1 / 2020-09-29 * Fixed: the getBucketPolicy bug. diff --git a/sdk/vendor/aliyuncs/oss-sdk-php/composer.json b/sdk/vendor/aliyuncs/oss-sdk-php/composer.json index 1ecb58c..29e280b 100644 --- a/sdk/vendor/aliyuncs/oss-sdk-php/composer.json +++ b/sdk/vendor/aliyuncs/oss-sdk-php/composer.json @@ -14,8 +14,8 @@ "php":">=5.3" }, "require-dev" : { - "phpunit/phpunit": "~4.0", - "satooshi/php-coveralls": "~1.0" + "phpunit/phpunit": "*", + "satooshi/php-coveralls": "*" }, "minimum-stability": "stable", "autoload": { diff --git a/sdk/vendor/aliyuncs/oss-sdk-php/src/OSS/Core/OssUtil.php b/sdk/vendor/aliyuncs/oss-sdk-php/src/OSS/Core/OssUtil.php index 656e3d3..e3f2037 100644 --- a/sdk/vendor/aliyuncs/oss-sdk-php/src/OSS/Core/OssUtil.php +++ b/sdk/vendor/aliyuncs/oss-sdk-php/src/OSS/Core/OssUtil.php @@ -439,7 +439,8 @@ BBB; $sub_object = $xml->addChild('Object'); $key = OssUtil::sReplace($object->getKey()); $sub_object->addChild('Key', $key); - if (!empty($object->getVersionId())) { + $versionId = $object->getVersionId(); + if (!empty($versionId)) { $sub_object->addChild('VersionId', $object->getVersionId()); } } diff --git a/sdk/vendor/aliyuncs/oss-sdk-php/src/OSS/Http/RequestCore.php b/sdk/vendor/aliyuncs/oss-sdk-php/src/OSS/Http/RequestCore.php index a78f19b..c8089b4 100644 --- a/sdk/vendor/aliyuncs/oss-sdk-php/src/OSS/Http/RequestCore.php +++ b/sdk/vendor/aliyuncs/oss-sdk-php/src/OSS/Http/RequestCore.php @@ -777,7 +777,7 @@ class RequestCore * data stored in the `curl_handle` and `response` properties unless replacement data is passed in via * parameters. * - * @param resource $curl_handle (Optional) The reference to the already executed cURL request. + * @param resource|\CurlHandle|null|false $curl_handle (Optional) The reference to the already executed cURL request. Receive CurlHandle instance from PHP8.0 * @param string $response (Optional) The actual response content itself that needs to be parsed. * @return ResponseCore A object containing a parsed HTTP response. */ @@ -788,8 +788,8 @@ class RequestCore $this->response = $response; } - // As long as this came back as a valid resource... - if (is_resource($curl_handle)) { + // As long as this came back as a valid resource or CurlHandle instance... + if (is_resource($curl_handle) || (is_object($curl_handle) && get_class($curl_handle) === 'CurlHandle')) { // Determine what's what. $header_size = curl_getinfo($curl_handle, CURLINFO_HEADER_SIZE); $this->response_headers = substr($this->response, 0, $header_size); @@ -844,12 +844,13 @@ class RequestCore $this->response = curl_exec($curl_handle); if ($this->response === false) { - throw new RequestCore_Exception('cURL resource: ' . (string)$curl_handle . '; cURL error: ' . curl_error($curl_handle) . ' (' . curl_errno($curl_handle) . ')'); + throw new RequestCore_Exception('cURL error: ' . curl_error($curl_handle) . ' (' . curl_errno($curl_handle) . ')'); } $parsed_response = $this->process_response($curl_handle, $this->response); curl_close($curl_handle); + unset($curl_handle); if ($parse) { return $parsed_response; diff --git a/sdk/vendor/aliyuncs/oss-sdk-php/src/OSS/OssClient.php b/sdk/vendor/aliyuncs/oss-sdk-php/src/OSS/OssClient.php index b741bfb..c41cacd 100644 --- a/sdk/vendor/aliyuncs/oss-sdk-php/src/OSS/OssClient.php +++ b/sdk/vendor/aliyuncs/oss-sdk-php/src/OSS/OssClient.php @@ -2843,10 +2843,10 @@ class OssClient $non_signable_resource .= $conjunction . $query_string; $conjunction = '&'; } - $this->requestUrl = $scheme . $hostname . $resource_uri . $signable_query_string . $non_signable_resource; + $requestUrl = $scheme . $hostname . $resource_uri . $signable_query_string . $non_signable_resource; //Creates the request - $request = new RequestCore($this->requestUrl, $this->requestProxy); + $request = new RequestCore($requestUrl, $this->requestProxy); $request->set_useragent($this->generateUserAgent()); // Streaming uploads if (isset($options[self::OSS_FILE_UPLOAD])) { @@ -2943,10 +2943,10 @@ class OssClient $request->add_header('Authorization', 'OSS ' . $this->accessKeyId . ':' . $signature); if (isset($options[self::OSS_PREAUTH]) && (integer)$options[self::OSS_PREAUTH] > 0) { - $signed_url = $this->requestUrl . $conjunction . self::OSS_URL_ACCESS_KEY_ID . '=' . rawurlencode($this->accessKeyId) . '&' . self::OSS_URL_EXPIRES . '=' . $options[self::OSS_PREAUTH] . '&' . self::OSS_URL_SIGNATURE . '=' . rawurlencode($signature); + $signed_url = $requestUrl . $conjunction . self::OSS_URL_ACCESS_KEY_ID . '=' . rawurlencode($this->accessKeyId) . '&' . self::OSS_URL_EXPIRES . '=' . $options[self::OSS_PREAUTH] . '&' . self::OSS_URL_SIGNATURE . '=' . rawurlencode($signature); return $signed_url; } elseif (isset($options[self::OSS_PREAUTH])) { - return $this->requestUrl; + return $requestUrl; } if ($this->timeout !== 0) { @@ -2962,7 +2962,7 @@ class OssClient throw(new OssException('RequestCoreException: ' . $e->getMessage())); } $response_header = $request->get_response_header(); - $response_header['oss-request-url'] = $this->requestUrl; + $response_header['oss-request-url'] = $requestUrl; $response_header['oss-redirects'] = $this->redirects; $response_header['oss-stringtosign'] = $string_to_sign; $response_header['oss-requestheaders'] = $request->request_headers; @@ -3257,7 +3257,12 @@ class OssClient $queryStringSorted = substr($queryStringSorted, 0, -1); - return $explodeResult[0] . '?' . $queryStringSorted; + $result = ''; + for ($i = 0; $i < $index -1; $i++) + { + $result .= $explodeResult[$i] . '?'; + } + return $result . $queryStringSorted; } /** @@ -3503,8 +3508,8 @@ class OssClient ); // OssClient version information const OSS_NAME = "aliyun-sdk-php"; - const OSS_VERSION = "2.4.1"; - const OSS_BUILD = "20200929"; + const OSS_VERSION = "2.4.2"; + const OSS_BUILD = "20210604"; const OSS_AUTHOR = ""; const OSS_OPTIONS_ORIGIN = 'Origin'; const OSS_OPTIONS_REQUEST_METHOD = 'Access-Control-Request-Method'; @@ -3517,7 +3522,6 @@ class OssClient // user's domain type. It could be one of the four: OSS_HOST_TYPE_NORMAL, OSS_HOST_TYPE_IP, OSS_HOST_TYPE_SPECIAL, OSS_HOST_TYPE_CNAME private $hostType = self::OSS_HOST_TYPE_NORMAL; - private $requestUrl; private $requestProxy = null; private $accessKeyId; private $accessKeySecret; diff --git a/sdk/vendor/aliyuncs/oss-sdk-php/tests/OSS/Tests/AclResultTest.php b/sdk/vendor/aliyuncs/oss-sdk-php/tests/OSS/Tests/AclResultTest.php index 12f4b1a..82168d0 100644 --- a/sdk/vendor/aliyuncs/oss-sdk-php/tests/OSS/Tests/AclResultTest.php +++ b/sdk/vendor/aliyuncs/oss-sdk-php/tests/OSS/Tests/AclResultTest.php @@ -6,7 +6,7 @@ use OSS\Result\AclResult; use OSS\Core\OssException; use OSS\Http\ResponseCore; -class AclResultTest extends \PHPUnit_Framework_TestCase +class AclResultTest extends \PHPUnit\Framework\TestCase { private $validXml = <<client = Common::getOssClient(); $this->bucketName = 'php-sdk-test-bucket-' . strval(rand(0, 10000)); $this->client->createBucket($this->bucketName); } - public function tearDown() + protected function tearDown(): void { $this->client->deleteBucket($this->bucketName); } diff --git a/sdk/vendor/aliyuncs/oss-sdk-php/tests/OSS/Tests/BucketInfoTest.php b/sdk/vendor/aliyuncs/oss-sdk-php/tests/OSS/Tests/BucketInfoTest.php index 80fa25c..f99bcee 100644 --- a/sdk/vendor/aliyuncs/oss-sdk-php/tests/OSS/Tests/BucketInfoTest.php +++ b/sdk/vendor/aliyuncs/oss-sdk-php/tests/OSS/Tests/BucketInfoTest.php @@ -8,7 +8,7 @@ use OSS\Model\BucketInfo; * Class BucketInfoTest * @package OSS\Tests */ -class BucketInfoTest extends \PHPUnit_Framework_TestCase +class BucketInfoTest extends \PHPUnit\Framework\TestCase { public function testConstruct() { diff --git a/sdk/vendor/aliyuncs/oss-sdk-php/tests/OSS/Tests/BucketLiveChannelTest.php b/sdk/vendor/aliyuncs/oss-sdk-php/tests/OSS/Tests/BucketLiveChannelTest.php index aaebadb..cedf884 100644 --- a/sdk/vendor/aliyuncs/oss-sdk-php/tests/OSS/Tests/BucketLiveChannelTest.php +++ b/sdk/vendor/aliyuncs/oss-sdk-php/tests/OSS/Tests/BucketLiveChannelTest.php @@ -7,12 +7,12 @@ require_once __DIR__ . '/Common.php'; use OSS\Model\LiveChannelConfig; use OSS\Core\OssException; -class BucketLiveChannelTest extends \PHPUnit_Framework_TestCase +class BucketLiveChannelTest extends \PHPUnit\Framework\TestCase { private $bucketName; private $client; - public function setUp() + protected function setUp(): void { $this->client = Common::getOssClient(); $this->bucketName = 'php-sdk-test-rtmp-bucket-name-' . strval(rand(0, 10000)); @@ -20,7 +20,7 @@ class BucketLiveChannelTest extends \PHPUnit_Framework_TestCase Common::waitMetaSync(); } - public function tearDown() + protected function tearDown(): void { ////to delete created bucket //1. delele live channel diff --git a/sdk/vendor/aliyuncs/oss-sdk-php/tests/OSS/Tests/CallbackTest.php b/sdk/vendor/aliyuncs/oss-sdk-php/tests/OSS/Tests/CallbackTest.php index 337ea24..31df548 100644 --- a/sdk/vendor/aliyuncs/oss-sdk-php/tests/OSS/Tests/CallbackTest.php +++ b/sdk/vendor/aliyuncs/oss-sdk-php/tests/OSS/Tests/CallbackTest.php @@ -289,7 +289,7 @@ class CallbackTest extends TestOssClientBase } } - public function setUp() + protected function setUp(): void { parent::setUp(); } diff --git a/sdk/vendor/aliyuncs/oss-sdk-php/tests/OSS/Tests/CnameConfigTest.php b/sdk/vendor/aliyuncs/oss-sdk-php/tests/OSS/Tests/CnameConfigTest.php index e3c1ce9..8f7529c 100644 --- a/sdk/vendor/aliyuncs/oss-sdk-php/tests/OSS/Tests/CnameConfigTest.php +++ b/sdk/vendor/aliyuncs/oss-sdk-php/tests/OSS/Tests/CnameConfigTest.php @@ -6,7 +6,7 @@ namespace OSS\Tests; use OSS\Model\CnameConfig; use OSS\Core\OssException; -class CnameConfigTest extends \PHPUnit_Framework_TestCase +class CnameConfigTest extends \PHPUnit\Framework\TestCase { private $xml1 = << diff --git a/sdk/vendor/aliyuncs/oss-sdk-php/tests/OSS/Tests/CopyObjectResult.php b/sdk/vendor/aliyuncs/oss-sdk-php/tests/OSS/Tests/CopyObjectResult.php index 171d4c8..7d1b0fb 100644 --- a/sdk/vendor/aliyuncs/oss-sdk-php/tests/OSS/Tests/CopyObjectResult.php +++ b/sdk/vendor/aliyuncs/oss-sdk-php/tests/OSS/Tests/CopyObjectResult.php @@ -6,7 +6,7 @@ use OSS\Core\OssException; use OSS\Http\ResponseCore; use OSS\Result\CopyObjectResult; -class CopyObjectResultTest extends \PHPUnit_Framework_TestCase +class CopyObjectResultTest extends \PHPUnit\Framework\TestCase { private $body = << @@ -45,7 +45,7 @@ BBBB; new CopyObjectResult($response); $this->assertFalse(true); } catch (OssException $e) { - + $this->assertFalse(false); } } diff --git a/sdk/vendor/aliyuncs/oss-sdk-php/tests/OSS/Tests/CorsConfigTest.php b/sdk/vendor/aliyuncs/oss-sdk-php/tests/OSS/Tests/CorsConfigTest.php index ddc4d3a..3329b1a 100644 --- a/sdk/vendor/aliyuncs/oss-sdk-php/tests/OSS/Tests/CorsConfigTest.php +++ b/sdk/vendor/aliyuncs/oss-sdk-php/tests/OSS/Tests/CorsConfigTest.php @@ -7,7 +7,7 @@ use OSS\Model\CorsConfig; use OSS\Model\CorsRule; use OSS\Core\OssException; -class CorsConfigTest extends \PHPUnit_Framework_TestCase +class CorsConfigTest extends \PHPUnit\Framework\TestCase { private $validXml = << diff --git a/sdk/vendor/aliyuncs/oss-sdk-php/tests/OSS/Tests/DeleteObjectVersionsResultTest.php b/sdk/vendor/aliyuncs/oss-sdk-php/tests/OSS/Tests/DeleteObjectVersionsResultTest.php index ed6b95e..890b1a5 100644 --- a/sdk/vendor/aliyuncs/oss-sdk-php/tests/OSS/Tests/DeleteObjectVersionsResultTest.php +++ b/sdk/vendor/aliyuncs/oss-sdk-php/tests/OSS/Tests/DeleteObjectVersionsResultTest.php @@ -6,7 +6,7 @@ use OSS\Result\DeleteObjectVersionsResult; use OSS\Core\OssException; use OSS\Http\ResponseCore; -class DeleteObjectVersionsResultTest extends \PHPUnit_Framework_TestCase +class DeleteObjectVersionsResultTest extends \PHPUnit\Framework\TestCase { private $validXml = <<assertTrue(false); } catch (OssException $e) { - + $this->assertTrue(true); } } } diff --git a/sdk/vendor/aliyuncs/oss-sdk-php/tests/OSS/Tests/GetBucketEncryptionResultTest.php b/sdk/vendor/aliyuncs/oss-sdk-php/tests/OSS/Tests/GetBucketEncryptionResultTest.php index 4512eb4..6f0e0d2 100644 --- a/sdk/vendor/aliyuncs/oss-sdk-php/tests/OSS/Tests/GetBucketEncryptionResultTest.php +++ b/sdk/vendor/aliyuncs/oss-sdk-php/tests/OSS/Tests/GetBucketEncryptionResultTest.php @@ -6,7 +6,7 @@ use OSS\Result\GetBucketEncryptionResult; use OSS\Core\OssException; use OSS\Http\ResponseCore; -class GetBucketEncryptionResultTest extends \PHPUnit_Framework_TestCase +class GetBucketEncryptionResultTest extends \PHPUnit\Framework\TestCase { private $validXml = << diff --git a/sdk/vendor/aliyuncs/oss-sdk-php/tests/OSS/Tests/GetBucketWormResultTest.php b/sdk/vendor/aliyuncs/oss-sdk-php/tests/OSS/Tests/GetBucketWormResultTest.php index 686ad7e..4d5d912 100644 --- a/sdk/vendor/aliyuncs/oss-sdk-php/tests/OSS/Tests/GetBucketWormResultTest.php +++ b/sdk/vendor/aliyuncs/oss-sdk-php/tests/OSS/Tests/GetBucketWormResultTest.php @@ -6,26 +6,26 @@ use OSS\Result\GetBucketWormResult; use OSS\Core\OssException; use OSS\Http\ResponseCore; -class GetBucketWormResultTest extends \PHPUnit_Framework_TestCase +class GetBucketWormResultTest extends \PHPUnit\Framework\TestCase { private $validXml = << - - ID1 - Locked - 1 - 2018-08-14T15:50:32 + + ID1 + Locked + 1 + 2018-08-14T15:50:32 BBBB; private $validXml2 = << - - ID2 - InProgress - 10 - 2018-09-14T15:50:32 + + ID2 + InProgress + 10 + 2018-09-14T15:50:32 BBBB; diff --git a/sdk/vendor/aliyuncs/oss-sdk-php/tests/OSS/Tests/GetCorsResultTest.php b/sdk/vendor/aliyuncs/oss-sdk-php/tests/OSS/Tests/GetCorsResultTest.php index a3281c8..76d87dc 100644 --- a/sdk/vendor/aliyuncs/oss-sdk-php/tests/OSS/Tests/GetCorsResultTest.php +++ b/sdk/vendor/aliyuncs/oss-sdk-php/tests/OSS/Tests/GetCorsResultTest.php @@ -7,7 +7,7 @@ use OSS\Core\OssException; use OSS\Result\GetCorsResult; use OSS\Http\ResponseCore; -class GetCorsResultTest extends \PHPUnit_Framework_TestCase +class GetCorsResultTest extends \PHPUnit\Framework\TestCase { private $validXml = << @@ -58,10 +58,10 @@ BBBB; { $response = new ResponseCore(array(), $this->validXml, 300); try { - new GetCorsResult($response); + $result = new GetCorsResult($response); $this->assertTrue(false); } catch (OssException $e) { - + $this->assertTrue(true); } } } diff --git a/sdk/vendor/aliyuncs/oss-sdk-php/tests/OSS/Tests/GetLifecycleResultTest.php b/sdk/vendor/aliyuncs/oss-sdk-php/tests/OSS/Tests/GetLifecycleResultTest.php index 92ae208..e6d9a72 100644 --- a/sdk/vendor/aliyuncs/oss-sdk-php/tests/OSS/Tests/GetLifecycleResultTest.php +++ b/sdk/vendor/aliyuncs/oss-sdk-php/tests/OSS/Tests/GetLifecycleResultTest.php @@ -8,7 +8,7 @@ use OSS\Core\OssException; use OSS\Model\LifecycleConfig; use OSS\Result\GetLifecycleResult; -class GetLifecycleResultTest extends \PHPUnit_Framework_TestCase +class GetLifecycleResultTest extends \PHPUnit\Framework\TestCase { private $validXml = << @@ -49,10 +49,10 @@ BBBB; { $response = new ResponseCore(array(), $this->validXml, 300); try { - new GetLifecycleResult($response); + $result = new GetLifecycleResult($response); $this->assertTrue(false); } catch (OssException $e) { - + $this->assertTrue(true); } } diff --git a/sdk/vendor/aliyuncs/oss-sdk-php/tests/OSS/Tests/GetLoggingResultTest.php b/sdk/vendor/aliyuncs/oss-sdk-php/tests/OSS/Tests/GetLoggingResultTest.php index 6195014..35f7436 100644 --- a/sdk/vendor/aliyuncs/oss-sdk-php/tests/OSS/Tests/GetLoggingResultTest.php +++ b/sdk/vendor/aliyuncs/oss-sdk-php/tests/OSS/Tests/GetLoggingResultTest.php @@ -8,7 +8,7 @@ use OSS\Http\ResponseCore; use OSS\Core\OssException; -class GetLoggingResultTest extends \PHPUnit_Framework_TestCase +class GetLoggingResultTest extends \PHPUnit\Framework\TestCase { private $validXml = << @@ -42,10 +42,10 @@ BBBB; { $response = new ResponseCore(array(), $this->validXml, 300); try { - new GetLoggingResult($response); + $result = new GetLoggingResult($response); $this->assertTrue(false); } catch (OssException $e) { - + $this->assertTrue(true); } } } diff --git a/sdk/vendor/aliyuncs/oss-sdk-php/tests/OSS/Tests/GetRefererResultTest.php b/sdk/vendor/aliyuncs/oss-sdk-php/tests/OSS/Tests/GetRefererResultTest.php index 072aa43..774aae9 100644 --- a/sdk/vendor/aliyuncs/oss-sdk-php/tests/OSS/Tests/GetRefererResultTest.php +++ b/sdk/vendor/aliyuncs/oss-sdk-php/tests/OSS/Tests/GetRefererResultTest.php @@ -7,7 +7,7 @@ use OSS\Http\ResponseCore; use OSS\Core\OssException; -class GetRefererResultTest extends \PHPUnit_Framework_TestCase +class GetRefererResultTest extends \PHPUnit\Framework\TestCase { private $validXml = << @@ -42,10 +42,10 @@ BBBB; { $response = new ResponseCore(array(), $this->validXml, 300); try { - new GetRefererResult($response); + $result = new GetRefererResult($response); $this->assertTrue(false); } catch (OssException $e) { - + $this->assertTrue(true); } } } diff --git a/sdk/vendor/aliyuncs/oss-sdk-php/tests/OSS/Tests/GetWebsiteResultTest.php b/sdk/vendor/aliyuncs/oss-sdk-php/tests/OSS/Tests/GetWebsiteResultTest.php index 70e1559..d853306 100644 --- a/sdk/vendor/aliyuncs/oss-sdk-php/tests/OSS/Tests/GetWebsiteResultTest.php +++ b/sdk/vendor/aliyuncs/oss-sdk-php/tests/OSS/Tests/GetWebsiteResultTest.php @@ -7,7 +7,7 @@ use OSS\Result\GetWebsiteResult; use OSS\Http\ResponseCore; use OSS\Core\OssException; -class GetWebsiteResultTest extends \PHPUnit_Framework_TestCase +class GetWebsiteResultTest extends \PHPUnit\Framework\TestCase { private $validXml = << @@ -41,10 +41,10 @@ BBBB; { $response = new ResponseCore(array(), $this->validXml, 300); try { - new GetWebsiteResult($response); + $result = new GetWebsiteResult($response); $this->assertTrue(false); } catch (OssException $e) { - + $this->assertTrue(true); } } } diff --git a/sdk/vendor/aliyuncs/oss-sdk-php/tests/OSS/Tests/HeaderResultTest.php b/sdk/vendor/aliyuncs/oss-sdk-php/tests/OSS/Tests/HeaderResultTest.php index dae4975..9354422 100644 --- a/sdk/vendor/aliyuncs/oss-sdk-php/tests/OSS/Tests/HeaderResultTest.php +++ b/sdk/vendor/aliyuncs/oss-sdk-php/tests/OSS/Tests/HeaderResultTest.php @@ -9,7 +9,7 @@ use OSS\Http\ResponseCore; * Class HeaderResultTest * @package OSS\Tests */ -class HeaderResultTest extends \PHPUnit_Framework_TestCase +class HeaderResultTest extends \PHPUnit\Framework\TestCase { public function testGetHeader() { diff --git a/sdk/vendor/aliyuncs/oss-sdk-php/tests/OSS/Tests/HttpTest.php b/sdk/vendor/aliyuncs/oss-sdk-php/tests/OSS/Tests/HttpTest.php index a59dfcd..989644c 100644 --- a/sdk/vendor/aliyuncs/oss-sdk-php/tests/OSS/Tests/HttpTest.php +++ b/sdk/vendor/aliyuncs/oss-sdk-php/tests/OSS/Tests/HttpTest.php @@ -7,7 +7,7 @@ use OSS\Http\ResponseCore; use OSS\Http\RequestCore_Exception; use Symfony\Component\Config\Definition\Exception\Exception; -class HttpTest extends \PHPUnit_Framework_TestCase +class HttpTest extends \PHPUnit\Framework\TestCase { public function testResponseCore() @@ -33,7 +33,7 @@ class HttpTest extends \PHPUnit_Framework_TestCase $httpResponse = $httpCore->send_request(); $this->assertTrue(false); } catch (RequestCore_Exception $e) { - + $this->assertTrue(true); } } diff --git a/sdk/vendor/aliyuncs/oss-sdk-php/tests/OSS/Tests/InitiateMultipartUploadResultTest.php b/sdk/vendor/aliyuncs/oss-sdk-php/tests/OSS/Tests/InitiateMultipartUploadResultTest.php index 9f6c7a5..76b10a6 100644 --- a/sdk/vendor/aliyuncs/oss-sdk-php/tests/OSS/Tests/InitiateMultipartUploadResultTest.php +++ b/sdk/vendor/aliyuncs/oss-sdk-php/tests/OSS/Tests/InitiateMultipartUploadResultTest.php @@ -7,7 +7,7 @@ use OSS\Core\OssException; use OSS\Result\InitiateMultipartUploadResult; use OSS\Http\ResponseCore; -class InitiateMultipartUploadResultTest extends \PHPUnit_Framework_TestCase +class InitiateMultipartUploadResultTest extends \PHPUnit\Framework\TestCase { private $validXml = << @@ -41,7 +41,7 @@ BBBB; $result = new InitiateMultipartUploadResult($response); $this->assertTrue(false); } catch (OssException $e) { - + $this->assertTrue(true); } } } diff --git a/sdk/vendor/aliyuncs/oss-sdk-php/tests/OSS/Tests/LifecycleConfigTest.php b/sdk/vendor/aliyuncs/oss-sdk-php/tests/OSS/Tests/LifecycleConfigTest.php index 7bd0331..063e436 100644 --- a/sdk/vendor/aliyuncs/oss-sdk-php/tests/OSS/Tests/LifecycleConfigTest.php +++ b/sdk/vendor/aliyuncs/oss-sdk-php/tests/OSS/Tests/LifecycleConfigTest.php @@ -7,7 +7,7 @@ use OSS\Model\LifecycleAction; use OSS\Model\LifecycleConfig; use OSS\Model\LifecycleRule; -class LifecycleConfigTest extends \PHPUnit_Framework_TestCase +class LifecycleConfigTest extends \PHPUnit\Framework\TestCase { private $validLifecycle = << diff --git a/sdk/vendor/aliyuncs/oss-sdk-php/tests/OSS/Tests/ListMultipartUploadResultTest.php b/sdk/vendor/aliyuncs/oss-sdk-php/tests/OSS/Tests/ListMultipartUploadResultTest.php index 5c757d3..88bd0a7 100644 --- a/sdk/vendor/aliyuncs/oss-sdk-php/tests/OSS/Tests/ListMultipartUploadResultTest.php +++ b/sdk/vendor/aliyuncs/oss-sdk-php/tests/OSS/Tests/ListMultipartUploadResultTest.php @@ -9,7 +9,7 @@ use OSS\Http\ResponseCore; * Class ListMultipartUploadResultTest * @package OSS\Tests */ -class ListMultipartUploadResultTest extends \PHPUnit_Framework_TestCase +class ListMultipartUploadResultTest extends \PHPUnit\Framework\TestCase { private $validXml = << diff --git a/sdk/vendor/aliyuncs/oss-sdk-php/tests/OSS/Tests/ListObjectVersionsResultTest.php b/sdk/vendor/aliyuncs/oss-sdk-php/tests/OSS/Tests/ListObjectVersionsResultTest.php index f386c68..8ddbdaa 100644 --- a/sdk/vendor/aliyuncs/oss-sdk-php/tests/OSS/Tests/ListObjectVersionsResultTest.php +++ b/sdk/vendor/aliyuncs/oss-sdk-php/tests/OSS/Tests/ListObjectVersionsResultTest.php @@ -6,7 +6,7 @@ use OSS\Result\ListObjectVersionsResult; use OSS\Core\OssException; use OSS\Http\ResponseCore; -class ListObjectVersionsResultTest extends \PHPUnit_Framework_TestCase +class ListObjectVersionsResultTest extends \PHPUnit\Framework\TestCase { private $validXml = <<getData(); + $this->assertTrue(true); } public function testParseInvalidXml() @@ -209,5 +210,6 @@ class ListObjectVersionsResultTest extends \PHPUnit_Framework_TestCase $response = new ResponseCore(array(), $this->invalidXml, 200); $result = new ListObjectVersionsResult($response); $stat = $result->getData(); + $this->assertTrue(true); } } diff --git a/sdk/vendor/aliyuncs/oss-sdk-php/tests/OSS/Tests/ListObjectsResultTest.php b/sdk/vendor/aliyuncs/oss-sdk-php/tests/OSS/Tests/ListObjectsResultTest.php index 85f262c..c977ce7 100644 --- a/sdk/vendor/aliyuncs/oss-sdk-php/tests/OSS/Tests/ListObjectsResultTest.php +++ b/sdk/vendor/aliyuncs/oss-sdk-php/tests/OSS/Tests/ListObjectsResultTest.php @@ -6,7 +6,7 @@ namespace OSS\Tests; use OSS\Result\ListObjectsResult; use OSS\Http\ResponseCore; -class ListObjectsResultTest extends \PHPUnit_Framework_TestCase +class ListObjectsResultTest extends \PHPUnit\Framework\TestCase { private $validXml1 = << diff --git a/sdk/vendor/aliyuncs/oss-sdk-php/tests/OSS/Tests/LiveChannelXmlTest.php b/sdk/vendor/aliyuncs/oss-sdk-php/tests/OSS/Tests/LiveChannelXmlTest.php index 5fb5d6e..b69ef7c 100644 --- a/sdk/vendor/aliyuncs/oss-sdk-php/tests/OSS/Tests/LiveChannelXmlTest.php +++ b/sdk/vendor/aliyuncs/oss-sdk-php/tests/OSS/Tests/LiveChannelXmlTest.php @@ -12,7 +12,7 @@ use OSS\Model\GetLiveChannelStatus; use OSS\Model\GetLiveChannelHistory; use OSS\Model\LiveChannelHistory; -class LiveChannelXmlTest extends \PHPUnit_Framework_TestCase +class LiveChannelXmlTest extends \PHPUnit\Framework\TestCase { private $config = << diff --git a/sdk/vendor/aliyuncs/oss-sdk-php/tests/OSS/Tests/LoggingConfigTest.php b/sdk/vendor/aliyuncs/oss-sdk-php/tests/OSS/Tests/LoggingConfigTest.php index 01496bb..05336c8 100644 --- a/sdk/vendor/aliyuncs/oss-sdk-php/tests/OSS/Tests/LoggingConfigTest.php +++ b/sdk/vendor/aliyuncs/oss-sdk-php/tests/OSS/Tests/LoggingConfigTest.php @@ -4,7 +4,7 @@ namespace OSS\Tests; use OSS\Model\LoggingConfig; -class LoggingConfigTest extends \PHPUnit_Framework_TestCase +class LoggingConfigTest extends \PHPUnit\Framework\TestCase { private $validXml = << diff --git a/sdk/vendor/aliyuncs/oss-sdk-php/tests/OSS/Tests/MimeTypesTest.php b/sdk/vendor/aliyuncs/oss-sdk-php/tests/OSS/Tests/MimeTypesTest.php index 0697409..1403d09 100644 --- a/sdk/vendor/aliyuncs/oss-sdk-php/tests/OSS/Tests/MimeTypesTest.php +++ b/sdk/vendor/aliyuncs/oss-sdk-php/tests/OSS/Tests/MimeTypesTest.php @@ -4,7 +4,7 @@ namespace OSS\Tests; use OSS\Core\MimeTypes; -class MimeTypesTest extends \PHPUnit_Framework_TestCase +class MimeTypesTest extends \PHPUnit\Framework\TestCase { public function testGetMimeType() { diff --git a/sdk/vendor/aliyuncs/oss-sdk-php/tests/OSS/Tests/OssClientBucketTest.php b/sdk/vendor/aliyuncs/oss-sdk-php/tests/OSS/Tests/OssClientBucketTest.php index df44fba..6bac445 100644 --- a/sdk/vendor/aliyuncs/oss-sdk-php/tests/OSS/Tests/OssClientBucketTest.php +++ b/sdk/vendor/aliyuncs/oss-sdk-php/tests/OSS/Tests/OssClientBucketTest.php @@ -98,7 +98,7 @@ class OssClientBucketTest extends TestOssClientBase } } - public function setUp() + protected function setUp(): void { parent::setUp(); @@ -125,7 +125,7 @@ class OssClientBucketTest extends TestOssClientBase $this->ossClient->createBucket($this->standardBucket, OssClient::OSS_ACL_TYPE_PRIVATE, $options); } - public function tearDown() + protected function tearDown(): void { parent::tearDown(); diff --git a/sdk/vendor/aliyuncs/oss-sdk-php/tests/OSS/Tests/OssClientImageTest.php b/sdk/vendor/aliyuncs/oss-sdk-php/tests/OSS/Tests/OssClientImageTest.php index 17b9b98..6def9f9 100644 --- a/sdk/vendor/aliyuncs/oss-sdk-php/tests/OSS/Tests/OssClientImageTest.php +++ b/sdk/vendor/aliyuncs/oss-sdk-php/tests/OSS/Tests/OssClientImageTest.php @@ -14,7 +14,7 @@ class OssClinetImageTest extends TestOssClientBase private $object; private $download_file; - public function setUp() + protected function setUp(): void { parent::setUp(); @@ -28,7 +28,7 @@ class OssClinetImageTest extends TestOssClientBase $this->client->uploadFile($this->bucketName, $this->object, $this->local_file); } - public function tearDown() + protected function tearDown(): void { parent::tearDown(); unlink($this->download_file); diff --git a/sdk/vendor/aliyuncs/oss-sdk-php/tests/OSS/Tests/OssClientListObjectsTest.php b/sdk/vendor/aliyuncs/oss-sdk-php/tests/OSS/Tests/OssClientListObjectsTest.php index de4735b..8ee47a2 100644 --- a/sdk/vendor/aliyuncs/oss-sdk-php/tests/OSS/Tests/OssClientListObjectsTest.php +++ b/sdk/vendor/aliyuncs/oss-sdk-php/tests/OSS/Tests/OssClientListObjectsTest.php @@ -145,7 +145,7 @@ class OssClientListObjectsTest extends TestOssClientBase $this->assertEquals("true", $listObjectInfo->getIsTruncated()); } - public function setUp() + protected function setUp(): void { parent::setUp(); //folder @@ -177,7 +177,7 @@ class OssClientListObjectsTest extends TestOssClientBase } - public function tearDown() + protected function tearDown(): void { parent::tearDown(); } diff --git a/sdk/vendor/aliyuncs/oss-sdk-php/tests/OSS/Tests/OssClientMultipartUploadTest.php b/sdk/vendor/aliyuncs/oss-sdk-php/tests/OSS/Tests/OssClientMultipartUploadTest.php index b7d0e26..8f40654 100644 --- a/sdk/vendor/aliyuncs/oss-sdk-php/tests/OSS/Tests/OssClientMultipartUploadTest.php +++ b/sdk/vendor/aliyuncs/oss-sdk-php/tests/OSS/Tests/OssClientMultipartUploadTest.php @@ -330,6 +330,7 @@ class OssClientMultipartUploadTest extends TestOssClientBase try { $this->ossClient->multiuploadFile($this->bucket, $object, $file, $options); + $this->assertFalse(false); } catch (OssException $e) { $this->assertFalse(true); } @@ -343,6 +344,7 @@ class OssClientMultipartUploadTest extends TestOssClientBase try { $this->ossClient->multiuploadFile($this->bucket, $object, $file, $options); + $this->assertFalse(false); } catch (OssException $e) { $this->assertFalse(true); } @@ -385,6 +387,7 @@ class OssClientMultipartUploadTest extends TestOssClientBase try { $this->ossClient->multiuploadFile($this->bucket, $object, $file); + $this->assertTrue(false); } catch (OssException $e) { $this->assertTrue(true); if (strpos($e, "parameter invalid, file is empty") == false) diff --git a/sdk/vendor/aliyuncs/oss-sdk-php/tests/OSS/Tests/OssClientObjectRequestPaymentTest.php b/sdk/vendor/aliyuncs/oss-sdk-php/tests/OSS/Tests/OssClientObjectRequestPaymentTest.php index d9b8d06..41e18cf 100644 --- a/sdk/vendor/aliyuncs/oss-sdk-php/tests/OSS/Tests/OssClientObjectRequestPaymentTest.php +++ b/sdk/vendor/aliyuncs/oss-sdk-php/tests/OSS/Tests/OssClientObjectRequestPaymentTest.php @@ -426,6 +426,7 @@ class OssClientObjectRequestPaymentTest extends TestOssClientBase $object = 'mpu/multipart-bigfile-test.tmp'; try { $this->ossClient->multiuploadFile($this->bucket, $object, $bigFileName, $options); + $this->assertTrue(true); } catch (OssException $e) { $this->assertFalse(true); } @@ -446,7 +447,7 @@ class OssClientObjectRequestPaymentTest extends TestOssClientBase unlink($bigFileName); } - public function setUp() + protected function setUp(): void { parent::setUp(); $this->payerClient = new OssClient( @@ -464,7 +465,7 @@ class OssClientObjectRequestPaymentTest extends TestOssClientBase $this->ossClient->putSymlink($this->bucket, "default-symlink", "default-object"); } - public function tearDown() + protected function tearDown(): void { parent::tearDown(); } diff --git a/sdk/vendor/aliyuncs/oss-sdk-php/tests/OSS/Tests/OssClientObjectTest.php b/sdk/vendor/aliyuncs/oss-sdk-php/tests/OSS/Tests/OssClientObjectTest.php index 2d38805..228a394 100644 --- a/sdk/vendor/aliyuncs/oss-sdk-php/tests/OSS/Tests/OssClientObjectTest.php +++ b/sdk/vendor/aliyuncs/oss-sdk-php/tests/OSS/Tests/OssClientObjectTest.php @@ -622,49 +622,158 @@ class OssClientObjectTest extends TestOssClientBase public function testUploadStream() { - $object = "oss-php-sdk-test/put-from-stream.txt"; - $options = array(OssClient::OSS_CHECK_MD5 => true); + $object = "oss-php-sdk-test/put-from-stream.txt"; + $options = array(OssClient::OSS_CHECK_MD5 => true); $handle = fopen(__FILE__, 'rb'); - /** - * Upload data to start MD5 - */ - try { - $this->ossClient->uploadStream($this->bucket, $object, $handle, $options); - } catch (OssException $e) { - $this->assertFalse(true); - } - - /** - * Check if the replication is the same - */ - try { - $content = $this->ossClient->getObject($this->bucket, $object); - $this->assertEquals($content, file_get_contents(__FILE__)); - } catch (OssException $e) { - $this->assertFalse(true); - } + /** + * Upload data to start MD5 + */ + try { + $this->ossClient->uploadStream($this->bucket, $object, $handle, $options); + } catch (OssException $e) { + $this->assertFalse(true); + } - $object = "oss-php-sdk-test/put-from-stream-without-md5.txt"; + /** + * Check if the replication is the same + */ + try { + $content = $this->ossClient->getObject($this->bucket, $object); + $this->assertEquals($content, file_get_contents(__FILE__)); + } catch (OssException $e) { + $this->assertFalse(true); + } + + $object = "oss-php-sdk-test/put-from-stream-without-md5.txt"; $handle = fopen(__FILE__, 'rb'); - try { - $this->ossClient->uploadStream($this->bucket, $object, $handle); - } catch (OssException $e) { - $this->assertFalse(true); - } - - /** - * Check if the replication is the same - */ - try { - $content = $this->ossClient->getObject($this->bucket, $object); - $this->assertEquals($content, file_get_contents(__FILE__)); - } catch (OssException $e) { - $this->assertFalse(true); - } + try { + $this->ossClient->uploadStream($this->bucket, $object, $handle); + } catch (OssException $e) { + $this->assertFalse(true); + } + + /** + * Check if the replication is the same + */ + try { + $content = $this->ossClient->getObject($this->bucket, $object); + $this->assertEquals($content, file_get_contents(__FILE__)); + } catch (OssException $e) { + $this->assertFalse(true); + } } - - public function setUp() + + public function testObjectKeyWithQuestionMark() + { + /** + * Upload the local variable to bucket + */ + $object = "oss-php-sdk-test/??/upload-test-object-name???123??123??.txt"; + $content = file_get_contents(__FILE__); + $options = array( + OssClient::OSS_LENGTH => strlen($content), + OssClient::OSS_HEADERS => array( + 'Expires' => 'Fri, 28 Feb 2020 05:38:42 GMT', + 'Cache-Control' => 'no-cache', + 'Content-Disposition' => 'attachment;filename=oss_download.log', + 'Content-Language' => 'zh-CN', + 'x-oss-server-side-encryption' => 'AES256', + 'x-oss-meta-self-define-title' => 'user define meta info', + ), + ); + + try { + $this->ossClient->putObject($this->bucket, $object, $content, $options); + } catch (OssException $e) { + $this->assertFalse(true); + } + + try { + $this->ossClient->putObject($this->bucket, $object, $content, $options); + } catch (OssException $e) { + $this->assertFalse(true); + } + + /** + * GetObject to the local variable and check for match + */ + try { + $content = $this->ossClient->getObject($this->bucket, $object); + $this->assertEquals($content, file_get_contents(__FILE__)); + } catch (OssException $e) { + $this->assertFalse(true); + } + + /** + * GetObject first five bytes + */ + try { + $options = array(OssClient::OSS_RANGE => '0-4'); + $content = $this->ossClient->getObject($this->bucket, $object, $options); + $this->assertEquals($content, 'assertFalse(true); + } + + + /** + * Upload the local file to object + */ + try { + $this->ossClient->uploadFile($this->bucket, $object, __FILE__); + } catch (OssException $e) { + $this->assertFalse(true); + } + + /** + * Download the file to the local variable and check for match. + */ + try { + $content = $this->ossClient->getObject($this->bucket, $object); + $this->assertEquals($content, file_get_contents(__FILE__)); + } catch (OssException $e) { + $this->assertFalse(true); + } + + /** + * Copy object + */ + $to_bucket = $this->bucket; + $to_object = $object . '.copy'; + $options = array(); + try { + $result = $this->ossClient->copyObject($this->bucket, $object, $to_bucket, $to_object, $options); + $this->assertFalse(empty($result)); + $this->assertEquals(strlen("2016-11-21T03:46:58.000Z"), strlen($result[0])); + $this->assertEquals(strlen("\"5B3C1A2E053D763E1B002CC607C5A0FE\""), strlen($result[1])); + } catch (OssException $e) { + $this->assertFalse(true); + var_dump($e->getMessage()); + + } + + /** + * Check if the replication is the same + */ + try { + $content = $this->ossClient->getObject($this->bucket, $to_object); + $this->assertEquals($content, file_get_contents(__FILE__)); + } catch (OssException $e) { + $this->assertFalse(true); + } + + + try { + $this->assertTrue($this->ossClient->doesObjectExist($this->bucket, $object)); + $this->ossClient->deleteObject($this->bucket, $object); + $this->assertFalse($this->ossClient->doesObjectExist($this->bucket, $object)); + } catch (OssException $e) { + $this->assertFalse(true); + } + } + + protected function setUp(): void { parent::setUp(); $this->ossClient->putObject($this->bucket, 'oss-php-sdk-test/upload-test-object-name.txt', file_get_contents(__FILE__)); diff --git a/sdk/vendor/aliyuncs/oss-sdk-php/tests/OSS/Tests/OssClientObjectVersioningTest.php b/sdk/vendor/aliyuncs/oss-sdk-php/tests/OSS/Tests/OssClientObjectVersioningTest.php index f13ca01..66f204a 100644 --- a/sdk/vendor/aliyuncs/oss-sdk-php/tests/OSS/Tests/OssClientObjectVersioningTest.php +++ b/sdk/vendor/aliyuncs/oss-sdk-php/tests/OSS/Tests/OssClientObjectVersioningTest.php @@ -569,7 +569,7 @@ class OssClientObjectVersioningTest extends TestOssClientBase $this->assertEquals(0, count($deleteMarkerList)); } - public function setUp() + protected function setUp(): void { parent::setUp(); @@ -577,7 +577,7 @@ class OssClientObjectVersioningTest extends TestOssClientBase } - public function tearDown() + protected function tearDown(): void { if (!$this->ossClient->doesBucketExist($this->bucket)) { return; diff --git a/sdk/vendor/aliyuncs/oss-sdk-php/tests/OSS/Tests/OssClientRestoreObjectTest.php b/sdk/vendor/aliyuncs/oss-sdk-php/tests/OSS/Tests/OssClientRestoreObjectTest.php index 6840813..9aa0b9b 100644 --- a/sdk/vendor/aliyuncs/oss-sdk-php/tests/OSS/Tests/OssClientRestoreObjectTest.php +++ b/sdk/vendor/aliyuncs/oss-sdk-php/tests/OSS/Tests/OssClientRestoreObjectTest.php @@ -141,7 +141,7 @@ class OssClientRestoreObjectTest extends TestOssClientBase } - public function setUp() + protected function setUp(): void { parent::setUp(); @@ -160,7 +160,7 @@ class OssClientRestoreObjectTest extends TestOssClientBase $this->ossClient->createBucket($this->archiveBucket, OssClient::OSS_ACL_TYPE_PRIVATE, $options); } - public function tearDown() + protected function tearDown(): void { parent::tearDown(); diff --git a/sdk/vendor/aliyuncs/oss-sdk-php/tests/OSS/Tests/OssClientSignatureTest.php b/sdk/vendor/aliyuncs/oss-sdk-php/tests/OSS/Tests/OssClientSignatureTest.php index 7c64d86..f5beb48 100644 --- a/sdk/vendor/aliyuncs/oss-sdk-php/tests/OSS/Tests/OssClientSignatureTest.php +++ b/sdk/vendor/aliyuncs/oss-sdk-php/tests/OSS/Tests/OssClientSignatureTest.php @@ -131,13 +131,13 @@ class OssClientSignatureTest extends TestOssClientBase $this->assertTrue(strpos($signedUrl1, 'Expires='.$expiration) !== false); } - public function tearDown() + protected function tearDown(): void { $this->ossClient->deleteObject($this->bucket, "a.file"); parent::tearDown(); } - public function setUp() + protected function setUp(): void { parent::setUp(); /** diff --git a/sdk/vendor/aliyuncs/oss-sdk-php/tests/OSS/Tests/OssClientTest.php b/sdk/vendor/aliyuncs/oss-sdk-php/tests/OSS/Tests/OssClientTest.php index 8d6afb2..247251a 100644 --- a/sdk/vendor/aliyuncs/oss-sdk-php/tests/OSS/Tests/OssClientTest.php +++ b/sdk/vendor/aliyuncs/oss-sdk-php/tests/OSS/Tests/OssClientTest.php @@ -111,7 +111,7 @@ class OssClientTest extends TestOssClientBase $ossClient->listBuckets(); $this->assertFalse(true); } catch (OssException $e) { - + $this->assertFalse(false); } } @@ -123,6 +123,7 @@ class OssClientTest extends TestOssClientBase $endpoint = ' ' . getenv('OSS_ENDPOINT') . '/ '; $ossClient = new OssClient($accessKeyId, $accessKeySecret, $endpoint, false); $ossClient->listBuckets(); + $this->assertTrue(true); } catch (OssException $e) { $this->assertFalse(true); } @@ -196,6 +197,7 @@ class OssClientTest extends TestOssClientBase try { $object='test-dir'; $ossClient->createObjectDir($bucket,$object); + $this->assertTrue(true); } catch (OssException $e) { $this->assertFalse(true); } @@ -204,6 +206,7 @@ class OssClientTest extends TestOssClientBase $object='0'; $ossClient->createObjectDir($bucket,$object); $ossClient->putObject($bucket,$object, ''); + $this->assertTrue(true); } catch (OssException $e) { var_dump($e); $this->assertFalse(true); @@ -219,6 +222,7 @@ class OssClientTest extends TestOssClientBase $bucket = getenv('OSS_BUCKET'); $ossClient = new OssClient($accessKeyId, $accessKeySecret, $endpoint, false); $ossClient->getBucketCors($bucket); + $this->assertTrue(true); } catch (OssException $e) { $this->assertFalse(true); } @@ -233,6 +237,7 @@ class OssClientTest extends TestOssClientBase $bucket = $this->bucket; $ossClient = new OssClient($accessKeyId, $accessKeySecret, $endpoint, false); $ossClient->getBucketCname($bucket); + $this->assertTrue(true); } catch (OssException $e) { $this->assertFalse(true); } diff --git a/sdk/vendor/aliyuncs/oss-sdk-php/tests/OSS/Tests/OssExceptionTest.php b/sdk/vendor/aliyuncs/oss-sdk-php/tests/OSS/Tests/OssExceptionTest.php index 4a418d5..91de9bb 100644 --- a/sdk/vendor/aliyuncs/oss-sdk-php/tests/OSS/Tests/OssExceptionTest.php +++ b/sdk/vendor/aliyuncs/oss-sdk-php/tests/OSS/Tests/OssExceptionTest.php @@ -4,7 +4,7 @@ namespace OSS\Tests; use OSS\Core\OssException; -class OssExceptionTest extends \PHPUnit_Framework_TestCase +class OssExceptionTest extends \PHPUnit\Framework\TestCase { public function testOSS_exception() { diff --git a/sdk/vendor/aliyuncs/oss-sdk-php/tests/OSS/Tests/OssUtilTest.php b/sdk/vendor/aliyuncs/oss-sdk-php/tests/OSS/Tests/OssUtilTest.php index ba2f1a0..85ee07b 100644 --- a/sdk/vendor/aliyuncs/oss-sdk-php/tests/OSS/Tests/OssUtilTest.php +++ b/sdk/vendor/aliyuncs/oss-sdk-php/tests/OSS/Tests/OssUtilTest.php @@ -7,7 +7,7 @@ use OSS\Core\OssException; use OSS\Core\OssUtil; use OSS\OssClient; -class OssUtilTest extends \PHPUnit_Framework_TestCase +class OssUtilTest extends \PHPUnit\Framework\TestCase { public function testIsChinese() { @@ -147,10 +147,10 @@ BBBB; $this->assertNotNull($list); } - public function testIsWin() - { - //$this->assertTrue(OssUtil::isWin()); - } + //public function testIsWin() + //{ + // //$this->assertTrue(OssUtil::isWin()); + //} public function testGetMd5SumForFile() { diff --git a/sdk/vendor/aliyuncs/oss-sdk-php/tests/OSS/Tests/PutSetDeleteResultTest.php b/sdk/vendor/aliyuncs/oss-sdk-php/tests/OSS/Tests/PutSetDeleteResultTest.php index b298e44..202f173 100644 --- a/sdk/vendor/aliyuncs/oss-sdk-php/tests/OSS/Tests/PutSetDeleteResultTest.php +++ b/sdk/vendor/aliyuncs/oss-sdk-php/tests/OSS/Tests/PutSetDeleteResultTest.php @@ -6,7 +6,7 @@ use OSS\Core\OssException; use OSS\Http\ResponseCore; use OSS\Result\PutSetDeleteResult; -class ResultTest extends \PHPUnit_Framework_TestCase +class ResultTest extends \PHPUnit\Framework\TestCase { public function testNullResponse() @@ -50,16 +50,16 @@ class ResultTest extends \PHPUnit_Framework_TestCase new PutSetDeleteResult($response); $this->assertFalse(true); } catch (OssException $e) { - + $this->assertFalse(false); } } - public function setUp() + protected function setUp(): void { } - public function tearDown() + protected function tearDown(): void { } diff --git a/sdk/vendor/aliyuncs/oss-sdk-php/tests/OSS/Tests/RefererConfigTest.php b/sdk/vendor/aliyuncs/oss-sdk-php/tests/OSS/Tests/RefererConfigTest.php index 8360a24..5112da8 100644 --- a/sdk/vendor/aliyuncs/oss-sdk-php/tests/OSS/Tests/RefererConfigTest.php +++ b/sdk/vendor/aliyuncs/oss-sdk-php/tests/OSS/Tests/RefererConfigTest.php @@ -5,7 +5,7 @@ namespace OSS\Tests; use OSS\Model\RefererConfig; -class RefererConfigTest extends \PHPUnit_Framework_TestCase +class RefererConfigTest extends \PHPUnit\Framework\TestCase { private $validXml = << diff --git a/sdk/vendor/aliyuncs/oss-sdk-php/tests/OSS/Tests/StorageCapacityTest.php b/sdk/vendor/aliyuncs/oss-sdk-php/tests/OSS/Tests/StorageCapacityTest.php index 4562da7..8d2a9df 100644 --- a/sdk/vendor/aliyuncs/oss-sdk-php/tests/OSS/Tests/StorageCapacityTest.php +++ b/sdk/vendor/aliyuncs/oss-sdk-php/tests/OSS/Tests/StorageCapacityTest.php @@ -6,7 +6,7 @@ use OSS\Model\StorageCapacityConfig; use OSS\Result\GetStorageCapacityResult; use OSS\Core\OssException; -class StorageCapacityTest extends \PHPUnit_Framework_TestCase +class StorageCapacityTest extends \PHPUnit\Framework\TestCase { private $inValidXml = <<assertTrue(false); - } catch (OssException $e) {} + } catch (OssException $e) { + $this->assertTrue(true); + } } public function testParseEmptyXml() @@ -38,7 +40,9 @@ BBBB; try { new GetStorageCapacityResult($response); $this->assertTrue(false); - } catch (OssException $e) {} + } catch (OssException $e) { + $this->assertTrue(true); + } } public function testParseValidXml() diff --git a/sdk/vendor/aliyuncs/oss-sdk-php/tests/OSS/Tests/TestOssClientBase.php b/sdk/vendor/aliyuncs/oss-sdk-php/tests/OSS/Tests/TestOssClientBase.php index 233568a..b204871 100644 --- a/sdk/vendor/aliyuncs/oss-sdk-php/tests/OSS/Tests/TestOssClientBase.php +++ b/sdk/vendor/aliyuncs/oss-sdk-php/tests/OSS/Tests/TestOssClientBase.php @@ -6,7 +6,7 @@ use OSS\OssClient; require_once __DIR__ . DIRECTORY_SEPARATOR . 'Common.php'; -class TestOssClientBase extends \PHPUnit_Framework_TestCase +class TestOssClientBase extends \PHPUnit\Framework\TestCase { /** * @var OssClient @@ -18,7 +18,7 @@ class TestOssClientBase extends \PHPUnit_Framework_TestCase */ protected $bucket; - public function setUp() + protected function setUp(): void { $this->bucket = Common::getBucketName() .'-'. time(); $this->ossClient = Common::getOssClient(); @@ -26,7 +26,7 @@ class TestOssClientBase extends \PHPUnit_Framework_TestCase Common::waitMetaSync(); } - public function tearDown() + protected function tearDown(): void { if (!$this->ossClient->doesBucketExist($this->bucket)) { return; diff --git a/sdk/vendor/aliyuncs/oss-sdk-php/tests/OSS/Tests/UploadPartResultTest.php b/sdk/vendor/aliyuncs/oss-sdk-php/tests/OSS/Tests/UploadPartResultTest.php index e4789ef..df4ad94 100644 --- a/sdk/vendor/aliyuncs/oss-sdk-php/tests/OSS/Tests/UploadPartResultTest.php +++ b/sdk/vendor/aliyuncs/oss-sdk-php/tests/OSS/Tests/UploadPartResultTest.php @@ -7,7 +7,7 @@ use OSS\Core\OssException; use OSS\Result\UploadPartResult; use OSS\Http\ResponseCore; -class UploadPartResultTest extends \PHPUnit_Framework_TestCase +class UploadPartResultTest extends \PHPUnit\Framework\TestCase { private $validHeader = array('etag' => '7265F4D211B56873A381D321F586E4A9'); private $invalidHeader = array(); diff --git a/sdk/vendor/aliyuncs/oss-sdk-php/tests/OSS/Tests/WebsiteConfigTest.php b/sdk/vendor/aliyuncs/oss-sdk-php/tests/OSS/Tests/WebsiteConfigTest.php index 2ec0fcb..d04b42c 100644 --- a/sdk/vendor/aliyuncs/oss-sdk-php/tests/OSS/Tests/WebsiteConfigTest.php +++ b/sdk/vendor/aliyuncs/oss-sdk-php/tests/OSS/Tests/WebsiteConfigTest.php @@ -5,7 +5,7 @@ namespace OSS\Tests; use OSS\Model\WebsiteConfig; -class WebsiteConfigTest extends \PHPUnit_Framework_TestCase +class WebsiteConfigTest extends \PHPUnit\Framework\TestCase { private $validXml = << diff --git a/sdk/vendor/composer/ClassLoader.php b/sdk/vendor/composer/ClassLoader.php index 1a58957..247294d 100644 --- a/sdk/vendor/composer/ClassLoader.php +++ b/sdk/vendor/composer/ClassLoader.php @@ -42,6 +42,8 @@ namespace Composer\Autoload; */ class ClassLoader { + private $vendorDir; + // PSR-4 private $prefixLengthsPsr4 = array(); private $prefixDirsPsr4 = array(); @@ -57,6 +59,13 @@ class ClassLoader private $missingClasses = array(); private $apcuPrefix; + private static $registeredLoaders = array(); + + public function __construct($vendorDir = null) + { + $this->vendorDir = $vendorDir; + } + public function getPrefixes() { if (!empty($this->prefixesPsr0)) { @@ -300,6 +309,17 @@ class ClassLoader public function register($prepend = false) { spl_autoload_register(array($this, 'loadClass'), true, $prepend); + + if (null === $this->vendorDir) { + return; + } + + if ($prepend) { + self::$registeredLoaders = array($this->vendorDir => $this) + self::$registeredLoaders; + } else { + unset(self::$registeredLoaders[$this->vendorDir]); + self::$registeredLoaders[$this->vendorDir] = $this; + } } /** @@ -308,6 +328,10 @@ class ClassLoader public function unregister() { spl_autoload_unregister(array($this, 'loadClass')); + + if (null !== $this->vendorDir) { + unset(self::$registeredLoaders[$this->vendorDir]); + } } /** @@ -367,6 +391,16 @@ class ClassLoader return $file; } + /** + * Returns the currently registered loaders indexed by their corresponding vendor directories. + * + * @return self[] + */ + public static function getRegisteredLoaders() + { + return self::$registeredLoaders; + } + private function findFileWithExtension($class, $ext) { // PSR-4 lookup diff --git a/sdk/vendor/composer/InstalledVersions.php b/sdk/vendor/composer/InstalledVersions.php index 8dbb372..698c236 100644 --- a/sdk/vendor/composer/InstalledVersions.php +++ b/sdk/vendor/composer/InstalledVersions.php @@ -1,7 +1,18 @@ array ( ), - 'reference' => 'e91742b194ff46741075d52a4ea0fc1148659407', + 'reference' => '0504b56a0d240e8ffa6c342073277a83898c68fd', 'name' => '__root__', ), 'versions' => @@ -31,19 +44,21 @@ private static $installed = array ( 'aliases' => array ( ), - 'reference' => 'e91742b194ff46741075d52a4ea0fc1148659407', + 'reference' => '0504b56a0d240e8ffa6c342073277a83898c68fd', ), 'aliyuncs/oss-sdk-php' => array ( - 'pretty_version' => 'v2.4.1', - 'version' => '2.4.1.0', + 'pretty_version' => 'v2.4.2', + 'version' => '2.4.2.0', 'aliases' => array ( ), - 'reference' => '492866331b7bafaac09506cf42f351b7e9e63766', + 'reference' => '0c9d902c33847c07efc66c4cdf823deaea8fc2b6', ), ), ); +private static $canGetVendors; +private static $installedByVendor = array(); @@ -53,7 +68,16 @@ private static $installed = array ( public static function getInstalledPackages() { -return array_keys(self::$installed['versions']); +$packages = array(); +foreach (self::getInstalled() as $installed) { +$packages[] = array_keys($installed['versions']); +} + +if (1 === \count($packages)) { +return $packages[0]; +} + +return array_keys(array_flip(\call_user_func_array('array_merge', $packages))); } @@ -66,7 +90,13 @@ return array_keys(self::$installed['versions']); public static function isInstalled($packageName) { -return isset(self::$installed['versions'][$packageName]); +foreach (self::getInstalled() as $installed) { +if (isset($installed['versions'][$packageName])) { +return true; +} +} + +return false; } @@ -101,42 +131,50 @@ return $provided->matches($constraint); public static function getVersionRanges($packageName) { -if (!isset(self::$installed['versions'][$packageName])) { -throw new \OutOfBoundsException('Package "' . $packageName . '" is not installed'); +foreach (self::getInstalled() as $installed) { +if (!isset($installed['versions'][$packageName])) { +continue; } $ranges = array(); -if (isset(self::$installed['versions'][$packageName]['pretty_version'])) { -$ranges[] = self::$installed['versions'][$packageName]['pretty_version']; +if (isset($installed['versions'][$packageName]['pretty_version'])) { +$ranges[] = $installed['versions'][$packageName]['pretty_version']; } -if (array_key_exists('aliases', self::$installed['versions'][$packageName])) { -$ranges = array_merge($ranges, self::$installed['versions'][$packageName]['aliases']); +if (array_key_exists('aliases', $installed['versions'][$packageName])) { +$ranges = array_merge($ranges, $installed['versions'][$packageName]['aliases']); } -if (array_key_exists('replaced', self::$installed['versions'][$packageName])) { -$ranges = array_merge($ranges, self::$installed['versions'][$packageName]['replaced']); +if (array_key_exists('replaced', $installed['versions'][$packageName])) { +$ranges = array_merge($ranges, $installed['versions'][$packageName]['replaced']); } -if (array_key_exists('provided', self::$installed['versions'][$packageName])) { -$ranges = array_merge($ranges, self::$installed['versions'][$packageName]['provided']); +if (array_key_exists('provided', $installed['versions'][$packageName])) { +$ranges = array_merge($ranges, $installed['versions'][$packageName]['provided']); } return implode(' || ', $ranges); } +throw new \OutOfBoundsException('Package "' . $packageName . '" is not installed'); +} + public static function getVersion($packageName) { -if (!isset(self::$installed['versions'][$packageName])) { -throw new \OutOfBoundsException('Package "' . $packageName . '" is not installed'); +foreach (self::getInstalled() as $installed) { +if (!isset($installed['versions'][$packageName])) { +continue; } -if (!isset(self::$installed['versions'][$packageName]['version'])) { +if (!isset($installed['versions'][$packageName]['version'])) { return null; } -return self::$installed['versions'][$packageName]['version']; +return $installed['versions'][$packageName]['version']; +} + +throw new \OutOfBoundsException('Package "' . $packageName . '" is not installed'); } @@ -145,15 +183,19 @@ return self::$installed['versions'][$packageName]['version']; public static function getPrettyVersion($packageName) { -if (!isset(self::$installed['versions'][$packageName])) { -throw new \OutOfBoundsException('Package "' . $packageName . '" is not installed'); +foreach (self::getInstalled() as $installed) { +if (!isset($installed['versions'][$packageName])) { +continue; } -if (!isset(self::$installed['versions'][$packageName]['pretty_version'])) { +if (!isset($installed['versions'][$packageName]['pretty_version'])) { return null; } -return self::$installed['versions'][$packageName]['pretty_version']; +return $installed['versions'][$packageName]['pretty_version']; +} + +throw new \OutOfBoundsException('Package "' . $packageName . '" is not installed'); } @@ -162,15 +204,19 @@ return self::$installed['versions'][$packageName]['pretty_version']; public static function getReference($packageName) { -if (!isset(self::$installed['versions'][$packageName])) { -throw new \OutOfBoundsException('Package "' . $packageName . '" is not installed'); +foreach (self::getInstalled() as $installed) { +if (!isset($installed['versions'][$packageName])) { +continue; } -if (!isset(self::$installed['versions'][$packageName]['reference'])) { +if (!isset($installed['versions'][$packageName]['reference'])) { return null; } -return self::$installed['versions'][$packageName]['reference']; +return $installed['versions'][$packageName]['reference']; +} + +throw new \OutOfBoundsException('Package "' . $packageName . '" is not installed'); } @@ -179,7 +225,9 @@ return self::$installed['versions'][$packageName]['reference']; public static function getRootPackage() { -return self::$installed['root']; +$installed = self::getInstalled(); + +return $installed[0]['root']; } @@ -214,5 +262,33 @@ return self::$installed; public static function reload($data) { self::$installed = $data; +self::$installedByVendor = array(); +} + + + + + +private static function getInstalled() +{ +if (null === self::$canGetVendors) { +self::$canGetVendors = method_exists('Composer\Autoload\ClassLoader', 'getRegisteredLoaders'); +} + +$installed = array(); + +if (self::$canGetVendors) { +foreach (ClassLoader::getRegisteredLoaders() as $vendorDir => $loader) { +if (isset(self::$installedByVendor[$vendorDir])) { +$installed[] = self::$installedByVendor[$vendorDir]; +} elseif (is_file($vendorDir.'/composer/installed.php')) { +$installed[] = self::$installedByVendor[$vendorDir] = require $vendorDir.'/composer/installed.php'; +} +} +} + +$installed[] = self::$installed; + +return $installed; } } diff --git a/sdk/vendor/composer/autoload_real.php b/sdk/vendor/composer/autoload_real.php index 75d6e95..b3c4f6c 100644 --- a/sdk/vendor/composer/autoload_real.php +++ b/sdk/vendor/composer/autoload_real.php @@ -25,7 +25,7 @@ class ComposerAutoloaderInitc01f83c61c7df694fdf929c88fea6382 require __DIR__ . '/platform_check.php'; spl_autoload_register(array('ComposerAutoloaderInitc01f83c61c7df694fdf929c88fea6382', 'loadClassLoader'), true, true); - self::$loader = $loader = new \Composer\Autoload\ClassLoader(); + self::$loader = $loader = new \Composer\Autoload\ClassLoader(\dirname(\dirname(__FILE__))); spl_autoload_unregister(array('ComposerAutoloaderInitc01f83c61c7df694fdf929c88fea6382', 'loadClassLoader')); $useStaticLoader = PHP_VERSION_ID >= 50600 && !defined('HHVM_VERSION') && (!function_exists('zend_loader_file_encoded') || !zend_loader_file_encoded()); diff --git a/sdk/vendor/composer/installed.json b/sdk/vendor/composer/installed.json index 466e35d..5857a23 100644 --- a/sdk/vendor/composer/installed.json +++ b/sdk/vendor/composer/installed.json @@ -2,17 +2,17 @@ "packages": [ { "name": "aliyuncs/oss-sdk-php", - "version": "v2.4.1", - "version_normalized": "2.4.1.0", + "version": "v2.4.2", + "version_normalized": "2.4.2.0", "source": { "type": "git", "url": "https://github.com/aliyun/aliyun-oss-php-sdk.git", - "reference": "492866331b7bafaac09506cf42f351b7e9e63766" + "reference": "0c9d902c33847c07efc66c4cdf823deaea8fc2b6" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/aliyun/aliyun-oss-php-sdk/zipball/492866331b7bafaac09506cf42f351b7e9e63766", - "reference": "492866331b7bafaac09506cf42f351b7e9e63766", + "url": "https://api.github.com/repos/aliyun/aliyun-oss-php-sdk/zipball/0c9d902c33847c07efc66c4cdf823deaea8fc2b6", + "reference": "0c9d902c33847c07efc66c4cdf823deaea8fc2b6", "shasum": "", "mirrors": [ { @@ -25,10 +25,10 @@ "php": ">=5.3" }, "require-dev": { - "phpunit/phpunit": "~4.0", - "satooshi/php-coveralls": "~1.0" + "phpunit/phpunit": "*", + "satooshi/php-coveralls": "*" }, - "time": "2020-09-29T06:23:57+00:00", + "time": "2021-06-04T06:55:06+00:00", "type": "library", "installation-source": "dist", "autoload": { @@ -50,7 +50,7 @@ "homepage": "http://www.aliyun.com/product/oss/", "support": { "issues": "https://github.com/aliyun/aliyun-oss-php-sdk/issues", - "source": "https://github.com/aliyun/aliyun-oss-php-sdk/tree/v2.4.1" + "source": "https://github.com/aliyun/aliyun-oss-php-sdk/tree/v2.4.2" }, "install-path": "../aliyuncs/oss-sdk-php" } diff --git a/sdk/vendor/composer/installed.php b/sdk/vendor/composer/installed.php index 674488a..a29da12 100644 --- a/sdk/vendor/composer/installed.php +++ b/sdk/vendor/composer/installed.php @@ -6,7 +6,7 @@ 'aliases' => array ( ), - 'reference' => 'e91742b194ff46741075d52a4ea0fc1148659407', + 'reference' => '0504b56a0d240e8ffa6c342073277a83898c68fd', 'name' => '__root__', ), 'versions' => @@ -18,16 +18,16 @@ 'aliases' => array ( ), - 'reference' => 'e91742b194ff46741075d52a4ea0fc1148659407', + 'reference' => '0504b56a0d240e8ffa6c342073277a83898c68fd', ), 'aliyuncs/oss-sdk-php' => array ( - 'pretty_version' => 'v2.4.1', - 'version' => '2.4.1.0', + 'pretty_version' => 'v2.4.2', + 'version' => '2.4.2.0', 'aliases' => array ( ), - 'reference' => '492866331b7bafaac09506cf42f351b7e9e63766', + 'reference' => '0c9d902c33847c07efc66c4cdf823deaea8fc2b6', ), ), );