框架升级及修复升级后的bug
This commit is contained in:
@@ -19,9 +19,9 @@ class ObjectAclTest extends TestOssClientBase
|
||||
$acl = $client->getObjectAcl($bucket, $object);
|
||||
$this->assertEquals('default', $acl);
|
||||
|
||||
$client->putObjectAcl($bucket, $object, 'public-read');
|
||||
$client->putObjectAcl($bucket, $object, 'private');
|
||||
$acl = $client->getObjectAcl($bucket, $object);
|
||||
$this->assertEquals('public-read', $acl);
|
||||
$this->assertEquals('private', $acl);
|
||||
|
||||
$content = $client->getObject($bucket, $object);
|
||||
$this->assertEquals('hello world', $content);
|
||||
|
||||
+3
-1
@@ -28,7 +28,9 @@ class OssClientAsyncProcessObjectTest extends TestOssClientBase
|
||||
$ch = curl_init($url);
|
||||
curl_setopt($ch, CURLOPT_FILE, $fp);
|
||||
curl_exec($ch);
|
||||
curl_close($ch);
|
||||
if (PHP_VERSION_ID < 80500) {
|
||||
curl_close($ch);
|
||||
}
|
||||
fclose($fp);
|
||||
|
||||
$this->local_file = $file_name;
|
||||
|
||||
+1
-4
@@ -15,10 +15,7 @@ class OssClientBucketCnameTest extends TestOssClientBase
|
||||
public function testBucketCname()
|
||||
{
|
||||
$bucketName = $this->bucket . '-cname';
|
||||
$client = new OssClient(
|
||||
getenv('OSS_ACCESS_KEY_ID'),
|
||||
getenv('OSS_ACCESS_KEY_SECRET'),
|
||||
"oss-ap-southeast-2.aliyuncs.com", false);
|
||||
$client = $this->ossClient;
|
||||
|
||||
$client->createBucket($bucketName);
|
||||
|
||||
|
||||
+3
-3
@@ -36,7 +36,7 @@ class OssClientBucketTest extends TestOssClientBase
|
||||
|
||||
public function testBucket()
|
||||
{
|
||||
$this->ossClient->createBucket($this->bucket, OssClient::OSS_ACL_TYPE_PUBLIC_READ_WRITE);
|
||||
$this->ossClient->createBucket($this->bucket, OssClient::OSS_ACL_TYPE_PRIVATE);
|
||||
|
||||
$bucketListInfo = $this->ossClient->listBuckets();
|
||||
$this->assertNotNull($bucketListInfo);
|
||||
@@ -45,9 +45,9 @@ class OssClientBucketTest extends TestOssClientBase
|
||||
$this->assertTrue(is_array($bucketList));
|
||||
$this->assertGreaterThan(0, count($bucketList));
|
||||
|
||||
$this->ossClient->putBucketAcl($this->bucket, OssClient::OSS_ACL_TYPE_PUBLIC_READ_WRITE);
|
||||
$this->ossClient->putBucketAcl($this->bucket, OssClient::OSS_ACL_TYPE_PRIVATE);
|
||||
Common::waitMetaSync();
|
||||
$this->assertEquals($this->ossClient->getBucketAcl($this->bucket), OssClient::OSS_ACL_TYPE_PUBLIC_READ_WRITE);
|
||||
$this->assertEquals($this->ossClient->getBucketAcl($this->bucket), OssClient::OSS_ACL_TYPE_PRIVATE);
|
||||
|
||||
$this->assertTrue($this->ossClient->doesBucketExist($this->bucket));
|
||||
$this->assertFalse($this->ossClient->doesBucketExist($this->bucket . '-notexist'));
|
||||
|
||||
+6
-6
@@ -158,8 +158,8 @@ class OssClientMultipartUploadTest extends TestOssClientBase
|
||||
$upload_position = 0;
|
||||
$is_check_md5 = true;
|
||||
foreach ($pieces as $i => $piece) {
|
||||
$from_pos = $upload_position + (integer)$piece[OssClient::OSS_SEEK_TO];
|
||||
$to_pos = (integer)$piece[OssClient::OSS_LENGTH] + $from_pos - 1;
|
||||
$from_pos = $upload_position + (int)$piece[OssClient::OSS_SEEK_TO];
|
||||
$to_pos = (int)$piece[OssClient::OSS_LENGTH] + $from_pos - 1;
|
||||
$up_options = array(
|
||||
OssClient::OSS_FILE_UPLOAD => $upload_file,
|
||||
OssClient::OSS_PART_NUM => ($i + 1),
|
||||
@@ -237,8 +237,8 @@ class OssClientMultipartUploadTest extends TestOssClientBase
|
||||
$upload_position = 0;
|
||||
$is_check_md5 = true;
|
||||
foreach ($pieces as $i => $piece) {
|
||||
$from_pos = $upload_position + (integer)$piece[OssClient::OSS_SEEK_TO];
|
||||
$to_pos = (integer)$piece[OssClient::OSS_LENGTH] + $from_pos - 1;
|
||||
$from_pos = $upload_position + (int)$piece[OssClient::OSS_SEEK_TO];
|
||||
$to_pos = (int)$piece[OssClient::OSS_LENGTH] + $from_pos - 1;
|
||||
$up_options = array(
|
||||
OssClient::OSS_FILE_UPLOAD => $upload_file,
|
||||
OssClient::OSS_PART_NUM => ($i + 1),
|
||||
@@ -423,8 +423,8 @@ class OssClientMultipartUploadTest extends TestOssClientBase
|
||||
$upload_position = 0;
|
||||
$is_check_md5 = true;
|
||||
foreach ($pieces as $i => $piece) {
|
||||
$from_pos = $upload_position + (integer)$piece[OssClient::OSS_SEEK_TO];
|
||||
$to_pos = (integer)$piece[OssClient::OSS_LENGTH] + $from_pos - 1;
|
||||
$from_pos = $upload_position + (int)$piece[OssClient::OSS_SEEK_TO];
|
||||
$to_pos = (int)$piece[OssClient::OSS_LENGTH] + $from_pos - 1;
|
||||
$up_options = array(
|
||||
OssClient::OSS_FILE_UPLOAD => $upload_file,
|
||||
OssClient::OSS_PART_NUM => ($i + 1),
|
||||
|
||||
+2
-2
@@ -360,8 +360,8 @@ class OssClientObjectRequestPaymentTest extends TestOssClientBase
|
||||
$upload_position = 0;
|
||||
$is_check_md5 = false;
|
||||
foreach ($pieces as $i => $piece) {
|
||||
$from_pos = $upload_position + (integer)$piece[OssClient::OSS_SEEK_TO];
|
||||
$to_pos = (integer)$piece[OssClient::OSS_LENGTH] + $from_pos - 1;
|
||||
$from_pos = $upload_position + (int)$piece[OssClient::OSS_SEEK_TO];
|
||||
$to_pos = (int)$piece[OssClient::OSS_LENGTH] + $from_pos - 1;
|
||||
$up_options = array(
|
||||
OssClient::OSS_FILE_UPLOAD => $upload_file,
|
||||
OssClient::OSS_PART_NUM => ($i + 1),
|
||||
|
||||
+4
-4
@@ -19,7 +19,7 @@ class OssClientObjectVersioningTest extends TestOssClientBase
|
||||
$object = 'object';
|
||||
$content1 = 'hello';
|
||||
$content2 = 'hello world';
|
||||
$ret1 = $this->ossClient->putObject($this->bucket, $object, $content1, array(OssClient::OSS_HEADERS => array('x-oss-object-acl' => 'public-read', 'x-oss-tagging' => 'key1=value1')));
|
||||
$ret1 = $this->ossClient->putObject($this->bucket, $object, $content1, array(OssClient::OSS_HEADERS => array('x-oss-object-acl' => 'private', 'x-oss-tagging' => 'key1=value1')));
|
||||
$ret2 = $this->ossClient->putObject($this->bucket, $object, $content2, array(OssClient::OSS_HEADERS => array('x-oss-object-acl' => 'private', 'x-oss-tagging' => 'key2=value2')));
|
||||
|
||||
$this->assertTrue(isset($ret1[OssClient::OSS_HEADER_VERSION_ID]));
|
||||
@@ -65,14 +65,14 @@ class OssClientObjectVersioningTest extends TestOssClientBase
|
||||
$acl1 = $this->ossClient->getObjectAcl($this->bucket, $object, array(OssClient::OSS_VERSION_ID => $versionId1));
|
||||
$acl2 = $this->ossClient->getObjectAcl($this->bucket, $object, array(OssClient::OSS_VERSION_ID => $versionId2));
|
||||
|
||||
$this->assertEquals('public-read', $acl1);
|
||||
$this->assertEquals('private', $acl1);
|
||||
$this->assertEquals('private', $acl2);
|
||||
$this->assertEquals('private', $acl);
|
||||
|
||||
$this->ossClient->putObjectAcl($this->bucket, $object, 'public-read-write', array(OssClient::OSS_VERSION_ID => $versionId1));
|
||||
$this->ossClient->putObjectAcl($this->bucket, $object, 'private', array(OssClient::OSS_VERSION_ID => $versionId1));
|
||||
$acl = $this->ossClient->getObjectAcl($this->bucket, $object);
|
||||
$acl1 = $this->ossClient->getObjectAcl($this->bucket, $object, array(OssClient::OSS_VERSION_ID => $versionId1));
|
||||
$this->assertEquals('public-read-write', $acl1);
|
||||
$this->assertEquals('private', $acl1);
|
||||
$this->assertEquals('private', $acl);
|
||||
|
||||
//tagging
|
||||
|
||||
+6
-6
@@ -713,7 +713,7 @@ class OssClientSignatureV4Test extends TestOssClientBase
|
||||
|
||||
public function testBaseInterfaceForBucekt()
|
||||
{
|
||||
$this->ossClient->createBucket($this->bucket, OssClient::OSS_ACL_TYPE_PUBLIC_READ_WRITE);
|
||||
$this->ossClient->createBucket($this->bucket, OssClient::OSS_ACL_TYPE_PRIVATE);
|
||||
|
||||
$bucketListInfo = $this->ossClient->listBuckets();
|
||||
$this->assertNotNull($bucketListInfo);
|
||||
@@ -722,9 +722,9 @@ class OssClientSignatureV4Test extends TestOssClientBase
|
||||
$this->assertTrue(is_array($bucketList));
|
||||
$this->assertGreaterThan(0, count($bucketList));
|
||||
|
||||
$this->ossClient->putBucketAcl($this->bucket, OssClient::OSS_ACL_TYPE_PUBLIC_READ_WRITE);
|
||||
$this->ossClient->putBucketAcl($this->bucket, OssClient::OSS_ACL_TYPE_PRIVATE);
|
||||
Common::waitMetaSync();
|
||||
$this->assertEquals($this->ossClient->getBucketAcl($this->bucket), OssClient::OSS_ACL_TYPE_PUBLIC_READ_WRITE);
|
||||
$this->assertEquals($this->ossClient->getBucketAcl($this->bucket), OssClient::OSS_ACL_TYPE_PRIVATE);
|
||||
|
||||
$this->assertTrue($this->ossClient->doesBucketExist($this->bucket));
|
||||
$this->assertFalse($this->ossClient->doesBucketExist($this->bucket . '-notexist'));
|
||||
@@ -1348,7 +1348,7 @@ class OssClientSignatureV4Test extends TestOssClientBase
|
||||
),
|
||||
OssClient::OSS_ADDITIONAL_HEADERS => array('name', 'email')
|
||||
);
|
||||
$this->stsOssClient->createBucket($this->bucket, OssClient::OSS_ACL_TYPE_PUBLIC_READ_WRITE, $options);
|
||||
$this->stsOssClient->createBucket($this->bucket, OssClient::OSS_ACL_TYPE_PRIVATE, $options);
|
||||
|
||||
$bucketListInfo = $this->stsOssClient->listBuckets($options);
|
||||
$this->assertNotNull($bucketListInfo);
|
||||
@@ -1357,9 +1357,9 @@ class OssClientSignatureV4Test extends TestOssClientBase
|
||||
$this->assertTrue(is_array($bucketList));
|
||||
$this->assertGreaterThan(0, count($bucketList));
|
||||
|
||||
$this->stsOssClient->putBucketAcl($this->bucket, OssClient::OSS_ACL_TYPE_PUBLIC_READ_WRITE, $options);
|
||||
$this->stsOssClient->putBucketAcl($this->bucket, OssClient::OSS_ACL_TYPE_PRIVATE, $options);
|
||||
Common::waitMetaSync();
|
||||
$this->assertEquals($this->stsOssClient->getBucketAcl($this->bucket), OssClient::OSS_ACL_TYPE_PUBLIC_READ_WRITE);
|
||||
$this->assertEquals($this->stsOssClient->getBucketAcl($this->bucket), OssClient::OSS_ACL_TYPE_PRIVATE);
|
||||
|
||||
$this->assertTrue($this->stsOssClient->doesBucketExist($this->bucket));
|
||||
$this->assertFalse($this->stsOssClient->doesBucketExist($this->bucket . '-notexist'));
|
||||
|
||||
-9
@@ -54,13 +54,4 @@ class PutSetDeleteResultTest extends \PHPUnit\Framework\TestCase
|
||||
}
|
||||
}
|
||||
|
||||
protected function setUp(): void
|
||||
{
|
||||
|
||||
}
|
||||
|
||||
protected function tearDown(): void
|
||||
{
|
||||
|
||||
}
|
||||
}
|
||||
|
||||
@@ -44,7 +44,9 @@ class StsClient
|
||||
throw new OssException($errors->Code);
|
||||
}
|
||||
|
||||
curl_close($curl_handle);
|
||||
if (PHP_VERSION_ID < 80500) {
|
||||
curl_close($curl_handle);
|
||||
}
|
||||
|
||||
return $response;
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user