Merge https://github.com/aliyun/aliyun-oss-php-sdk into liveChannel

aliyun · Nov 15, 2016 · de10fa6 · de10fa6
2 parents 5d277b2 + 250c8e5
commit de10fa6
Show file tree

Hide file tree

Showing 6 changed files with 9 additions and 6 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,10 @@
 # ChangeLog - Aliyun OSS SDK for PHP
 
+## v2.1.0 / 2016-11-12
+
+* 增加[RTMP](https://help.aliyun.com/document_detail/44297.html)接口
+* 增加支持[图片服务](https://help.aliyun.com/document_detail/44686.html)
+
 ## v2.0.7 / 2016-06-17
 
 * Support append object

diff --git a/src/OSS/OssClient.php b/src/OSS/OssClient.php
@@ -2478,8 +2478,8 @@ public function setConnectTimeout($connectTimeout)
     );
     // OssClient版本信息
     const OSS_NAME = "aliyun-sdk-php";
-    const OSS_VERSION = "2.0.7";
-    const OSS_BUILD = "20160617";
+    const OSS_VERSION = "2.1.0";
+    const OSS_BUILD = "20161112";
     const OSS_AUTHOR = "";
     const OSS_OPTIONS_ORIGIN = 'Origin';
     const OSS_OPTIONS_REQUEST_METHOD = 'Access-Control-Request-Method';

diff --git a/tests/OSS/Tests/BucketLiveChannelTest.php b/tests/OSS/Tests/BucketLiveChannelTest.php
@@ -21,7 +21,6 @@ public function setUp()
         $this->bucketName = 'php-sdk-test-rtmp-bucket-name-' . strval(rand(0, 10000));
         $this->client->createBucket($this->bucketName);
         Common::waitMetaSync();
-        sleep(15);
     }
 
     public function tearDown()

diff --git a/tests/OSS/Tests/Common.php b/tests/OSS/Tests/Common.php
@@ -64,7 +64,7 @@ public static function createBucket()
     public static function waitMetaSync()
     {
         if (getenv('TRAVIS')) {
-            sleep(50);
+            sleep(10);
         }
     }
 }
diff --git a/tests/OSS/Tests/OssClientImageTest.php b/tests/OSS/Tests/OssClientImageTest.php
@@ -26,7 +26,6 @@ public function setUp()
         $this->bucketName = 'php-sdk-test-bucket-image-' . strval(rand(0, 10000));
         $this->client->createBucket($this->bucketName);
         Common::waitMetaSync();
-        sleep(15);
         $this->local_file = "example.jpg";
         $this->object = "oss-example.jpg";
         $this->download_file = "image.jpg";

diff --git a/tests/OSS/Tests/TestOssClientBase.php b/tests/OSS/Tests/TestOssClientBase.php
@@ -23,11 +23,11 @@ public function setUp()
         $this->bucket = Common::getBucketName() . rand(100000, 999999);
         $this->ossClient = Common::getOssClient();
         $this->ossClient->createBucket($this->bucket);
+	Common::waitMetaSync();
     }
 
     public function tearDown()
     {
-        sleep(30);
         if (!$this->ossClient->doesBucketExist($this->bucket)) {
             return;
         }