From 3f3d124873c783c1b96cd75f0b59913841cbdd03 Mon Sep 17 00:00:00 2001 From: MooN Date: Thu, 25 Jun 2020 15:13:15 +0800 Subject: [PATCH] replace alioss sdk 2.3.0 with version 2.3.1 --- Plugin.php | 4 +- aliyun-oss-php-sdk-2.3.0/CHANGELOG.md | 92 --- aliyun-oss-php-sdk-2.3.0/samples/Config.php | 15 - aliyun-oss-php-sdk-2.3.0/test.php | 9 - aliyun-oss-php-sdk-2.3.1/.coveralls.yml | 2 + aliyun-oss-php-sdk-2.3.1/.gitignore | 8 + aliyun-oss-php-sdk-2.3.1/.travis.yml | 21 + aliyun-oss-php-sdk-2.3.1/CHANGELOG.md | 97 +++ .../LICENSE.md | 0 .../README-CN.md | 0 .../README.md | 0 .../autoload.php | 1 - .../build-phar.sh | 0 .../composer.json | 0 .../example.jpg | Bin .../index.php | 0 .../phpunit.xml | 0 .../samples/Bucket.php | 55 +- .../samples/BucketCors.php | 28 +- .../samples/BucketLifecycle.php | 28 +- .../samples/BucketLogging.php | 30 +- .../samples/BucketReferer.php | 30 +- .../samples/BucketWebsite.php | 26 +- .../samples/Callback.php | 24 +- .../samples/Common.php | 10 +- aliyun-oss-php-sdk-2.3.1/samples/Config.php | 15 + .../samples/Image.php | 22 +- .../samples/LiveChannel.php | 40 +- .../samples/MultipartUpload.php | 38 +- .../samples/Object.php | 137 ++-- .../samples/RunAll.php | 2 +- .../samples/Signature.php | 31 +- .../src/OSS/Core/MimeTypes.php | 7 +- .../src/OSS/Core/OssException.php | 4 +- .../src/OSS/Core/OssUtil.php | 108 ++- .../src/OSS/Http/LICENSE | 0 .../src/OSS/Http/RequestCore.php | 35 +- .../src/OSS/Http/RequestCore_Exception.php | 0 .../src/OSS/Http/ResponseCore.php | 10 +- .../src/OSS/Model/BucketInfo.php | 14 +- .../src/OSS/Model/BucketListInfo.php | 6 +- .../src/OSS/Model/CnameConfig.php | 0 .../src/OSS/Model/CorsConfig.php | 10 +- .../src/OSS/Model/CorsRule.php | 18 +- .../src/OSS/Model/GetLiveChannelHistory.php | 0 .../src/OSS/Model/GetLiveChannelInfo.php | 0 .../src/OSS/Model/GetLiveChannelStatus.php | 0 .../src/OSS/Model/LifecycleAction.php | 2 +- .../src/OSS/Model/LifecycleConfig.php | 10 +- .../src/OSS/Model/LifecycleRule.php | 20 +- .../src/OSS/Model/ListMultipartUploadInfo.php | 0 .../src/OSS/Model/ListPartsInfo.php | 0 .../src/OSS/Model/LiveChannelConfig.php | 0 .../src/OSS/Model/LiveChannelHistory.php | 0 .../src/OSS/Model/LiveChannelInfo.php | 0 .../src/OSS/Model/LiveChannelListInfo.php | 2 +- .../src/OSS/Model/LoggingConfig.php | 2 +- .../src/OSS/Model/ObjectInfo.php | 8 +- .../src/OSS/Model/ObjectListInfo.php | 6 +- .../src/OSS/Model/PartInfo.php | 0 .../src/OSS/Model/PrefixInfo.php | 8 +- .../src/OSS/Model/RefererConfig.php | 2 +- .../src/OSS/Model/StorageCapacityConfig.php | 2 +- .../src/OSS/Model/UploadInfo.php | 2 +- .../src/OSS/Model/WebsiteConfig.php | 2 +- .../src/OSS/Model/XmlConfig.php | 4 +- .../src/OSS/OssClient.php | 669 +++++++++--------- .../src/OSS/Result/AclResult.php | 3 +- .../src/OSS/Result/AppendResult.php | 2 +- .../src/OSS/Result/BodyResult.php | 0 .../src/OSS/Result/CallbackResult.php | 0 .../src/OSS/Result/CopyObjectResult.php | 0 .../src/OSS/Result/DeleteObjectsResult.php | 0 .../src/OSS/Result/ExistResult.php | 7 +- .../src/OSS/Result/GetCnameResult.php | 0 .../src/OSS/Result/GetCorsResult.php | 3 +- .../src/OSS/Result/GetLifecycleResult.php | 8 +- .../Result/GetLiveChannelHistoryResult.php | 0 .../OSS/Result/GetLiveChannelInfoResult.php | 0 .../OSS/Result/GetLiveChannelStatusResult.php | 0 .../src/OSS/Result/GetLocationResult.php | 4 +- .../src/OSS/Result/GetLoggingResult.php | 6 +- .../src/OSS/Result/GetRefererResult.php | 6 +- .../OSS/Result/GetStorageCapacityResult.php | 4 +- .../src/OSS/Result/GetWebsiteResult.php | 6 +- .../src/OSS/Result/HeaderResult.php | 2 +- .../Result/InitiateMultipartUploadResult.php | 2 +- .../src/OSS/Result/ListBucketsResult.php | 0 .../src/OSS/Result/ListLiveChannelResult.php | 0 .../OSS/Result/ListMultipartUploadResult.php | 2 +- .../src/OSS/Result/ListObjectsResult.php | 2 +- .../src/OSS/Result/ListPartsResult.php | 2 +- .../src/OSS/Result/PutLiveChannelResult.php | 0 .../src/OSS/Result/PutSetDeleteResult.php | 0 .../src/OSS/Result/Result.php | 26 +- .../src/OSS/Result/SymlinkResult.php | 0 .../src/OSS/Result/UploadPartResult.php | 0 .../tests/OSS/Tests/AclResultTest.php | 0 .../tests/OSS/Tests/BodyResultTest.php | 0 .../tests/OSS/Tests/BucketCnameTest.php | 0 .../tests/OSS/Tests/BucketInfoTest.php | 0 .../tests/OSS/Tests/BucketLiveChannelTest.php | 0 .../tests/OSS/Tests/CallbackTest.php | 37 +- .../tests/OSS/Tests/CnameConfigTest.php | 0 .../tests/OSS/Tests/Common.php | 18 +- .../tests/OSS/Tests/ContentTypeTest.php | 0 .../tests/OSS/Tests/CopyObjectResult.php | 0 .../tests/OSS/Tests/CorsConfigTest.php | 0 .../tests/OSS/Tests/ExistResultTest.php | 0 .../tests/OSS/Tests/GetCorsResultTest.php | 0 .../OSS/Tests/GetLifecycleResultTest.php | 0 .../tests/OSS/Tests/GetLoggingResultTest.php | 0 .../tests/OSS/Tests/GetRefererResultTest.php | 0 .../tests/OSS/Tests/GetWebsiteResultTest.php | 0 .../tests/OSS/Tests/HeaderResultTest.php | 0 .../tests/OSS/Tests/HttpTest.php | 0 .../InitiateMultipartUploadResultTest.php | 0 .../tests/OSS/Tests/LifecycleConfigTest.php | 0 .../tests/OSS/Tests/ListBucketsResultTest.php | 0 .../Tests/ListMultipartUploadResultTest.php | 0 .../tests/OSS/Tests/ListObjectsResultTest.php | 0 .../tests/OSS/Tests/ListPartsResultTest.php | 0 .../tests/OSS/Tests/LiveChannelXmlTest.php | 0 .../tests/OSS/Tests/LoggingConfigTest.php | 0 .../tests/OSS/Tests/MimeTypesTest.php | 0 .../tests/OSS/Tests/ObjectAclTest.php | 0 .../OSS/Tests/OssClientBucketCorsTest.php | 0 .../Tests/OssClientBucketLifecycleTest.php | 0 .../OSS/Tests/OssClientBucketLoggingTest.php | 0 .../OSS/Tests/OssClientBucketRefererTest.php | 0 .../OssClientBucketStorageCapacityTest.php | 0 .../tests/OSS/Tests/OssClientBucketTest.php | 4 +- .../OSS/Tests/OssClientBucketWebsiteTest.php | 0 .../tests/OSS/Tests/OssClientImageTest.php | 0 .../Tests/OssClientMultipartUploadTest.php | 0 .../tests/OSS/Tests/OssClientObjectTest.php | 80 ++- .../OSS/Tests/OssClientRestoreObjectTest.php | 0 .../OSS/Tests/OssClientSignatureTest.php | 0 .../tests/OSS/Tests/OssClientTest.php | 0 .../tests/OSS/Tests/OssExceptionTest.php | 0 .../tests/OSS/Tests/OssUtilTest.php | 26 + .../OSS/Tests/PutSetDeleteResultTest.php | 0 .../tests/OSS/Tests/RefererConfigTest.php | 0 .../tests/OSS/Tests/StorageCapacityTest.php | 0 .../tests/OSS/Tests/SymlinkTest.php | 2 +- .../tests/OSS/Tests/TestOssClientBase.php | 0 .../tests/OSS/Tests/UploadPartResultTest.php | 0 .../tests/OSS/Tests/WebsiteConfigTest.php | 0 148 files changed, 1042 insertions(+), 926 deletions(-) delete mode 100755 aliyun-oss-php-sdk-2.3.0/CHANGELOG.md delete mode 100755 aliyun-oss-php-sdk-2.3.0/samples/Config.php delete mode 100644 aliyun-oss-php-sdk-2.3.0/test.php create mode 100644 aliyun-oss-php-sdk-2.3.1/.coveralls.yml create mode 100644 aliyun-oss-php-sdk-2.3.1/.gitignore create mode 100644 aliyun-oss-php-sdk-2.3.1/.travis.yml create mode 100644 aliyun-oss-php-sdk-2.3.1/CHANGELOG.md rename {aliyun-oss-php-sdk-2.3.0 => aliyun-oss-php-sdk-2.3.1}/LICENSE.md (100%) mode change 100755 => 100644 rename {aliyun-oss-php-sdk-2.3.0 => aliyun-oss-php-sdk-2.3.1}/README-CN.md (100%) mode change 100755 => 100644 rename {aliyun-oss-php-sdk-2.3.0 => aliyun-oss-php-sdk-2.3.1}/README.md (100%) mode change 100755 => 100644 rename {aliyun-oss-php-sdk-2.3.0 => aliyun-oss-php-sdk-2.3.1}/autoload.php (95%) mode change 100755 => 100644 rename {aliyun-oss-php-sdk-2.3.0 => aliyun-oss-php-sdk-2.3.1}/build-phar.sh (100%) rename {aliyun-oss-php-sdk-2.3.0 => aliyun-oss-php-sdk-2.3.1}/composer.json (100%) mode change 100755 => 100644 rename {aliyun-oss-php-sdk-2.3.0 => aliyun-oss-php-sdk-2.3.1}/example.jpg (100%) mode change 100755 => 100644 rename {aliyun-oss-php-sdk-2.3.0 => aliyun-oss-php-sdk-2.3.1}/index.php (100%) mode change 100755 => 100644 rename {aliyun-oss-php-sdk-2.3.0 => aliyun-oss-php-sdk-2.3.1}/phpunit.xml (100%) mode change 100755 => 100644 rename {aliyun-oss-php-sdk-2.3.0 => aliyun-oss-php-sdk-2.3.1}/samples/Bucket.php (66%) mode change 100755 => 100644 rename {aliyun-oss-php-sdk-2.3.0 => aliyun-oss-php-sdk-2.3.1}/samples/BucketCors.php (76%) mode change 100755 => 100644 rename {aliyun-oss-php-sdk-2.3.0 => aliyun-oss-php-sdk-2.3.1}/samples/BucketLifecycle.php (81%) mode change 100755 => 100644 rename {aliyun-oss-php-sdk-2.3.0 => aliyun-oss-php-sdk-2.3.1}/samples/BucketLogging.php (70%) mode change 100755 => 100644 rename {aliyun-oss-php-sdk-2.3.0 => aliyun-oss-php-sdk-2.3.1}/samples/BucketReferer.php (76%) mode change 100755 => 100644 rename {aliyun-oss-php-sdk-2.3.0 => aliyun-oss-php-sdk-2.3.1}/samples/BucketWebsite.php (73%) mode change 100755 => 100644 rename {aliyun-oss-php-sdk-2.3.0 => aliyun-oss-php-sdk-2.3.1}/samples/Callback.php (70%) mode change 100755 => 100644 rename {aliyun-oss-php-sdk-2.3.0 => aliyun-oss-php-sdk-2.3.1}/samples/Common.php (87%) mode change 100755 => 100644 create mode 100644 aliyun-oss-php-sdk-2.3.1/samples/Config.php rename {aliyun-oss-php-sdk-2.3.0 => aliyun-oss-php-sdk-2.3.1}/samples/Image.php (84%) mode change 100755 => 100644 rename {aliyun-oss-php-sdk-2.3.0 => aliyun-oss-php-sdk-2.3.1}/samples/LiveChannel.php (65%) mode change 100755 => 100644 rename {aliyun-oss-php-sdk-2.3.0 => aliyun-oss-php-sdk-2.3.1}/samples/MultipartUpload.php (79%) mode change 100755 => 100644 rename {aliyun-oss-php-sdk-2.3.0 => aliyun-oss-php-sdk-2.3.1}/samples/Object.php (78%) mode change 100755 => 100644 rename {aliyun-oss-php-sdk-2.3.0 => aliyun-oss-php-sdk-2.3.1}/samples/RunAll.php (90%) mode change 100755 => 100644 rename {aliyun-oss-php-sdk-2.3.0 => aliyun-oss-php-sdk-2.3.1}/samples/Signature.php (76%) mode change 100755 => 100644 rename {aliyun-oss-php-sdk-2.3.0 => aliyun-oss-php-sdk-2.3.1}/src/OSS/Core/MimeTypes.php (96%) mode change 100755 => 100644 rename {aliyun-oss-php-sdk-2.3.0 => aliyun-oss-php-sdk-2.3.1}/src/OSS/Core/OssException.php (86%) mode change 100755 => 100644 rename {aliyun-oss-php-sdk-2.3.0 => aliyun-oss-php-sdk-2.3.1}/src/OSS/Core/OssUtil.php (80%) mode change 100755 => 100644 rename {aliyun-oss-php-sdk-2.3.0 => aliyun-oss-php-sdk-2.3.1}/src/OSS/Http/LICENSE (100%) mode change 100755 => 100644 rename {aliyun-oss-php-sdk-2.3.0 => aliyun-oss-php-sdk-2.3.1}/src/OSS/Http/RequestCore.php (96%) mode change 100755 => 100644 rename {aliyun-oss-php-sdk-2.3.0 => aliyun-oss-php-sdk-2.3.1}/src/OSS/Http/RequestCore_Exception.php (100%) mode change 100755 => 100644 rename {aliyun-oss-php-sdk-2.3.0 => aliyun-oss-php-sdk-2.3.1}/src/OSS/Http/ResponseCore.php (89%) mode change 100755 => 100644 rename {aliyun-oss-php-sdk-2.3.0 => aliyun-oss-php-sdk-2.3.1}/src/OSS/Model/BucketInfo.php (81%) mode change 100755 => 100644 rename {aliyun-oss-php-sdk-2.3.0 => aliyun-oss-php-sdk-2.3.1}/src/OSS/Model/BucketListInfo.php (83%) mode change 100755 => 100644 rename {aliyun-oss-php-sdk-2.3.0 => aliyun-oss-php-sdk-2.3.1}/src/OSS/Model/CnameConfig.php (100%) mode change 100755 => 100644 rename {aliyun-oss-php-sdk-2.3.0 => aliyun-oss-php-sdk-2.3.1}/src/OSS/Model/CorsConfig.php (94%) mode change 100755 => 100644 rename {aliyun-oss-php-sdk-2.3.0 => aliyun-oss-php-sdk-2.3.1}/src/OSS/Model/CorsRule.php (89%) mode change 100755 => 100644 rename {aliyun-oss-php-sdk-2.3.0 => aliyun-oss-php-sdk-2.3.1}/src/OSS/Model/GetLiveChannelHistory.php (100%) mode change 100755 => 100644 rename {aliyun-oss-php-sdk-2.3.0 => aliyun-oss-php-sdk-2.3.1}/src/OSS/Model/GetLiveChannelInfo.php (100%) mode change 100755 => 100644 rename {aliyun-oss-php-sdk-2.3.0 => aliyun-oss-php-sdk-2.3.1}/src/OSS/Model/GetLiveChannelStatus.php (100%) mode change 100755 => 100644 rename {aliyun-oss-php-sdk-2.3.0 => aliyun-oss-php-sdk-2.3.1}/src/OSS/Model/LifecycleAction.php (96%) mode change 100755 => 100644 rename {aliyun-oss-php-sdk-2.3.0 => aliyun-oss-php-sdk-2.3.1}/src/OSS/Model/LifecycleConfig.php (92%) mode change 100755 => 100644 rename {aliyun-oss-php-sdk-2.3.0 => aliyun-oss-php-sdk-2.3.1}/src/OSS/Model/LifecycleRule.php (82%) mode change 100755 => 100644 rename {aliyun-oss-php-sdk-2.3.0 => aliyun-oss-php-sdk-2.3.1}/src/OSS/Model/ListMultipartUploadInfo.php (100%) mode change 100755 => 100644 rename {aliyun-oss-php-sdk-2.3.0 => aliyun-oss-php-sdk-2.3.1}/src/OSS/Model/ListPartsInfo.php (100%) mode change 100755 => 100644 rename {aliyun-oss-php-sdk-2.3.0 => aliyun-oss-php-sdk-2.3.1}/src/OSS/Model/LiveChannelConfig.php (100%) mode change 100755 => 100644 rename {aliyun-oss-php-sdk-2.3.0 => aliyun-oss-php-sdk-2.3.1}/src/OSS/Model/LiveChannelHistory.php (100%) mode change 100755 => 100644 rename {aliyun-oss-php-sdk-2.3.0 => aliyun-oss-php-sdk-2.3.1}/src/OSS/Model/LiveChannelInfo.php (100%) mode change 100755 => 100644 rename {aliyun-oss-php-sdk-2.3.0 => aliyun-oss-php-sdk-2.3.1}/src/OSS/Model/LiveChannelListInfo.php (97%) mode change 100755 => 100644 rename {aliyun-oss-php-sdk-2.3.0 => aliyun-oss-php-sdk-2.3.1}/src/OSS/Model/LoggingConfig.php (98%) mode change 100755 => 100644 rename {aliyun-oss-php-sdk-2.3.0 => aliyun-oss-php-sdk-2.3.1}/src/OSS/Model/ObjectInfo.php (82%) mode change 100755 => 100644 rename {aliyun-oss-php-sdk-2.3.0 => aliyun-oss-php-sdk-2.3.1}/src/OSS/Model/ObjectListInfo.php (93%) mode change 100755 => 100644 rename {aliyun-oss-php-sdk-2.3.0 => aliyun-oss-php-sdk-2.3.1}/src/OSS/Model/PartInfo.php (100%) mode change 100755 => 100644 rename {aliyun-oss-php-sdk-2.3.0 => aliyun-oss-php-sdk-2.3.1}/src/OSS/Model/PrefixInfo.php (62%) mode change 100755 => 100644 rename {aliyun-oss-php-sdk-2.3.0 => aliyun-oss-php-sdk-2.3.1}/src/OSS/Model/RefererConfig.php (97%) mode change 100755 => 100644 rename {aliyun-oss-php-sdk-2.3.0 => aliyun-oss-php-sdk-2.3.1}/src/OSS/Model/StorageCapacityConfig.php (96%) mode change 100755 => 100644 rename {aliyun-oss-php-sdk-2.3.0 => aliyun-oss-php-sdk-2.3.1}/src/OSS/Model/UploadInfo.php (94%) mode change 100755 => 100644 rename {aliyun-oss-php-sdk-2.3.0 => aliyun-oss-php-sdk-2.3.1}/src/OSS/Model/WebsiteConfig.php (97%) mode change 100755 => 100644 rename {aliyun-oss-php-sdk-2.3.0 => aliyun-oss-php-sdk-2.3.1}/src/OSS/Model/XmlConfig.php (61%) mode change 100755 => 100644 rename {aliyun-oss-php-sdk-2.3.0 => aliyun-oss-php-sdk-2.3.1}/src/OSS/OssClient.php (82%) mode change 100755 => 100644 rename {aliyun-oss-php-sdk-2.3.0 => aliyun-oss-php-sdk-2.3.1}/src/OSS/Result/AclResult.php (86%) mode change 100755 => 100644 rename {aliyun-oss-php-sdk-2.3.0 => aliyun-oss-php-sdk-2.3.1}/src/OSS/Result/AppendResult.php (87%) mode change 100755 => 100644 rename {aliyun-oss-php-sdk-2.3.0 => aliyun-oss-php-sdk-2.3.1}/src/OSS/Result/BodyResult.php (100%) mode change 100755 => 100644 rename {aliyun-oss-php-sdk-2.3.0 => aliyun-oss-php-sdk-2.3.1}/src/OSS/Result/CallbackResult.php (100%) mode change 100755 => 100644 rename {aliyun-oss-php-sdk-2.3.0 => aliyun-oss-php-sdk-2.3.1}/src/OSS/Result/CopyObjectResult.php (100%) mode change 100755 => 100644 rename {aliyun-oss-php-sdk-2.3.0 => aliyun-oss-php-sdk-2.3.1}/src/OSS/Result/DeleteObjectsResult.php (100%) mode change 100755 => 100644 rename {aliyun-oss-php-sdk-2.3.0 => aliyun-oss-php-sdk-2.3.1}/src/OSS/Result/ExistResult.php (65%) mode change 100755 => 100644 rename {aliyun-oss-php-sdk-2.3.0 => aliyun-oss-php-sdk-2.3.1}/src/OSS/Result/GetCnameResult.php (100%) mode change 100755 => 100644 rename {aliyun-oss-php-sdk-2.3.0 => aliyun-oss-php-sdk-2.3.1}/src/OSS/Result/GetCorsResult.php (81%) mode change 100755 => 100644 rename {aliyun-oss-php-sdk-2.3.0 => aliyun-oss-php-sdk-2.3.1}/src/OSS/Result/GetLifecycleResult.php (75%) mode change 100755 => 100644 rename {aliyun-oss-php-sdk-2.3.0 => aliyun-oss-php-sdk-2.3.1}/src/OSS/Result/GetLiveChannelHistoryResult.php (100%) mode change 100755 => 100644 rename {aliyun-oss-php-sdk-2.3.0 => aliyun-oss-php-sdk-2.3.1}/src/OSS/Result/GetLiveChannelInfoResult.php (100%) mode change 100755 => 100644 rename {aliyun-oss-php-sdk-2.3.0 => aliyun-oss-php-sdk-2.3.1}/src/OSS/Result/GetLiveChannelStatusResult.php (100%) mode change 100755 => 100644 rename {aliyun-oss-php-sdk-2.3.0 => aliyun-oss-php-sdk-2.3.1}/src/OSS/Result/GetLocationResult.php (79%) mode change 100755 => 100644 rename {aliyun-oss-php-sdk-2.3.0 => aliyun-oss-php-sdk-2.3.1}/src/OSS/Result/GetLoggingResult.php (78%) mode change 100755 => 100644 rename {aliyun-oss-php-sdk-2.3.0 => aliyun-oss-php-sdk-2.3.1}/src/OSS/Result/GetRefererResult.php (78%) mode change 100755 => 100644 rename {aliyun-oss-php-sdk-2.3.0 => aliyun-oss-php-sdk-2.3.1}/src/OSS/Result/GetStorageCapacityResult.php (85%) mode change 100755 => 100644 rename {aliyun-oss-php-sdk-2.3.0 => aliyun-oss-php-sdk-2.3.1}/src/OSS/Result/GetWebsiteResult.php (77%) mode change 100755 => 100644 rename {aliyun-oss-php-sdk-2.3.0 => aliyun-oss-php-sdk-2.3.1}/src/OSS/Result/HeaderResult.php (86%) mode change 100755 => 100644 rename {aliyun-oss-php-sdk-2.3.0 => aliyun-oss-php-sdk-2.3.1}/src/OSS/Result/InitiateMultipartUploadResult.php (93%) mode change 100755 => 100644 rename {aliyun-oss-php-sdk-2.3.0 => aliyun-oss-php-sdk-2.3.1}/src/OSS/Result/ListBucketsResult.php (100%) mode change 100755 => 100644 rename {aliyun-oss-php-sdk-2.3.0 => aliyun-oss-php-sdk-2.3.1}/src/OSS/Result/ListLiveChannelResult.php (100%) mode change 100755 => 100644 rename {aliyun-oss-php-sdk-2.3.0 => aliyun-oss-php-sdk-2.3.1}/src/OSS/Result/ListMultipartUploadResult.php (97%) mode change 100755 => 100644 rename {aliyun-oss-php-sdk-2.3.0 => aliyun-oss-php-sdk-2.3.1}/src/OSS/Result/ListObjectsResult.php (97%) mode change 100755 => 100644 rename {aliyun-oss-php-sdk-2.3.0 => aliyun-oss-php-sdk-2.3.1}/src/OSS/Result/ListPartsResult.php (96%) mode change 100755 => 100644 rename {aliyun-oss-php-sdk-2.3.0 => aliyun-oss-php-sdk-2.3.1}/src/OSS/Result/PutLiveChannelResult.php (100%) mode change 100755 => 100644 rename {aliyun-oss-php-sdk-2.3.0 => aliyun-oss-php-sdk-2.3.1}/src/OSS/Result/PutSetDeleteResult.php (100%) mode change 100755 => 100644 rename {aliyun-oss-php-sdk-2.3.0 => aliyun-oss-php-sdk-2.3.1}/src/OSS/Result/Result.php (80%) mode change 100755 => 100644 rename {aliyun-oss-php-sdk-2.3.0 => aliyun-oss-php-sdk-2.3.1}/src/OSS/Result/SymlinkResult.php (100%) mode change 100755 => 100644 rename {aliyun-oss-php-sdk-2.3.0 => aliyun-oss-php-sdk-2.3.1}/src/OSS/Result/UploadPartResult.php (100%) mode change 100755 => 100644 rename {aliyun-oss-php-sdk-2.3.0 => aliyun-oss-php-sdk-2.3.1}/tests/OSS/Tests/AclResultTest.php (100%) mode change 100755 => 100644 rename {aliyun-oss-php-sdk-2.3.0 => aliyun-oss-php-sdk-2.3.1}/tests/OSS/Tests/BodyResultTest.php (100%) mode change 100755 => 100644 rename {aliyun-oss-php-sdk-2.3.0 => aliyun-oss-php-sdk-2.3.1}/tests/OSS/Tests/BucketCnameTest.php (100%) mode change 100755 => 100644 rename {aliyun-oss-php-sdk-2.3.0 => aliyun-oss-php-sdk-2.3.1}/tests/OSS/Tests/BucketInfoTest.php (100%) mode change 100755 => 100644 rename {aliyun-oss-php-sdk-2.3.0 => aliyun-oss-php-sdk-2.3.1}/tests/OSS/Tests/BucketLiveChannelTest.php (100%) mode change 100755 => 100644 rename {aliyun-oss-php-sdk-2.3.0 => aliyun-oss-php-sdk-2.3.1}/tests/OSS/Tests/CallbackTest.php (88%) mode change 100755 => 100644 rename {aliyun-oss-php-sdk-2.3.0 => aliyun-oss-php-sdk-2.3.1}/tests/OSS/Tests/CnameConfigTest.php (100%) mode change 100755 => 100644 rename {aliyun-oss-php-sdk-2.3.0 => aliyun-oss-php-sdk-2.3.1}/tests/OSS/Tests/Common.php (76%) mode change 100755 => 100644 rename {aliyun-oss-php-sdk-2.3.0 => aliyun-oss-php-sdk-2.3.1}/tests/OSS/Tests/ContentTypeTest.php (100%) mode change 100755 => 100644 rename {aliyun-oss-php-sdk-2.3.0 => aliyun-oss-php-sdk-2.3.1}/tests/OSS/Tests/CopyObjectResult.php (100%) mode change 100755 => 100644 rename {aliyun-oss-php-sdk-2.3.0 => aliyun-oss-php-sdk-2.3.1}/tests/OSS/Tests/CorsConfigTest.php (100%) mode change 100755 => 100644 rename {aliyun-oss-php-sdk-2.3.0 => aliyun-oss-php-sdk-2.3.1}/tests/OSS/Tests/ExistResultTest.php (100%) mode change 100755 => 100644 rename {aliyun-oss-php-sdk-2.3.0 => aliyun-oss-php-sdk-2.3.1}/tests/OSS/Tests/GetCorsResultTest.php (100%) mode change 100755 => 100644 rename {aliyun-oss-php-sdk-2.3.0 => aliyun-oss-php-sdk-2.3.1}/tests/OSS/Tests/GetLifecycleResultTest.php (100%) mode change 100755 => 100644 rename {aliyun-oss-php-sdk-2.3.0 => aliyun-oss-php-sdk-2.3.1}/tests/OSS/Tests/GetLoggingResultTest.php (100%) mode change 100755 => 100644 rename {aliyun-oss-php-sdk-2.3.0 => aliyun-oss-php-sdk-2.3.1}/tests/OSS/Tests/GetRefererResultTest.php (100%) mode change 100755 => 100644 rename {aliyun-oss-php-sdk-2.3.0 => aliyun-oss-php-sdk-2.3.1}/tests/OSS/Tests/GetWebsiteResultTest.php (100%) mode change 100755 => 100644 rename {aliyun-oss-php-sdk-2.3.0 => aliyun-oss-php-sdk-2.3.1}/tests/OSS/Tests/HeaderResultTest.php (100%) mode change 100755 => 100644 rename {aliyun-oss-php-sdk-2.3.0 => aliyun-oss-php-sdk-2.3.1}/tests/OSS/Tests/HttpTest.php (100%) mode change 100755 => 100644 rename {aliyun-oss-php-sdk-2.3.0 => aliyun-oss-php-sdk-2.3.1}/tests/OSS/Tests/InitiateMultipartUploadResultTest.php (100%) mode change 100755 => 100644 rename {aliyun-oss-php-sdk-2.3.0 => aliyun-oss-php-sdk-2.3.1}/tests/OSS/Tests/LifecycleConfigTest.php (100%) mode change 100755 => 100644 rename {aliyun-oss-php-sdk-2.3.0 => aliyun-oss-php-sdk-2.3.1}/tests/OSS/Tests/ListBucketsResultTest.php (100%) mode change 100755 => 100644 rename {aliyun-oss-php-sdk-2.3.0 => aliyun-oss-php-sdk-2.3.1}/tests/OSS/Tests/ListMultipartUploadResultTest.php (100%) mode change 100755 => 100644 rename {aliyun-oss-php-sdk-2.3.0 => aliyun-oss-php-sdk-2.3.1}/tests/OSS/Tests/ListObjectsResultTest.php (100%) mode change 100755 => 100644 rename {aliyun-oss-php-sdk-2.3.0 => aliyun-oss-php-sdk-2.3.1}/tests/OSS/Tests/ListPartsResultTest.php (100%) mode change 100755 => 100644 rename {aliyun-oss-php-sdk-2.3.0 => aliyun-oss-php-sdk-2.3.1}/tests/OSS/Tests/LiveChannelXmlTest.php (100%) mode change 100755 => 100644 rename {aliyun-oss-php-sdk-2.3.0 => aliyun-oss-php-sdk-2.3.1}/tests/OSS/Tests/LoggingConfigTest.php (100%) mode change 100755 => 100644 rename {aliyun-oss-php-sdk-2.3.0 => aliyun-oss-php-sdk-2.3.1}/tests/OSS/Tests/MimeTypesTest.php (100%) mode change 100755 => 100644 rename {aliyun-oss-php-sdk-2.3.0 => aliyun-oss-php-sdk-2.3.1}/tests/OSS/Tests/ObjectAclTest.php (100%) mode change 100755 => 100644 rename {aliyun-oss-php-sdk-2.3.0 => aliyun-oss-php-sdk-2.3.1}/tests/OSS/Tests/OssClientBucketCorsTest.php (100%) mode change 100755 => 100644 rename {aliyun-oss-php-sdk-2.3.0 => aliyun-oss-php-sdk-2.3.1}/tests/OSS/Tests/OssClientBucketLifecycleTest.php (100%) mode change 100755 => 100644 rename {aliyun-oss-php-sdk-2.3.0 => aliyun-oss-php-sdk-2.3.1}/tests/OSS/Tests/OssClientBucketLoggingTest.php (100%) mode change 100755 => 100644 rename {aliyun-oss-php-sdk-2.3.0 => aliyun-oss-php-sdk-2.3.1}/tests/OSS/Tests/OssClientBucketRefererTest.php (100%) mode change 100755 => 100644 rename {aliyun-oss-php-sdk-2.3.0 => aliyun-oss-php-sdk-2.3.1}/tests/OSS/Tests/OssClientBucketStorageCapacityTest.php (100%) mode change 100755 => 100644 rename {aliyun-oss-php-sdk-2.3.0 => aliyun-oss-php-sdk-2.3.1}/tests/OSS/Tests/OssClientBucketTest.php (97%) mode change 100755 => 100644 rename {aliyun-oss-php-sdk-2.3.0 => aliyun-oss-php-sdk-2.3.1}/tests/OSS/Tests/OssClientBucketWebsiteTest.php (100%) mode change 100755 => 100644 rename {aliyun-oss-php-sdk-2.3.0 => aliyun-oss-php-sdk-2.3.1}/tests/OSS/Tests/OssClientImageTest.php (100%) mode change 100755 => 100644 rename {aliyun-oss-php-sdk-2.3.0 => aliyun-oss-php-sdk-2.3.1}/tests/OSS/Tests/OssClientMultipartUploadTest.php (100%) mode change 100755 => 100644 rename {aliyun-oss-php-sdk-2.3.0 => aliyun-oss-php-sdk-2.3.1}/tests/OSS/Tests/OssClientObjectTest.php (91%) mode change 100755 => 100644 rename {aliyun-oss-php-sdk-2.3.0 => aliyun-oss-php-sdk-2.3.1}/tests/OSS/Tests/OssClientRestoreObjectTest.php (100%) mode change 100755 => 100644 rename {aliyun-oss-php-sdk-2.3.0 => aliyun-oss-php-sdk-2.3.1}/tests/OSS/Tests/OssClientSignatureTest.php (100%) mode change 100755 => 100644 rename {aliyun-oss-php-sdk-2.3.0 => aliyun-oss-php-sdk-2.3.1}/tests/OSS/Tests/OssClientTest.php (100%) mode change 100755 => 100644 rename {aliyun-oss-php-sdk-2.3.0 => aliyun-oss-php-sdk-2.3.1}/tests/OSS/Tests/OssExceptionTest.php (100%) mode change 100755 => 100644 rename {aliyun-oss-php-sdk-2.3.0 => aliyun-oss-php-sdk-2.3.1}/tests/OSS/Tests/OssUtilTest.php (86%) mode change 100755 => 100644 rename {aliyun-oss-php-sdk-2.3.0 => aliyun-oss-php-sdk-2.3.1}/tests/OSS/Tests/PutSetDeleteResultTest.php (100%) mode change 100755 => 100644 rename {aliyun-oss-php-sdk-2.3.0 => aliyun-oss-php-sdk-2.3.1}/tests/OSS/Tests/RefererConfigTest.php (100%) mode change 100755 => 100644 rename {aliyun-oss-php-sdk-2.3.0 => aliyun-oss-php-sdk-2.3.1}/tests/OSS/Tests/StorageCapacityTest.php (100%) mode change 100755 => 100644 rename {aliyun-oss-php-sdk-2.3.0 => aliyun-oss-php-sdk-2.3.1}/tests/OSS/Tests/SymlinkTest.php (95%) mode change 100755 => 100644 rename {aliyun-oss-php-sdk-2.3.0 => aliyun-oss-php-sdk-2.3.1}/tests/OSS/Tests/TestOssClientBase.php (100%) mode change 100755 => 100644 rename {aliyun-oss-php-sdk-2.3.0 => aliyun-oss-php-sdk-2.3.1}/tests/OSS/Tests/UploadPartResultTest.php (100%) mode change 100755 => 100644 rename {aliyun-oss-php-sdk-2.3.0 => aliyun-oss-php-sdk-2.3.1}/tests/OSS/Tests/WebsiteConfigTest.php (100%) mode change 100755 => 100644 diff --git a/Plugin.php b/Plugin.php index f1c33c3..9022c16 100644 --- a/Plugin.php +++ b/Plugin.php @@ -1,6 +1,6 @@ createBucket($bucket, OssClient::OSS_ACL_TYPE_PUBLIC_READ_WRITE); Common::println("bucket $bucket created"); -// 判断Bucket是否存在 +// Check whether a bucket exists $doesExist = $ossClient->doesBucketExist($bucket); Common::println("bucket $bucket exist? " . ($doesExist ? "yes" : "no")); -// 获取Bucket列表 +// Get the bucket list $bucketListInfo = $ossClient->listBuckets(); -// 设置bucket的ACL +// Set bucket ACL $ossClient->putBucketAcl($bucket, OssClient::OSS_ACL_TYPE_PUBLIC_READ_WRITE); Common::println("bucket $bucket acl put"); -// 获取bucket的ACL +// Get bucket ACL $acl = $ossClient->getBucketAcl($bucket); Common::println("bucket $bucket acl get: " . $acl); -//******************************* 完整用法参考下面函数 **************************************************** +//******************************* For complete usage, see the following functions **************************************************** createBucket($ossClient, $bucket); doesBucketExist($ossClient, $bucket); @@ -39,13 +39,13 @@ getBucketAcl($ossClient, $bucket); listBuckets($ossClient); /** - * 创建一个存储空间 - * acl 指的是bucket的访问控制权限，有三种，私有读写，公共读私有写，公共读写。 - * 私有读写就是只有bucket的拥有者或授权用户才有权限操作 - * 三种权限分别对应 (OssClient::OSS_ACL_TYPE_PRIVATE，OssClient::OSS_ACL_TYPE_PUBLIC_READ, OssClient::OSS_ACL_TYPE_PUBLIC_READ_WRITE) + * Create a new bucket + * acl indicates the access permission of a bucket, including: private, public-read-only/private-read-write, and public read-write. + * Private indicates that only the bucket owner or authorized users can access the data.. + * The three permissions are separately defined by (OssClient::OSS_ACL_TYPE_PRIVATE,OssClient::OSS_ACL_TYPE_PUBLIC_READ, OssClient::OSS_ACL_TYPE_PUBLIC_READ_WRITE) * - * @param OssClient $ossClient OssClient实例 - * @param string $bucket 要创建的存储空间名称 + * @param OssClient $ossClient OssClient instance + * @param string $bucket Name of the bucket to create * @return null */ function createBucket($ossClient, $bucket) @@ -61,10 +61,10 @@ function createBucket($ossClient, $bucket) } /** - * 判断Bucket是否存在 + * Check whether a bucket exists. * - * @param OssClient $ossClient OssClient实例 - * @param string $bucket 存储空间名称 + * @param OssClient $ossClient OssClient instance + * @param string $bucket bucket name */ function doesBucketExist($ossClient, $bucket) { @@ -83,10 +83,11 @@ function doesBucketExist($ossClient, $bucket) } /** - * 删除bucket，如果bucket不为空则bucket无法删除成功， 不为空表示bucket既没有object，也没有未完成的multipart上传时的parts + * Delete a bucket. If the bucket is not empty, the deletion fails. + * A bucket which is not empty indicates that it does not contain any objects or parts that are not completely uploaded during multipart upload * - * @param OssClient $ossClient OssClient实例 - * @param string $bucket 待删除的存储空间名称 + * @param OssClient $ossClient OssClient instance + * @param string $bucket Name of the bucket to delete * @return null */ function deleteBucket($ossClient, $bucket) @@ -102,10 +103,10 @@ function deleteBucket($ossClient, $bucket) } /** - * 设置bucket的acl配置 + * Set bucket ACL * - * @param OssClient $ossClient OssClient实例 - * @param string $bucket 存储空间名称 + * @param OssClient $ossClient OssClient instance + * @param string $bucket bucket name * @return null */ function putBucketAcl($ossClient, $bucket) @@ -123,10 +124,10 @@ function putBucketAcl($ossClient, $bucket) /** - * 获取bucket的acl配置 + * Get bucket ACL * - * @param OssClient $ossClient OssClient实例 - * @param string $bucket 存储空间名称 + * @param OssClient $ossClient OssClient instance + * @param string $bucket bucket name * @return null */ function getBucketAcl($ossClient, $bucket) @@ -144,9 +145,9 @@ function getBucketAcl($ossClient, $bucket) /** - * 列出用户所有的Bucket + * List all buckets * - * @param OssClient $ossClient OssClient实例 + * @param OssClient $ossClient OssClient instance * @return null */ function listBuckets($ossClient) diff --git a/aliyun-oss-php-sdk-2.3.0/samples/BucketCors.php b/aliyun-oss-php-sdk-2.3.1/samples/BucketCors.php old mode 100755 new mode 100644 similarity index 76% rename from aliyun-oss-php-sdk-2.3.0/samples/BucketCors.php rename to aliyun-oss-php-sdk-2.3.1/samples/BucketCors.php index cc5c0b9..dfa42d3 --- a/aliyun-oss-php-sdk-2.3.0/samples/BucketCors.php +++ b/aliyun-oss-php-sdk-2.3.1/samples/BucketCors.php @@ -11,9 +11,9 @@ if (is_null($ossClient)) exit(1); $bucket = Common::getBucketName(); -//******************************* 简单使用 **************************************************************** +//******************************* Simple usage**************************************************************** -// 设置cors配置 +// Set cors configuration $corsConfig = new CorsConfig(); $rule = new CorsRule(); $rule->addAllowedHeader("x-oss-header"); @@ -24,15 +24,15 @@ $corsConfig->addRule($rule); $ossClient->putBucketCors($bucket, $corsConfig); Common::println("bucket $bucket corsConfig created:" . $corsConfig->serializeToXml()); -// 获取cors配置 +// Get cors configuration $corsConfig = $ossClient->getBucketCors($bucket); Common::println("bucket $bucket corsConfig fetched:" . $corsConfig->serializeToXml()); -// 删除cors配置 +// Delete cors configuration $ossClient->deleteBucketCors($bucket); Common::println("bucket $bucket corsConfig deleted"); -//******************************* 完整用法参考下面函数 ***************************************************** +//******************************* For complete usage, see the following functions ***************************************************** putBucketCors($ossClient, $bucket); getBucketCors($ossClient, $bucket); @@ -40,10 +40,10 @@ deleteBucketCors($ossClient, $bucket); getBucketCors($ossClient, $bucket); /** - * 设置bucket的cors配置 + * Set bucket cores * - * @param OssClient $ossClient OssClient实例 - * @param string $bucket 存储空间名称 + * @param OssClient $ossClient OssClient instance + * @param string $bucket bucket name * @return null */ function putBucketCors($ossClient, $bucket) @@ -67,10 +67,10 @@ function putBucketCors($ossClient, $bucket) } /** - * 获取并打印bucket的cors配置 + * Get and print the cors configuration of a bucket * - * @param OssClient $ossClient OssClient实例 - * @param string $bucket 存储空间名称 + * @param OssClient $ossClient OssClient instance + * @param string $bucket bucket name * @return null */ function getBucketCors($ossClient, $bucket) @@ -88,10 +88,10 @@ function getBucketCors($ossClient, $bucket) } /** - * 删除bucket的所有的cors配置 + * Delete all cors configuraiton of a bucket * - * @param OssClient $ossClient OssClient实例 - * @param string $bucket 存储空间名称 + * @param OssClient $ossClient OssClient instance + * @param string $bucket bucket name * @return null */ function deleteBucketCors($ossClient, $bucket) diff --git a/aliyun-oss-php-sdk-2.3.0/samples/BucketLifecycle.php b/aliyun-oss-php-sdk-2.3.1/samples/BucketLifecycle.php old mode 100755 new mode 100644 similarity index 81% rename from aliyun-oss-php-sdk-2.3.0/samples/BucketLifecycle.php rename to aliyun-oss-php-sdk-2.3.1/samples/BucketLifecycle.php index ec0c37f..04d2edd --- a/aliyun-oss-php-sdk-2.3.0/samples/BucketLifecycle.php +++ b/aliyun-oss-php-sdk-2.3.1/samples/BucketLifecycle.php @@ -11,9 +11,9 @@ $bucket = Common::getBucketName(); $ossClient = Common::getOssClient(); if (is_null($ossClient)) exit(1); -//******************************* 简单使用 ******************************************************* +//******************************* Simple Usage ******************************************************* -//设置lifecycle规则 +// Set lifecycle configuration $lifecycleConfig = new LifecycleConfig(); $actions = array(); $actions[] = new LifecycleAction("Expiration", "Days", 3); @@ -22,16 +22,16 @@ $lifecycleConfig->addRule($lifecycleRule); $ossClient->putBucketLifecycle($bucket, $lifecycleConfig); Common::println("bucket $bucket lifecycleConfig created:" . $lifecycleConfig->serializeToXml()); -//获取lifecycle规则 +// Get lifecycle configuration $lifecycleConfig = $ossClient->getBucketLifecycle($bucket); Common::println("bucket $bucket lifecycleConfig fetched:" . $lifecycleConfig->serializeToXml()); -//删除bucket的lifecycle配置 +// Delete bucket lifecycle configuration $ossClient->deleteBucketLifecycle($bucket); Common::println("bucket $bucket lifecycleConfig deleted"); -//***************************** 完整用法参考下面函数 *********************************************** +//***************************** For complete usage, see the following functions *********************************************** putBucketLifecycle($ossClient, $bucket); getBucketLifecycle($ossClient, $bucket); @@ -39,10 +39,10 @@ deleteBucketLifecycle($ossClient, $bucket); getBucketLifecycle($ossClient, $bucket); /** - * 设置bucket的生命周期配置 + * Set bucket lifecycle configuration * - * @param OssClient $ossClient OssClient实例 - * @param string $bucket 存储空间名称 + * @param OssClient $ossClient OssClient instance + * @param string $bucket bucket name * @return null */ function putBucketLifecycle($ossClient, $bucket) @@ -67,10 +67,10 @@ function putBucketLifecycle($ossClient, $bucket) } /** - * 获取bucket的生命周期配置 + * Get bucket lifecycle configuration * - * @param OssClient $ossClient OssClient实例 - * @param string $bucket 存储空间名称 + * @param OssClient $ossClient OssClient instance + * @param string $bucket bucket name * @return null */ function getBucketLifecycle($ossClient, $bucket) @@ -88,10 +88,10 @@ function getBucketLifecycle($ossClient, $bucket) } /** - * 删除bucket的生命周期配置 + * Delete bucket lifecycle configuration * - * @param OssClient $ossClient OssClient实例 - * @param string $bucket 存储空间名称 + * @param OssClient $ossClient OssClient instance + * @param string $bucket bucket name * @return null */ function deleteBucketLifecycle($ossClient, $bucket) diff --git a/aliyun-oss-php-sdk-2.3.0/samples/BucketLogging.php b/aliyun-oss-php-sdk-2.3.1/samples/BucketLogging.php old mode 100755 new mode 100644 similarity index 70% rename from aliyun-oss-php-sdk-2.3.0/samples/BucketLogging.php rename to aliyun-oss-php-sdk-2.3.1/samples/BucketLogging.php index 406e1d4..eef71f2 --- a/aliyun-oss-php-sdk-2.3.0/samples/BucketLogging.php +++ b/aliyun-oss-php-sdk-2.3.1/samples/BucketLogging.php @@ -8,21 +8,21 @@ $bucket = Common::getBucketName(); $ossClient = Common::getOssClient(); if (is_null($ossClient)) exit(1); -//*******************************简单使用*************************************************************** +//*******************************Simple Usage *************************************************************** -// 设置Bucket访问日志记录规则, 访问日志文件的存放位置是同bucket下的access.log前缀的文件 +// Set bucket access logging rules. Access logs are stored under the same bucket with a 'access.log' prefix. $ossClient->putBucketLogging($bucket, $bucket, "access.log", array()); Common::println("bucket $bucket lifecycleConfig created"); -// 获取Bucket访问日志记录规则 +// Get bucket access logging rules $loggingConfig = $ossClient->getBucketLogging($bucket, array()); Common::println("bucket $bucket lifecycleConfig fetched:" . $loggingConfig->serializeToXml()); -// 删除Bucket访问日志记录规则 +// Delete bucket access logging rules $loggingConfig = $ossClient->getBucketLogging($bucket, array()); Common::println("bucket $bucket lifecycleConfig deleted"); -//******************************* 完整用法参考下面函数 **************************************************** +//******************************* For complete usage, see the following functions **************************************************** putBucketLogging($ossClient, $bucket); getBucketLogging($ossClient, $bucket); @@ -30,16 +30,16 @@ deleteBucketLogging($ossClient, $bucket); getBucketLogging($ossClient, $bucket); /** - * 设置bucket的Logging配置 + * Set bucket logging configuration * - * @param OssClient $ossClient OssClient实例 - * @param string $bucket 存储空间名称 + * @param OssClient $ossClient OssClient instance + * @param string $bucket bucket name * @return null */ function putBucketLogging($ossClient, $bucket) { $option = array(); - //访问日志存放在本bucket下 + // Access logs are stored in the same bucket. $targetBucket = $bucket; $targetPrefix = "access.log"; @@ -54,10 +54,10 @@ function putBucketLogging($ossClient, $bucket) } /** - * 获取bucket的Logging配置 + * Get bucket logging configuration * - * @param OssClient $ossClient OssClient实例 - * @param string $bucket 存储空间名称 + * @param OssClient $ossClient OssClient instance + * @param string $bucket bucket name * @return null */ function getBucketLogging($ossClient, $bucket) @@ -76,10 +76,10 @@ function getBucketLogging($ossClient, $bucket) } /** - * 删除bucket的Logging配置 + * Delete bucket logging configuration * - * @param OssClient $ossClient OssClient实例 - * @param string $bucket 存储空间名称 + * @param OssClient $ossClient OssClient instance + * @param string $bucket bucket name * @return null */ function deleteBucketLogging($ossClient, $bucket) diff --git a/aliyun-oss-php-sdk-2.3.0/samples/BucketReferer.php b/aliyun-oss-php-sdk-2.3.1/samples/BucketReferer.php old mode 100755 new mode 100644 similarity index 76% rename from aliyun-oss-php-sdk-2.3.0/samples/BucketReferer.php rename to aliyun-oss-php-sdk-2.3.1/samples/BucketReferer.php index 3828df6..628f784 --- a/aliyun-oss-php-sdk-2.3.0/samples/BucketReferer.php +++ b/aliyun-oss-php-sdk-2.3.1/samples/BucketReferer.php @@ -9,26 +9,26 @@ $bucket = Common::getBucketName(); $ossClient = Common::getOssClient(); if (is_null($ossClient)) exit(1); -//******************************* 简单使用 **************************************************************** +//******************************* Simple Usage **************************************************************** -//设置referer白名单 +// Set referer whitelist $refererConfig = new RefererConfig(); $refererConfig->setAllowEmptyReferer(true); $refererConfig->addReferer("www.aliiyun.com"); $refererConfig->addReferer("www.aliiyuncs.com"); $ossClient->putBucketReferer($bucket, $refererConfig); Common::println("bucket $bucket refererConfig created:" . $refererConfig->serializeToXml()); -//获取Referer白名单 +// Get referer whitelist $refererConfig = $ossClient->getBucketReferer($bucket); Common::println("bucket $bucket refererConfig fetched:" . $refererConfig->serializeToXml()); -//删除referer白名单 +// Delete referrer whitelist $refererConfig = new RefererConfig(); $ossClient->putBucketReferer($bucket, $refererConfig); Common::println("bucket $bucket refererConfig deleted"); -//******************************* 完整用法参考下面函数 **************************************************** +//******************************* For complete usage, see the following functions **************************************************** putBucketReferer($ossClient, $bucket); getBucketReferer($ossClient, $bucket); @@ -36,10 +36,10 @@ deleteBucketReferer($ossClient, $bucket); getBucketReferer($ossClient, $bucket); /** - * 设置bucket的防盗链配置 + * Set bucket referer configuration * - * @param OssClient $ossClient OssClient实例 - * @param string $bucket 存储空间名称 + * @param OssClient $ossClient OssClient instance + * @param string $bucket bucket name * @return null */ function putBucketReferer($ossClient, $bucket) @@ -59,10 +59,10 @@ function putBucketReferer($ossClient, $bucket) } /** - * 获取bucket的防盗链配置 + * Get bucket referer configuration * - * @param OssClient $ossClient OssClient实例 - * @param string $bucket 存储空间名称 + * @param OssClient $ossClient OssClient instance + * @param string $bucket bucket name * @return null */ function getBucketReferer($ossClient, $bucket) @@ -80,11 +80,11 @@ function getBucketReferer($ossClient, $bucket) } /** - * 删除bucket的防盗链配置 - * Referer白名单不能直接清空，只能通过重新设置来覆盖之前的规则。 + * Delete bucket referer configuration + * Referer whitelist cannot be directly deleted. So use a empty one to overwrite it. * - * @param OssClient $ossClient OssClient实例 - * @param string $bucket 存储空间名称 + * @param OssClient $ossClient OssClient instance + * @param string $bucket bucket name * @return null */ function deleteBucketReferer($ossClient, $bucket) diff --git a/aliyun-oss-php-sdk-2.3.0/samples/BucketWebsite.php b/aliyun-oss-php-sdk-2.3.1/samples/BucketWebsite.php old mode 100755 new mode 100644 similarity index 73% rename from aliyun-oss-php-sdk-2.3.0/samples/BucketWebsite.php rename to aliyun-oss-php-sdk-2.3.1/samples/BucketWebsite.php index 54706f8..6c387e6 --- a/aliyun-oss-php-sdk-2.3.0/samples/BucketWebsite.php +++ b/aliyun-oss-php-sdk-2.3.1/samples/BucketWebsite.php @@ -9,22 +9,22 @@ $bucket = Common::getBucketName(); $ossClient = Common::getOssClient(); if (is_null($ossClient)) exit(1); -//*******************************简单使用*************************************************************** +//******************************* Simple Usage *************************************************************** -// 设置Bucket的静态网站托管模式 +// Set bucket static website configuration $websiteConfig = new WebsiteConfig("index.html", "error.html"); $ossClient->putBucketWebsite($bucket, $websiteConfig); Common::println("bucket $bucket websiteConfig created:" . $websiteConfig->serializeToXml()); -// 查看Bucket的静态网站托管状态 +// Get bucket static website configuration $websiteConfig = $ossClient->getBucketWebsite($bucket); Common::println("bucket $bucket websiteConfig fetched:" . $websiteConfig->serializeToXml()); -// 删除Bucket的静态网站托管模式 +// Delete bucket static website configuration $ossClient->deleteBucketWebsite($bucket); Common::println("bucket $bucket websiteConfig deleted"); -//******************************* 完整用法参考下面函数 **************************************************** +//******************************* For complete usage, see the following functions **************************************************** putBucketWebsite($ossClient, $bucket); getBucketWebsite($ossClient, $bucket); @@ -32,10 +32,10 @@ deleteBucketWebsite($ossClient, $bucket); getBucketWebsite($ossClient, $bucket); /** - * 设置bucket的静态网站托管模式配置 + * Sets bucket static website configuration * * @param $ossClient OssClient - * @param $bucket string 存储空间名称 + * @param $bucket string bucket name * @return null */ function putBucketWebsite($ossClient, $bucket) @@ -52,10 +52,10 @@ function putBucketWebsite($ossClient, $bucket) } /** - * 获取bucket的静态网站托管状态 + * Get bucket static website configuration * - * @param OssClient $ossClient OssClient实例 - * @param string $bucket 存储空间名称 + * @param OssClient $ossClient OssClient instance + * @param string $bucket bucket name * @return null */ function getBucketWebsite($ossClient, $bucket) @@ -73,10 +73,10 @@ function getBucketWebsite($ossClient, $bucket) } /** - * 删除bucket的静态网站托管模式配置 + * Delete bucket static website configuration * - * @param OssClient $ossClient OssClient实例 - * @param string $bucket 存储空间名称 + * @param OssClient $ossClient OssClient instance + * @param string $bucket bucket name * @return null */ function deleteBucketWebsite($ossClient, $bucket) diff --git a/aliyun-oss-php-sdk-2.3.0/samples/Callback.php b/aliyun-oss-php-sdk-2.3.1/samples/Callback.php old mode 100755 new mode 100644 similarity index 70% rename from aliyun-oss-php-sdk-2.3.0/samples/Callback.php rename to aliyun-oss-php-sdk-2.3.1/samples/Callback.php index 8612a1c..4b7bc41 --- a/aliyun-oss-php-sdk-2.3.0/samples/Callback.php +++ b/aliyun-oss-php-sdk-2.3.1/samples/Callback.php @@ -7,14 +7,14 @@ $bucket = Common::getBucketName(); $ossClient = Common::getOssClient(); if (is_null($ossClient)) exit(1); -//*******************************简单使用*************************************************************** +//******************************* Simple Usage *************************************************************** -/** putObject 使用callback上传内容到oss文件 - * callbackurl参数指定请求回调的服务器url - * callbackbodytype参数可为application/json或application/x-www-form-urlencoded, 可选参数，默认为application/x-www-form-urlencoded - * OSS_CALLBACK_VAR参数可以不设置 +/** putObject Upload content to an OSS file using callback. + * The callbackurl specifies the server url for the request callback. + * The callbackbodytype can be application/json or application/x-www-form-urlencoded,the optional parameters,the default for the application/x - WWW - form - urlencoded + * Users can choose not to set OSS_BACK_VAR */ -$url = +$url = '{ "callbackUrl":"callback.oss-demo.com:23450", "callbackHost":"oss-cn-hangzhou.aliyuncs.com", @@ -35,17 +35,17 @@ Common::println($result['body']); Common::println($result['info']['http_code']); /** - * completeMultipartUpload 使用callback上传内容到oss文件 - * callbackurl参数指定请求回调的服务器url - * callbackbodytype参数可为application/json或application/x-www-form-urlencoded, 可选参数，默认为application/x-www-form-urlencoded - * OSS_CALLBACK_VAR参数可以不设置 - */ + * completeMultipartUpload Upload content to an OSS file using callback. + * callbackurl specifies the server url for the request callback + * The callbackbodytype can be application/json or application/x-www-form-urlencoded,the optional parameters,the default for the application/x - WWW - form - urlencoded + * Users can choose not to set OSS_BACK_VAR. + */ $object = "multipart-callback-test.txt"; $copiedObject = "multipart-callback-test.txt.copied"; $ossClient->putObject($bucket, $copiedObject, file_get_contents(__FILE__)); /** - * step 1. 初始化一个分块上传事件, 也就是初始化上传Multipart, 获取upload id + * step 1. Initialize a block upload event, that is, a multipart upload process to get an upload id */ $upload_id = $ossClient->initiateMultipartUpload($bucket, $object); diff --git a/aliyun-oss-php-sdk-2.3.0/samples/Common.php b/aliyun-oss-php-sdk-2.3.1/samples/Common.php old mode 100755 new mode 100644 similarity index 87% rename from aliyun-oss-php-sdk-2.3.0/samples/Common.php rename to aliyun-oss-php-sdk-2.3.1/samples/Common.php index f419d17..49bd493 --- a/aliyun-oss-php-sdk-2.3.0/samples/Common.php +++ b/aliyun-oss-php-sdk-2.3.1/samples/Common.php @@ -14,7 +14,7 @@ use OSS\Core\OssException; /** * Class Common * - * 示例程序【Samples/*.php】 的Common类，用于获取OssClient实例和其他公用方法 + * The Common class for 【Samples/*.php】 used to obtain OssClient instance and other common functions */ class Common { @@ -24,9 +24,9 @@ class Common const bucket = Config::OSS_TEST_BUCKET; /** - * 根据Config配置，得到一个OssClient实例 + * Get an OSSClient instance according to config. * - * @return OssClient 一个OssClient实例 + * @return OssClient An OssClient instance */ public static function getOssClient() { @@ -46,7 +46,7 @@ class Common } /** - * 工具方法，创建一个存储空间，如果发生异常直接exit + * A tool function which creates a bucket and exists the process if there are exceptions */ public static function createBucket() { @@ -81,4 +81,4 @@ class Common } } -Common::createBucket(); +# Common::createBucket(); diff --git a/aliyun-oss-php-sdk-2.3.1/samples/Config.php b/aliyun-oss-php-sdk-2.3.1/samples/Config.php new file mode 100644 index 0000000..fc3a167 --- /dev/null +++ b/aliyun-oss-php-sdk-2.3.1/samples/Config.php @@ -0,0 +1,15 @@ +uploadFile($bucketName, $object, "example.jpg"); -// 图片缩放 +// Image resize $options = array( OssClient::OSS_FILE_DOWNLOAD => $download_file, OssClient::OSS_PROCESS => "image/resize,m_fixed,h_100,w_100", ); $ossClient->getObject($bucketName, $object, $options); printImage("imageResize",$download_file); -// 图片裁剪 +// Image crop $options = array( OssClient::OSS_FILE_DOWNLOAD => $download_file, OssClient::OSS_PROCESS => "image/crop,w_100,h_100,x_100,y_100,r_1", ); $ossClient->getObject($bucketName, $object, $options); printImage("iamgeCrop", $download_file); -// 图片旋转 +// Image rotate $options = array( OssClient::OSS_FILE_DOWNLOAD => $download_file, OssClient::OSS_PROCESS => "image/rotate,90", ); $ossClient->getObject($bucketName, $object, $options); printImage("imageRotate", $download_file); -// 图片锐化 +// Image sharpen $options = array( OssClient::OSS_FILE_DOWNLOAD => $download_file, OssClient::OSS_PROCESS => "image/sharpen,100", ); $ossClient->getObject($bucketName, $object, $options); printImage("imageSharpen", $download_file); -// 图片水印 +// Add watermark into a image $options = array( OssClient::OSS_FILE_DOWNLOAD => $download_file, OssClient::OSS_PROCESS => "image/watermark,text_SGVsbG8g5Zu-54mH5pyN5YqhIQ", ); $ossClient->getObject($bucketName, $object, $options); printImage("imageWatermark", $download_file); -// 图片格式转换 +// Image format convertion $options = array( OssClient::OSS_FILE_DOWNLOAD => $download_file, OssClient::OSS_PROCESS => "image/format,png", ); $ossClient->getObject($bucketName, $object, $options); printImage("imageFormat", $download_file); -// 获取图片信息 +// Get image information $options = array( OssClient::OSS_FILE_DOWNLOAD => $download_file, OssClient::OSS_PROCESS => "image/info", ); @@ -65,7 +65,7 @@ printImage("imageInfo", $download_file); /** - * 生成一个带签名的可用于浏览器直接打开的url, URL的有效期是3600秒 + * Generate a signed url which could be used in browser to access the object. The expiration time is 1 hour. */ $timeout = 3600; $options = array( @@ -74,7 +74,7 @@ $options = array( $signedUrl = $ossClient->signUrl($bucketName, $object, $timeout, "GET", $options); Common::println("rtmp url: \n" . $signedUrl); -//最后删除上传的$object +// Finally delete the $object uploaded. $ossClient->deleteObject($bucketName, $object); function printImage($func, $imageFile) diff --git a/aliyun-oss-php-sdk-2.3.0/samples/LiveChannel.php b/aliyun-oss-php-sdk-2.3.1/samples/LiveChannel.php old mode 100755 new mode 100644 similarity index 65% rename from aliyun-oss-php-sdk-2.3.0/samples/LiveChannel.php rename to aliyun-oss-php-sdk-2.3.1/samples/LiveChannel.php index 2f7d3a8..67bb541 --- a/aliyun-oss-php-sdk-2.3.0/samples/LiveChannel.php +++ b/aliyun-oss-php-sdk-2.3.1/samples/LiveChannel.php @@ -8,11 +8,14 @@ $bucket = Common::getBucketName(); $ossClient = Common::getOssClient(); if (is_null($ossClient)) exit(1); -//******************************* 简单使用 ******************************************************* +//******************************* Simple Usage ******************************************************* /** - 创建一个直播频道 - 频道的名称是test_rtmp_live。直播生成的m3u8文件叫做test.m3u8，该索引文件包含3片ts文件，每片ts文件的时长为5秒（这只是一个建议值，具体的时长取决于关键帧）。 + * Create a Live Channel + * The live channel's name is test_rtmp_live. + * The play url file is named as test.m3u8, which includes 3 ts files. + * The time period of each file is 5 seconds.(It is recommneded value only for demo purpose, the actual period depends on the key frame.) + * */ $config = new LiveChannelConfig(array( 'description' => 'live channel test', @@ -29,9 +32,9 @@ Common::println("bucket $bucket liveChannel created:\n" . "playurls: ". $info->getPlayUrls()[0] . "\n"); /** - 对创建好的频道，可以使用listBucketLiveChannels来进行列举已达到管理的目的。 - prefix可以按照前缀过滤list出来的频道。 - max_keys表示迭代器内部一次list出来的频道的最大数量，这个值最大不能超过1000，不填写的话默认为100。 + * You can use listBucketLiveChannels to list and manage all existing live channels. + * Prefix can be used to filter listed live channels by prefix. + * Max_keys indicates the maximum numbers of live channels that can be listed in an iterator at one time. Its value is 1000 in maximum and 100 by default. */ $list = $ossClient->listBucketLiveChannels($bucket); Common::println("bucket $bucket listLiveChannel:\n" . @@ -50,7 +53,9 @@ foreach($list->getChannelList() as $list) "list live channel getNextMarker: ". $list->getLastModified() . "\n"); } /** - 创建直播频道之后拿到推流用的play_url（rtmp推流的url，如果Bucket不是公共读写权限那么还需要带上签名，见下文示例）和推流用的publish_url（推流产生的m3u8文件的url） + * Obtain the play_url (url used for rtmp stream pushing. + * If the the bucket is not globally readable and writable, + * the url must be signed as shown in the following.) and pulish_url (the url included in the m3u8 file generated in stream pushing) used to push streams. */ $play_url = $ossClient->signRtmpUrl($bucket, "test_rtmp_live", 3600, array('params' => array('playlistName' => 'playlist.m3u8'))); Common::println("bucket $bucket rtmp url: \n" . $play_url); @@ -58,12 +63,13 @@ $play_url = $ossClient->signRtmpUrl($bucket, "test_rtmp_live", 3600); Common::println("bucket $bucket rtmp url: \n" . $play_url); /** - 创建好直播频道，如果想把这个频道禁用掉（断掉正在推的流或者不再允许向一个地址推流），应该使用putLiveChannelStatus接口，将频道的status改成“Disabled”，如果要将一个禁用状态的频道启用，那么也是调用这个接口，将status改成“Enabled” + * If you want to disable a created live channel (disable the pushing streaming or do not allow stream pushing to an IP address), call putLiveChannelStatus to change the channel status to "Disabled". + * If you want to enable a disabled live channel, call PutLiveChannelStatus to chanage the channel status to "Enabled". */ $resp = $ossClient->putLiveChannelStatus($bucket, "test_rtmp_live", "enabled"); /** - 创建好直播频道之后调用getLiveChannelInfo可以得到频道相关的信息 + * You can callLiveChannelInfo to get the information about a live channel. */ $info = $ossClient->getLiveChannelInfo($bucket, 'test_rtmp_live'); Common::println("bucket $bucket LiveChannelInfo:\n" . @@ -75,7 +81,7 @@ Common::println("bucket $bucket LiveChannelInfo:\n" . "live channel info playListName: ". $info->getPlayListName() . "\n"); /** - 如果想查看一个频道历史推流记录，可以调用getLiveChannelHistory。目前最多可以看到10次推流的记录 + * Gets the historical pushing streaming records by calling getLiveChannelHistory. Now the max records to return is 10. */ $history = $ossClient->getLiveChannelHistory($bucket, "test_rtmp_live"); if (count($history->getLiveRecordList()) != 0) @@ -90,9 +96,9 @@ if (count($history->getLiveRecordList()) != 0) } /** - 对于正在推流的频道调用get_live_channel_stat可以获得流的状态信息。 - 如果频道正在推流，那么stat_result中的所有字段都有意义。 - 如果频道闲置或者处于“Disabled”状态，那么status为“Idle”或“Disabled”，其他字段无意义。 + * Get the live channel's status by calling getLiveChannelStatus. + * If the live channel is receiving the pushing stream, all attributes in stat_result are valid. + * If the live channel is idle or disabled, then the status is idle or Disabled and other attributes have no meaning. */ $status = $ossClient->getLiveChannelStatus($bucket, "test_rtmp_live"); Common::println("bucket $bucket listLiveChannel:\n" . @@ -108,9 +114,9 @@ Common::println("bucket $bucket listLiveChannel:\n" . "live channel status AdioCodec: ". $status->getAudioCodec() . "\n"); /** - * 如果希望利用直播推流产生的ts文件生成一个点播列表，可以使用postVodPlaylist方法。 - * 指定起始时间为当前时间减去60秒，结束时间为当前时间，这意味着将生成一个长度为60秒的点播视频。 - * 播放列表指定为“vod_playlist.m3u8”，也就是说这个接口调用成功之后会在OSS上生成一个名叫“vod_playlist.m3u8”的播放列表文件。 + * If you want to generate a play url from the ts files generated from pushing streaming, call postVodPlayList. + * Specify the start time to 60 seconds before the current time and the end time to the current time, which means that a video of 60 seconds is generated. + * The playlist file is specified to “vod_playlist.m3u8”, which means that a palylist file named vod_playlist.m3u8 is created after the interface is called. */ $current_time = time(); $ossClient->postVodPlaylist($bucket, @@ -120,6 +126,6 @@ $ossClient->postVodPlaylist($bucket, ); /** - * 如果一个直播频道已经不打算再使用了，那么可以调用delete_live_channel来删除频道。 + * Call delete_live_channel to delete a live channel if it will no longer be in used. */ $ossClient->deleteBucketLiveChannel($bucket, "test_rtmp_live"); diff --git a/aliyun-oss-php-sdk-2.3.0/samples/MultipartUpload.php b/aliyun-oss-php-sdk-2.3.1/samples/MultipartUpload.php old mode 100755 new mode 100644 similarity index 79% rename from aliyun-oss-php-sdk-2.3.0/samples/MultipartUpload.php rename to aliyun-oss-php-sdk-2.3.1/samples/MultipartUpload.php index e8d69a3..21756b7 --- a/aliyun-oss-php-sdk-2.3.0/samples/MultipartUpload.php +++ b/aliyun-oss-php-sdk-2.3.1/samples/MultipartUpload.php @@ -9,27 +9,27 @@ $bucket = Common::getBucketName(); $ossClient = Common::getOssClient(); if (is_null($ossClient)) exit(1); -//*******************************简单使用*************************************************************** +//******************************* Simple usage *************************************************************** /** - * 查看完整用法中的 "putObjectByRawApis"函数，查看使用基础的分片上传api进行文件上传，用户可以基于这个自行实现断点续传等功能 + * See the putObjectByRawAPis usage in complete example to check out basic multipart upload APIs which can be used as resumable upload. */ -// 使用分片上传接口上传文件, 接口会根据文件大小决定是使用普通上传还是分片上传 +// Upload a file using the multipart upload interface, which determines to use simple upload or multipart upload based on the file size. $ossClient->multiuploadFile($bucket, "file.php", __FILE__, array()); Common::println("local file " . __FILE__ . " is uploaded to the bucket $bucket, file.php"); -// 上传本地目录到bucket内的targetdir子目录中 +// Upload local directory's data into target dir $ossClient->uploadDir($bucket, "targetdir", __DIR__); Common::println("local dir " . __DIR__ . " is uploaded to the bucket $bucket, targetdir/"); -// 列出当前未完成的分片上传 +// List the incomplete multipart uploads $listMultipartUploadInfo = $ossClient->listMultipartUploads($bucket, array()); -//******************************* 完整用法参考下面函数 **************************************************** +//******************************* For complete usage, see the following functions **************************************************** multiuploadFile($ossClient, $bucket); putObjectByRawApis($ossClient, $bucket); @@ -37,10 +37,10 @@ uploadDir($ossClient, $bucket); listMultipartUploads($ossClient, $bucket); /** - * 通过multipart上传文件 + * Upload files using multipart upload * - * @param OssClient $ossClient OssClient实例 - * @param string $bucket 存储空间名称 + * @param OssClient $ossClient OssClient instance + * @param string $bucket bucket name * @return null */ function multiuploadFile($ossClient, $bucket) @@ -60,17 +60,17 @@ function multiuploadFile($ossClient, $bucket) } /** - * 使用基本的api分阶段进行分片上传 + * Use basic multipart upload for file upload. * - * @param OssClient $ossClient OssClient实例 - * @param string $bucket 存储空间名称 + * @param OssClient $ossClient OssClient instance + * @param string $bucket bucket name * @throws OssException */ function putObjectByRawApis($ossClient, $bucket) { $object = "test/multipart-test.txt"; /** - * step 1. 初始化一个分块上传事件, 也就是初始化上传Multipart, 获取upload id + * step 1. Initialize a block upload event, that is, a multipart upload process to get an upload id */ try { $uploadId = $ossClient->initiateMultipartUpload($bucket, $object); @@ -81,7 +81,7 @@ function putObjectByRawApis($ossClient, $bucket) } print(__FUNCTION__ . ": initiateMultipartUpload OK" . "\n"); /* - * step 2. 上传分片 + * step 2. Upload parts */ $partSize = 10 * 1024 * 1024; $uploadFile = __FILE__; @@ -104,7 +104,7 @@ function putObjectByRawApis($ossClient, $bucket) $contentMd5 = OssUtil::getMd5SumForFile($uploadFile, $fromPos, $toPos); $upOptions[$ossClient::OSS_CONTENT_MD5] = $contentMd5; } - //2. 将每一分片上传到OSS + //2. Upload each part to OSS try { $responseUploadPart[] = $ossClient->uploadPart($bucket, $object, $uploadId, $upOptions); } catch (OssException $e) { @@ -122,7 +122,7 @@ function putObjectByRawApis($ossClient, $bucket) ); } /** - * step 3. 完成上传 + * step 3. Complete the upload */ try { $ossClient->completeMultipartUpload($bucket, $object, $uploadId, $uploadParts); @@ -135,10 +135,10 @@ function putObjectByRawApis($ossClient, $bucket) } /** - * 按照目录上传文件 + * Upload by directories * * @param OssClient $ossClient OssClient - * @param string $bucket 存储空间名称 + * @param string $bucket bucket name * */ function uploadDir($ossClient, $bucket) @@ -156,7 +156,7 @@ function uploadDir($ossClient, $bucket) } /** - * 获取当前未完成的分片上传列表 + * Get ongoing multipart uploads * * @param $ossClient OssClient * @param $bucket string diff --git a/aliyun-oss-php-sdk-2.3.0/samples/Object.php b/aliyun-oss-php-sdk-2.3.1/samples/Object.php old mode 100755 new mode 100644 similarity index 78% rename from aliyun-oss-php-sdk-2.3.0/samples/Object.php rename to aliyun-oss-php-sdk-2.3.1/samples/Object.php index 3bf024b..ae6eb83 --- a/aliyun-oss-php-sdk-2.3.0/samples/Object.php +++ b/aliyun-oss-php-sdk-2.3.1/samples/Object.php @@ -7,9 +7,9 @@ use OSS\Core\OssException; $bucket = Common::getBucketName(); $ossClient = Common::getOssClient(); if (is_null($ossClient)) exit(1); -//*******************************简单使用*************************************************************** +//******************************* Simple usage *************************************************************** -// 简单上传变量的内容到oss文件 +// Upload the in-memory string (hi, oss) to an OSS file $result = $ossClient->putObject($bucket, "b.file", "hi, oss"); Common::println("b.file is created"); Common::println($result['x-oss-request-id']); @@ -17,7 +17,7 @@ Common::println($result['etag']); Common::println($result['content-md5']); Common::println($result['body']); -// 上传本地文件 +// Uploads a local file to an OSS file $result = $ossClient->uploadFile($bucket, "c.file", __FILE__); Common::println("c.file is created"); Common::println("b.file is created"); @@ -26,21 +26,21 @@ Common::println($result['etag']); Common::println($result['content-md5']); Common::println($result['body']); -// 下载object到本地变量 +// Download an oss object as an in-memory variable $content = $ossClient->getObject($bucket, "b.file"); Common::println("b.file is fetched, the content is: " . $content); -// 给object添加symlink +// Add a symlink to an object $content = $ossClient->putSymlink($bucket, "test-symlink", "b.file"); Common::println("test-symlink is created"); Common::println($result['x-oss-request-id']); Common::println($result['etag']); -// 获取symlink +// Get a symlink $content = $ossClient->getSymlink($bucket, "test-symlink"); Common::println("test-symlink refer to : " . $content[OssClient::OSS_SYMLINK_TARGET]); -// 下载object到本地文件 +// Download an object to a local file. $options = array( OssClient::OSS_FILE_DOWNLOAD => "./c.file.localcopy", ); @@ -48,26 +48,26 @@ $ossClient->getObject($bucket, "c.file", $options); Common::println("b.file is fetched to the local file: c.file.localcopy"); Common::println("b.file is created"); -// 拷贝object +// Copy an object $result = $ossClient->copyObject($bucket, "c.file", $bucket, "c.file.copy"); Common::println("lastModifiedTime: " . $result[0]); Common::println("ETag: " . $result[1]); -// 判断object是否存在 +// Check whether an object exists $doesExist = $ossClient->doesObjectExist($bucket, "c.file.copy"); Common::println("file c.file.copy exist? " . ($doesExist ? "yes" : "no")); -// 删除object +// Delete an object $result = $ossClient->deleteObject($bucket, "c.file.copy"); Common::println("c.file.copy is deleted"); Common::println("b.file is created"); Common::println($result['x-oss-request-id']); -// 判断object是否存在 +// Check whether an object exists $doesExist = $ossClient->doesObjectExist($bucket, "c.file.copy"); Common::println("file c.file.copy exist? " . ($doesExist ? "yes" : "no")); -// 批量删除object +// Delete multiple objects in batch $result = $ossClient->deleteObjects($bucket, array("b.file", "c.file")); foreach($result as $object) Common::println($object); @@ -75,7 +75,7 @@ foreach($result as $object) sleep(2); unlink("c.file.localcopy"); -//******************************* 完整用法参考下面函数 **************************************************** +//******************************* For complete usage, see the following functions **************************************************** listObjects($ossClient, $bucket); listAllObjects($ossClient, $bucket); @@ -93,10 +93,10 @@ doesObjectExist($ossClient, $bucket); getSymlink($ossClient, $bucket); putSymlink($ossClient, $bucket); /** - * 创建虚拟目录 + * Create a 'virtual' folder * - * @param OssClient $ossClient OssClient实例 - * @param string $bucket 存储空间名称 + * @param OssClient $ossClient OssClient instance + * @param string $bucket bucket name * @return null */ function createObjectDir($ossClient, $bucket) @@ -112,12 +112,12 @@ function createObjectDir($ossClient, $bucket) } /** - * 把本地变量的内容到文件 + * Upload in-memory data to oss * - * 简单上传,上传指定变量的内存值作为object的内容 + * Simple upload---upload specified in-memory data to an OSS object * - * @param OssClient $ossClient OssClient实例 - * @param string $bucket 存储空间名称 + * @param OssClient $ossClient OssClient instance + * @param string $bucket bucket name * @return null */ function putObject($ossClient, $bucket) @@ -137,10 +137,10 @@ function putObject($ossClient, $bucket) /** - * 上传指定的本地文件内容 + * Uploads a local file to OSS * - * @param OssClient $ossClient OssClient实例 - * @param string $bucket 存储空间名称 + * @param OssClient $ossClient OssClient instance + * @param string $bucket bucket name * @return null */ function uploadFile($ossClient, $bucket) @@ -160,11 +160,12 @@ function uploadFile($ossClient, $bucket) } /** - * 列出Bucket内所有目录和文件, 注意如果符合条件的文件数目超过设置的max-keys， 用户需要使用返回的nextMarker作为入参，通过 - * 循环调用ListObjects得到所有的文件，具体操作见下面的 listAllObjects 示例 + * Lists all files and folders in the bucket. + * Note if there's more items than the max-keys specified, the caller needs to use the nextMarker returned as the value for the next call's maker paramter. + * Loop through all the items returned from ListObjects. * - * @param OssClient $ossClient OssClient实例 - * @param string $bucket 存储空间名称 + * @param OssClient $ossClient OssClient instance + * @param string $bucket bucket name * @return null */ function listObjects($ossClient, $bucket) @@ -187,8 +188,8 @@ function listObjects($ossClient, $bucket) return; } print(__FUNCTION__ . ": OK" . "\n"); - $objectList = $listObjectInfo->getObjectList(); // 文件列表 - $prefixList = $listObjectInfo->getPrefixList(); // 目录列表 + $objectList = $listObjectInfo->getObjectList(); // object list + $prefixList = $listObjectInfo->getPrefixList(); // directory list if (!empty($objectList)) { print("objectList:\n"); foreach ($objectList as $objectInfo) { @@ -204,15 +205,15 @@ function listObjects($ossClient, $bucket) } /** - * 列出Bucket内所有目录和文件， 根据返回的nextMarker循环得到所有Objects + * Lists all folders and files under the bucket. Use nextMarker repeatedly to get all objects. * - * @param OssClient $ossClient OssClient实例 - * @param string $bucket 存储空间名称 + * @param OssClient $ossClient OssClient instance + * @param string $bucket bucket name * @return null */ function listAllObjects($ossClient, $bucket) { - //构造dir下的文件和虚拟目录 + // Create dir/obj 'folder' and put some files into it. for ($i = 0; $i < 100; $i += 1) { $ossClient->putObject($bucket, "dir/obj" . strval($i), "hi"); $ossClient->createObjectDir($bucket, "dir/obj" . strval($i)); @@ -238,7 +239,7 @@ function listAllObjects($ossClient, $bucket) printf($e->getMessage() . "\n"); return; } - // 得到nextMarker，从上一次listObjects读到的最后一个文件的下一个文件开始继续获取文件列表 + // Get the nextMarker, and it would be used as the next call's marker parameter to resume from the last call $nextMarker = $listObjectInfo->getNextMarker(); $listObject = $listObjectInfo->getObjectList(); $listPrefix = $listObjectInfo->getPrefixList(); @@ -251,10 +252,10 @@ function listAllObjects($ossClient, $bucket) } /** - * 获取object的内容 + * Get the content of an object. * - * @param OssClient $ossClient OssClient实例 - * @param string $bucket 存储空间名称 + * @param OssClient $ossClient OssClient instance + * @param string $bucket bucket name * @return null */ function getObject($ossClient, $bucket) @@ -277,10 +278,10 @@ function getObject($ossClient, $bucket) } /** - * put symlink + * Put symlink * - * @param OssClient $ossClient OssClient实例 - * @param string $bucket 存储空间名称 + * @param OssClient $ossClient The Instance of OssClient + * @param string $bucket bucket name * @return null */ function putSymlink($ossClient, $bucket) @@ -305,10 +306,10 @@ function putSymlink($ossClient, $bucket) } /** - * 获取symlink + * Get symlink * - * @param OssClient $ossClient OssClient实例 - * @param string $bucket 存储空间名称 + * @param OssClient $ossClient OssClient instance + * @param string $bucket bucket name * @return null */ function getSymlink($ossClient, $bucket) @@ -333,13 +334,13 @@ function getSymlink($ossClient, $bucket) } /** - * get_object_to_local_file + * Get_object_to_local_file * - * 获取object - * 将object下载到指定的文件 + * Get object + * Download object to a specified file. * - * @param OssClient $ossClient OssClient实例 - * @param string $bucket 存储空间名称 + * @param OssClient $ossClient OssClient instance + * @param string $bucket bucket name * @return null */ function getObjectToLocalFile($ossClient, $bucket) @@ -369,11 +370,11 @@ function getObjectToLocalFile($ossClient, $bucket) } /** - * 拷贝object - * 当目的object和源object完全相同时，表示修改object的meta信息 + * Copy object + * When the source object is same as the target one, copy operation will just update the metadata. * - * @param OssClient $ossClient OssClient实例 - * @param string $bucket 存储空间名称 + * @param OssClient $ossClient OssClient instance + * @param string $bucket bucket name * @return null */ function copyObject($ossClient, $bucket) @@ -395,11 +396,11 @@ function copyObject($ossClient, $bucket) } /** - * 修改Object Meta - * 利用copyObject接口的特性：当目的object和源object完全相同时，表示修改object的meta信息 + * Update Object Meta + * it leverages the feature of copyObject： when the source object is just the target object, the metadata could be updated via copy * - * @param OssClient $ossClient OssClient实例 - * @param string $bucket 存储空间名称 + * @param OssClient $ossClient OssClient instance + * @param string $bucket bucket name * @return null */ function modifyMetaForObject($ossClient, $bucket) @@ -425,10 +426,10 @@ function modifyMetaForObject($ossClient, $bucket) } /** - * 获取object meta, 也就是getObjectMeta接口 + * Get object meta, that is, getObjectMeta * - * @param OssClient $ossClient OssClient实例 - * @param string $bucket 存储空间名称 + * @param OssClient $ossClient OssClient instance + * @param string $bucket bucket name * @return null */ function getObjectMeta($ossClient, $bucket) @@ -452,10 +453,10 @@ function getObjectMeta($ossClient, $bucket) } /** - * 删除object + * Delete an object * - * @param OssClient $ossClient OssClient实例 - * @param string $bucket 存储空间名称 + * @param OssClient $ossClient OssClient instance + * @param string $bucket bucket name * @return null */ function deleteObject($ossClient, $bucket) @@ -473,10 +474,10 @@ function deleteObject($ossClient, $bucket) /** - * 批量删除object + * Delete multiple objects in batch * - * @param OssClient $ossClient OssClient实例 - * @param string $bucket 存储空间名称 + * @param OssClient $ossClient OssClient instance + * @param string $bucket bucket name * @return null */ function deleteObjects($ossClient, $bucket) @@ -495,10 +496,10 @@ function deleteObjects($ossClient, $bucket) } /** - * 判断object是否存在 + * Check whether an object exists * - * @param OssClient $ossClient OssClient实例 - * @param string $bucket 存储空间名称 + * @param OssClient $ossClient OssClient instance + * @param string $bucket bucket name * @return null */ function doesObjectExist($ossClient, $bucket) diff --git a/aliyun-oss-php-sdk-2.3.0/samples/RunAll.php b/aliyun-oss-php-sdk-2.3.1/samples/RunAll.php old mode 100755 new mode 100644 similarity index 90% rename from aliyun-oss-php-sdk-2.3.0/samples/RunAll.php rename to aliyun-oss-php-sdk-2.3.1/samples/RunAll.php index a4d6d9b..0cd7ec1 --- a/aliyun-oss-php-sdk-2.3.0/samples/RunAll.php +++ b/aliyun-oss-php-sdk-2.3.1/samples/RunAll.php @@ -9,5 +9,5 @@ require_once __DIR__ . '/BucketReferer.php'; require_once __DIR__ . '/BucketLogging.php'; require_once __DIR__ . '/BucketWebsite.php'; require_once __DIR__ . '/Signature.php'; -require_once __DIR__ . '/Object.php'; +require_once __DIR__ . '/Object1.php'; require_once __DIR__ . '/MultipartUpload.php'; \ No newline at end of file diff --git a/aliyun-oss-php-sdk-2.3.0/samples/Signature.php b/aliyun-oss-php-sdk-2.3.1/samples/Signature.php old mode 100755 new mode 100644 similarity index 76% rename from aliyun-oss-php-sdk-2.3.0/samples/Signature.php rename to aliyun-oss-php-sdk-2.3.1/samples/Signature.php index 5ef2b7d..eef5981 --- a/aliyun-oss-php-sdk-2.3.0/samples/Signature.php +++ b/aliyun-oss-php-sdk-2.3.1/samples/Signature.php @@ -10,33 +10,33 @@ $bucket = Common::getBucketName(); $ossClient = Common::getOssClient(); if (is_null($ossClient)) exit(1); -//******************************* 简单使用 *************************************************************** +//******************************* Simple Usage *************************************************************** $ossClient->uploadFile($bucket, "a.file", __FILE__); -// 生成GetObject的签名url，用户可以使用这个url直接在浏览器下载 +// Generate a signed url for getting an object. The URL can be used in browser directly to download the file. $signedUrl = $ossClient->signUrl($bucket, "a.file", 3600); Common::println($signedUrl); -// 生成用于putObject的签名URL，用户可以直接用put方法使用这个url上传文件到 "a.file" +// Generate the signed url for putting an object. User can use put method with this url to upload a file to "a.file". $signedUrl = $ossClient->signUrl($bucket, "a.file", "3600", "PUT"); Common::println($signedUrl); -// 生成从本地文件上传PutObject的签名url, 用户可以直接使用这个url把本地文件上传到　"a.file" +// Generate the signed url for putting an object from local file. The url can be used directly to upload the file to "a.file". $signedUrl = $ossClient->signUrl($bucket, "a.file", 3600, "PUT", array('Content-Type' => 'txt')); Common::println($signedUrl); -//******************************* 完整用法参考下面函数 **************************************************** +//******************************* For complete usage, see the following functions **************************************************** getSignedUrlForPuttingObject($ossClient, $bucket); getSignedUrlForPuttingObjectFromFile($ossClient, $bucket); getSignedUrlForGettingObject($ossClient, $bucket); /** - * 生成GetObject的签名url,主要用于私有权限下的读访问控制 + * Generate the signed url for getObject() to control read accesses under private privilege * - * @param $ossClient OssClient OssClient实例 - * @param $bucket string 存储空间名称 + * @param $ossClient OssClient OssClient instance + * @param $bucket string bucket name * @return null */ function getSignedUrlForGettingObject($ossClient, $bucket) @@ -52,7 +52,7 @@ function getSignedUrlForGettingObject($ossClient, $bucket) } print(__FUNCTION__ . ": signedUrl: " . $signedUrl . "\n"); /** - * 可以类似的代码来访问签名的URL，也可以输入到浏览器中去访问 + * Use similar code to access the object by url, or use browser to access the object. */ $request = new RequestCore($signedUrl); $request->set_method('GET'); @@ -67,10 +67,10 @@ function getSignedUrlForGettingObject($ossClient, $bucket) } /** - * 生成PutObject的签名url,主要用于私有权限下的写访问控制 + * Generate the signed url for PutObject to control write accesses under private privilege. * - * @param OssClient $ossClient OssClient实例 - * @param string $bucket 存储空间名称 + * @param OssClient $ossClient OssClient instance + * @param string $bucket bucket name * @return null * @throws OssException */ @@ -105,11 +105,10 @@ function getSignedUrlForPuttingObject($ossClient, $bucket) } /** - * 生成PutObject的签名url,主要用于私有权限下的写访问控制， 用户可以利用生成的signedUrl - * 从文件上传文件 + * Generate the signed url for PutObject's signed url. User could use the signed url to upload file directly. * - * @param OssClient $ossClient OssClient实例 - * @param string $bucket 存储空间名称 + * @param OssClient $ossClient OssClient instance + * @param string $bucket bucket name * @throws OssException */ function getSignedUrlForPuttingObjectFromFile($ossClient, $bucket) diff --git a/aliyun-oss-php-sdk-2.3.0/src/OSS/Core/MimeTypes.php b/aliyun-oss-php-sdk-2.3.1/src/OSS/Core/MimeTypes.php old mode 100755 new mode 100644 similarity index 96% rename from aliyun-oss-php-sdk-2.3.0/src/OSS/Core/MimeTypes.php rename to aliyun-oss-php-sdk-2.3.1/src/OSS/Core/MimeTypes.php index e9b88ff..17685c3 --- a/aliyun-oss-php-sdk-2.3.0/src/OSS/Core/MimeTypes.php +++ b/aliyun-oss-php-sdk-2.3.1/src/OSS/Core/MimeTypes.php @@ -5,16 +5,17 @@ namespace OSS\Core; /** * Class MimeTypes * - * 在上传文件的时候，根据文件的缺省名，得到其对应的Content-type + * The map of a file's extention name to its corresponding Content-Type value in the file upload request. + * If the file extention name is not predefined in this class, getMimetype() returns null. * * @package OSS\Core */ class MimeTypes { /** - * 根据文件名，获取http协议header中的content-type应该填写的数据 + * Get the content-type value of http header from the file's extension name. * - * @param string $name 缺省名 + * @param string $name Default file extension name. * @return string content-type */ public static function getMimetype($name) diff --git a/aliyun-oss-php-sdk-2.3.0/src/OSS/Core/OssException.php b/aliyun-oss-php-sdk-2.3.1/src/OSS/Core/OssException.php old mode 100755 new mode 100644 similarity index 86% rename from aliyun-oss-php-sdk-2.3.0/src/OSS/Core/OssException.php rename to aliyun-oss-php-sdk-2.3.1/src/OSS/Core/OssException.php index b0e9e8b..2320c9e --- a/aliyun-oss-php-sdk-2.3.0/src/OSS/Core/OssException.php +++ b/aliyun-oss-php-sdk-2.3.1/src/OSS/Core/OssException.php @@ -5,8 +5,8 @@ namespace OSS\Core; /** * Class OssException * - * OssClient在使用的时候，所抛出的异常，用户在使用OssClient的时候，要Try住相关代码， - * try的Exception应该是OssException，其中会得到相关异常原因 + * This is the class that OSSClient is expected to thrown, which the caller needs to handle properly. + * It has the OSS specific errors which is useful for troubleshooting. * * @package OSS\Core */ diff --git a/aliyun-oss-php-sdk-2.3.0/src/OSS/Core/OssUtil.php b/aliyun-oss-php-sdk-2.3.1/src/OSS/Core/OssUtil.php old mode 100755 new mode 100644 similarity index 80% rename from aliyun-oss-php-sdk-2.3.0/src/OSS/Core/OssUtil.php rename to aliyun-oss-php-sdk-2.3.1/src/OSS/Core/OssUtil.php index 6e5d413..541d2c3 --- a/aliyun-oss-php-sdk-2.3.0/src/OSS/Core/OssUtil.php +++ b/aliyun-oss-php-sdk-2.3.1/src/OSS/Core/OssUtil.php @@ -5,7 +5,7 @@ namespace OSS\Core; /** * Class OssUtil * - * Oss工具类，主要供OssClient使用，用户也可以使用本类进行返回结果的格式化 + * Oss Util class for OssClient. The caller could use it for formating the result from OssClient. * * @package OSS */ @@ -20,10 +20,10 @@ class OssUtil const OSS_MIN_PART_SIZE = 102400; // 100KB /** - * 生成query params + * Generate query params * - * @param array $options 关联数组 - * @return string 返回诸如 key1=value1&key2=value2 + * @param array $options: a key-value pair array. + * @return string: the key-value list in the format such as key1=value1&key2=value2 */ public static function toQueryString($options = array()) { @@ -38,7 +38,7 @@ class OssUtil } /** - * 转义字符替换 + * Html encoding '<', '>', '&', '\', '"' in subject parameter. * * @param string $subject * @return string @@ -51,7 +51,7 @@ class OssUtil } /** - * 检查是否是中文编码 + * Check whether the string includes any chinese character * * @param $str * @return int @@ -62,10 +62,10 @@ class OssUtil } /** - * 检测是否GB2312编码 + * Checks if the string is encoded by GB2312. * * @param string $str - * @return boolean false UTF-8编码 TRUE GB2312编码 + * @return boolean false UTF-8 encoding TRUE GB2312 encoding */ public static function isGb2312($str) { @@ -87,7 +87,7 @@ class OssUtil } /** - * 检测是否GBK编码 + * Checks if the string is encoded by GBK * * @param string $str * @param boolean $gbk @@ -114,13 +114,13 @@ class OssUtil } /** - * 检验bucket名称是否合法 - * bucket的命名规范： - * 1. 只能包括小写字母，数字 - * 2. 必须以小写字母或者数字开头 - * 3. 长度必须在3-63字节之间 + * Checks if the bucket name is valid + * bucket naming rules + * 1. Can only include lowercase letters, numbers, or dashes + * 2. Must start and end with lowercase letters or numbers + * 3. Must be within a length from 3 to 63 bytes. * - * @param string $bucket Bucket名称 + * @param string $bucket Bucket name * @return boolean */ public static function validateBucket($bucket) @@ -133,11 +133,11 @@ class OssUtil } /** - * 检验object名称是否合法 - * object命名规范: - * 1. 规则长度必须在1-1023字节之间 - * 2. 使用UTF-8编码 - * 3. 不能以 "/" "\\"开头 + * Checks if object name is valid + * object naming rules: + * 1. Must be within a length from 1 to 1023 bytes + * 2. Cannot start with '/' or '\\'. + * 3. Must be encoded in UTF-8. * * @param string $object Object名称 * @return boolean @@ -155,7 +155,7 @@ class OssUtil /** - * 判断字符串$str是不是以$findMe开始 + * Checks if $str starts with $findMe * * @param string $str * @param string $findMe @@ -170,8 +170,9 @@ class OssUtil } } + /** - * 生成createBucketXmlBody接口的xml消息 + * Generate the xml message of createBucketXmlBody. * * @param string $storageClass * @return string @@ -184,7 +185,7 @@ class OssUtil } /** - * 检验$options + * validate $options * * @param array $options * @throws OssException @@ -199,7 +200,7 @@ class OssUtil } /** - * 检查上传文件的内容是否合法 + * check whether the Content is valid. * * @param $content string * @throws OssException @@ -212,7 +213,7 @@ class OssUtil } /** - * 校验BUCKET/OBJECT/OBJECT GROUP是否为空 + * Check if BUCKET/OBJECT/OBJECT GROUP is empty. * * @param string $name * @param string $errMsg @@ -227,7 +228,7 @@ class OssUtil } /** - * 仅供测试使用的接口,请勿使用 + * This is a method for test only. DO NOT USE. * * @param $filename * @param $size @@ -268,7 +269,7 @@ BBB; } /** - * 得到文件的md5编码 + * Get MD5 of the file. * * @param $filename * @param $from_pos @@ -318,7 +319,7 @@ BBB; } /** - * 检测是否windows系统，因为windows系统默认编码为GBK + * Check if the OS is Windows. The default encoding in Windows is GBK. * * @return bool */ @@ -328,7 +329,9 @@ BBB; } /** - * 主要是由于windows系统编码是gbk，遇到中文时候，如果不进行转换处理会出现找不到文件的问题 + * Encodes the file path from GBK to UTF-8. + * The default encoding in Windows is GBK. + * And if the file path is in Chinese, the file would not be found without the transcoding to UTF-8. * * @param $file_path * @return string @@ -342,9 +345,9 @@ BBB; } /** - * 判断用户输入的endpoint是否是 xxx.xxx.xxx.xxx:port 或者 xxx.xxx.xxx.xxx的ip格式 + * Check if the endpoint is in the IPv4 format, such as xxx.xxx.xxx.xxx:port or xxx.xxx.xxx.xxx. * - * @param string $endpoint 需要做判断的endpoint + * @param string $endpoint The endpoint to check. * @return boolean */ public static function isIPFormat($endpoint) @@ -360,7 +363,44 @@ BBB; } /** - * 生成DeleteMultiObjects接口的xml消息 + * Get the host:port from endpoint. + * + * @param string $endpoint the endpoint. + * @return boolean + */ + public static function getHostPortFromEndpoint($endpoint) + { + $str = $endpoint; + $pos = strpos($str, "://"); + if ($pos !== false) { + $str = substr($str, $pos+3); + } + + $pos = strpos($str, '#'); + if ($pos !== false) { + $str = substr($str, 0, $pos); + } + + $pos = strpos($str, '?'); + if ($pos !== false) { + $str = substr($str, 0, $pos); + } + + $pos = strpos($str, '/'); + if ($pos !== false) { + $str = substr($str, 0, $pos); + } + + $pos = strpos($str, '@'); + if ($pos !== false) { + $str = substr($str, $pos+1); + } + + return $str; + } + + /** + * Generate the xml message of DeleteMultiObjects. * * @param string[] $objects * @param bool $quiet @@ -379,7 +419,7 @@ BBB; } /** - * 生成CompleteMultipartUpload接口的xml消息 + * Generate the xml message of CompleteMultipartUpload. * * @param array[] $listParts * @return string @@ -396,7 +436,7 @@ BBB; } /** - * 读取目录 + * Read the directory, return a associative array in which the MD5 is the named key and the is the value. * * @param string $dir * @param string $exclude diff --git a/aliyun-oss-php-sdk-2.3.0/src/OSS/Http/LICENSE b/aliyun-oss-php-sdk-2.3.1/src/OSS/Http/LICENSE old mode 100755 new mode 100644 similarity index 100% rename from aliyun-oss-php-sdk-2.3.0/src/OSS/Http/LICENSE rename to aliyun-oss-php-sdk-2.3.1/src/OSS/Http/LICENSE diff --git a/aliyun-oss-php-sdk-2.3.0/src/OSS/Http/RequestCore.php b/aliyun-oss-php-sdk-2.3.1/src/OSS/Http/RequestCore.php old mode 100755 new mode 100644 similarity index 96% rename from aliyun-oss-php-sdk-2.3.0/src/OSS/Http/RequestCore.php rename to aliyun-oss-php-sdk-2.3.1/src/OSS/Http/RequestCore.php index 06d0f87..e1d221e --- a/aliyun-oss-php-sdk-2.3.0/src/OSS/Http/RequestCore.php +++ b/aliyun-oss-php-sdk-2.3.1/src/OSS/Http/RequestCore.php @@ -3,7 +3,7 @@ namespace OSS\Http; /** - * Handles all HTTP requests using cURL and manages the responses. + * Handle all HTTP requests using cURL and manages the responses. * * @version 2011.06.07 * @copyright 2006-2011 Ryan Parman @@ -75,7 +75,7 @@ class RequestCore public $method; /** - * Stores the proxy settings to use for the request. + * Store the proxy settings to use for the request. */ public $proxy = null; @@ -170,14 +170,14 @@ class RequestCore public $registered_streaming_write_callback = null; /** - * 请求超时时间， 默认是5184000秒，6天 + * The request timeout time, which is 5,184,000 seconds,that is, 6 days by default * * @var int */ public $timeout = 5184000; /** - * 连接超时时间，默认是10秒 + * The connection timeout time, which is 10 seconds by default * * @var int */ @@ -216,7 +216,7 @@ class RequestCore // CONSTRUCTOR/DESTRUCTOR /** - * Constructs a new instance of this class. + * Construct a new instance of this class. * * @param string $url (Optional) The URL to request or service endpoint to query. * @param string $proxy (Optional) The faux-url to use for proxy settings. Takes the following format: `proxy://user:pass@hostname:port` @@ -249,7 +249,7 @@ class RequestCore } /** - * Destructs the instance. Closes opened file handles. + * Destruct the instance. Closes opened file handles. * * @return $this A reference to the current instance. */ @@ -271,7 +271,7 @@ class RequestCore // REQUEST METHODS /** - * Sets the credentials to use for authentication. + * Set the credentials to use for authentication. * * @param string $user (Required) The username to authenticate with. * @param string $pass (Required) The password to authenticate with. @@ -285,7 +285,7 @@ class RequestCore } /** - * Adds a custom HTTP header to the cURL request. + * Add a custom HTTP header to the cURL request. * * @param string $key (Required) The custom HTTP header to set. * @param mixed $value (Required) The value to assign to the custom HTTP header. @@ -298,7 +298,7 @@ class RequestCore } /** - * Removes an HTTP header from the cURL request. + * Remove an HTTP header from the cURL request. * * @param string $key (Required) The custom HTTP header to set. * @return $this A reference to the current instance. @@ -324,7 +324,7 @@ class RequestCore } /** - * Sets a custom useragent string for the class. + * Set a custom useragent string for the class. * * @param string $ua (Required) The useragent string to use. * @return $this A reference to the current instance. @@ -373,7 +373,7 @@ class RequestCore } /** - * Sets the length in bytes to read from the stream while streaming up. + * Set the length in bytes to read from the stream while streaming up. * * @param integer $size (Required) The length in bytes to read from the stream. * @return $this A reference to the current instance. @@ -386,7 +386,7 @@ class RequestCore } /** - * Sets the resource to read from while streaming up. Reads the stream from its current position until + * Set the resource to read from while streaming up. Reads the stream from its current position until * EOF or `$size` bytes have been read. If `$size` is not given it will be determined by and * . * @@ -414,7 +414,7 @@ class RequestCore } /** - * Sets the file to read from while streaming up. + * Set the file to read from while streaming up. * * @param string $location (Required) The readable location to read from. * @return $this A reference to the current instance. @@ -428,7 +428,7 @@ class RequestCore } /** - * Sets the resource to write to while streaming down. + * Set the resource to write to while streaming down. * * @param resource $resource (Required) The writeable resource to write to. * @return $this A reference to the current instance. @@ -441,7 +441,7 @@ class RequestCore } /** - * Sets the file to write to while streaming down. + * Set the file to write to while streaming down. * * @param string $location (Required) The writeable location to write to. * @return $this A reference to the current instance. @@ -631,7 +631,7 @@ class RequestCore } /** - * Prepares and adds the details of the cURL request. This can be passed along to a + * Prepare and adds the details of the cURL request. This can be passed along to a * function. * * @return resource The handle for the cURL object. @@ -685,7 +685,6 @@ class RequestCore // Enable a proxy connection if requested. if ($this->proxy) { - $host = $this->proxy['host']; $host .= ($this->proxy['port']) ? ':' . $this->proxy['port'] : ''; curl_setopt($curl_handle, CURLOPT_PROXY, $host); @@ -830,7 +829,7 @@ class RequestCore } /** - * Sends the request, calling necessary utility functions to update built-in properties. + * Send the request, calling necessary utility functions to update built-in properties. * * @param boolean $parse (Optional) Whether to parse the response with ResponseCore or not. * @return string The resulting unparsed data from the request. diff --git a/aliyun-oss-php-sdk-2.3.0/src/OSS/Http/RequestCore_Exception.php b/aliyun-oss-php-sdk-2.3.1/src/OSS/Http/RequestCore_Exception.php old mode 100755 new mode 100644 similarity index 100% rename from aliyun-oss-php-sdk-2.3.0/src/OSS/Http/RequestCore_Exception.php rename to aliyun-oss-php-sdk-2.3.1/src/OSS/Http/RequestCore_Exception.php diff --git a/aliyun-oss-php-sdk-2.3.0/src/OSS/Http/ResponseCore.php b/aliyun-oss-php-sdk-2.3.1/src/OSS/Http/ResponseCore.php old mode 100755 new mode 100644 similarity index 89% rename from aliyun-oss-php-sdk-2.3.0/src/OSS/Http/ResponseCore.php rename to aliyun-oss-php-sdk-2.3.1/src/OSS/Http/ResponseCore.php index 106d181..9093561 --- a/aliyun-oss-php-sdk-2.3.0/src/OSS/Http/ResponseCore.php +++ b/aliyun-oss-php-sdk-2.3.1/src/OSS/Http/ResponseCore.php @@ -8,25 +8,25 @@ namespace OSS\Http; class ResponseCore { /** - * Stores the HTTP header information. + * Store the HTTP header information. */ public $header; /** - * Stores the SimpleXML response. + * Store the SimpleXML response. */ public $body; /** - * Stores the HTTP response code. + * Store the HTTP response code. */ public $status; /** - * Constructs a new instance of this class. + * Construct a new instance of this class. * * @param array $header (Required) Associative array of HTTP headers (typically returned by ). - * @param string $body (Required) XML-formatted response from AWS. + * @param string $body (Required) XML-formatted response from OSS. * @param integer $status (Optional) HTTP response status code from the request. * @return Mixed Contains an `header` property (HTTP headers as an associative array), a or `body` property, and an `status` code. */ diff --git a/aliyun-oss-php-sdk-2.3.0/src/OSS/Model/BucketInfo.php b/aliyun-oss-php-sdk-2.3.1/src/OSS/Model/BucketInfo.php old mode 100755 new mode 100644 similarity index 81% rename from aliyun-oss-php-sdk-2.3.0/src/OSS/Model/BucketInfo.php rename to aliyun-oss-php-sdk-2.3.1/src/OSS/Model/BucketInfo.php index 9b89674..09e7dea --- a/aliyun-oss-php-sdk-2.3.0/src/OSS/Model/BucketInfo.php +++ b/aliyun-oss-php-sdk-2.3.1/src/OSS/Model/BucketInfo.php @@ -4,7 +4,7 @@ namespace OSS\Model; /** - * Bucket信息，ListBuckets接口返回数据 + * Bucket information class. This is the type of element in BucketListInfo's * * Class BucketInfo * @package OSS\Model @@ -26,7 +26,7 @@ class BucketInfo } /** - * 得到bucket所在的region + * Get bucket location * * @return string */ @@ -36,7 +36,7 @@ class BucketInfo } /** - * 得到bucket的名称 + * Get bucket name * * @return string */ @@ -46,7 +46,7 @@ class BucketInfo } /** - * 得到bucket的创建时间 + * Get bucket creation time. * * @return string */ @@ -56,20 +56,20 @@ class BucketInfo } /** - * bucket所在的region + * bucket region * * @var string */ private $location; /** - * bucket的名称 + * bucket name * * @var string */ private $name; /** - * bucket的创建事件 + * bucket creation time * * @var string */ diff --git a/aliyun-oss-php-sdk-2.3.0/src/OSS/Model/BucketListInfo.php b/aliyun-oss-php-sdk-2.3.1/src/OSS/Model/BucketListInfo.php old mode 100755 new mode 100644 similarity index 83% rename from aliyun-oss-php-sdk-2.3.0/src/OSS/Model/BucketListInfo.php rename to aliyun-oss-php-sdk-2.3.1/src/OSS/Model/BucketListInfo.php index 910717f..ce03a0d --- a/aliyun-oss-php-sdk-2.3.0/src/OSS/Model/BucketListInfo.php +++ b/aliyun-oss-php-sdk-2.3.1/src/OSS/Model/BucketListInfo.php @@ -5,7 +5,7 @@ namespace OSS\Model; /** * Class BucketListInfo * - * ListBuckets接口返回的数据类型 + * It's the type of return value of ListBuckets. * * @package OSS\Model */ @@ -21,7 +21,7 @@ class BucketListInfo } /** - * 得到BucketInfo列表 + * Get the BucketInfo list * * @return BucketInfo[] */ @@ -31,7 +31,7 @@ class BucketListInfo } /** - * BucketInfo信息列表 + * BucketInfo list * * @var array */ diff --git a/aliyun-oss-php-sdk-2.3.0/src/OSS/Model/CnameConfig.php b/aliyun-oss-php-sdk-2.3.1/src/OSS/Model/CnameConfig.php old mode 100755 new mode 100644 similarity index 100% rename from aliyun-oss-php-sdk-2.3.0/src/OSS/Model/CnameConfig.php rename to aliyun-oss-php-sdk-2.3.1/src/OSS/Model/CnameConfig.php diff --git a/aliyun-oss-php-sdk-2.3.0/src/OSS/Model/CorsConfig.php b/aliyun-oss-php-sdk-2.3.1/src/OSS/Model/CorsConfig.php old mode 100755 new mode 100644 similarity index 94% rename from aliyun-oss-php-sdk-2.3.0/src/OSS/Model/CorsConfig.php rename to aliyun-oss-php-sdk-2.3.1/src/OSS/Model/CorsConfig.php index c44c10a..62a0d71 --- a/aliyun-oss-php-sdk-2.3.0/src/OSS/Model/CorsConfig.php +++ b/aliyun-oss-php-sdk-2.3.1/src/OSS/Model/CorsConfig.php @@ -22,7 +22,7 @@ class CorsConfig implements XmlConfig } /** - * 得到CorsRule列表 + * Get CorsRule list * * @return CorsRule[] */ @@ -33,7 +33,7 @@ class CorsConfig implements XmlConfig /** - * 添加一条CorsRule + * Add a new CorsRule * * @param CorsRule $rule * @throws OssException @@ -47,7 +47,7 @@ class CorsConfig implements XmlConfig } /** - * 从xml数据中解析出CorsConfig + * Parse CorsConfig from the xml. * * @param string $strXml * @throws OssException @@ -78,7 +78,7 @@ class CorsConfig implements XmlConfig } /** - * 生成xml字符串 + * Serialize the object into xml string. * * @return string */ @@ -105,7 +105,7 @@ class CorsConfig implements XmlConfig const OSS_MAX_RULES = 10; /** - * orsRule列表 + * CorsRule list * * @var CorsRule[] */ diff --git a/aliyun-oss-php-sdk-2.3.0/src/OSS/Model/CorsRule.php b/aliyun-oss-php-sdk-2.3.1/src/OSS/Model/CorsRule.php old mode 100755 new mode 100644 similarity index 89% rename from aliyun-oss-php-sdk-2.3.0/src/OSS/Model/CorsRule.php rename to aliyun-oss-php-sdk-2.3.1/src/OSS/Model/CorsRule.php index 2cbe1c1..08353a0 --- a/aliyun-oss-php-sdk-2.3.0/src/OSS/Model/CorsRule.php +++ b/aliyun-oss-php-sdk-2.3.1/src/OSS/Model/CorsRule.php @@ -13,7 +13,7 @@ use OSS\Core\OssException; class CorsRule { /** - * Rule中增加一条allowedOrigin + * Add an allowedOrigin rule * * @param string $allowedOrigin */ @@ -25,7 +25,7 @@ class CorsRule } /** - * Rule中增加一条allowedMethod + * Add an allowedMethod rule * * @param string $allowedMethod */ @@ -37,7 +37,7 @@ class CorsRule } /** - * Rule中增加一条allowedHeader + * Add an allowedHeader rule * * @param string $allowedHeader */ @@ -49,7 +49,7 @@ class CorsRule } /** - * Rule中增加一条exposeHeader + * Add an exposeHeader rule * * @param string $exposeHeader */ @@ -77,7 +77,7 @@ class CorsRule } /** - * 得到AllowedHeaders列表 + * Get the AllowedHeaders list * * @return string[] */ @@ -87,7 +87,7 @@ class CorsRule } /** - * 得到AllowedOrigins列表 + * Get the AllowedOrigins list * * @return string[] */ @@ -97,7 +97,7 @@ class CorsRule } /** - * 得到AllowedMethods列表 + * Get the AllowedMethods list * * @return string[] */ @@ -107,7 +107,7 @@ class CorsRule } /** - * 得到ExposeHeaders列表 + * Get the ExposeHeaders list * * @return string[] */ @@ -117,7 +117,7 @@ class CorsRule } /** - * 根据提供的xmlRule， 把this按照一定的规则插入到$xmlRule中 + * Serialize all the rules into the xml represented by parameter $xmlRule * * @param \SimpleXMLElement $xmlRule * @throws OssException diff --git a/aliyun-oss-php-sdk-2.3.0/src/OSS/Model/GetLiveChannelHistory.php b/aliyun-oss-php-sdk-2.3.1/src/OSS/Model/GetLiveChannelHistory.php old mode 100755 new mode 100644 similarity index 100% rename from aliyun-oss-php-sdk-2.3.0/src/OSS/Model/GetLiveChannelHistory.php rename to aliyun-oss-php-sdk-2.3.1/src/OSS/Model/GetLiveChannelHistory.php diff --git a/aliyun-oss-php-sdk-2.3.0/src/OSS/Model/GetLiveChannelInfo.php b/aliyun-oss-php-sdk-2.3.1/src/OSS/Model/GetLiveChannelInfo.php old mode 100755 new mode 100644 similarity index 100% rename from aliyun-oss-php-sdk-2.3.0/src/OSS/Model/GetLiveChannelInfo.php rename to aliyun-oss-php-sdk-2.3.1/src/OSS/Model/GetLiveChannelInfo.php diff --git a/aliyun-oss-php-sdk-2.3.0/src/OSS/Model/GetLiveChannelStatus.php b/aliyun-oss-php-sdk-2.3.1/src/OSS/Model/GetLiveChannelStatus.php old mode 100755 new mode 100644 similarity index 100% rename from aliyun-oss-php-sdk-2.3.0/src/OSS/Model/GetLiveChannelStatus.php rename to aliyun-oss-php-sdk-2.3.1/src/OSS/Model/GetLiveChannelStatus.php diff --git a/aliyun-oss-php-sdk-2.3.0/src/OSS/Model/LifecycleAction.php b/aliyun-oss-php-sdk-2.3.1/src/OSS/Model/LifecycleAction.php old mode 100755 new mode 100644 similarity index 96% rename from aliyun-oss-php-sdk-2.3.0/src/OSS/Model/LifecycleAction.php rename to aliyun-oss-php-sdk-2.3.1/src/OSS/Model/LifecycleAction.php index 5abd825..a0e2126 --- a/aliyun-oss-php-sdk-2.3.0/src/OSS/Model/LifecycleAction.php +++ b/aliyun-oss-php-sdk-2.3.1/src/OSS/Model/LifecycleAction.php @@ -71,7 +71,7 @@ class LifecycleAction } /** - * appendToXml 把actions插入到xml中 + * Use appendToXml to insert actions into xml. * * @param \SimpleXMLElement $xmlRule */ diff --git a/aliyun-oss-php-sdk-2.3.0/src/OSS/Model/LifecycleConfig.php b/aliyun-oss-php-sdk-2.3.1/src/OSS/Model/LifecycleConfig.php old mode 100755 new mode 100644 similarity index 92% rename from aliyun-oss-php-sdk-2.3.0/src/OSS/Model/LifecycleConfig.php rename to aliyun-oss-php-sdk-2.3.1/src/OSS/Model/LifecycleConfig.php index fc4f575..f2d2dc3 --- a/aliyun-oss-php-sdk-2.3.0/src/OSS/Model/LifecycleConfig.php +++ b/aliyun-oss-php-sdk-2.3.1/src/OSS/Model/LifecycleConfig.php @@ -13,7 +13,7 @@ use OSS\Core\OssException; class LifecycleConfig implements XmlConfig { /** - * 从xml数据中解析出LifecycleConfig + * Parse the xml into this object. * * @param string $strXml * @throws OssException @@ -48,7 +48,7 @@ class LifecycleConfig implements XmlConfig /** - * 生成xml字符串 + * Serialize the object to xml * * @return string */ @@ -65,7 +65,7 @@ class LifecycleConfig implements XmlConfig /** * - * 添加LifecycleRule + * Add a LifecycleRule * * @param LifecycleRule $lifecycleRule * @throws OssException @@ -79,7 +79,7 @@ class LifecycleConfig implements XmlConfig } /** - * 将配置转换成字符串，便于用户查看 + * Serialize the object into xml string. * * @return string */ @@ -89,7 +89,7 @@ class LifecycleConfig implements XmlConfig } /** - * 得到所有的生命周期规则 + * Get all lifecycle rules. * * @return LifecycleRule[] */ diff --git a/aliyun-oss-php-sdk-2.3.0/src/OSS/Model/LifecycleRule.php b/aliyun-oss-php-sdk-2.3.1/src/OSS/Model/LifecycleRule.php old mode 100755 new mode 100644 similarity index 82% rename from aliyun-oss-php-sdk-2.3.0/src/OSS/Model/LifecycleRule.php rename to aliyun-oss-php-sdk-2.3.1/src/OSS/Model/LifecycleRule.php index ec615b9..73c6cc3 --- a/aliyun-oss-php-sdk-2.3.0/src/OSS/Model/LifecycleRule.php +++ b/aliyun-oss-php-sdk-2.3.1/src/OSS/Model/LifecycleRule.php @@ -12,7 +12,7 @@ namespace OSS\Model; class LifecycleRule { /** - * 得到规则ID + * Get Id * * @return string */ @@ -22,7 +22,7 @@ class LifecycleRule } /** - * @param string $id 规则ID + * @param string $id Rule Id */ public function setId($id) { @@ -30,7 +30,7 @@ class LifecycleRule } /** - * 得到文件前缀 + * Get a file prefix * * @return string */ @@ -40,9 +40,9 @@ class LifecycleRule } /** - * 设置文件前缀 + * Set a file prefix * - * @param string $prefix 文件前缀 + * @param string $prefix The file prefix */ public function setPrefix($prefix) { @@ -50,7 +50,7 @@ class LifecycleRule } /** - * Lifecycle规则的状态 + * Get Lifecycle status * * @return string */ @@ -60,7 +60,7 @@ class LifecycleRule } /** - * 设置Lifecycle规则状态 + * Set Lifecycle status * * @param string $status */ @@ -90,9 +90,9 @@ class LifecycleRule /** * LifecycleRule constructor. * - * @param string $id 规则ID - * @param string $prefix 文件前缀 - * @param string $status 规则状态，可选[self::LIFECYCLE_STATUS_ENABLED, self::LIFECYCLE_STATUS_DISABLED] + * @param string $id rule Id + * @param string $prefix File prefix + * @param string $status Rule status, which has the following valid values: [self::LIFECYCLE_STATUS_ENABLED, self::LIFECYCLE_STATUS_DISABLED] * @param LifecycleAction[] $actions */ public function __construct($id, $prefix, $status, $actions) diff --git a/aliyun-oss-php-sdk-2.3.0/src/OSS/Model/ListMultipartUploadInfo.php b/aliyun-oss-php-sdk-2.3.1/src/OSS/Model/ListMultipartUploadInfo.php old mode 100755 new mode 100644 similarity index 100% rename from aliyun-oss-php-sdk-2.3.0/src/OSS/Model/ListMultipartUploadInfo.php rename to aliyun-oss-php-sdk-2.3.1/src/OSS/Model/ListMultipartUploadInfo.php diff --git a/aliyun-oss-php-sdk-2.3.0/src/OSS/Model/ListPartsInfo.php b/aliyun-oss-php-sdk-2.3.1/src/OSS/Model/ListPartsInfo.php old mode 100755 new mode 100644 similarity index 100% rename from aliyun-oss-php-sdk-2.3.0/src/OSS/Model/ListPartsInfo.php rename to aliyun-oss-php-sdk-2.3.1/src/OSS/Model/ListPartsInfo.php diff --git a/aliyun-oss-php-sdk-2.3.0/src/OSS/Model/LiveChannelConfig.php b/aliyun-oss-php-sdk-2.3.1/src/OSS/Model/LiveChannelConfig.php old mode 100755 new mode 100644 similarity index 100% rename from aliyun-oss-php-sdk-2.3.0/src/OSS/Model/LiveChannelConfig.php rename to aliyun-oss-php-sdk-2.3.1/src/OSS/Model/LiveChannelConfig.php diff --git a/aliyun-oss-php-sdk-2.3.0/src/OSS/Model/LiveChannelHistory.php b/aliyun-oss-php-sdk-2.3.1/src/OSS/Model/LiveChannelHistory.php old mode 100755 new mode 100644 similarity index 100% rename from aliyun-oss-php-sdk-2.3.0/src/OSS/Model/LiveChannelHistory.php rename to aliyun-oss-php-sdk-2.3.1/src/OSS/Model/LiveChannelHistory.php diff --git a/aliyun-oss-php-sdk-2.3.0/src/OSS/Model/LiveChannelInfo.php b/aliyun-oss-php-sdk-2.3.1/src/OSS/Model/LiveChannelInfo.php old mode 100755 new mode 100644 similarity index 100% rename from aliyun-oss-php-sdk-2.3.0/src/OSS/Model/LiveChannelInfo.php rename to aliyun-oss-php-sdk-2.3.1/src/OSS/Model/LiveChannelInfo.php diff --git a/aliyun-oss-php-sdk-2.3.0/src/OSS/Model/LiveChannelListInfo.php b/aliyun-oss-php-sdk-2.3.1/src/OSS/Model/LiveChannelListInfo.php old mode 100755 new mode 100644 similarity index 97% rename from aliyun-oss-php-sdk-2.3.0/src/OSS/Model/LiveChannelListInfo.php rename to aliyun-oss-php-sdk-2.3.1/src/OSS/Model/LiveChannelListInfo.php index bb5093a..f4ee02f --- a/aliyun-oss-php-sdk-2.3.0/src/OSS/Model/LiveChannelListInfo.php +++ b/aliyun-oss-php-sdk-2.3.1/src/OSS/Model/LiveChannelListInfo.php @@ -5,7 +5,7 @@ namespace OSS\Model; /** * Class LiveChannelListInfo * - * ListBucketLiveChannels接口返回数据 + * The data returned by ListBucketLiveChannels * * @package OSS\Model * @link http://help.aliyun.com/document_detail/oss/api-reference/bucket/GetBucket.html diff --git a/aliyun-oss-php-sdk-2.3.0/src/OSS/Model/LoggingConfig.php b/aliyun-oss-php-sdk-2.3.1/src/OSS/Model/LoggingConfig.php old mode 100755 new mode 100644 similarity index 98% rename from aliyun-oss-php-sdk-2.3.0/src/OSS/Model/LoggingConfig.php rename to aliyun-oss-php-sdk-2.3.1/src/OSS/Model/LoggingConfig.php index 978421a..ed9fb1d --- a/aliyun-oss-php-sdk-2.3.0/src/OSS/Model/LoggingConfig.php +++ b/aliyun-oss-php-sdk-2.3.1/src/OSS/Model/LoggingConfig.php @@ -42,7 +42,7 @@ class LoggingConfig implements XmlConfig } /** - * 序列化成xml字符串 + * Serialize to xml string * */ public function serializeToXml() diff --git a/aliyun-oss-php-sdk-2.3.0/src/OSS/Model/ObjectInfo.php b/aliyun-oss-php-sdk-2.3.1/src/OSS/Model/ObjectInfo.php old mode 100755 new mode 100644 similarity index 82% rename from aliyun-oss-php-sdk-2.3.0/src/OSS/Model/ObjectInfo.php rename to aliyun-oss-php-sdk-2.3.1/src/OSS/Model/ObjectInfo.php index 2ae6c99..891f862 --- a/aliyun-oss-php-sdk-2.3.0/src/OSS/Model/ObjectInfo.php +++ b/aliyun-oss-php-sdk-2.3.1/src/OSS/Model/ObjectInfo.php @@ -6,11 +6,11 @@ namespace OSS\Model; * * Class ObjectInfo * - * listObjects接口中返回的Object列表中的类 + * The element type of ObjectListInfo, which is the return value type of listObjects * - * listObjects接口返回数据中包含两个Array - * 一个是拿到的Object列表【可以理解成对应文件系统中的文件列表】 - * 一个是拿到的Prefix列表【可以理解成对应文件系统中的目录列表】 + * The return value of listObjects includes two arrays + * One is the returned ObjectListInfo, which is similar to a file list in a file system. + * The other is the returned prefix list, which is similar to a folder list in a file system. * * @package OSS\Model */ diff --git a/aliyun-oss-php-sdk-2.3.0/src/OSS/Model/ObjectListInfo.php b/aliyun-oss-php-sdk-2.3.1/src/OSS/Model/ObjectListInfo.php old mode 100755 new mode 100644 similarity index 93% rename from aliyun-oss-php-sdk-2.3.0/src/OSS/Model/ObjectListInfo.php rename to aliyun-oss-php-sdk-2.3.1/src/OSS/Model/ObjectListInfo.php index dbe7c7a..81c5d27 --- a/aliyun-oss-php-sdk-2.3.0/src/OSS/Model/ObjectListInfo.php +++ b/aliyun-oss-php-sdk-2.3.1/src/OSS/Model/ObjectListInfo.php @@ -5,7 +5,7 @@ namespace OSS\Model; /** * Class ObjectListInfo * - * ListObjects接口返回数据 + * The class of return value of ListObjects * * @package OSS\Model * @link http://help.aliyun.com/document_detail/oss/api-reference/bucket/GetBucket.html @@ -87,7 +87,7 @@ class ObjectListInfo } /** - * 返回ListObjects接口返回数据中的ObjectInfo列表 + * Get the ObjectInfo list. * * @return ObjectInfo[] */ @@ -97,7 +97,7 @@ class ObjectListInfo } /** - * 返回ListObjects接口返回数据中的PrefixInfo列表 + * Get the PrefixInfo list * * @return PrefixInfo[] */ diff --git a/aliyun-oss-php-sdk-2.3.0/src/OSS/Model/PartInfo.php b/aliyun-oss-php-sdk-2.3.1/src/OSS/Model/PartInfo.php old mode 100755 new mode 100644 similarity index 100% rename from aliyun-oss-php-sdk-2.3.0/src/OSS/Model/PartInfo.php rename to aliyun-oss-php-sdk-2.3.1/src/OSS/Model/PartInfo.php diff --git a/aliyun-oss-php-sdk-2.3.0/src/OSS/Model/PrefixInfo.php b/aliyun-oss-php-sdk-2.3.1/src/OSS/Model/PrefixInfo.php old mode 100755 new mode 100644 similarity index 62% rename from aliyun-oss-php-sdk-2.3.0/src/OSS/Model/PrefixInfo.php rename to aliyun-oss-php-sdk-2.3.1/src/OSS/Model/PrefixInfo.php index e61eac4..27920b9 --- a/aliyun-oss-php-sdk-2.3.0/src/OSS/Model/PrefixInfo.php +++ b/aliyun-oss-php-sdk-2.3.1/src/OSS/Model/PrefixInfo.php @@ -5,10 +5,10 @@ namespace OSS\Model; /** * Class PrefixInfo * - * listObjects接口中返回的Prefix列表中的类 - * listObjects接口返回数据中包含两个Array: - * 一个是拿到的Object列表【可以理解成对应文件系统中的文件列表】 - * 一个是拿到的Prefix列表【可以理解成对应文件系统中的目录列表】 + * ListObjects return Prefix 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 Prefix list【Can be understood as the corresponding file system directory list】 * * @package OSS\Model * @link http://help.aliyun.com/document_detail/oss/api-reference/bucket/GetBucket.html diff --git a/aliyun-oss-php-sdk-2.3.0/src/OSS/Model/RefererConfig.php b/aliyun-oss-php-sdk-2.3.1/src/OSS/Model/RefererConfig.php old mode 100755 new mode 100644 similarity index 97% rename from aliyun-oss-php-sdk-2.3.0/src/OSS/Model/RefererConfig.php rename to aliyun-oss-php-sdk-2.3.1/src/OSS/Model/RefererConfig.php index 1d7d975..0830143 --- a/aliyun-oss-php-sdk-2.3.0/src/OSS/Model/RefererConfig.php +++ b/aliyun-oss-php-sdk-2.3.1/src/OSS/Model/RefererConfig.php @@ -29,7 +29,7 @@ class RefererConfig implements XmlConfig /** - * 把RefererConfig序列化成xml + * serialize the RefererConfig object into xml string * * @return string */ diff --git a/aliyun-oss-php-sdk-2.3.0/src/OSS/Model/StorageCapacityConfig.php b/aliyun-oss-php-sdk-2.3.1/src/OSS/Model/StorageCapacityConfig.php old mode 100755 new mode 100644 similarity index 96% rename from aliyun-oss-php-sdk-2.3.0/src/OSS/Model/StorageCapacityConfig.php rename to aliyun-oss-php-sdk-2.3.1/src/OSS/Model/StorageCapacityConfig.php index 05e6332..024b5c9 --- a/aliyun-oss-php-sdk-2.3.0/src/OSS/Model/StorageCapacityConfig.php +++ b/aliyun-oss-php-sdk-2.3.1/src/OSS/Model/StorageCapacityConfig.php @@ -29,7 +29,7 @@ class StorageCapacityConfig implements XmlConfig } /** - * 把StorageCapacityConfig序列化成xml + * Serialize StorageCapacityConfig into xml * * @return string */ diff --git a/aliyun-oss-php-sdk-2.3.0/src/OSS/Model/UploadInfo.php b/aliyun-oss-php-sdk-2.3.1/src/OSS/Model/UploadInfo.php old mode 100755 new mode 100644 similarity index 94% rename from aliyun-oss-php-sdk-2.3.0/src/OSS/Model/UploadInfo.php rename to aliyun-oss-php-sdk-2.3.1/src/OSS/Model/UploadInfo.php index 8eaa363..49aa414 --- a/aliyun-oss-php-sdk-2.3.0/src/OSS/Model/UploadInfo.php +++ b/aliyun-oss-php-sdk-2.3.1/src/OSS/Model/UploadInfo.php @@ -5,7 +5,7 @@ namespace OSS\Model; /** * Class UploadInfo * - * ListMultipartUpload接口得到的UploadInfo + * The return value of ListMultipartUpload * * @package OSS\Model */ diff --git a/aliyun-oss-php-sdk-2.3.0/src/OSS/Model/WebsiteConfig.php b/aliyun-oss-php-sdk-2.3.1/src/OSS/Model/WebsiteConfig.php old mode 100755 new mode 100644 similarity index 97% rename from aliyun-oss-php-sdk-2.3.0/src/OSS/Model/WebsiteConfig.php rename to aliyun-oss-php-sdk-2.3.1/src/OSS/Model/WebsiteConfig.php index 8ea08a0..e298eb4 --- a/aliyun-oss-php-sdk-2.3.0/src/OSS/Model/WebsiteConfig.php +++ b/aliyun-oss-php-sdk-2.3.1/src/OSS/Model/WebsiteConfig.php @@ -40,7 +40,7 @@ class WebsiteConfig implements XmlConfig } /** - * 把WebsiteConfig序列化成xml + * Serialize the WebsiteConfig object into xml string. * * @return string * @throws OssException diff --git a/aliyun-oss-php-sdk-2.3.0/src/OSS/Model/XmlConfig.php b/aliyun-oss-php-sdk-2.3.1/src/OSS/Model/XmlConfig.php old mode 100755 new mode 100644 similarity index 61% rename from aliyun-oss-php-sdk-2.3.0/src/OSS/Model/XmlConfig.php rename to aliyun-oss-php-sdk-2.3.1/src/OSS/Model/XmlConfig.php index d353a22..8c0a0db --- a/aliyun-oss-php-sdk-2.3.0/src/OSS/Model/XmlConfig.php +++ b/aliyun-oss-php-sdk-2.3.1/src/OSS/Model/XmlConfig.php @@ -10,7 +10,7 @@ interface XmlConfig { /** - * 接口定义，实现此接口的类都需要实现从xml数据解析的函数 + * Interface method: Parse the object from the xml. * * @param string $strXml * @return null @@ -18,7 +18,7 @@ interface XmlConfig public function parseFromXml($strXml); /** - * 接口定义，实现此接口的类，都需要实现把子类序列化成xml字符串的接口 + * Interface method: Serialize the object into xml. * * @return string */ diff --git a/aliyun-oss-php-sdk-2.3.0/src/OSS/OssClient.php b/aliyun-oss-php-sdk-2.3.1/src/OSS/OssClient.php old mode 100755 new mode 100644 similarity index 82% rename from aliyun-oss-php-sdk-2.3.0/src/OSS/OssClient.php rename to aliyun-oss-php-sdk-2.3.1/src/OSS/OssClient.php index 1c090d3..daae42c --- a/aliyun-oss-php-sdk-2.3.0/src/OSS/OssClient.php +++ b/aliyun-oss-php-sdk-2.3.1/src/OSS/OssClient.php @@ -17,11 +17,12 @@ use OSS\Result\AclResult; use OSS\Result\BodyResult; use OSS\Result\GetCorsResult; use OSS\Result\GetLifecycleResult; +use OSS\Result\GetLocationResult; use OSS\Result\GetLoggingResult; use OSS\Result\GetRefererResult; +use OSS\Result\GetStorageCapacityResult; use OSS\Result\GetWebsiteResult; use OSS\Result\GetCnameResult; -use OSS\Result\GetLocationResult; use OSS\Result\HeaderResult; use OSS\Result\InitiateMultipartUploadResult; use OSS\Result\ListBucketsResult; @@ -39,9 +40,9 @@ use OSS\Result\GetLiveChannelHistoryResult; use OSS\Result\GetLiveChannelInfoResult; use OSS\Result\GetLiveChannelStatusResult; use OSS\Result\ListLiveChannelResult; -use OSS\Result\GetStorageCapacityResult; use OSS\Result\AppendResult; use OSS\Model\ObjectListInfo; +use OSS\Result\SymlinkResult; use OSS\Result\UploadPartResult; use OSS\Model\BucketListInfo; use OSS\Model\LifecycleConfig; @@ -49,35 +50,33 @@ use OSS\Model\RefererConfig; use OSS\Model\WebsiteConfig; use OSS\Core\OssUtil; use OSS\Model\ListPartsInfo; -use OSS\Result\SymlinkResult; /** * Class OssClient * - * Object Storage Service(OSS) 的客户端类，封装了用户通过OSS API对OSS服务的各种操作， - * 用户通过OssClient实例可以进行Bucket，Object，MultipartUpload, ACL等操作，具体 - * 的接口规则可以参考官方OSS API文档 + * Object Storage Service(OSS)'s client class, which wraps all OSS APIs user could call to talk to OSS. + * Users could do operations on bucket, object, including MultipartUpload or setting ACL via an OSSClient instance. + * For more details, please check out the OSS API document:https://www.alibabacloud.com/help/doc-detail/31947.htm */ class OssClient { /** - * 构造函数 + * Constructor * - * 构造函数有几种情况： - * 1. 一般的时候初始化使用 $ossClient = new OssClient($id, $key, $endpoint) - * 2. 如果使用CNAME的，比如使用的是www.testoss.com，在控制台上做了CNAME的绑定， - * 初始化使用 $ossClient = new OssClient($id, $key, $endpoint, true) - * 3. 如果使用了阿里云SecurityTokenService(STS)，获得了AccessKeyID, AccessKeySecret, Token - * 初始化使用 $ossClient = new OssClient($id, $key, $endpoint, false, $token) - * 4. 如果用户使用的endpoint是ip - * 初始化使用 $ossClient = new OssClient($id, $key, “1.2.3.4:8900”) + * There're a few different ways to create an OssClient object: + * 1. Most common one from access Id, access Key and the endpoint: $ossClient = new OssClient($id, $key, $endpoint) + * 2. If the endpoint is the CName (such as www.testoss.com, make sure it's CName binded in the OSS console), + * uses $ossClient = new OssClient($id, $key, $endpoint, true) + * 3. If using Alicloud's security token service (STS), then the AccessKeyId, AccessKeySecret and STS token are all got from STS. + * Use this: $ossClient = new OssClient($id, $key, $endpoint, false, $token) + * 4. If the endpoint is in IP format, you could use this: $ossClient = new OssClient($id, $key, “1.2.3.4:8900”) * - * @param string $accessKeyId 从OSS获得的AccessKeyId - * @param string $accessKeySecret 从OSS获得的AccessKeySecret - * @param string $endpoint 您选定的OSS数据中心访问域名，例如oss-cn-hangzhou.aliyuncs.com - * @param boolean $isCName 是否对Bucket做了域名绑定，并且Endpoint参数填写的是自己的域名 - * @param string $securityToken - * @param string $requestProxy 添加代理支持 + * @param string $accessKeyId The AccessKeyId from OSS or STS + * @param string $accessKeySecret The AccessKeySecret from OSS or STS + * @param string $endpoint The domain name of the datacenter,For example: oss-cn-hangzhou.aliyuncs.com + * @param boolean $isCName If this is the CName and binded in the bucket. + * @param string $securityToken from STS. + * @param string $requestProxy * @throws OssException */ public function __construct($accessKeyId, $accessKeySecret, $endpoint, $isCName = false, $securityToken = NULL, $requestProxy = NULL) @@ -100,12 +99,11 @@ class OssClient $this->accessKeySecret = $accessKeySecret; $this->securityToken = $securityToken; $this->requestProxy = $requestProxy; - self::checkEnv(); } /** - * 列举用户所有的Bucket[GetService], Endpoint类型为cname不能进行此操作 + * Lists the Bucket [GetService]. Not applicable if the endpoint is CName (because CName must be binded to a specific bucket). * * @param array $options * @throws OssException @@ -126,7 +124,7 @@ class OssClient } /** - * 创建bucket，默认创建的bucket的ACL是OssClient::OSS_ACL_TYPE_PRIVATE + * Creates bucket,The ACL of the bucket created by default is OssClient::OSS_ACL_TYPE_PRIVATE * * @param string $bucket * @param string $acl @@ -152,9 +150,9 @@ class OssClient } /** - * 删除bucket - * 如果Bucket不为空（Bucket中有Object，或者有分块上传的碎片），则Bucket无法删除， - * 必须删除Bucket中的所有Object以及碎片后，Bucket才能成功删除。 + * Deletes bucket + * The deletion will not succeed if the bucket is not empty (either has objects or parts) + * To delete a bucket, all its objects and parts must be deleted first. * * @param string $bucket * @param array $options @@ -172,7 +170,7 @@ class OssClient } /** - * 判断bucket是否存在 + * Checks if a bucket exists * * @param string $bucket * @return bool @@ -189,9 +187,9 @@ class OssClient $result = new ExistResult($response); return $result->getData(); } - + /** - * 获取bucket所属的数据中心位置信息 + * Get the data center location information for the bucket * * @param string $bucket * @param array $options @@ -209,27 +207,27 @@ class OssClient $result = new GetLocationResult($response); return $result->getData(); } - + /** - * 获取Bucket的Meta信息 + * Get the Meta information for the Bucket * * @param string $bucket - * @param array $options 具体参考SDK文档 + * @param array $options Refer to the SDK documentation * @return array */ public function getBucketMeta($bucket, $options = NULL) { - $this->precheckCommon($bucket, NULL, $options, false); - $options[self::OSS_BUCKET] = $bucket; - $options[self::OSS_METHOD] = self::OSS_HTTP_HEAD; - $options[self::OSS_OBJECT] = '/'; - $response = $this->auth($options); - $result = new HeaderResult($response); - return $result->getData(); + $this->precheckCommon($bucket, NULL, $options, false); + $options[self::OSS_BUCKET] = $bucket; + $options[self::OSS_METHOD] = self::OSS_HTTP_HEAD; + $options[self::OSS_OBJECT] = '/'; + $response = $this->auth($options); + $result = new HeaderResult($response); + return $result->getData(); } /** - * 获取bucket的ACL配置情况 + * Gets the bucket ACL * * @param string $bucket * @param array $options @@ -249,11 +247,11 @@ class OssClient } /** - * 设置bucket的ACL配置情况 + * Sets the bucket ACL * - * @param string $bucket bucket名称 - * @param string $acl 读写权限，可选值 ['private', 'public-read', 'public-read-write'] - * @param array $options 可以为空 + * @param string $bucket bucket name + * @param string $acl access permissions, valid values are ['private', 'public-read', 'public-read-write'] + * @param array $options by default is empty * @throws OssException * @return null */ @@ -271,7 +269,7 @@ class OssClient } /** - * 获取object的ACL属性 + * Gets object ACL * * @param string $bucket * @param string $object @@ -292,11 +290,11 @@ class OssClient } /** - * 设置object的ACL属性 + * Sets the object ACL * - * @param string $bucket bucket名称 - * @param string $object object名称 - * @param string $acl 读写权限，可选值 ['default', 'private', 'public-read', 'public-read-write'] + * @param string $bucket bucket name + * @param string $object object name + * @param string $acl access permissions, valid values are ['default', 'private', 'public-read', 'public-read-write'] * @throws OssException * @return null */ @@ -314,10 +312,10 @@ class OssClient } /** - * 获取Bucket的访问日志配置情况 + * Gets the bucket logging config * - * @param string $bucket bucket名称 - * @param array $options 可以为空 + * @param string $bucket bucket name + * @param array $options by default is empty * @throws OssException * @return LoggingConfig */ @@ -334,12 +332,12 @@ class OssClient } /** - * 开启Bucket访问日志记录功能，只有Bucket的所有者才能更改 + * Sets the bycket logging config. Only owner can call this API. * - * @param string $bucket bucket名称 - * @param string $targetBucket 日志文件存放的bucket - * @param string $targetPrefix 日志的文件前缀 - * @param array $options 可以为空 + * @param string $bucket bucket name + * @param string $targetBucket The logging file's bucket + * @param string $targetPrefix The logging file's prefix + * @param array $options By default is empty. * @throws OssException * @return null */ @@ -361,10 +359,10 @@ class OssClient } /** - * 关闭bucket访问日志记录功能 + * Deletes the bucket logging config * - * @param string $bucket bucket名称 - * @param array $options 可以为空 + * @param string $bucket bucket name + * @param array $options * @throws OssException * @return null */ @@ -381,11 +379,11 @@ class OssClient } /** - * 将bucket设置成静态网站托管模式 + * Sets the website config in bucket---that is could make the bucket as a static website once the CName is binded. * - * @param string $bucket bucket名称 + * @param string $bucket bucket name * @param WebsiteConfig $websiteConfig - * @param array $options 可以为空 + * @param array $options * @throws OssException * @return null */ @@ -404,9 +402,9 @@ class OssClient } /** - * 获取bucket的静态网站托管状态 + * Gets the website config in the bucket * - * @param string $bucket bucket名称 + * @param string $bucket bucket name * @param array $options * @throws OssException * @return WebsiteConfig @@ -424,9 +422,9 @@ class OssClient } /** - * 关闭bucket的静态网站托管模式 + * Deletes the website config in the bucket * - * @param string $bucket bucket名称 + * @param string $bucket bucket name * @param array $options * @throws OssException * @return null @@ -444,10 +442,10 @@ class OssClient } /** - * 在指定的bucket上设定一个跨域资源共享(CORS)的规则，如果原规则存在则覆盖原规则 + * Sets the cross-origin-resource-sharing (CORS) rule. It would overwrite the originl one. * - * @param string $bucket bucket名称 - * @param CorsConfig $corsConfig 跨域资源共享配置，具体规则参见SDK文档 + * @param string $bucket bucket name + * @param CorsConfig $corsConfig CORS config. Check out the details from OSS API document * @param array $options array * @throws OssException * @return null @@ -467,10 +465,10 @@ class OssClient } /** - * 获取Bucket的CORS配置情况 + * Gets the bucket CORS config * - * @param string $bucket bucket名称 - * @param array $options 可以为空 + * @param string $bucket bucket name + * @param array $options * @throws OssException * @return CorsConfig */ @@ -487,9 +485,9 @@ class OssClient } /** - * 关闭指定Bucket对应的CORS功能并清空所有规则 + * Deletes the bucket's CORS config and disable the CORS on the bucket. * - * @param string $bucket bucket名称 + * @param string $bucket bucket name * @param array $options * @throws OssException * @return null @@ -507,9 +505,9 @@ class OssClient } /** - * 为指定Bucket增加CNAME绑定 + * Bind a CName for the bucket * - * @param string $bucket bucket名称 + * @param string $bucket bucket name * @param string $cname * @param array $options * @throws OssException @@ -534,9 +532,9 @@ class OssClient } /** - * 获取指定Bucket已绑定的CNAME列表 + * Gets the binded CName list of the bucket * - * @param string $bucket bucket名称 + * @param string $bucket bucket name * @param array $options * @throws OssException * @return CnameConfig @@ -554,9 +552,9 @@ class OssClient } /** - * 解除指定Bucket的CNAME绑定 + * Remove a CName binding from the bucket * - * @param string $bucket bucket名称 + * @param string $bucket bucket name * @param CnameConfig $cnameConfig * @param array $options * @throws OssException @@ -581,9 +579,9 @@ class OssClient } /** - * 为指定Bucket创建LiveChannel + * Creates a Live Channel under a bucket * - * @param string $bucket bucket名称 + * @param string $bucket bucket name * @param string channelName $channelName * @param LiveChannelConfig $channelConfig * @param array $options @@ -610,11 +608,11 @@ class OssClient } /** - * 设置LiveChannel的status + * Sets the LiveChannel status * - * @param string $bucket bucket名称 + * @param string $bucket bucket name * @param string channelName $channelName - * @param string channelStatus $channelStatus 为enabled或disabled + * @param string channelStatus $channelStatus enabled or disabled * @param array $options * @throws OssException * @return null @@ -634,9 +632,9 @@ class OssClient } /** - * 获取LiveChannel信息 + * Gets the LiveChannel information by the channel name * - * @param string $bucket bucket名称 + * @param string $bucket bucket name * @param string channelName $channelName * @param array $options * @throws OssException @@ -656,9 +654,9 @@ class OssClient } /** - * 获取LiveChannel状态信息 + * Gets the status of LiveChannel * - * @param string $bucket bucket名称 + * @param string $bucket bucket name * @param string channelName $channelName * @param array $options * @throws OssException @@ -679,9 +677,9 @@ class OssClient } /** - *获取LiveChannel推流记录 + * Gets the LiveChannel pushing streaming record * - * @param string $bucket bucket名称 + * @param string $bucket bucket name * @param string channelName $channelName * @param array $options * @throws OssException @@ -702,9 +700,9 @@ class OssClient } /** - *获取指定Bucket下的live channel列表 + *Gets the live channel list under a bucket. * - * @param string $bucket bucket名称 + * @param string $bucket bucket name * @param array $options * @throws OssException * @return LiveChannelListInfo @@ -730,12 +728,12 @@ class OssClient } /** - * 为指定LiveChannel生成播放列表 + * Creates a play list file for the LiveChannel * - * @param string $bucket bucket名称 + * @param string $bucket bucket name * @param string channelName $channelName - * @param string $playlistName 指定生成的点播播放列表的名称，必须以“.m3u8”结尾 - * @param array $setTime startTime和EndTime以unix时间戳格式给定,跨度不能超过一天 + * @param string $playlistName The playlist name, must end with ".m3u8". + * @param array $setTime startTime and EndTime in unix time. No more than 1 day. * @throws OssException * @return null */ @@ -755,9 +753,9 @@ class OssClient } /** - * 删除指定Bucket的LiveChannel + * Deletes the Bucket LiveChannel * - * @param string $bucket bucket名称 + * @param string $bucket bucket name * @param string channelName $channelName * @param array $options * @throws OssException @@ -777,14 +775,14 @@ class OssClient } /** - * 生成带签名的推流地址 + * Generates the signed pushing streaming url * - * @param string $bucket bucket名称 + * @param string $bucket bucket name * @param string channelName $channelName - * @param int timeout 设置超时时间，单位为秒 + * @param int timeout timeout value in seconds * @param array $options * @throws OssException - * @return 推流地址 + * @return The signed pushing streaming url */ public function signRtmpUrl($bucket, $channelName, $timeout = 60, $options = NULL) { @@ -813,16 +811,16 @@ class OssClient } /** - * 检验跨域资源请求, 发送跨域请求之前会发送一个preflight请求（OPTIONS）并带上特定的来源域， - * HTTP方法和header信息等给OSS以决定是否发送真正的请求。 OSS可以通过putBucketCors接口 - * 来开启Bucket的CORS支持，开启CORS功能之后，OSS在收到浏览器preflight请求时会根据设定的 - * 规则评估是否允许本次请求 + * Precheck the CORS request. Before sending a CORS request, a preflight request (OPTIONS) is sent with the specific origin. + * HTTP METHOD and headers information are sent to OSS as well for evaluating if the CORS request is allowed. + * + * Note: OSS could enable the CORS on the bucket by calling putBucketCors. Once CORS is enabled, the OSS could evaluate accordingto the preflight request. * - * @param string $bucket bucket名称 - * @param string $object object名称 - * @param string $origin 请求来源域 - * @param string $request_method 表明实际请求中会使用的HTTP方法 - * @param string $request_headers 表明实际请求中会使用的除了简单头部之外的headers + * @param string $bucket bucket name + * @param string $object object name + * @param string $origin the origin of the request + * @param string $request_method The actual HTTP method which will be used in CORS request + * @param string $request_headers The actual HTTP headers which will be used in CORS request * @param array $options * @return array * @throws OssException @@ -845,10 +843,10 @@ class OssClient } /** - * 设置Bucket的Lifecycle配置 + * Sets the bucket's lifecycle config * - * @param string $bucket bucket名称 - * @param LifecycleConfig $lifecycleConfig Lifecycle配置类 + * @param string $bucket bucket name + * @param LifecycleConfig $lifecycleConfig LifecycleConfig instance * @param array $options * @throws OssException * @return null @@ -868,9 +866,9 @@ class OssClient } /** - * 获取Bucket的Lifecycle配置情况 + * Gets bucket's lifecycle config * - * @param string $bucket bucket名称 + * @param string $bucket bucket name * @param array $options * @throws OssException * @return LifecycleConfig @@ -888,9 +886,9 @@ class OssClient } /** - * 删除指定Bucket的生命周期配置 + * Deletes the bucket's lifecycle config * - * @param string $bucket bucket名称 + * @param string $bucket bucket name * @param array $options * @throws OssException * @return null @@ -908,10 +906,10 @@ class OssClient } /** - * 设置一个bucket的referer访问白名单和是否允许referer字段为空的请求访问 - * Bucket Referer防盗链具体见OSS防盗链 + * Sets a bucket's referer, which has a whitelist of referrer and specifies if empty referer is allowed. + * Checks out API document for more details about "Bucket Referer" * - * @param string $bucket bucket名称 + * @param string $bucket bucket name * @param RefererConfig $refererConfig * @param array $options * @return ResponseCore @@ -932,10 +930,10 @@ class OssClient } /** - * 获取Bucket的Referer配置情况 - * Bucket Referer防盗链具体见OSS防盗链 + * Gets the bucket's Referer + * Checks out API document for more details about "Bucket Referer" * - * @param string $bucket bucket名称 + * @param string $bucket bucket name * @param array $options * @throws OssException * @return RefererConfig @@ -951,12 +949,13 @@ class OssClient $result = new GetRefererResult($response); return $result->getData(); } - + + /** - * 设置bucket的容量大小，单位GB - * 当bucket的容量大于设置的容量时，禁止继续写入 + * Set the size of the bucket,the unit is GB + * When the capacity of the bucket is bigger than the set, it's forbidden to continue writing * - * @param string $bucket bucket名称 + * @param string $bucket bucket name * @param int $storageCapacity * @param array $options * @return ResponseCore @@ -976,11 +975,11 @@ class OssClient $result = new PutSetDeleteResult($response); return $result->getData(); } - + /** - * 获取bucket的容量大小，单位GB + * Get the capacity of the bucket, the unit is GB * - * @param string $bucket bucket名称 + * @param string $bucket bucket name * @param array $options * @throws OssException * @return int @@ -997,19 +996,19 @@ class OssClient return $result->getData(); } + /** - * 获取bucket下的object列表 + * Lists the bucket's object list (in ObjectListInfo) * * @param string $bucket - * @param array $options - * 其中options中的参数如下 + * @param array $options are defined below: * $options = array( - * 'max-keys' => max-keys用于限定此次返回object的最大数，如果不设定，默认为100，max-keys取值不能大于1000。 - * 'prefix' => 限定返回的object key必须以prefix作为前缀。注意使用prefix查询时，返回的key中仍会包含prefix。 - * 'delimiter' => 是一个用于对Object名字进行分组的字符。所有名字包含指定的前缀且第一次出现delimiter字符之间的object作为一组元素 - * 'marker' => 用户设定结果从marker之后按字母排序的第一个开始返回。 + * 'max-keys' => specifies max object count to return. By default is 100 and max value could be 1000. + * 'prefix' => specifies the key prefix the returned objects must have. Note that the returned keys still contain the prefix. + * 'delimiter' => The delimiter of object name for grouping object. When it's specified, listObjects will differeniate the object and folder. And it will return subfolder's objects. + * 'marker' => The key of returned object must be greater than the 'marker'. *) - * 其中 prefix，marker用来实现分页显示效果，参数的长度必须小于256字节。 + * Prefix and marker are for filtering and paging. Their length must be less than 256 bytes * @throws OssException * @return ObjectListInfo */ @@ -1037,12 +1036,12 @@ class OssClient } /** - * 创建虚拟目录 (本函数会在object名称后增加'/', 所以创建目录的object名称不需要'/'结尾，否则，目录名称会变成'//') + * Creates a virtual 'folder' in OSS. The name should not end with '/' because the method will append the name with a '/' anyway. * - * 暂不开放此接口 + * Internal use only. * - * @param string $bucket bucket名称 - * @param string $object object名称 + * @param string $bucket bucket name + * @param string $object object name * @param array $options * @return null */ @@ -1059,11 +1058,11 @@ class OssClient } /** - * 上传内存中的内容 + * Uploads the $content object to OSS. * - * @param string $bucket bucket名称 - * @param string $object objcet名称 - * @param string $content 上传的内容 + * @param string $bucket bucket name + * @param string $object objcet name + * @param string $content The content object * @param array $options * @return null */ @@ -1102,11 +1101,12 @@ class OssClient return $result->getData(); } + /** - * 创建symlink - * @param string $bucket bucket名称 - * @param string $symlink symlink名称 - * @param string $targetObject 目标object名称 + * creates symlink + * @param string $bucket bucket name + * @param string $symlink symlink name + * @param string $targetObject targetObject name * @param array $options * @return null */ @@ -1126,9 +1126,9 @@ class OssClient } /** - * 获取symlink - *@param string $bucket bucket名称 - * @param string $symlink symlink名称 + * gets symlink + *@param string $bucket bucket name + * @param string $symlink symlink name * @return null */ public function getSymlink($bucket, $symlink) @@ -1146,11 +1146,11 @@ class OssClient } /** - * 上传本地文件 + * Uploads a local file * - * @param string $bucket bucket名称 - * @param string $object object名称 - * @param string $file 本地文件路径 + * @param string $bucket bucket name + * @param string $object object name + * @param string $file local file path * @param array $options * @return null * @throws OssException @@ -1183,11 +1183,11 @@ class OssClient } /** - * 追加上传内存中的内容 - * - * @param string $bucket bucket名称 - * @param string $object objcet名称 - * @param string $content 本次追加上传的内容 + * Append the object with the content at the specified position. + * The specified position is typically the lengh of the current file. + * @param string $bucket bucket name + * @param string $object objcet name + * @param string $content content to append * @param array $options * @return int next append position * @throws OssException @@ -1224,11 +1224,11 @@ class OssClient } /** - * 追加上传本地文件 + * Append the object with a local file * - * @param string $bucket bucket名称 - * @param string $object object名称 - * @param string $file 追加上传的本地文件路径 + * @param string $bucket bucket name + * @param string $object object name + * @param string $file The local file path to append with * @param array $options * @return int next append position * @throws OssException @@ -1266,12 +1266,12 @@ class OssClient } /** - * 拷贝一个在OSS上已经存在的object成另外一个object + * Copy from an existing OSS object to another OSS object. If the target object exists already, it will be overwritten. * - * @param string $fromBucket 源bucket名称 - * @param string $fromObject 源object名称 - * @param string $toBucket 目标bucket名称 - * @param string $toObject 目标object名称 + * @param string $fromBucket Source bucket name + * @param string $fromObject Source object name + * @param string $toBucket Target bucket name + * @param string $toObject Target object name * @param array $options * @return null * @throws OssException @@ -1294,11 +1294,11 @@ class OssClient } /** - * 获取Object的Meta信息 + * Gets Object metadata * - * @param string $bucket bucket名称 - * @param string $object object名称 - * @param string $options 具体参考SDK文档 + * @param string $bucket bucket name + * @param string $object object name + * @param string $options Checks out the SDK document for the detail * @return array */ public function getObjectMeta($bucket, $object, $options = NULL) @@ -1313,10 +1313,10 @@ class OssClient } /** - * 删除某个Object + * Deletes a object * - * @param string $bucket bucket名称 - * @param string $object object名称 + * @param string $bucket bucket name + * @param string $object object name * @param array $options * @return null */ @@ -1332,10 +1332,10 @@ class OssClient } /** - * 删除同一个Bucket中的多个Object + * Deletes multiple objects in a bucket * - * @param string $bucket bucket名称 - * @param array $objects object列表 + * @param string $bucket bucket name + * @param array $objects object list * @param array $options * @return ResponseCore * @throws null @@ -1367,11 +1367,11 @@ class OssClient } /** - * 获得Object内容 + * Gets Object content * - * @param string $bucket bucket名称 - * @param string $object object名称 - * @param array $options 该参数中必须设置ALIOSS::OSS_FILE_DOWNLOAD，ALIOSS::OSS_RANGE可选，可以根据实际情况设置；如果不设置，默认会下载全部内容 + * @param string $bucket bucket name + * @param string $object object name + * @param array $options It must contain ALIOSS::OSS_FILE_DOWNLOAD. And ALIOSS::OSS_RANGE is optional and empty means to download the whole file. * @return string */ public function getObject($bucket, $object, $options = NULL) @@ -1399,13 +1399,13 @@ class OssClient } /** - * 检测Object是否存在 - * 通过获取Object的Meta信息来判断Object是否存在， 用户需要自行解析ResponseCore判断object是否存在 + * Checks if the object exists + * It's implemented by getObjectMeta(). * - * @param string $bucket bucket名称 - * @param string $object object名称 + * @param string $bucket bucket name + * @param string $object object name * @param array $options - * @return bool + * @return bool True:object exists; False:object does not exist */ public function doesObjectExist($bucket, $object, $options = NULL) { @@ -1419,11 +1419,11 @@ class OssClient } /** - * 针对Archive类型的Object读取 - * 需要使用Restore操作让服务端执行解冻任务 + * Object reading for Archive type + * Use Restore to enable the server to perform the thawing task * - * @param string $bucket bucket名称 - * @param string $object object名称 + * @param string $bucket bucket name + * @param string $object object name * @return null * @throws OssException */ @@ -1440,8 +1440,9 @@ class OssClient } /** - * 获取分片大小，根据用户提供的part_size，重新计算一个更合理的partsize - * + * Gets the part size according to the preferred part size. + * If the specified part size is too small or too big, it will return a min part or max part size instead. + * Otherwise returns the specified part size. * @param int $partSize * @return int */ @@ -1457,12 +1458,12 @@ class OssClient } /** - * 计算文件可以分成多少个part，以及每个part的长度以及起始位置 - * 方法必须在 中调用 + * Computes the parts count, size and start position according to the file size and the part size. + * It must be only called by upload_Part(). * - * @param integer $file_size 文件大小 - * @param integer $partSize part大小,默认5M - * @return array An array 包含 key-value 键值对. Key 为 `seekTo` 和 `length`. + * @param integer $file_size File size + * @param integer $partSize part大小,part size. Default is 5MB + * @return array An array contains key-value pairs--the key is `seekTo`and value is `length`. */ public function generateMultiuploadParts($file_size, $partSize = 5242880) { @@ -1482,13 +1483,13 @@ class OssClient } /** - * 初始化multi-part upload + * Initialize a multi-part upload * - * @param string $bucket Bucket名称 - * @param string $object Object名称 - * @param array $options Key-Value数组 + * @param string $bucket bucket name + * @param string $object object name + * @param array $options Key-Value array * @throws OssException - * @return string 返回uploadid + * @return string returns uploadid */ public function initiateMultipartUpload($bucket, $object, $options = NULL) { @@ -1511,12 +1512,12 @@ class OssClient } /** - * 分片上传的块上传接口 + * Upload a part in a multiparts upload. * - * @param string $bucket Bucket名称 - * @param string $object Object名称 + * @param string $bucket bucket name + * @param string $object object name * @param string $uploadId - * @param array $options Key-Value数组 + * @param array $options Key-Value array * @return string eTag * @throws OssException */ @@ -1540,12 +1541,12 @@ class OssClient } /** - * 获取已成功上传的part + * Gets the uploaded parts. * - * @param string $bucket Bucket名称 - * @param string $object Object名称 + * @param string $bucket bucket name + * @param string $object object name * @param string $uploadId uploadId - * @param array $options Key-Value数组 + * @param array $options Key-Value array * @return ListPartsInfo * @throws OssException */ @@ -1569,12 +1570,12 @@ class OssClient } /** - * 中止进行一半的分片上传操作 + * Abort a multiparts upload * - * @param string $bucket Bucket名称 - * @param string $object Object名称 + * @param string $bucket bucket name + * @param string $object object name * @param string $uploadId uploadId - * @param array $options Key-Value数组 + * @param array $options Key-Value name * @return null * @throws OssException */ @@ -1591,13 +1592,13 @@ class OssClient } /** - * 在将所有数据Part都上传完成后，调用此接口完成本次分块上传 + * Completes a multiparts upload, after all parts are uploaded. * - * @param string $bucket Bucket名称 - * @param string $object Object名称 + * @param string $bucket bucket name + * @param string $object object name * @param string $uploadId uploadId * @param array $listParts array( array("PartNumber"=> int, "ETag"=>string)) - * @param array $options Key-Value数组 + * @param array $options Key-Value array * @throws OssException * @return null */ @@ -1623,11 +1624,10 @@ class OssClient } /** - * 罗列出所有执行中的Multipart Upload事件，即已经被初始化的Multipart Upload但是未被 - * Complete或者Abort的Multipart Upload事件 + * Lists all ongoing multipart upload events, which means all initialized but not completed or aborted multipart uploads. * * @param string $bucket bucket - * @param array $options 关联数组 + * @param array $options key-value array--expected keys are 'delimiter', 'key-marker', 'max-uploads', 'prefix', 'upload-id-marker' * @throws OssException * @return ListMultipartUploadInfo */ @@ -1657,15 +1657,15 @@ class OssClient } /** - * 从一个已存在的Object中拷贝数据来上传一个Part + * Copy an existing file as a part * - * @param string $fromBucket 源bucket名称 - * @param string $fromObject 源object名称 - * @param string $toBucket 目标bucket名称 - * @param string $toObject 目标object名称 - * @param int $partNumber 分块上传的块id - * @param string $uploadId 初始化multipart upload返回的uploadid - * @param array $options Key-Value数组 + * @param string $fromBucket source bucket name + * @param string $fromObject source object name + * @param string $toBucket target bucket name + * @param string $toObject target object name + * @param int $partNumber Part number + * @param string $uploadId Upload Id + * @param array $options Key-Value array---it should have 'start' or 'end' key to specify the range of the source object to copy. If it's not specifed, the whole object is copied. * @return null * @throws OssException */ @@ -1674,7 +1674,7 @@ class OssClient $this->precheckCommon($fromBucket, $fromObject, $options); $this->precheckCommon($toBucket, $toObject, $options); - //如果没有设置$options['isFullCopy']，则需要强制判断copy的起止位置 + //If $options['isFullCopy'] is not set, copy from the beginning $start_range = "0"; if (isset($options['start'])) { $start_range = $options['start']; @@ -1701,12 +1701,12 @@ class OssClient } /** - * multipart上传统一封装，从初始化到完成multipart，以及出错后中止动作 + * A higher level API for uploading a file with multipart upload. It consists of initialization, parts upload and completion. * - * @param string $bucket bucket名称 - * @param string $object object名称 - * @param string $file 需要上传的本地文件的路径 - * @param array $options Key-Value数组 + * @param string $bucket bucket name + * @param string $object object name + * @param string $file The local file to upload + * @param array $options Key-Value array * @return null * @throws OssException */ @@ -1739,7 +1739,7 @@ class OssClient if ($upload_position === false || !isset($upload_file_size) || $upload_file_size === false || $upload_file_size < 0) { throw new OssException('The size of `fileUpload` cannot be determined in ' . __FUNCTION__ . '().'); } - // 处理partSize + // Computes the part size and assign it to options. if (isset($options[self::OSS_PART_SIZE])) { $options[self::OSS_PART_SIZE] = $this->computePartSize($options[self::OSS_PART_SIZE]); } else { @@ -1747,20 +1747,20 @@ class OssClient } $is_check_md5 = $this->isCheckMD5($options); - // 如果上传的文件小于partSize,则直接使用普通方式上传 + // if the file size is less than part size, use simple file upload. if ($upload_file_size < $options[self::OSS_PART_SIZE] && !isset($options[self::OSS_UPLOAD_ID])) { return $this->uploadFile($bucket, $object, $uploadFile, $options); } - // 初始化multipart + // Using multipart upload, initialize if no OSS_UPLOAD_ID is specified in options. if (isset($options[self::OSS_UPLOAD_ID])) { $uploadId = $options[self::OSS_UPLOAD_ID]; } else { - // 初始化 + // initialize $uploadId = $this->initiateMultipartUpload($bucket, $object, $options); } - // 获取的分片 + // generates the parts information and upload them one by one $pieces = $this->generateMultiuploadParts($upload_file_size, (integer)$options[self::OSS_PART_SIZE]); $response_upload_part = array(); foreach ($pieces as $i => $piece) { @@ -1791,15 +1791,15 @@ class OssClient } /** - * 上传本地目录内的文件或者目录到指定bucket的指定prefix的object中 + * Uploads the local directory to the specified bucket into specified folder (prefix) * - * @param string $bucket bucket名称 - * @param string $prefix 需要上传到的object的key前缀，可以理解成bucket中的子目录，结尾不能是'/'，接口中会补充'/' - * @param string $localDirectory 需要上传的本地目录 - * @param string $exclude 需要排除的目录 - * @param bool $recursive 是否递归的上传localDirectory下的子目录内容 + * @param string $bucket bucket name + * @param string $prefix The object key prefix. Typically it's folder name. The name should not end with '/' as the API appends it automatically. + * @param string $localDirectory The local directory to upload + * @param string $exclude To excluded directories + * @param bool $recursive Recursive flag. True: Recursively upload all datas under the local directory; False: only upload first layer's files. * @param bool $checkMd5 - * @return array 返回两个列表 array("succeededList" => array("object"), "failedList" => array("object"=>"errorMessage")) + * @return array Returns two list: array("succeededList" => array("object"), "failedList" => array("object"=>"errorMessage")) * @throws OssException */ public function uploadDir($bucket, $prefix, $localDirectory, $exclude = '.|..|.svn|.git', $recursive = false, $checkMd5 = true) @@ -1810,7 +1810,7 @@ class OssClient if (empty($localDirectory)) throw new OssException("parameter error, localDirectory is empty"); $directory = $localDirectory; $directory = OssUtil::encodePath($directory); - //判断是否目录 + //If it's not the local directory, throw OSSException. if (!is_dir($directory)) { throw new OssException('parameter error: ' . $directory . ' is not a directory, please check it'); } @@ -1840,14 +1840,14 @@ class OssClient } /** - * 支持生成get和put签名, 用户可以生成一个具有一定有效期的 - * 签名过的url + * Sign URL with specified expiration time in seconds (timeout) and HTTP method. + * The signed URL could be used to access the object directly. * * @param string $bucket * @param string $object - * @param int $timeout + * @param int $timeout expiration time in seconds. * @param string $method - * @param array $options Key-Value数组 + * @param array $options Key-Value array * @return string * @throws OssException */ @@ -1872,7 +1872,7 @@ class OssClient } /** - * 检测options参数 + * validates options. Create a empty array if it's NULL. * * @param array $options * @throws OssException @@ -1886,7 +1886,7 @@ class OssClient } /** - * 校验bucket参数 + * Validates bucket parameter * * @param string $bucket * @param string $errMsg @@ -1898,7 +1898,7 @@ class OssClient } /** - * 校验object参数 + * validates object parameter * * @param string $object * @throws OssException @@ -1918,21 +1918,21 @@ class OssClient { if (is_string($storage)) { switch ($storage) { - case self::OSS_STORAGE_ARCHIVE: - return; - case self::OSS_STORAGE_IA: - return; - case self::OSS_STORAGE_STANDARD: - return; - default: - break; + case self::OSS_STORAGE_ARCHIVE: + return; + case self::OSS_STORAGE_IA: + return; + case self::OSS_STORAGE_STANDARD: + return; + default: + break; } } throw new OssException('storage name is invalid'); } /** - * 校验bucket,options参数 + * Validates bucket,options parameters and optionally validate object parameter. * * @param string $bucket * @param string $object @@ -1949,7 +1949,7 @@ class OssClient } /** - * 参数校验 + * checks parameters * * @param array $options * @param string $param @@ -1964,7 +1964,7 @@ class OssClient } /** - * 检测md5 + * Checks md5 * * @param array $options * @return bool|null @@ -1975,7 +1975,7 @@ class OssClient } /** - * 获取value + * Gets value of the specified key from the options * * @param array $options * @param string $key @@ -2006,7 +2006,7 @@ class OssClient } /** - * 获取mimetype类型 + * Gets mimetype * * @param string $object * @return string @@ -2029,7 +2029,7 @@ class OssClient } /** - * 验证并且执行请求，按照OSS Api协议，执行操作 + * Validates and executes the request according to OSS API protocol. * * @param array $options * @return ResponseCore @@ -2039,24 +2039,24 @@ class OssClient private function auth($options) { OssUtil::validateOptions($options); - //验证bucket，list_bucket时不需要验证 + //Validates bucket, not required for list_bucket $this->authPrecheckBucket($options); - //验证object + //Validates object $this->authPrecheckObject($options); - //Object名称的编码必须是utf8 + //object name encoding must be UTF-8 $this->authPrecheckObjectEncoding($options); - //验证ACL + //Validates ACL $this->authPrecheckAcl($options); - // 获得当次请求使用的协议头，是https还是http + // Should https or http be used? $scheme = $this->useSSL ? 'https://' : 'http://'; - // 获得当次请求使用的hostname，如果是公共域名或者专有域名，bucket拼在前面构成三级域名 + // gets the host name. If the host name is public domain or private domain, form a third level domain by prefixing the bucket name on the domain name. $hostname = $this->generateHostname($options[self::OSS_BUCKET]); $string_to_sign = ''; $headers = $this->generateHeaders($options, $hostname); $signable_query_string_params = $this->generateSignableQueryStringParam($options); $signable_query_string = OssUtil::toQueryString($signable_query_string_params); $resource_uri = $this->generateResourceUri($options); - //生成请求URL + //Generates the URL (add query parameters) $conjunction = '?'; $non_signable_resource = ''; if (isset($options[self::OSS_SUB_RESOURCE])) { @@ -2073,7 +2073,7 @@ class OssClient } $this->requestUrl = $scheme . $hostname . $resource_uri . $signable_query_string . $non_signable_resource; - //创建请求 + //Creates the request $request = new RequestCore($this->requestUrl, $this->requestProxy); $request->set_useragent($this->generateUserAgent()); // Streaming uploads @@ -2157,11 +2157,11 @@ class OssClient $string_to_sign .= strtolower($header_key) . ':' . $header_value . "\n"; } } - // 生成 signable_resource + // Generates the signable_resource $signable_resource = $this->generateSignableResource($options); $string_to_sign .= rawurldecode($signable_resource) . urldecode($signable_query_string); - //对?后面的要签名的string字母序排序 + // Sort the strings to be signed. $string_to_sign_ordered = $this->stringToSignSorted($string_to_sign); $signature = base64_encode(hash_hmac('sha1', $string_to_sign_ordered, $this->accessKeySecret, true)); @@ -2196,7 +2196,7 @@ class OssClient //retry if OSS Internal Error if ((integer)$request->get_response_code() === 500) { if ($this->redirects <= $this->maxRetries) { - //设置休眠 + //Sets the sleep time betwen each retry. $delay = (integer)(pow(4, $this->redirects) * 100000); usleep($delay); $this->redirects++; @@ -2209,7 +2209,7 @@ class OssClient } /** - * 设置最大尝试次数 + * Sets the max retry count * * @param int $maxRetries * @return void @@ -2220,7 +2220,7 @@ class OssClient } /** - * 获取最大尝试次数 + * Gets the max retry count * * @return int */ @@ -2230,7 +2230,7 @@ class OssClient } /** - * 打开sts enable标志，使用户构造函数中传入的$sts生效 + * Enaable/disable STS in the URL. This is to determine the $sts value passed from constructor take effect or not. * * @param boolean $enable */ @@ -2256,7 +2256,7 @@ class OssClient } /** - * 检查bucket名称格式是否正确，如果非法抛出异常 + * Validates bucket name--throw OssException if it's invalid * * @param $options * @throws OssException @@ -2270,7 +2270,7 @@ class OssClient /** * - * 检查object名称格式是否正确，如果非法抛出异常 + * Validates the object name--throw OssException if it's invalid. * * @param $options * @throws OssException @@ -2287,9 +2287,9 @@ class OssClient } /** - * 检查object的编码，如果是gbk或者gb2312则尝试将其转化为utf8编码 + * Checks the object's encoding. Convert it to UTF8 if it's in GBK or GB2312 * - * @param mixed $options 参数 + * @param mixed $options parameter */ private function authPrecheckObjectEncoding(&$options) { @@ -2310,7 +2310,7 @@ class OssClient } /** - * 检查ACL是否是预定义中三种之一，如果不是抛出异常 + * Checks if the ACL is one of the 3 predefined one. Throw OSSException if not. * * @param $options * @throws OssException @@ -2325,11 +2325,11 @@ class OssClient } /** - * 获得档次请求使用的域名 - * bucket在前的三级域名，或者二级域名，如果是cname或者ip的话，则是二级域名 + * Gets the host name for the current request. + * It could be either a third level domain (prefixed by bucket name) or second level domain if it's CName or IP * * @param $bucket - * @return string 剥掉协议头的域名 + * @return string The host name without the protocol scheem (e.g. https://) */ private function generateHostname($bucket) { @@ -2338,17 +2338,17 @@ class OssClient } elseif ($this->hostType === self::OSS_HOST_TYPE_CNAME) { $hostname = $this->hostname; } else { - // 专有域或者官网endpoint + // Private domain or public domain $hostname = ($bucket == '') ? $this->hostname : ($bucket . '.') . $this->hostname; } return $hostname; } /** - * 获得当次请求的资源定位字段 + * Gets the resource Uri in the current request * * @param $options - * @return string 资源定位字段 + * @return string return the resource uri. */ private function generateResourceUri($options) { @@ -2375,7 +2375,7 @@ class OssClient } /** - * 生成signalbe_query_string_param, array类型 + * Generates the signalbe query string parameters in array type * * @param array $options * @return array @@ -2416,7 +2416,7 @@ class OssClient } /** - * 生成用于签名resource段 + * Generates the resource uri for signing * * @param mixed $options * @return string @@ -2427,7 +2427,7 @@ class OssClient $signableResource .= '/'; if (isset($options[self::OSS_BUCKET]) && '' !== $options[self::OSS_BUCKET]) { $signableResource .= $options[self::OSS_BUCKET]; - // 如果操作没有Object操作的话，这里最后是否有斜线有个trick，ip的域名下，不需要加'/'， 否则需要加'/' + // if there's no object in options, adding a '/' if the host type is not IP.\ if ($options[self::OSS_OBJECT] == '/') { if ($this->hostType !== self::OSS_HOST_TYPE_IP) { $signableResource .= "/"; @@ -2445,14 +2445,14 @@ class OssClient } /** - * 生成query_string + * generates query string * * @param mixed $options * @return string */ private function generateQueryString($options) { - //请求参数 + //query parameters $queryStringParams = array(); if (isset($options[self::OSS_QUERY_STRING])) { $queryStringParams = array_merge($queryStringParams, $options[self::OSS_QUERY_STRING]); @@ -2482,7 +2482,7 @@ class OssClient } /** - * 初始化headers + * Initialize headers * * @param mixed $options * @param string $hostname hostname @@ -2500,11 +2500,11 @@ class OssClient $headers[self::OSS_CONTENT_MD5] = $options[self::OSS_CONTENT_MD5]; } - //添加stsSecurityToken + //Add stsSecurityToken if ((!is_null($this->securityToken)) && (!$this->enableStsInUrl)) { $headers[self::OSS_SECURITY_TOKEN] = $this->securityToken; } - //合并HTTP headers + //Merge HTTP headers if (isset($options[self::OSS_HEADERS])) { $headers = array_merge($headers, $options[self::OSS_HEADERS]); } @@ -2512,7 +2512,7 @@ class OssClient } /** - * 生成请求用的UserAgent + * Generates UserAgent * * @return string */ @@ -2522,13 +2522,12 @@ class OssClient } /** - * 检查endpoint的种类 - * 如有有协议头，剥去协议头 - * 并且根据参数 is_cname 和endpoint本身，判定域名类型，是ip，cname，还是专有域或者官网域名 + * Checks endpoint type and returns the endpoint without the protocol schema. + * Figures out the domain's type (ip, cname or private/public domain). * * @param string $endpoint * @param boolean $isCName - * @return string 剥掉协议头的域名 + * @return string The domain name without the protocol schema. */ private function checkEndpoint($endpoint, $isCName) { @@ -2542,6 +2541,8 @@ class OssClient $ret_endpoint = $endpoint; } + $ret_endpoint = OssUtil::getHostPortFromEndpoint($ret_endpoint); + if ($isCName) { $this->hostType = self::OSS_HOST_TYPE_CNAME; } elseif (OssUtil::isIPFormat($ret_endpoint)) { @@ -2553,14 +2554,14 @@ class OssClient } /** - * 用来检查sdk所以来的扩展是否打开 - * + * Check if all dependent extensions are installed correctly. + * For now only "curl" is needed. * @throws OssException */ public static function checkEnv() { if (function_exists('get_loaded_extensions')) { - //检测curl扩展 + //Test curl extension $enabled_extension = array("curl"); $extensions = get_loaded_extensions(); if ($extensions) { @@ -2578,7 +2579,7 @@ class OssClient } /** - //* 设置http库的请求超时时间，单位秒 + * Sets the http's timeout (in seconds) * * @param int $timeout */ @@ -2588,7 +2589,7 @@ class OssClient } /** - * 设置http库的连接超时时间，单位秒 + * Sets the http's connection timeout (in seconds) * * @param int $connectTimeout */ @@ -2597,11 +2598,11 @@ class OssClient $this->connectTimeout = $connectTimeout; } - // 生命周期相关常量 + // Constants for Life cycle const OSS_LIFECYCLE_EXPIRATION = "Expiration"; const OSS_LIFECYCLE_TIMING_DAYS = "Days"; const OSS_LIFECYCLE_TIMING_DATE = "Date"; - //OSS 内部常量 + //OSS Internal constants const OSS_BUCKET = 'bucket'; const OSS_OBJECT = 'object'; const OSS_HEADERS = OssUtil::OSS_HEADERS; @@ -2670,18 +2671,18 @@ class OssClient const OSS_STORAGE_IA = 'IA'; const OSS_STORAGE_ARCHIVE = 'Archive'; - //私有URL变量 + //private URLs const OSS_URL_ACCESS_KEY_ID = 'OSSAccessKeyId'; const OSS_URL_EXPIRES = 'Expires'; const OSS_URL_SIGNATURE = 'Signature'; - //HTTP方法 + //HTTP METHOD const OSS_HTTP_GET = 'GET'; const OSS_HTTP_PUT = 'PUT'; const OSS_HTTP_HEAD = 'HEAD'; const OSS_HTTP_POST = 'POST'; const OSS_HTTP_DELETE = 'DELETE'; const OSS_HTTP_OPTIONS = 'OPTIONS'; - //其他常量 + //Others const OSS_ACL = 'x-oss-acl'; const OSS_OBJECT_ACL = 'x-oss-object-acl'; const OSS_OBJECT_GROUP = 'x-oss-file-group'; @@ -2692,7 +2693,7 @@ class OssClient const OSS_PROCESS = "x-oss-process"; const OSS_CALLBACK = "x-oss-callback"; const OSS_CALLBACK_VAR = "x-oss-callback-var"; - //支持STS SecurityToken + //Constants for STS SecurityToken const OSS_SECURITY_TOKEN = "x-oss-security-token"; const OSS_ACL_TYPE_PRIVATE = 'private'; const OSS_ACL_TYPE_PUBLIC_READ = 'public-read'; @@ -2700,39 +2701,39 @@ class OssClient const OSS_ENCODING_TYPE = "encoding-type"; const OSS_ENCODING_TYPE_URL = "url"; - // 域名类型 + // Domain Types const OSS_HOST_TYPE_NORMAL = "normal";//http://bucket.oss-cn-hangzhou.aliyuncs.com/object const OSS_HOST_TYPE_IP = "ip"; //http://1.1.1.1/bucket/object const OSS_HOST_TYPE_SPECIAL = 'special'; //http://bucket.guizhou.gov/object const OSS_HOST_TYPE_CNAME = "cname"; //http://mydomain.com/object - //OSS ACL数组 + //OSS ACL array static $OSS_ACL_TYPES = array( self::OSS_ACL_TYPE_PRIVATE, self::OSS_ACL_TYPE_PUBLIC_READ, self::OSS_ACL_TYPE_PUBLIC_READ_WRITE ); - // OssClient版本信息 + // OssClient version information const OSS_NAME = "aliyun-sdk-php"; - const OSS_VERSION = "2.3.0"; - const OSS_BUILD = "20180105"; + const OSS_VERSION = "2.3.1"; + const OSS_BUILD = "20191115"; const OSS_AUTHOR = ""; const OSS_OPTIONS_ORIGIN = 'Origin'; const OSS_OPTIONS_REQUEST_METHOD = 'Access-Control-Request-Method'; const OSS_OPTIONS_REQUEST_HEADERS = 'Access-Control-Request-Headers'; - //是否使用ssl + //use ssl flag private $useSSL = false; private $maxRetries = 3; private $redirects = 0; - // 用户提供的域名类型，有四种 OSS_HOST_TYPE_NORMAL, OSS_HOST_TYPE_IP, OSS_HOST_TYPE_SPECIAL, OSS_HOST_TYPE_CNAME + // 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; private $hostname; private $securityToken; - private $requestProxy = null; private $enableStsInUrl = false; private $timeout = 0; private $connectTimeout = 0; diff --git a/aliyun-oss-php-sdk-2.3.0/src/OSS/Result/AclResult.php b/aliyun-oss-php-sdk-2.3.1/src/OSS/Result/AclResult.php old mode 100755 new mode 100644 similarity index 86% rename from aliyun-oss-php-sdk-2.3.0/src/OSS/Result/AclResult.php rename to aliyun-oss-php-sdk-2.3.1/src/OSS/Result/AclResult.php index 6da0860..7061ff0 --- a/aliyun-oss-php-sdk-2.3.0/src/OSS/Result/AclResult.php +++ b/aliyun-oss-php-sdk-2.3.1/src/OSS/Result/AclResult.php @@ -5,8 +5,7 @@ namespace OSS\Result; use OSS\Core\OssException; /** - * Class AclResult getBucketAcl接口返回结果类，封装了 - * 返回的xml数据的解析 + * The type of the return value of getBucketAcl, it wraps the data parsed from xml. * * @package OSS\Result */ diff --git a/aliyun-oss-php-sdk-2.3.0/src/OSS/Result/AppendResult.php b/aliyun-oss-php-sdk-2.3.1/src/OSS/Result/AppendResult.php old mode 100755 new mode 100644 similarity index 87% rename from aliyun-oss-php-sdk-2.3.0/src/OSS/Result/AppendResult.php rename to aliyun-oss-php-sdk-2.3.1/src/OSS/Result/AppendResult.php index 433c03e..d898d58 --- a/aliyun-oss-php-sdk-2.3.0/src/OSS/Result/AppendResult.php +++ b/aliyun-oss-php-sdk-2.3.1/src/OSS/Result/AppendResult.php @@ -11,7 +11,7 @@ use OSS\Core\OssException; class AppendResult extends Result { /** - * 结果中part的next-append-position + * Get the value of next-append-position from append's response headers * * @return int * @throws OssException diff --git a/aliyun-oss-php-sdk-2.3.0/src/OSS/Result/BodyResult.php b/aliyun-oss-php-sdk-2.3.1/src/OSS/Result/BodyResult.php old mode 100755 new mode 100644 similarity index 100% rename from aliyun-oss-php-sdk-2.3.0/src/OSS/Result/BodyResult.php rename to aliyun-oss-php-sdk-2.3.1/src/OSS/Result/BodyResult.php diff --git a/aliyun-oss-php-sdk-2.3.0/src/OSS/Result/CallbackResult.php b/aliyun-oss-php-sdk-2.3.1/src/OSS/Result/CallbackResult.php old mode 100755 new mode 100644 similarity index 100% rename from aliyun-oss-php-sdk-2.3.0/src/OSS/Result/CallbackResult.php rename to aliyun-oss-php-sdk-2.3.1/src/OSS/Result/CallbackResult.php diff --git a/aliyun-oss-php-sdk-2.3.0/src/OSS/Result/CopyObjectResult.php b/aliyun-oss-php-sdk-2.3.1/src/OSS/Result/CopyObjectResult.php old mode 100755 new mode 100644 similarity index 100% rename from aliyun-oss-php-sdk-2.3.0/src/OSS/Result/CopyObjectResult.php rename to aliyun-oss-php-sdk-2.3.1/src/OSS/Result/CopyObjectResult.php diff --git a/aliyun-oss-php-sdk-2.3.0/src/OSS/Result/DeleteObjectsResult.php b/aliyun-oss-php-sdk-2.3.1/src/OSS/Result/DeleteObjectsResult.php old mode 100755 new mode 100644 similarity index 100% rename from aliyun-oss-php-sdk-2.3.0/src/OSS/Result/DeleteObjectsResult.php rename to aliyun-oss-php-sdk-2.3.1/src/OSS/Result/DeleteObjectsResult.php diff --git a/aliyun-oss-php-sdk-2.3.0/src/OSS/Result/ExistResult.php b/aliyun-oss-php-sdk-2.3.1/src/OSS/Result/ExistResult.php old mode 100755 new mode 100644 similarity index 65% rename from aliyun-oss-php-sdk-2.3.0/src/OSS/Result/ExistResult.php rename to aliyun-oss-php-sdk-2.3.1/src/OSS/Result/ExistResult.php index f7aa287..e9522d4 --- a/aliyun-oss-php-sdk-2.3.0/src/OSS/Result/ExistResult.php +++ b/aliyun-oss-php-sdk-2.3.1/src/OSS/Result/ExistResult.php @@ -3,8 +3,7 @@ namespace OSS\Result; /** - * Class ExistResult 检查bucket和object是否存在的返回结果， - * 根据返回response的http status判断 + * Class ExistResult checks if bucket or object exists, according to the http status in response headers. * @package OSS\Result */ class ExistResult extends Result @@ -18,8 +17,8 @@ class ExistResult extends Result } /** - * 根据返回http状态码判断，[200-299]即认为是OK, 判断是否存在的接口，404也认为是一种 - * 有效响应 + * Check if the response status is OK according to the http status code. + * [200-299]: OK; [404]: Not found. It means the object or bucket is not found--it's a valid response too. * * @return bool */ diff --git a/aliyun-oss-php-sdk-2.3.0/src/OSS/Result/GetCnameResult.php b/aliyun-oss-php-sdk-2.3.1/src/OSS/Result/GetCnameResult.php old mode 100755 new mode 100644 similarity index 100% rename from aliyun-oss-php-sdk-2.3.0/src/OSS/Result/GetCnameResult.php rename to aliyun-oss-php-sdk-2.3.1/src/OSS/Result/GetCnameResult.php diff --git a/aliyun-oss-php-sdk-2.3.0/src/OSS/Result/GetCorsResult.php b/aliyun-oss-php-sdk-2.3.1/src/OSS/Result/GetCorsResult.php old mode 100755 new mode 100644 similarity index 81% rename from aliyun-oss-php-sdk-2.3.0/src/OSS/Result/GetCorsResult.php rename to aliyun-oss-php-sdk-2.3.1/src/OSS/Result/GetCorsResult.php index a51afe2..8fb10ea --- a/aliyun-oss-php-sdk-2.3.0/src/OSS/Result/GetCorsResult.php +++ b/aliyun-oss-php-sdk-2.3.1/src/OSS/Result/GetCorsResult.php @@ -18,8 +18,7 @@ class GetCorsResult extends Result } /** - * 根据返回http状态码判断，[200-299]即认为是OK, 获取bucket相关配置的接口，404也认为是一种 - * 有效响应 + * Check if the response is OK, according to the http status. [200-299]:OK, the Cors config could be got; [404]: not found--no Cors config. * * @return bool */ diff --git a/aliyun-oss-php-sdk-2.3.0/src/OSS/Result/GetLifecycleResult.php b/aliyun-oss-php-sdk-2.3.1/src/OSS/Result/GetLifecycleResult.php old mode 100755 new mode 100644 similarity index 75% rename from aliyun-oss-php-sdk-2.3.0/src/OSS/Result/GetLifecycleResult.php rename to aliyun-oss-php-sdk-2.3.1/src/OSS/Result/GetLifecycleResult.php index 6b440c3..e0a9595 --- a/aliyun-oss-php-sdk-2.3.0/src/OSS/Result/GetLifecycleResult.php +++ b/aliyun-oss-php-sdk-2.3.1/src/OSS/Result/GetLifecycleResult.php @@ -12,7 +12,7 @@ use OSS\Model\LifecycleConfig; class GetLifecycleResult extends Result { /** - * 解析Lifestyle数据 + * Parse the LifecycleConfig object from the response * * @return LifecycleConfig */ @@ -25,8 +25,8 @@ class GetLifecycleResult extends Result } /** - * 根据返回http状态码判断，[200-299]即认为是OK, 获取bucket相关配置的接口，404也认为是一种 - * 有效响应 + * Check if the response is OK according to the http status. + * [200-299]: OK, and the LifecycleConfig could be got; [404] The Life cycle config is not found. * * @return bool */ @@ -38,4 +38,4 @@ class GetLifecycleResult extends Result } return false; } -} \ No newline at end of file +} diff --git a/aliyun-oss-php-sdk-2.3.0/src/OSS/Result/GetLiveChannelHistoryResult.php b/aliyun-oss-php-sdk-2.3.1/src/OSS/Result/GetLiveChannelHistoryResult.php old mode 100755 new mode 100644 similarity index 100% rename from aliyun-oss-php-sdk-2.3.0/src/OSS/Result/GetLiveChannelHistoryResult.php rename to aliyun-oss-php-sdk-2.3.1/src/OSS/Result/GetLiveChannelHistoryResult.php diff --git a/aliyun-oss-php-sdk-2.3.0/src/OSS/Result/GetLiveChannelInfoResult.php b/aliyun-oss-php-sdk-2.3.1/src/OSS/Result/GetLiveChannelInfoResult.php old mode 100755 new mode 100644 similarity index 100% rename from aliyun-oss-php-sdk-2.3.0/src/OSS/Result/GetLiveChannelInfoResult.php rename to aliyun-oss-php-sdk-2.3.1/src/OSS/Result/GetLiveChannelInfoResult.php diff --git a/aliyun-oss-php-sdk-2.3.0/src/OSS/Result/GetLiveChannelStatusResult.php b/aliyun-oss-php-sdk-2.3.1/src/OSS/Result/GetLiveChannelStatusResult.php old mode 100755 new mode 100644 similarity index 100% rename from aliyun-oss-php-sdk-2.3.0/src/OSS/Result/GetLiveChannelStatusResult.php rename to aliyun-oss-php-sdk-2.3.1/src/OSS/Result/GetLiveChannelStatusResult.php diff --git a/aliyun-oss-php-sdk-2.3.0/src/OSS/Result/GetLocationResult.php b/aliyun-oss-php-sdk-2.3.1/src/OSS/Result/GetLocationResult.php old mode 100755 new mode 100644 similarity index 79% rename from aliyun-oss-php-sdk-2.3.0/src/OSS/Result/GetLocationResult.php rename to aliyun-oss-php-sdk-2.3.1/src/OSS/Result/GetLocationResult.php index 71c4c96..a0c5129 --- a/aliyun-oss-php-sdk-2.3.0/src/OSS/Result/GetLocationResult.php +++ b/aliyun-oss-php-sdk-2.3.1/src/OSS/Result/GetLocationResult.php @@ -4,8 +4,8 @@ namespace OSS\Result; use OSS\Core\OssException; /** - * Class GetLocationResult getBucketLocation接口返回结果类，封装了 - * 返回的xml数据的解析 + * Class GetLocationResult getBucketLocation interface returns the result class, encapsulated + * The returned xml data is parsed * * @package OSS\Result */ diff --git a/aliyun-oss-php-sdk-2.3.0/src/OSS/Result/GetLoggingResult.php b/aliyun-oss-php-sdk-2.3.1/src/OSS/Result/GetLoggingResult.php old mode 100755 new mode 100644 similarity index 78% rename from aliyun-oss-php-sdk-2.3.0/src/OSS/Result/GetLoggingResult.php rename to aliyun-oss-php-sdk-2.3.1/src/OSS/Result/GetLoggingResult.php index 72fc3ae..eab8c64 --- a/aliyun-oss-php-sdk-2.3.0/src/OSS/Result/GetLoggingResult.php +++ b/aliyun-oss-php-sdk-2.3.1/src/OSS/Result/GetLoggingResult.php @@ -12,7 +12,7 @@ use OSS\Model\LoggingConfig; class GetLoggingResult extends Result { /** - * 解析LoggingConfig数据 + * Parse LoggingConfig data * * @return LoggingConfig */ @@ -25,8 +25,8 @@ class GetLoggingResult extends Result } /** - * 根据返回http状态码判断，[200-299]即认为是OK, 获取bucket相关配置的接口，404也认为是一种 - * 有效响应 + * Judged according to the return HTTP status code, [200-299] that is OK, get the bucket configuration interface, + * 404 is also considered a valid response * * @return bool */ diff --git a/aliyun-oss-php-sdk-2.3.0/src/OSS/Result/GetRefererResult.php b/aliyun-oss-php-sdk-2.3.1/src/OSS/Result/GetRefererResult.php old mode 100755 new mode 100644 similarity index 78% rename from aliyun-oss-php-sdk-2.3.0/src/OSS/Result/GetRefererResult.php rename to aliyun-oss-php-sdk-2.3.1/src/OSS/Result/GetRefererResult.php index aee50d3..a8a649e --- a/aliyun-oss-php-sdk-2.3.0/src/OSS/Result/GetRefererResult.php +++ b/aliyun-oss-php-sdk-2.3.1/src/OSS/Result/GetRefererResult.php @@ -12,7 +12,7 @@ use OSS\Model\RefererConfig; class GetRefererResult extends Result { /** - * 解析RefererConfig数据 + * Parse RefererConfig data * * @return RefererConfig */ @@ -25,8 +25,8 @@ class GetRefererResult extends Result } /** - * 根据返回http状态码判断，[200-299]即认为是OK, 获取bucket相关配置的接口，404也认为是一种 - * 有效响应 + * Judged according to the return HTTP status code, [200-299] that is OK, get the bucket configuration interface, + * 404 is also considered a valid response * * @return bool */ diff --git a/aliyun-oss-php-sdk-2.3.0/src/OSS/Result/GetStorageCapacityResult.php b/aliyun-oss-php-sdk-2.3.1/src/OSS/Result/GetStorageCapacityResult.php old mode 100755 new mode 100644 similarity index 85% rename from aliyun-oss-php-sdk-2.3.0/src/OSS/Result/GetStorageCapacityResult.php rename to aliyun-oss-php-sdk-2.3.1/src/OSS/Result/GetStorageCapacityResult.php index 84e4916..2f4127b --- a/aliyun-oss-php-sdk-2.3.0/src/OSS/Result/GetStorageCapacityResult.php +++ b/aliyun-oss-php-sdk-2.3.1/src/OSS/Result/GetStorageCapacityResult.php @@ -5,8 +5,8 @@ namespace OSS\Result; use OSS\Core\OssException; /** - * Class AclResult getBucketAcl接口返回结果类，封装了 - * 返回的xml数据的解析 + * Class AclResult GetBucketAcl interface returns the result class, encapsulated + * The returned xml data is parsed * * @package OSS\Result */ diff --git a/aliyun-oss-php-sdk-2.3.0/src/OSS/Result/GetWebsiteResult.php b/aliyun-oss-php-sdk-2.3.1/src/OSS/Result/GetWebsiteResult.php old mode 100755 new mode 100644 similarity index 77% rename from aliyun-oss-php-sdk-2.3.0/src/OSS/Result/GetWebsiteResult.php rename to aliyun-oss-php-sdk-2.3.1/src/OSS/Result/GetWebsiteResult.php index 3099172..64d54fa --- a/aliyun-oss-php-sdk-2.3.0/src/OSS/Result/GetWebsiteResult.php +++ b/aliyun-oss-php-sdk-2.3.1/src/OSS/Result/GetWebsiteResult.php @@ -11,7 +11,7 @@ use OSS\Model\WebsiteConfig; class GetWebsiteResult extends Result { /** - * 解析WebsiteConfig数据 + * Parse WebsiteConfig data * * @return WebsiteConfig */ @@ -24,8 +24,8 @@ class GetWebsiteResult extends Result } /** - * 根据返回http状态码判断，[200-299]即认为是OK, 获取bucket相关配置的接口，404也认为是一种 - * 有效响应 + * Judged according to the return HTTP status code, [200-299] that is OK, get the bucket configuration interface, + * 404 is also considered a valid response * * @return bool */ diff --git a/aliyun-oss-php-sdk-2.3.0/src/OSS/Result/HeaderResult.php b/aliyun-oss-php-sdk-2.3.1/src/OSS/Result/HeaderResult.php old mode 100755 new mode 100644 similarity index 86% rename from aliyun-oss-php-sdk-2.3.0/src/OSS/Result/HeaderResult.php rename to aliyun-oss-php-sdk-2.3.1/src/OSS/Result/HeaderResult.php index c9aae56..1ca4d1a --- a/aliyun-oss-php-sdk-2.3.0/src/OSS/Result/HeaderResult.php +++ b/aliyun-oss-php-sdk-2.3.1/src/OSS/Result/HeaderResult.php @@ -11,7 +11,7 @@ namespace OSS\Result; class HeaderResult extends Result { /** - * 把返回的ResponseCore中的header作为返回数据 + * The returned ResponseCore header is used as the return data * * @return array */ diff --git a/aliyun-oss-php-sdk-2.3.0/src/OSS/Result/InitiateMultipartUploadResult.php b/aliyun-oss-php-sdk-2.3.1/src/OSS/Result/InitiateMultipartUploadResult.php old mode 100755 new mode 100644 similarity index 93% rename from aliyun-oss-php-sdk-2.3.0/src/OSS/Result/InitiateMultipartUploadResult.php rename to aliyun-oss-php-sdk-2.3.1/src/OSS/Result/InitiateMultipartUploadResult.php index af985f2..53a15da --- a/aliyun-oss-php-sdk-2.3.0/src/OSS/Result/InitiateMultipartUploadResult.php +++ b/aliyun-oss-php-sdk-2.3.1/src/OSS/Result/InitiateMultipartUploadResult.php @@ -12,7 +12,7 @@ use OSS\Core\OssException; class InitiateMultipartUploadResult extends Result { /** - * 结果中获取uploadId并返回 + * Get uploadId in result and return * * @throws OssException * @return string diff --git a/aliyun-oss-php-sdk-2.3.0/src/OSS/Result/ListBucketsResult.php b/aliyun-oss-php-sdk-2.3.1/src/OSS/Result/ListBucketsResult.php old mode 100755 new mode 100644 similarity index 100% rename from aliyun-oss-php-sdk-2.3.0/src/OSS/Result/ListBucketsResult.php rename to aliyun-oss-php-sdk-2.3.1/src/OSS/Result/ListBucketsResult.php diff --git a/aliyun-oss-php-sdk-2.3.0/src/OSS/Result/ListLiveChannelResult.php b/aliyun-oss-php-sdk-2.3.1/src/OSS/Result/ListLiveChannelResult.php old mode 100755 new mode 100644 similarity index 100% rename from aliyun-oss-php-sdk-2.3.0/src/OSS/Result/ListLiveChannelResult.php rename to aliyun-oss-php-sdk-2.3.1/src/OSS/Result/ListLiveChannelResult.php diff --git a/aliyun-oss-php-sdk-2.3.0/src/OSS/Result/ListMultipartUploadResult.php b/aliyun-oss-php-sdk-2.3.1/src/OSS/Result/ListMultipartUploadResult.php old mode 100755 new mode 100644 similarity index 97% rename from aliyun-oss-php-sdk-2.3.0/src/OSS/Result/ListMultipartUploadResult.php rename to aliyun-oss-php-sdk-2.3.1/src/OSS/Result/ListMultipartUploadResult.php index bcb20bf..3220c86 --- a/aliyun-oss-php-sdk-2.3.0/src/OSS/Result/ListMultipartUploadResult.php +++ b/aliyun-oss-php-sdk-2.3.1/src/OSS/Result/ListMultipartUploadResult.php @@ -14,7 +14,7 @@ use OSS\Model\UploadInfo; class ListMultipartUploadResult extends Result { /** - * 解析从ListMultipartUpload接口的返回数据 + * Parse the return data from the ListMultipartUpload interface * * @return ListMultipartUploadInfo */ diff --git a/aliyun-oss-php-sdk-2.3.0/src/OSS/Result/ListObjectsResult.php b/aliyun-oss-php-sdk-2.3.1/src/OSS/Result/ListObjectsResult.php old mode 100755 new mode 100644 similarity index 97% rename from aliyun-oss-php-sdk-2.3.0/src/OSS/Result/ListObjectsResult.php rename to aliyun-oss-php-sdk-2.3.1/src/OSS/Result/ListObjectsResult.php index fcf493d..f44c66a --- a/aliyun-oss-php-sdk-2.3.0/src/OSS/Result/ListObjectsResult.php +++ b/aliyun-oss-php-sdk-2.3.1/src/OSS/Result/ListObjectsResult.php @@ -14,7 +14,7 @@ use OSS\Model\PrefixInfo; class ListObjectsResult extends Result { /** - * 解析ListObjects接口返回的xml数据 + * Parse the xml data returned by the ListObjects interface * * return ObjectListInfo */ diff --git a/aliyun-oss-php-sdk-2.3.0/src/OSS/Result/ListPartsResult.php b/aliyun-oss-php-sdk-2.3.1/src/OSS/Result/ListPartsResult.php old mode 100755 new mode 100644 similarity index 96% rename from aliyun-oss-php-sdk-2.3.0/src/OSS/Result/ListPartsResult.php rename to aliyun-oss-php-sdk-2.3.1/src/OSS/Result/ListPartsResult.php index fd8a1b8..092d94e --- a/aliyun-oss-php-sdk-2.3.0/src/OSS/Result/ListPartsResult.php +++ b/aliyun-oss-php-sdk-2.3.1/src/OSS/Result/ListPartsResult.php @@ -13,7 +13,7 @@ use OSS\Model\PartInfo; class ListPartsResult extends Result { /** - * 解析ListParts接口返回的xml数据 + * Parse the xml data returned by the ListParts interface * * @return ListPartsInfo */ diff --git a/aliyun-oss-php-sdk-2.3.0/src/OSS/Result/PutLiveChannelResult.php b/aliyun-oss-php-sdk-2.3.1/src/OSS/Result/PutLiveChannelResult.php old mode 100755 new mode 100644 similarity index 100% rename from aliyun-oss-php-sdk-2.3.0/src/OSS/Result/PutLiveChannelResult.php rename to aliyun-oss-php-sdk-2.3.1/src/OSS/Result/PutLiveChannelResult.php diff --git a/aliyun-oss-php-sdk-2.3.0/src/OSS/Result/PutSetDeleteResult.php b/aliyun-oss-php-sdk-2.3.1/src/OSS/Result/PutSetDeleteResult.php old mode 100755 new mode 100644 similarity index 100% rename from aliyun-oss-php-sdk-2.3.0/src/OSS/Result/PutSetDeleteResult.php rename to aliyun-oss-php-sdk-2.3.1/src/OSS/Result/PutSetDeleteResult.php diff --git a/aliyun-oss-php-sdk-2.3.0/src/OSS/Result/Result.php b/aliyun-oss-php-sdk-2.3.1/src/OSS/Result/Result.php old mode 100755 new mode 100644 similarity index 80% rename from aliyun-oss-php-sdk-2.3.0/src/OSS/Result/Result.php rename to aliyun-oss-php-sdk-2.3.1/src/OSS/Result/Result.php index 491256f..e5d83d3 --- a/aliyun-oss-php-sdk-2.3.0/src/OSS/Result/Result.php +++ b/aliyun-oss-php-sdk-2.3.1/src/OSS/Result/Result.php @@ -7,8 +7,8 @@ use OSS\Http\ResponseCore; /** - * Class Result, 操作结果类的基类，不同的请求在处理返回数据的时候有不同的逻辑， - * 具体的解析逻辑推迟到子类实现 + * Class Result, The result class of The operation of the base class, different requests in dealing with the return of data have different logic, + * The specific parsing logic postponed to subclass implementation * * @package OSS\Model */ @@ -29,7 +29,7 @@ abstract class Result } /** - * 获取requestId + * Get requestId * * @return string */ @@ -46,7 +46,7 @@ abstract class Result } /** - * 得到返回数据，不同的请求返回数据格式不同 + * Get the returned data, different request returns the data format is different * * $return mixed */ @@ -56,14 +56,14 @@ abstract class Result } /** - * 由子类实现，不同的请求返回数据有不同的解析逻辑，由子类实现 + * Subclass implementation, different requests return data has different analytical logic, implemented by subclasses * * @return mixed */ abstract protected function parseDataFromResponse(); /** - * 操作是否成功 + * Whether the operation is successful * * @return mixed */ @@ -99,7 +99,7 @@ abstract class Result } /** - * 尝试从body中获取错误Message + * Try to get the error message from body * * @param $body * @return string @@ -117,7 +117,7 @@ abstract class Result } /** - * 尝试从body中获取错误Code + * Try to get the error Code from body * * @param $body * @return string @@ -135,7 +135,7 @@ abstract class Result } /** - * 根据返回http状态码判断，[200-299]即认为是OK + * Judging from the return http status code, [200-299] that is OK * * @return bool */ @@ -149,7 +149,7 @@ abstract class Result } /** - * 返回原始的返回数据 + * Return the original return data * * @return ResponseCore */ @@ -159,15 +159,15 @@ abstract class Result } /** - * 标示请求是否成功 + * Indicate whether the request is successful */ protected $isOk = false; /** - * 由子类解析过的数据 + * Data parsed by subclasses */ protected $parsedData = null; /** - * 存放auth函数返回的原始Response + * Store the original Response returned by the auth function * * @var ResponseCore */ diff --git a/aliyun-oss-php-sdk-2.3.0/src/OSS/Result/SymlinkResult.php b/aliyun-oss-php-sdk-2.3.1/src/OSS/Result/SymlinkResult.php old mode 100755 new mode 100644 similarity index 100% rename from aliyun-oss-php-sdk-2.3.0/src/OSS/Result/SymlinkResult.php rename to aliyun-oss-php-sdk-2.3.1/src/OSS/Result/SymlinkResult.php diff --git a/aliyun-oss-php-sdk-2.3.0/src/OSS/Result/UploadPartResult.php b/aliyun-oss-php-sdk-2.3.1/src/OSS/Result/UploadPartResult.php old mode 100755 new mode 100644 similarity index 100% rename from aliyun-oss-php-sdk-2.3.0/src/OSS/Result/UploadPartResult.php rename to aliyun-oss-php-sdk-2.3.1/src/OSS/Result/UploadPartResult.php diff --git a/aliyun-oss-php-sdk-2.3.0/tests/OSS/Tests/AclResultTest.php b/aliyun-oss-php-sdk-2.3.1/tests/OSS/Tests/AclResultTest.php old mode 100755 new mode 100644 similarity index 100% rename from aliyun-oss-php-sdk-2.3.0/tests/OSS/Tests/AclResultTest.php rename to aliyun-oss-php-sdk-2.3.1/tests/OSS/Tests/AclResultTest.php diff --git a/aliyun-oss-php-sdk-2.3.0/tests/OSS/Tests/BodyResultTest.php b/aliyun-oss-php-sdk-2.3.1/tests/OSS/Tests/BodyResultTest.php old mode 100755 new mode 100644 similarity index 100% rename from aliyun-oss-php-sdk-2.3.0/tests/OSS/Tests/BodyResultTest.php rename to aliyun-oss-php-sdk-2.3.1/tests/OSS/Tests/BodyResultTest.php diff --git a/aliyun-oss-php-sdk-2.3.0/tests/OSS/Tests/BucketCnameTest.php b/aliyun-oss-php-sdk-2.3.1/tests/OSS/Tests/BucketCnameTest.php old mode 100755 new mode 100644 similarity index 100% rename from aliyun-oss-php-sdk-2.3.0/tests/OSS/Tests/BucketCnameTest.php rename to aliyun-oss-php-sdk-2.3.1/tests/OSS/Tests/BucketCnameTest.php diff --git a/aliyun-oss-php-sdk-2.3.0/tests/OSS/Tests/BucketInfoTest.php b/aliyun-oss-php-sdk-2.3.1/tests/OSS/Tests/BucketInfoTest.php old mode 100755 new mode 100644 similarity index 100% rename from aliyun-oss-php-sdk-2.3.0/tests/OSS/Tests/BucketInfoTest.php rename to aliyun-oss-php-sdk-2.3.1/tests/OSS/Tests/BucketInfoTest.php diff --git a/aliyun-oss-php-sdk-2.3.0/tests/OSS/Tests/BucketLiveChannelTest.php b/aliyun-oss-php-sdk-2.3.1/tests/OSS/Tests/BucketLiveChannelTest.php old mode 100755 new mode 100644 similarity index 100% rename from aliyun-oss-php-sdk-2.3.0/tests/OSS/Tests/BucketLiveChannelTest.php rename to aliyun-oss-php-sdk-2.3.1/tests/OSS/Tests/BucketLiveChannelTest.php diff --git a/aliyun-oss-php-sdk-2.3.0/tests/OSS/Tests/CallbackTest.php b/aliyun-oss-php-sdk-2.3.1/tests/OSS/Tests/CallbackTest.php old mode 100755 new mode 100644 similarity index 88% rename from aliyun-oss-php-sdk-2.3.0/tests/OSS/Tests/CallbackTest.php rename to aliyun-oss-php-sdk-2.3.1/tests/OSS/Tests/CallbackTest.php index a0db003..337ea24 --- a/aliyun-oss-php-sdk-2.3.0/tests/OSS/Tests/CallbackTest.php +++ b/aliyun-oss-php-sdk-2.3.1/tests/OSS/Tests/CallbackTest.php @@ -17,7 +17,7 @@ class CallbackTest extends TestOssClientBase $this->ossClient->putObject($this->bucket, $copiedObject, file_get_contents(__FILE__)); /** - * step 1. 初始化一个分块上传事件, 也就是初始化上传Multipart, 获取upload id + * step 1. Initialize a block upload event, which is initialized to upload Multipart, get the upload id */ try { $upload_id = $this->ossClient->initiateMultipartUpload($this->bucket, $object); @@ -44,11 +44,10 @@ class CallbackTest extends TestOssClientBase /** * step 3. */ - $json = '{ - "callbackUrl":"oss-demo.aliyuncs.com:23450", - "callbackHost":"oss-cn-hangzhou.aliyuncs.com", + "callbackUrl":"'.Common::getCallbackUrl().'",'. + ' "callbackHost":"oss-cn-hangzhou.aliyuncs.com", "callbackBody":"{\"mimeType\":${mimeType},\"size\":${size},\"x:var1\":${x:var1},\"x:var2\":${x:var2}}", "callbackBodyType":"application/json" }'; @@ -78,7 +77,7 @@ class CallbackTest extends TestOssClientBase $this->ossClient->putObject($this->bucket, $copiedObject, file_get_contents(__FILE__)); /** - * step 1. 初始化一个分块上传事件, 也就是初始化上传Multipart, 获取upload id + * step 1. Initialize a block upload event, which is initialized to upload Multipart, get the upload id */ try { $upload_id = $this->ossClient->initiateMultipartUpload($this->bucket, $object); @@ -139,8 +138,8 @@ class CallbackTest extends TestOssClientBase { $json = '{ - "callbackUrl":"oss-demo.aliyuncs.com:23450", - "callbackHost":"oss-cn-hangzhou.aliyuncs.com", + "callbackUrl":"'.Common::getCallbackUrl().'",'. + ' "callbackHost":"oss-cn-hangzhou.aliyuncs.com", "callbackBody":"{\"mimeType\":${mimeType},\"size\":${size}}", "callbackBodyType":"application/json" }'; @@ -151,8 +150,8 @@ class CallbackTest extends TestOssClientBase { $url = '{ - "callbackUrl":"oss-demo.aliyuncs.com:23450", - "callbackHost":"oss-cn-hangzhou.aliyuncs.com", + "callbackUrl":"'.Common::getCallbackUrl().'",'. + ' "callbackHost":"oss-cn-hangzhou.aliyuncs.com", "callbackBody":"bucket=${bucket}&object=${object}&etag=${etag}&size=${size}&mimeType=${mimeType}&imageInfo.height=${imageInfo.height}&imageInfo.width=${imageInfo.width}&imageInfo.format=${imageInfo.format}", "callbackBodyType":"application/x-www-form-urlencoded" }'; @@ -163,8 +162,8 @@ class CallbackTest extends TestOssClientBase { $url = '{ - "callbackUrl":"oss-demo.aliyuncs.com:23450", - "callbackHost":"oss-cn-hangzhou.aliyuncs.com", + "callbackUrl":"'.Common::getCallbackUrl().'",'. + ' "callbackHost":"oss-cn-hangzhou.aliyuncs.com", "callbackBody":"bucket=${bucket}&object=${object}&etag=${etag}&size=${size}&mimeType=${mimeType}&imageInfo.height=${imageInfo.height}&imageInfo.width=${imageInfo.width}&imageInfo.format=${imageInfo.format}" }'; $options = array(OssClient::OSS_CALLBACK => $url); @@ -174,8 +173,8 @@ class CallbackTest extends TestOssClientBase { $json = '{ - "callbackUrl":"oss-demo.aliyuncs.com:23450", - "callbackHost":"oss-cn-hangzhou.aliyuncs.com", + "callbackUrl":"'.Common::getCallbackUrl().'",'. + ' "callbackHost":"oss-cn-hangzhou.aliyuncs.com", "callbackBody":"{\" 春水碧于天，画船听雨眠。\":\"垆边人似月，皓腕凝霜雪。\"}", "callbackBodyType":"application/json" }'; @@ -186,8 +185,8 @@ class CallbackTest extends TestOssClientBase { $url = '{ - "callbackUrl":"oss-demo.aliyuncs.com:23450", - "callbackHost":"oss-cn-hangzhou.aliyuncs.com", + "callbackUrl":"'.Common::getCallbackUrl().'",'. + ' "callbackHost":"oss-cn-hangzhou.aliyuncs.com", "callbackBody":"春水碧于天，画船听雨眠。垆边人似月，皓腕凝霜雪", "callbackBodyType":"application/x-www-form-urlencoded" }'; @@ -198,8 +197,8 @@ class CallbackTest extends TestOssClientBase { $json = '{ - "callbackUrl":"oss-demo.aliyuncs.com:23450", - "callbackHost":"oss-cn-hangzhou.aliyuncs.com", + "callbackUrl":"'.Common::getCallbackUrl().'",'. + ' "callbackHost":"oss-cn-hangzhou.aliyuncs.com", "callbackBody":"{\"mimeType\":${mimeType},\"size\":${size},\"x:var1\":${x:var1},\"x:var2\":${x:var2}}", "callbackBodyType":"application/json" }'; @@ -218,8 +217,8 @@ class CallbackTest extends TestOssClientBase { $url = '{ - "callbackUrl":"oss-demo.aliyuncs.com:23450", - "callbackHost":"oss-cn-hangzhou.aliyuncs.com", + "callbackUrl":"'.Common::getCallbackUrl().'",'. + ' "callbackHost":"oss-cn-hangzhou.aliyuncs.com", "callbackBody":"bucket=${bucket}&object=${object}&etag=${etag}&size=${size}&mimeType=${mimeType}&imageInfo.height=${imageInfo.height}&imageInfo.width=${imageInfo.width}&imageInfo.format=${imageInfo.format}&my_var1=${x:var1}&my_var2=${x:var2}", "callbackBodyType":"application/x-www-form-urlencoded" }'; diff --git a/aliyun-oss-php-sdk-2.3.0/tests/OSS/Tests/CnameConfigTest.php b/aliyun-oss-php-sdk-2.3.1/tests/OSS/Tests/CnameConfigTest.php old mode 100755 new mode 100644 similarity index 100% rename from aliyun-oss-php-sdk-2.3.0/tests/OSS/Tests/CnameConfigTest.php rename to aliyun-oss-php-sdk-2.3.1/tests/OSS/Tests/CnameConfigTest.php diff --git a/aliyun-oss-php-sdk-2.3.0/tests/OSS/Tests/Common.php b/aliyun-oss-php-sdk-2.3.1/tests/OSS/Tests/Common.php old mode 100755 new mode 100644 similarity index 76% rename from aliyun-oss-php-sdk-2.3.0/tests/OSS/Tests/Common.php rename to aliyun-oss-php-sdk-2.3.1/tests/OSS/Tests/Common.php index 9d7190c..1528944 --- a/aliyun-oss-php-sdk-2.3.0/tests/OSS/Tests/Common.php +++ b/aliyun-oss-php-sdk-2.3.1/tests/OSS/Tests/Common.php @@ -10,14 +10,14 @@ use OSS\Core\OssException; /** * Class Common * - * 示例程序【Samples/*.php】 的Common类，用于获取OssClient实例和其他公用方法 + * Sample program [Samples / *. Php] Common class, used to obtain OssClient instance and other public methods */ class Common { /** - * 根据Config配置，得到一个OssClient实例 + * According to the Config configuration, get an OssClient instance * - * @return OssClient 一个OssClient实例 + * @return OssClient An OssClient instance */ public static function getOssClient() { @@ -39,8 +39,18 @@ class Common return getenv('OSS_BUCKET'); } + public static function getRegion() + { + return getenv('OSS_REGION'); + } + + public static function getCallbackUrl() + { + return getenv('OSS_CALLBACK_URL'); + } + /** - * 工具方法，创建一个bucket + * Tool method, create a bucket */ public static function createBucket() { diff --git a/aliyun-oss-php-sdk-2.3.0/tests/OSS/Tests/ContentTypeTest.php b/aliyun-oss-php-sdk-2.3.1/tests/OSS/Tests/ContentTypeTest.php old mode 100755 new mode 100644 similarity index 100% rename from aliyun-oss-php-sdk-2.3.0/tests/OSS/Tests/ContentTypeTest.php rename to aliyun-oss-php-sdk-2.3.1/tests/OSS/Tests/ContentTypeTest.php diff --git a/aliyun-oss-php-sdk-2.3.0/tests/OSS/Tests/CopyObjectResult.php b/aliyun-oss-php-sdk-2.3.1/tests/OSS/Tests/CopyObjectResult.php old mode 100755 new mode 100644 similarity index 100% rename from aliyun-oss-php-sdk-2.3.0/tests/OSS/Tests/CopyObjectResult.php rename to aliyun-oss-php-sdk-2.3.1/tests/OSS/Tests/CopyObjectResult.php diff --git a/aliyun-oss-php-sdk-2.3.0/tests/OSS/Tests/CorsConfigTest.php b/aliyun-oss-php-sdk-2.3.1/tests/OSS/Tests/CorsConfigTest.php old mode 100755 new mode 100644 similarity index 100% rename from aliyun-oss-php-sdk-2.3.0/tests/OSS/Tests/CorsConfigTest.php rename to aliyun-oss-php-sdk-2.3.1/tests/OSS/Tests/CorsConfigTest.php diff --git a/aliyun-oss-php-sdk-2.3.0/tests/OSS/Tests/ExistResultTest.php b/aliyun-oss-php-sdk-2.3.1/tests/OSS/Tests/ExistResultTest.php old mode 100755 new mode 100644 similarity index 100% rename from aliyun-oss-php-sdk-2.3.0/tests/OSS/Tests/ExistResultTest.php rename to aliyun-oss-php-sdk-2.3.1/tests/OSS/Tests/ExistResultTest.php diff --git a/aliyun-oss-php-sdk-2.3.0/tests/OSS/Tests/GetCorsResultTest.php b/aliyun-oss-php-sdk-2.3.1/tests/OSS/Tests/GetCorsResultTest.php old mode 100755 new mode 100644 similarity index 100% rename from aliyun-oss-php-sdk-2.3.0/tests/OSS/Tests/GetCorsResultTest.php rename to aliyun-oss-php-sdk-2.3.1/tests/OSS/Tests/GetCorsResultTest.php diff --git a/aliyun-oss-php-sdk-2.3.0/tests/OSS/Tests/GetLifecycleResultTest.php b/aliyun-oss-php-sdk-2.3.1/tests/OSS/Tests/GetLifecycleResultTest.php old mode 100755 new mode 100644 similarity index 100% rename from aliyun-oss-php-sdk-2.3.0/tests/OSS/Tests/GetLifecycleResultTest.php rename to aliyun-oss-php-sdk-2.3.1/tests/OSS/Tests/GetLifecycleResultTest.php diff --git a/aliyun-oss-php-sdk-2.3.0/tests/OSS/Tests/GetLoggingResultTest.php b/aliyun-oss-php-sdk-2.3.1/tests/OSS/Tests/GetLoggingResultTest.php old mode 100755 new mode 100644 similarity index 100% rename from aliyun-oss-php-sdk-2.3.0/tests/OSS/Tests/GetLoggingResultTest.php rename to aliyun-oss-php-sdk-2.3.1/tests/OSS/Tests/GetLoggingResultTest.php diff --git a/aliyun-oss-php-sdk-2.3.0/tests/OSS/Tests/GetRefererResultTest.php b/aliyun-oss-php-sdk-2.3.1/tests/OSS/Tests/GetRefererResultTest.php old mode 100755 new mode 100644 similarity index 100% rename from aliyun-oss-php-sdk-2.3.0/tests/OSS/Tests/GetRefererResultTest.php rename to aliyun-oss-php-sdk-2.3.1/tests/OSS/Tests/GetRefererResultTest.php diff --git a/aliyun-oss-php-sdk-2.3.0/tests/OSS/Tests/GetWebsiteResultTest.php b/aliyun-oss-php-sdk-2.3.1/tests/OSS/Tests/GetWebsiteResultTest.php old mode 100755 new mode 100644 similarity index 100% rename from aliyun-oss-php-sdk-2.3.0/tests/OSS/Tests/GetWebsiteResultTest.php rename to aliyun-oss-php-sdk-2.3.1/tests/OSS/Tests/GetWebsiteResultTest.php diff --git a/aliyun-oss-php-sdk-2.3.0/tests/OSS/Tests/HeaderResultTest.php b/aliyun-oss-php-sdk-2.3.1/tests/OSS/Tests/HeaderResultTest.php old mode 100755 new mode 100644 similarity index 100% rename from aliyun-oss-php-sdk-2.3.0/tests/OSS/Tests/HeaderResultTest.php rename to aliyun-oss-php-sdk-2.3.1/tests/OSS/Tests/HeaderResultTest.php diff --git a/aliyun-oss-php-sdk-2.3.0/tests/OSS/Tests/HttpTest.php b/aliyun-oss-php-sdk-2.3.1/tests/OSS/Tests/HttpTest.php old mode 100755 new mode 100644 similarity index 100% rename from aliyun-oss-php-sdk-2.3.0/tests/OSS/Tests/HttpTest.php rename to aliyun-oss-php-sdk-2.3.1/tests/OSS/Tests/HttpTest.php diff --git a/aliyun-oss-php-sdk-2.3.0/tests/OSS/Tests/InitiateMultipartUploadResultTest.php b/aliyun-oss-php-sdk-2.3.1/tests/OSS/Tests/InitiateMultipartUploadResultTest.php old mode 100755 new mode 100644 similarity index 100% rename from aliyun-oss-php-sdk-2.3.0/tests/OSS/Tests/InitiateMultipartUploadResultTest.php rename to aliyun-oss-php-sdk-2.3.1/tests/OSS/Tests/InitiateMultipartUploadResultTest.php diff --git a/aliyun-oss-php-sdk-2.3.0/tests/OSS/Tests/LifecycleConfigTest.php b/aliyun-oss-php-sdk-2.3.1/tests/OSS/Tests/LifecycleConfigTest.php old mode 100755 new mode 100644 similarity index 100% rename from aliyun-oss-php-sdk-2.3.0/tests/OSS/Tests/LifecycleConfigTest.php rename to aliyun-oss-php-sdk-2.3.1/tests/OSS/Tests/LifecycleConfigTest.php diff --git a/aliyun-oss-php-sdk-2.3.0/tests/OSS/Tests/ListBucketsResultTest.php b/aliyun-oss-php-sdk-2.3.1/tests/OSS/Tests/ListBucketsResultTest.php old mode 100755 new mode 100644 similarity index 100% rename from aliyun-oss-php-sdk-2.3.0/tests/OSS/Tests/ListBucketsResultTest.php rename to aliyun-oss-php-sdk-2.3.1/tests/OSS/Tests/ListBucketsResultTest.php diff --git a/aliyun-oss-php-sdk-2.3.0/tests/OSS/Tests/ListMultipartUploadResultTest.php b/aliyun-oss-php-sdk-2.3.1/tests/OSS/Tests/ListMultipartUploadResultTest.php old mode 100755 new mode 100644 similarity index 100% rename from aliyun-oss-php-sdk-2.3.0/tests/OSS/Tests/ListMultipartUploadResultTest.php rename to aliyun-oss-php-sdk-2.3.1/tests/OSS/Tests/ListMultipartUploadResultTest.php diff --git a/aliyun-oss-php-sdk-2.3.0/tests/OSS/Tests/ListObjectsResultTest.php b/aliyun-oss-php-sdk-2.3.1/tests/OSS/Tests/ListObjectsResultTest.php old mode 100755 new mode 100644 similarity index 100% rename from aliyun-oss-php-sdk-2.3.0/tests/OSS/Tests/ListObjectsResultTest.php rename to aliyun-oss-php-sdk-2.3.1/tests/OSS/Tests/ListObjectsResultTest.php diff --git a/aliyun-oss-php-sdk-2.3.0/tests/OSS/Tests/ListPartsResultTest.php b/aliyun-oss-php-sdk-2.3.1/tests/OSS/Tests/ListPartsResultTest.php old mode 100755 new mode 100644 similarity index 100% rename from aliyun-oss-php-sdk-2.3.0/tests/OSS/Tests/ListPartsResultTest.php rename to aliyun-oss-php-sdk-2.3.1/tests/OSS/Tests/ListPartsResultTest.php diff --git a/aliyun-oss-php-sdk-2.3.0/tests/OSS/Tests/LiveChannelXmlTest.php b/aliyun-oss-php-sdk-2.3.1/tests/OSS/Tests/LiveChannelXmlTest.php old mode 100755 new mode 100644 similarity index 100% rename from aliyun-oss-php-sdk-2.3.0/tests/OSS/Tests/LiveChannelXmlTest.php rename to aliyun-oss-php-sdk-2.3.1/tests/OSS/Tests/LiveChannelXmlTest.php diff --git a/aliyun-oss-php-sdk-2.3.0/tests/OSS/Tests/LoggingConfigTest.php b/aliyun-oss-php-sdk-2.3.1/tests/OSS/Tests/LoggingConfigTest.php old mode 100755 new mode 100644 similarity index 100% rename from aliyun-oss-php-sdk-2.3.0/tests/OSS/Tests/LoggingConfigTest.php rename to aliyun-oss-php-sdk-2.3.1/tests/OSS/Tests/LoggingConfigTest.php diff --git a/aliyun-oss-php-sdk-2.3.0/tests/OSS/Tests/MimeTypesTest.php b/aliyun-oss-php-sdk-2.3.1/tests/OSS/Tests/MimeTypesTest.php old mode 100755 new mode 100644 similarity index 100% rename from aliyun-oss-php-sdk-2.3.0/tests/OSS/Tests/MimeTypesTest.php rename to aliyun-oss-php-sdk-2.3.1/tests/OSS/Tests/MimeTypesTest.php diff --git a/aliyun-oss-php-sdk-2.3.0/tests/OSS/Tests/ObjectAclTest.php b/aliyun-oss-php-sdk-2.3.1/tests/OSS/Tests/ObjectAclTest.php old mode 100755 new mode 100644 similarity index 100% rename from aliyun-oss-php-sdk-2.3.0/tests/OSS/Tests/ObjectAclTest.php rename to aliyun-oss-php-sdk-2.3.1/tests/OSS/Tests/ObjectAclTest.php diff --git a/aliyun-oss-php-sdk-2.3.0/tests/OSS/Tests/OssClientBucketCorsTest.php b/aliyun-oss-php-sdk-2.3.1/tests/OSS/Tests/OssClientBucketCorsTest.php old mode 100755 new mode 100644 similarity index 100% rename from aliyun-oss-php-sdk-2.3.0/tests/OSS/Tests/OssClientBucketCorsTest.php rename to aliyun-oss-php-sdk-2.3.1/tests/OSS/Tests/OssClientBucketCorsTest.php diff --git a/aliyun-oss-php-sdk-2.3.0/tests/OSS/Tests/OssClientBucketLifecycleTest.php b/aliyun-oss-php-sdk-2.3.1/tests/OSS/Tests/OssClientBucketLifecycleTest.php old mode 100755 new mode 100644 similarity index 100% rename from aliyun-oss-php-sdk-2.3.0/tests/OSS/Tests/OssClientBucketLifecycleTest.php rename to aliyun-oss-php-sdk-2.3.1/tests/OSS/Tests/OssClientBucketLifecycleTest.php diff --git a/aliyun-oss-php-sdk-2.3.0/tests/OSS/Tests/OssClientBucketLoggingTest.php b/aliyun-oss-php-sdk-2.3.1/tests/OSS/Tests/OssClientBucketLoggingTest.php old mode 100755 new mode 100644 similarity index 100% rename from aliyun-oss-php-sdk-2.3.0/tests/OSS/Tests/OssClientBucketLoggingTest.php rename to aliyun-oss-php-sdk-2.3.1/tests/OSS/Tests/OssClientBucketLoggingTest.php diff --git a/aliyun-oss-php-sdk-2.3.0/tests/OSS/Tests/OssClientBucketRefererTest.php b/aliyun-oss-php-sdk-2.3.1/tests/OSS/Tests/OssClientBucketRefererTest.php old mode 100755 new mode 100644 similarity index 100% rename from aliyun-oss-php-sdk-2.3.0/tests/OSS/Tests/OssClientBucketRefererTest.php rename to aliyun-oss-php-sdk-2.3.1/tests/OSS/Tests/OssClientBucketRefererTest.php diff --git a/aliyun-oss-php-sdk-2.3.0/tests/OSS/Tests/OssClientBucketStorageCapacityTest.php b/aliyun-oss-php-sdk-2.3.1/tests/OSS/Tests/OssClientBucketStorageCapacityTest.php old mode 100755 new mode 100644 similarity index 100% rename from aliyun-oss-php-sdk-2.3.0/tests/OSS/Tests/OssClientBucketStorageCapacityTest.php rename to aliyun-oss-php-sdk-2.3.1/tests/OSS/Tests/OssClientBucketStorageCapacityTest.php diff --git a/aliyun-oss-php-sdk-2.3.0/tests/OSS/Tests/OssClientBucketTest.php b/aliyun-oss-php-sdk-2.3.1/tests/OSS/Tests/OssClientBucketTest.php old mode 100755 new mode 100644 similarity index 97% rename from aliyun-oss-php-sdk-2.3.0/tests/OSS/Tests/OssClientBucketTest.php rename to aliyun-oss-php-sdk-2.3.1/tests/OSS/Tests/OssClientBucketTest.php index f207ca1..d0a2a22 --- a/aliyun-oss-php-sdk-2.3.0/tests/OSS/Tests/OssClientBucketTest.php +++ b/aliyun-oss-php-sdk-2.3.1/tests/OSS/Tests/OssClientBucketTest.php @@ -51,11 +51,11 @@ class OssClientBucketTest extends TestOssClientBase $this->assertTrue($this->ossClient->doesBucketExist($this->bucket)); $this->assertFalse($this->ossClient->doesBucketExist($this->bucket . '-notexist')); - $this->assertEquals($this->ossClient->getBucketLocation($this->bucket), 'oss-us-west-1'); + $this->assertEquals($this->ossClient->getBucketLocation($this->bucket), Common::getRegion()); $res = $this->ossClient->getBucketMeta($this->bucket); $this->assertEquals('200', $res['info']['http_code']); - $this->assertEquals('oss-us-west-1', $res['x-oss-bucket-region']); + $this->assertEquals(Common::getRegion(), $res['x-oss-bucket-region']); } public function testCreateBucketWithStorageType() diff --git a/aliyun-oss-php-sdk-2.3.0/tests/OSS/Tests/OssClientBucketWebsiteTest.php b/aliyun-oss-php-sdk-2.3.1/tests/OSS/Tests/OssClientBucketWebsiteTest.php old mode 100755 new mode 100644 similarity index 100% rename from aliyun-oss-php-sdk-2.3.0/tests/OSS/Tests/OssClientBucketWebsiteTest.php rename to aliyun-oss-php-sdk-2.3.1/tests/OSS/Tests/OssClientBucketWebsiteTest.php diff --git a/aliyun-oss-php-sdk-2.3.0/tests/OSS/Tests/OssClientImageTest.php b/aliyun-oss-php-sdk-2.3.1/tests/OSS/Tests/OssClientImageTest.php old mode 100755 new mode 100644 similarity index 100% rename from aliyun-oss-php-sdk-2.3.0/tests/OSS/Tests/OssClientImageTest.php rename to aliyun-oss-php-sdk-2.3.1/tests/OSS/Tests/OssClientImageTest.php diff --git a/aliyun-oss-php-sdk-2.3.0/tests/OSS/Tests/OssClientMultipartUploadTest.php b/aliyun-oss-php-sdk-2.3.1/tests/OSS/Tests/OssClientMultipartUploadTest.php old mode 100755 new mode 100644 similarity index 100% rename from aliyun-oss-php-sdk-2.3.0/tests/OSS/Tests/OssClientMultipartUploadTest.php rename to aliyun-oss-php-sdk-2.3.1/tests/OSS/Tests/OssClientMultipartUploadTest.php diff --git a/aliyun-oss-php-sdk-2.3.0/tests/OSS/Tests/OssClientObjectTest.php b/aliyun-oss-php-sdk-2.3.1/tests/OSS/Tests/OssClientObjectTest.php old mode 100755 new mode 100644 similarity index 91% rename from aliyun-oss-php-sdk-2.3.0/tests/OSS/Tests/OssClientObjectTest.php rename to aliyun-oss-php-sdk-2.3.1/tests/OSS/Tests/OssClientObjectTest.php index 34e3ded..2f1201b --- a/aliyun-oss-php-sdk-2.3.0/tests/OSS/Tests/OssClientObjectTest.php +++ b/aliyun-oss-php-sdk-2.3.1/tests/OSS/Tests/OssClientObjectTest.php @@ -78,7 +78,7 @@ class OssClientObjectTest extends TestOssClientBase public function testObject() { /** - * 上传本地变量到bucket + * Upload the local variable to bucket */ $object = "oss-php-sdk-test/upload-test-object-name.txt"; $content = file_get_contents(__FILE__); @@ -129,7 +129,7 @@ class OssClientObjectTest extends TestOssClientBase } /** - * getObject到本地变量，检查是否match + * GetObject to the local variable and check for match */ try { $content = $this->ossClient->getObject($this->bucket, $object); @@ -139,7 +139,7 @@ class OssClientObjectTest extends TestOssClientBase } /** - * getObject的前五个字节 + * GetObject first five bytes */ try { $options = array(OssClient::OSS_RANGE => '0-4'); @@ -151,7 +151,7 @@ class OssClientObjectTest extends TestOssClientBase /** - * 上传本地文件到object + * Upload the local file to object */ try { $this->ossClient->uploadFile($this->bucket, $object, __FILE__); @@ -160,7 +160,7 @@ class OssClientObjectTest extends TestOssClientBase } /** - * 下载文件到本地变量，检查是否match + * Download the file to the local variable and check for match. */ try { $content = $this->ossClient->getObject($this->bucket, $object); @@ -170,7 +170,7 @@ class OssClientObjectTest extends TestOssClientBase } /** - * 下载文件到本地文件 + * Download the file to the local file */ $localfile = "upload-test-object-name.txt"; $options = array( @@ -188,7 +188,7 @@ class OssClientObjectTest extends TestOssClientBase } /** - * 下载文件到本地文件 no such key + * Download the file to the local file. no such key */ $localfile = "upload-test-object-name-no-such-key.txt"; $options = array( @@ -208,7 +208,7 @@ class OssClientObjectTest extends TestOssClientBase } /** - * 下载文件到内容 no such key + * Download the file to the content. no such key */ try { $result = $this->ossClient->getObject($this->bucket, $object . "no-such-key"); @@ -222,7 +222,7 @@ class OssClientObjectTest extends TestOssClientBase } /** - * 复制object + * Copy object */ $to_bucket = $this->bucket; $to_object = $object . '.copy'; @@ -239,7 +239,7 @@ class OssClientObjectTest extends TestOssClientBase } /** - * 检查复制的是否相同 + * Check if the replication is the same */ try { $content = $this->ossClient->getObject($this->bucket, $to_object); @@ -249,7 +249,7 @@ class OssClientObjectTest extends TestOssClientBase } /** - * 列出bucket内的文件列表 + * List the files in your bucket. */ $prefix = ''; $delimiter = '/'; @@ -276,7 +276,7 @@ class OssClientObjectTest extends TestOssClientBase } /** - * 设置文件的meta信息 + * Set the meta information for the file */ $from_bucket = $this->bucket; $from_object = "oss-php-sdk-test/upload-test-object-name.txt"; @@ -295,7 +295,7 @@ class OssClientObjectTest extends TestOssClientBase } /** - * 获取文件的meta信息 + * Get the meta information for the file */ $object = "oss-php-sdk-test/upload-test-object-name.txt"; try { @@ -306,7 +306,7 @@ class OssClientObjectTest extends TestOssClientBase } /** - * 删除单个文件 + * Delete single file */ $object = "oss-php-sdk-test/upload-test-object-name.txt"; @@ -319,7 +319,7 @@ class OssClientObjectTest extends TestOssClientBase } /** - * 删除多个个文件 + * Delete multiple files */ $object1 = "oss-php-sdk-test/upload-test-object-name.txt"; $object2 = "oss-php-sdk-test/upload-test-object-name.txt.copy"; @@ -345,7 +345,7 @@ class OssClientObjectTest extends TestOssClientBase $content_array = array('Hello OSS', 'Hi OSS', 'OSS OK'); /** - * 追加上传字符串 + * Append the upload string */ try { $position = $this->ossClient->appendObject($this->bucket, $object, $content_array[0], 0); @@ -359,7 +359,7 @@ class OssClientObjectTest extends TestOssClientBase } /** - * 检查内容的是否相同 + * Check if the content is the same */ try { $content = $this->ossClient->getObject($this->bucket, $object); @@ -370,7 +370,7 @@ class OssClientObjectTest extends TestOssClientBase /** - * 删除测试object + * Delete test object */ try { $this->ossClient->deleteObject($this->bucket, $object); @@ -379,7 +379,7 @@ class OssClientObjectTest extends TestOssClientBase } /** - * 追加上传本地文件 + * Append the upload of local files */ try { $position = $this->ossClient->appendFile($this->bucket, $object, __FILE__, 0); @@ -391,7 +391,7 @@ class OssClientObjectTest extends TestOssClientBase } /** - * 检查复制的是否相同 + * Check if the replication is the same */ try { $content = $this->ossClient->getObject($this->bucket, $object); @@ -401,7 +401,7 @@ class OssClientObjectTest extends TestOssClientBase } /** - * 删除测试object + * Delete test object */ try { $this->ossClient->deleteObject($this->bucket, $object); @@ -418,7 +418,7 @@ class OssClientObjectTest extends TestOssClientBase ); /** - * 带option的追加上传 + * Append upload with option */ try { $position = $this->ossClient->appendObject($this->bucket, $object, "Hello OSS, ", 0, $options); @@ -428,7 +428,7 @@ class OssClientObjectTest extends TestOssClientBase } /** - * 获取文件的meta信息 + * Get the meta information for the file */ try { $objectMeta = $this->ossClient->getObjectMeta($this->bucket, $object); @@ -438,7 +438,7 @@ class OssClientObjectTest extends TestOssClientBase } /** - * 删除测试object + * Delete test object */ try { $this->ossClient->deleteObject($this->bucket, $object); @@ -465,7 +465,7 @@ class OssClientObjectTest extends TestOssClientBase $options = array(OssClient::OSS_CHECK_MD5 => true); /** - * 上传数据开启MD5 + * Upload data to start MD5 */ try { $this->ossClient->putObject($this->bucket, $object, $content, $options); @@ -474,7 +474,7 @@ class OssClientObjectTest extends TestOssClientBase } /** - * 检查复制的是否相同 + * Check if the replication is the same */ try { $content = $this->ossClient->getObject($this->bucket, $object); @@ -484,7 +484,7 @@ class OssClientObjectTest extends TestOssClientBase } /** - * 上传文件开启MD5 + * Upload file to start MD5 */ try { $this->ossClient->uploadFile($this->bucket, $object, __FILE__, $options); @@ -493,7 +493,7 @@ class OssClientObjectTest extends TestOssClientBase } /** - * 检查复制的是否相同 + * Check if the replication is the same */ try { $content = $this->ossClient->getObject($this->bucket, $object); @@ -503,7 +503,7 @@ class OssClientObjectTest extends TestOssClientBase } /** - * 删除测试object + * Delete test object */ try { $this->ossClient->deleteObject($this->bucket, $object); @@ -516,7 +516,7 @@ class OssClientObjectTest extends TestOssClientBase $options = array(OssClient::OSS_CHECK_MD5 => true); /** - * 追加上传字符串 + * Append the upload string */ try { $position = $this->ossClient->appendObject($this->bucket, $object, $content_array[0], 0, $options); @@ -530,7 +530,7 @@ class OssClientObjectTest extends TestOssClientBase } /** - * 检查内容的是否相同 + * Check if the content is the same */ try { $content = $this->ossClient->getObject($this->bucket, $object); @@ -540,7 +540,7 @@ class OssClientObjectTest extends TestOssClientBase } /** - * 删除测试object + * Delete test object */ try { $this->ossClient->deleteObject($this->bucket, $object); @@ -549,7 +549,7 @@ class OssClientObjectTest extends TestOssClientBase } /** - * 追加上传本地文件 + * Append upload of local files */ try { $position = $this->ossClient->appendFile($this->bucket, $object, __FILE__, 0, $options); @@ -561,7 +561,7 @@ class OssClientObjectTest extends TestOssClientBase } /** - * 检查复制的是否相同 + * Check if the replication is the same */ try { $content = $this->ossClient->getObject($this->bucket, $object); @@ -571,7 +571,7 @@ class OssClientObjectTest extends TestOssClientBase } /** - * 删除测试object + * delete test object */ try { $this->ossClient->deleteObject($this->bucket, $object); @@ -580,6 +580,16 @@ class OssClientObjectTest extends TestOssClientBase } } + public function testWithInvalidBucketName() + { + try { + $this->ossClient->createBucket("abcefc/", "test-key"); + $this->assertFalse(true); + } catch (OssException $e) { + $this->assertEquals('"abcefc/"bucket name is invalid', $e->getMessage()); + } + } + public function setUp() { parent::setUp(); diff --git a/aliyun-oss-php-sdk-2.3.0/tests/OSS/Tests/OssClientRestoreObjectTest.php b/aliyun-oss-php-sdk-2.3.1/tests/OSS/Tests/OssClientRestoreObjectTest.php old mode 100755 new mode 100644 similarity index 100% rename from aliyun-oss-php-sdk-2.3.0/tests/OSS/Tests/OssClientRestoreObjectTest.php rename to aliyun-oss-php-sdk-2.3.1/tests/OSS/Tests/OssClientRestoreObjectTest.php diff --git a/aliyun-oss-php-sdk-2.3.0/tests/OSS/Tests/OssClientSignatureTest.php b/aliyun-oss-php-sdk-2.3.1/tests/OSS/Tests/OssClientSignatureTest.php old mode 100755 new mode 100644 similarity index 100% rename from aliyun-oss-php-sdk-2.3.0/tests/OSS/Tests/OssClientSignatureTest.php rename to aliyun-oss-php-sdk-2.3.1/tests/OSS/Tests/OssClientSignatureTest.php diff --git a/aliyun-oss-php-sdk-2.3.0/tests/OSS/Tests/OssClientTest.php b/aliyun-oss-php-sdk-2.3.1/tests/OSS/Tests/OssClientTest.php old mode 100755 new mode 100644 similarity index 100% rename from aliyun-oss-php-sdk-2.3.0/tests/OSS/Tests/OssClientTest.php rename to aliyun-oss-php-sdk-2.3.1/tests/OSS/Tests/OssClientTest.php diff --git a/aliyun-oss-php-sdk-2.3.0/tests/OSS/Tests/OssExceptionTest.php b/aliyun-oss-php-sdk-2.3.1/tests/OSS/Tests/OssExceptionTest.php old mode 100755 new mode 100644 similarity index 100% rename from aliyun-oss-php-sdk-2.3.0/tests/OSS/Tests/OssExceptionTest.php rename to aliyun-oss-php-sdk-2.3.1/tests/OSS/Tests/OssExceptionTest.php diff --git a/aliyun-oss-php-sdk-2.3.0/tests/OSS/Tests/OssUtilTest.php b/aliyun-oss-php-sdk-2.3.1/tests/OSS/Tests/OssUtilTest.php old mode 100755 new mode 100644 similarity index 86% rename from aliyun-oss-php-sdk-2.3.0/tests/OSS/Tests/OssUtilTest.php rename to aliyun-oss-php-sdk-2.3.1/tests/OSS/Tests/OssUtilTest.php index adf6457..c565249 --- a/aliyun-oss-php-sdk-2.3.0/tests/OSS/Tests/OssUtilTest.php +++ b/aliyun-oss-php-sdk-2.3.1/tests/OSS/Tests/OssUtilTest.php @@ -222,4 +222,30 @@ BBBB; return str_replace("\n", "", str_replace("\r", "", $xml)); } + public function testGetHostPortFromEndpoint() + { + $str = OssUtil::getHostPortFromEndpoint('http://username:password@hostname:80/path?arg=value#anchor'); + $this->assertEquals('hostname:80', $str); + + $str = OssUtil::getHostPortFromEndpoint('hostname:80'); + $this->assertEquals('hostname:80', $str); + + $str = OssUtil::getHostPortFromEndpoint('www.hostname.com'); + $this->assertEquals('www.hostname.com', $str); + + $str = OssUtil::getHostPortFromEndpoint('http://www.hostname.com'); + $this->assertEquals('www.hostname.com', $str); + + $str = OssUtil::getHostPortFromEndpoint('https://www.hostname.com'); + $this->assertEquals('www.hostname.com', $str); + + $str = OssUtil::getHostPortFromEndpoint('192.168.1.10:8080'); + $this->assertEquals('192.168.1.10:8080', $str); + + $str = OssUtil::getHostPortFromEndpoint('http:///path?arg=value#anchor'); + $this->assertEquals('', $str); + + $str = OssUtil::getHostPortFromEndpoint('file://username:password@hostname:80/path?arg=value#anchor'); + $this->assertEquals('hostname:80', $str); + } } diff --git a/aliyun-oss-php-sdk-2.3.0/tests/OSS/Tests/PutSetDeleteResultTest.php b/aliyun-oss-php-sdk-2.3.1/tests/OSS/Tests/PutSetDeleteResultTest.php old mode 100755 new mode 100644 similarity index 100% rename from aliyun-oss-php-sdk-2.3.0/tests/OSS/Tests/PutSetDeleteResultTest.php rename to aliyun-oss-php-sdk-2.3.1/tests/OSS/Tests/PutSetDeleteResultTest.php diff --git a/aliyun-oss-php-sdk-2.3.0/tests/OSS/Tests/RefererConfigTest.php b/aliyun-oss-php-sdk-2.3.1/tests/OSS/Tests/RefererConfigTest.php old mode 100755 new mode 100644 similarity index 100% rename from aliyun-oss-php-sdk-2.3.0/tests/OSS/Tests/RefererConfigTest.php rename to aliyun-oss-php-sdk-2.3.1/tests/OSS/Tests/RefererConfigTest.php diff --git a/aliyun-oss-php-sdk-2.3.0/tests/OSS/Tests/StorageCapacityTest.php b/aliyun-oss-php-sdk-2.3.1/tests/OSS/Tests/StorageCapacityTest.php old mode 100755 new mode 100644 similarity index 100% rename from aliyun-oss-php-sdk-2.3.0/tests/OSS/Tests/StorageCapacityTest.php rename to aliyun-oss-php-sdk-2.3.1/tests/OSS/Tests/StorageCapacityTest.php diff --git a/aliyun-oss-php-sdk-2.3.0/tests/OSS/Tests/SymlinkTest.php b/aliyun-oss-php-sdk-2.3.1/tests/OSS/Tests/SymlinkTest.php old mode 100755 new mode 100644 similarity index 95% rename from aliyun-oss-php-sdk-2.3.0/tests/OSS/Tests/SymlinkTest.php rename to aliyun-oss-php-sdk-2.3.1/tests/OSS/Tests/SymlinkTest.php index d257c94..4a39dfa --- a/aliyun-oss-php-sdk-2.3.0/tests/OSS/Tests/SymlinkTest.php +++ b/aliyun-oss-php-sdk-2.3.1/tests/OSS/Tests/SymlinkTest.php @@ -53,7 +53,7 @@ class SymlinkTest extends TestOssClientBase $this->ossClient->getObject($bucket, $symlink); $this->assertTrue(false); }catch (OssException $e){ - $this->assertEquals('The symlink target object does not exist', $e->getErrorMessage()); + $this->assertEquals('The specified key does not exist.', $e->getErrorMessage()); } } diff --git a/aliyun-oss-php-sdk-2.3.0/tests/OSS/Tests/TestOssClientBase.php b/aliyun-oss-php-sdk-2.3.1/tests/OSS/Tests/TestOssClientBase.php old mode 100755 new mode 100644 similarity index 100% rename from aliyun-oss-php-sdk-2.3.0/tests/OSS/Tests/TestOssClientBase.php rename to aliyun-oss-php-sdk-2.3.1/tests/OSS/Tests/TestOssClientBase.php diff --git a/aliyun-oss-php-sdk-2.3.0/tests/OSS/Tests/UploadPartResultTest.php b/aliyun-oss-php-sdk-2.3.1/tests/OSS/Tests/UploadPartResultTest.php old mode 100755 new mode 100644 similarity index 100% rename from aliyun-oss-php-sdk-2.3.0/tests/OSS/Tests/UploadPartResultTest.php rename to aliyun-oss-php-sdk-2.3.1/tests/OSS/Tests/UploadPartResultTest.php diff --git a/aliyun-oss-php-sdk-2.3.0/tests/OSS/Tests/WebsiteConfigTest.php b/aliyun-oss-php-sdk-2.3.1/tests/OSS/Tests/WebsiteConfigTest.php old mode 100755 new mode 100644 similarity index 100% rename from aliyun-oss-php-sdk-2.3.0/tests/OSS/Tests/WebsiteConfigTest.php rename to aliyun-oss-php-sdk-2.3.1/tests/OSS/Tests/WebsiteConfigTest.php