Merge 923af74 into f7c787b

aliyun · Nov 30, 2017 · 65aaf6b · 65aaf6b
2 parents f7c787b + 923af74
commit 65aaf6b
Show file tree

Hide file tree

Showing 6 changed files with 79 additions and 12 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/OssClientBucketCorsTest.php b/tests/OSS/Tests/OssClientBucketCorsTest.php
@@ -75,6 +75,7 @@ public function testBucket()
             Common::waitMetaSync();
             $corsConfig3 = $this->ossClient->getBucketCors($this->bucket);
             $this->assertNotNull($corsConfig3);
+
             $this->assertNotEquals($corsConfig->serializeToXml(), $corsConfig3->serializeToXml());
         } catch (OssException $e) {
             $this->assertFalse(True);

diff --git a/tests/OSS/Tests/OssClientObjectTest.php b/tests/OSS/Tests/OssClientObjectTest.php
@@ -47,6 +47,7 @@ public function testGetObjectWithAcceptEncoding()
 
         try {
             $res = $this->ossClient->getObject($this->bucket, $object, $options);
+
             $this->assertEquals(file_get_contents(__FILE__), $res);
         } catch (OssException $e) {
             $this->assertTrue(false);
@@ -337,6 +338,22 @@ public function testObject()
         } catch (OssException $e) {
             $this->assertFalse(true);
         }
+
+        $object = "emptybodytest";
+        try {
+            $this->ossClient->putObject($this->bucket, $object, "", $options);
+        } catch (OssException $e) {
+            $this->assertFalse(true);
+        }
+
+        try {
+            $content = $this->ossClient->getObject($this->bucket, $object);
+            $this->assertEquals($content, "");
+        } catch (OssException $e) {
+            $this->assertFalse(true);
+        }
+
+
     }
 
     public function testAppendObject()
@@ -423,6 +440,8 @@ public function testAppendObject()
         try {
             $position = $this->ossClient->appendObject($this->bucket, $object, "Hello OSS, ", 0, $options);
             $position = $this->ossClient->appendObject($this->bucket, $object, "Hi OSS.", $position);
+            $position1 = $this->ossClient->appendObject($this->bucket, $object, "", $position);
+            $this->assertEquals($position, $position1);
         } catch (OssException $e) {
             $this->assertFalse(true);
         }

diff --git a/tests/OSS/Tests/OssClientTest.php b/tests/OSS/Tests/OssClientTest.php
@@ -4,7 +4,7 @@
 
 use OSS\Core\OssException;
 use OSS\OssClient;
-
+use OSS\Core\OssUtil;
 class OssClientTest extends \PHPUnit_Framework_TestCase
 {
     public function testConstrunct()
@@ -108,4 +108,53 @@ public function testConstrunct9()
         }
     }
 
+	public function  testPutNullObject()
+    {
+
+        $accessKeyId = getenv('OSS_ACCESS_KEY_ID');
+        $accessKeySecret = getenv('OSS_ACCESS_KEY_SECRET');
+        $endpoint = getenv('OSS_ENDPOINT');
+        $bucket =getenv('OSS_BUCKET');
+        try{
+            $ossClient = new OssClient($accessKeyId,$accessKeySecret, $endpoint, false);
+            if(!$ossClient->doesBucketExist($bucket)){
+                $ossClient->createBucket($bucket, OssClient::OSS_ACL_TYPE_PRIVATE);
+            }
+            $ossClient->putObject($bucket, 'testNullObject', '');
+            $this->assertEquals('',$ossClient->getObject($bucket,'testNullObject'));
+
+        }catch (OssException $e){
+
+            $this->assertFalse(true);
+
+        }
+
+    }
+
+    public function  testPutnotNullObject()
+    {
+
+        $accessKeyId = getenv('OSS_ACCESS_KEY_ID');
+        $accessKeySecret = getenv('OSS_ACCESS_KEY_SECRET');
+        $endpoint = getenv('OSS_ENDPOINT');
+        $bucket =getenv('OSS_BUCKET');
+        $content='test';
+        OssUtil::validateContent($content);
+        try{
+            $ossClient = new OssClient($accessKeyId,$accessKeySecret, $endpoint, false);
+            if(!$ossClient->doesBucketExist($bucket)){
+                $ossClient->createBucket($bucket, OssClient::OSS_ACL_TYPE_PRIVATE);
+            }
+
+            $ossClient->putObject($bucket, 'testNotNullObject', $content);
+            $this->assertEquals($content,$ossClient->getObject($bucket,'testNotNullObject') );
+
+        }catch (OssException $e){
+
+            $this->assertFalse(true);
+
+        }
+
+    }
+
 }