@@ -16,34 +16,32 @@ class OssClientForcePathStyleTest extends TestOssClientBase
16
16
{
17
17
public function testForcePathStyle ()
18
18
{
19
- $ accessKeyId = getenv ("OSS_ACCESS_KEY_ID " );
20
- $ accessKeySecret = getenv ("OSS_ACCESS_KEY_SECRET " );
21
- $ endpoint = getenv ('OSS_ENDPOINT ' );
22
- $ provider = new StaticCredentialsProvider ($ accessKeyId , $ accessKeySecret );
23
19
$ config = array (
24
- 'endpoint ' => $ endpoint ,
25
- 'provider ' => $ provider ,
20
+ 'signatureVersion ' => OssClient::OSS_SIGNATURE_VERSION_V4 ,
26
21
'hostType ' => OssClient::OSS_HOST_TYPE_PATH_STYLE ,
27
22
);
28
- $ ossClient = new OssClient ($ config );
23
+ $ this ->ossClient = Common::getOssClient ($ config );
24
+
29
25
try {
30
- $ ossClient ->getBucketInfo ($ this ->bucket );
26
+ $ this -> ossClient ->getBucketInfo ($ this ->bucket );
31
27
} catch (OssException $ e ) {
32
28
$ this ->assertEquals ($ e ->getErrorCode (), "SecondLevelDomainForbidden " );
33
29
$ this ->assertTrue (true );
34
30
}
35
31
36
32
try {
37
33
$ object = "oss-php-sdk-test/upload-test-object-name.txt " ;
38
- $ ossClient ->putObject ($ this ->bucket , $ object , 'hi oss ' );
34
+ $ this -> ossClient ->putObject ($ this ->bucket , $ object , 'hi oss ' );
39
35
} catch (OssException $ e ) {
40
36
$ this ->assertEquals ($ e ->getErrorCode (), "SecondLevelDomainForbidden " );
41
37
$ this ->assertTrue (true );
42
38
}
43
39
44
40
try {
45
- $ strUrl = $ endpoint . "/ " . $ this ->bucket . "/ " . $ object ;
46
- $ signUrl = $ ossClient ->signUrl ($ this ->bucket , $ object , 3600 );
41
+ $ endpoint = Common::getEndpoint ();
42
+ $ endpoint = str_replace (array ('http:// ' , 'https:// ' ), '' , $ endpoint );
43
+ $ strUrl = $ this ->bucket . '. ' . $ endpoint . "/ " . $ object ;
44
+ $ signUrl = $ this ->ossClient ->signUrl ($ this ->bucket , $ object , 3600 );
47
45
$ this ->assertTrue (strpos ($ signUrl , $ strUrl ) !== false );
48
46
} catch (OssException $ e ) {
49
47
$ this ->assertFalse (true );
0 commit comments