Merge e0730a5 into f7c787b

aliyun · Dec 11, 2017 · ffc335c · ffc335c
2 parents f7c787b + e0730a5
commit ffc335c
Show file tree

Hide file tree

Showing 4 changed files with 55 additions and 14 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -1,10 +1,10 @@
 language: php
 php:
+  - 7.1
   - 7.0
   - 5.6
   - 5.5
   - 5.4
-  - 5.3
 install:
   - composer self-update
   - composer install --no-interaction

diff --git a/src/OSS/OssClient.php b/src/OSS/OssClient.php
@@ -975,7 +975,6 @@ public function putObject($bucket, $object, $content, $options = NULL)
     {
         $this->precheckCommon($bucket, $object, $options);
 
-        OssUtil::validateContent($content);
         $options[self::OSS_CONTENT] = $content;
         $options[self::OSS_BUCKET] = $bucket;
         $options[self::OSS_METHOD] = self::OSS_HTTP_PUT;
@@ -1058,7 +1057,6 @@ public function appendObject($bucket, $object, $content, $position, $options = N
     {
         $this->precheckCommon($bucket, $object, $options);
 
-        OssUtil::validateContent($content);
         $options[self::OSS_CONTENT] = $content;
         $options[self::OSS_BUCKET] = $bucket;
         $options[self::OSS_METHOD] = self::OSS_HTTP_POST;

diff --git a/tests/OSS/Tests/CallbackTest.php b/tests/OSS/Tests/CallbackTest.php
@@ -47,7 +47,7 @@ public function testMultipartUploadCallbackNormal()
 
         $json = 
         '{
-            "callbackUrl":"callback.oss-demo.com:23450",
+            "callbackUrl":"oss-demo.aliyuncs.com:23450",
             "callbackHost":"oss-cn-hangzhou.aliyuncs.com",
             "callbackBody":"{\"mimeType\":${mimeType},\"size\":${size},\"x:var1\":${x:var1},\"x:var2\":${x:var2}}",
             "callbackBodyType":"application/json"
@@ -139,7 +139,7 @@ public function testPutObjectCallbackNormal()
         {
             $json = 
             '{
-                "callbackUrl":"callback.oss-demo.com:23450",
+                "callbackUrl":"oss-demo.aliyuncs.com:23450",
                 "callbackHost":"oss-cn-hangzhou.aliyuncs.com",
                 "callbackBody":"{\"mimeType\":${mimeType},\"size\":${size}}",
                 "callbackBodyType":"application/json"
@@ -151,7 +151,7 @@ public function testPutObjectCallbackNormal()
        {
             $url = 
             '{
-                "callbackUrl":"callback.oss-demo.com:23450",
+                "callbackUrl":"oss-demo.aliyuncs.com:23450",
                 "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,7 +163,7 @@ public function testPutObjectCallbackNormal()
        {
             $url = 
             '{
-                "callbackUrl":"callback.oss-demo.com:23450",
+                "callbackUrl":"oss-demo.aliyuncs.com:23450",
                 "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}"
             }';
@@ -174,7 +174,7 @@ public function testPutObjectCallbackNormal()
         {
             $json = 
             '{
-                "callbackUrl":"callback.oss-demo.com:23450",
+                "callbackUrl":"oss-demo.aliyuncs.com:23450",
                 "callbackHost":"oss-cn-hangzhou.aliyuncs.com",
                 "callbackBody":"{\" 春水碧于天，画船听雨眠。\":\"垆边人似月，皓腕凝霜雪。\"}",
                 "callbackBodyType":"application/json"
@@ -186,7 +186,7 @@ public function testPutObjectCallbackNormal()
         {
             $url = 
             '{
-                "callbackUrl":"callback.oss-demo.com:23450",
+                "callbackUrl":"oss-demo.aliyuncs.com:23450",
                 "callbackHost":"oss-cn-hangzhou.aliyuncs.com",
                 "callbackBody":"春水碧于天，画船听雨眠。垆边人似月，皓腕凝霜雪",
                 "callbackBodyType":"application/x-www-form-urlencoded"
@@ -198,7 +198,7 @@ public function testPutObjectCallbackNormal()
         {
             $json = 
             '{
-                "callbackUrl":"callback.oss-demo.com:23450",
+                "callbackUrl":"oss-demo.aliyuncs.com:23450",
                 "callbackHost":"oss-cn-hangzhou.aliyuncs.com",
                 "callbackBody":"{\"mimeType\":${mimeType},\"size\":${size},\"x:var1\":${x:var1},\"x:var2\":${x:var2}}",
                 "callbackBodyType":"application/json"
@@ -218,7 +218,7 @@ public function testPutObjectCallbackNormal()
         {
             $url = 
             '{
-                "callbackUrl":"callback.oss-demo.com:23450",
+                "callbackUrl":"oss-demo.aliyuncs.com:23450",
                 "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/tests/OSS/Tests/OssClientTest.php b/tests/OSS/Tests/OssClientTest.php
@@ -98,14 +98,57 @@ public function testConstrunct8()
     public function testConstrunct9()
     {
         try {
-	    $accessKeyId = ' ' . getenv('OSS_ACCESS_KEY_ID') . ' ';
-	    $accessKeySecret = ' ' . getenv('OSS_ACCESS_KEY_SECRET') . ' ';
-	    $endpoint = ' ' . getenv('OSS_ENDPOINT') . '/ ';
+            $accessKeyId = ' ' . getenv('OSS_ACCESS_KEY_ID') . ' ';
+            $accessKeySecret = ' ' . getenv('OSS_ACCESS_KEY_SECRET') . ' ';
+            $endpoint = ' ' . getenv('OSS_ENDPOINT') . '/ ';
             $ossClient = new OssClient($accessKeyId, $accessKeySecret , $endpoint, false);
             $ossClient->listBuckets();
         } catch (OssException $e) {
             $this->assertFalse(true);
         }
     }
 
+    public function testSupportPutEmptyObject()
+    {
+        try {
+            $accessKeyId = ' ' . getenv('OSS_ACCESS_KEY_ID') . ' ';
+            $accessKeySecret = ' ' . getenv('OSS_ACCESS_KEY_SECRET') . ' ';
+            $endpoint = ' ' . getenv('OSS_ENDPOINT') . '/ ';
+            $bucket = getenv('OSS_BUCKET');
+            $ossClient = new OssClient($accessKeyId, $accessKeySecret , $endpoint, false);
+            $ossClient->putObject($bucket,'test_emptybody','');
+        } catch (OssException $e) {
+            $this->assertFalse(true);
+        }
+    }
+
+    public function testCreateObjectDir()
+    {
+        try {
+            $accessKeyId = ' ' . getenv('OSS_ACCESS_KEY_ID') . ' ';
+            $accessKeySecret = ' ' . getenv('OSS_ACCESS_KEY_SECRET') . ' ';
+            $endpoint = ' ' . getenv('OSS_ENDPOINT') . '/ ';
+            $bucket = getenv('OSS_BUCKET');
+            $object='test-dir';
+            $ossClient = new OssClient($accessKeyId, $accessKeySecret , $endpoint, false);
+            $ossClient->createObjectDir($bucket,$object);
+        } catch (OssException $e) {
+            $this->assertFalse(true);
+        }
+    }
+
+    public function testGetBucketCors()
+    {
+        try {
+            $accessKeyId = ' ' . getenv('OSS_ACCESS_KEY_ID') . ' ';
+            $accessKeySecret = ' ' . getenv('OSS_ACCESS_KEY_SECRET') . ' ';
+            $endpoint = ' ' . getenv('OSS_ENDPOINT') . '/ ';
+            $bucket = getenv('OSS_BUCKET');
+            $ossClient = new OssClient($accessKeyId, $accessKeySecret , $endpoint, false);
+            $ossClient->getBucketCors($bucket);
+        } catch (OssException $e) {
+            $this->assertFalse(true);
+        }
+    }
+
 }