Merge pull request #308 from qiniu/develop

rwifeng · web-flow · commit afe7d8715d8a · 2019-07-09T15:55:07.000+08:00
delete checkCrc
diff --git a/.travis.yml b/.travis.yml
@@ -6,7 +6,6 @@ php:
   - 5.5
   - 5.6
   - 7.0
-  - 7.2
 
 before_script:
   - export QINIU_TEST_ENV="travis"
diff --git a/composer.json b/composer.json
@@ -16,7 +16,7 @@
         "php": ">=5.3.3"
     },
     "require-dev": {
-        "phpunit/phpunit": "~8.0",
+        "phpunit/phpunit": "~4.0",
         "squizlabs/php_codesniffer": "~2.3"
     },
     "autoload": {
diff --git a/src/Qiniu/Config.php b/src/Qiniu/Config.php
@@ -3,7 +3,7 @@
 
 final class Config
 {
-    const SDK_VER = '7.3.0';
+    const SDK_VER = '7.2.9';
 
     const BLOCK_SIZE = 4194304; //4*1024*1024 分块上传块大小，该参数为接口规格，不能修改
 
diff --git a/src/Qiniu/Storage/FormUploader.php b/src/Qiniu/Storage/FormUploader.php
@@ -31,8 +31,7 @@ public static function put(
         $config,
         $params,
         $mime,
-        $fname,
-        $checkCrc
+        $fname
     ) {
         $fields = array('token' => $upToken);
         if ($key === null) {
diff --git a/src/Qiniu/Storage/UploadManager.php b/src/Qiniu/Storage/UploadManager.php
@@ -46,8 +46,7 @@ public function put(
         $data,
         $params = null,
         $mime = 'application/octet-stream',
-        $fname = null,
-        $checkCrc = false
+        $fname = null
     ) {
     
         $params = self::trimParams($params);
@@ -58,8 +57,7 @@ public function put(
             $this->config,
             $params,
             $mime,
-            $fname,
-            $checkCrc
+            $fname
         );
     }
 
@@ -110,8 +108,7 @@ public function putFile(
                 $this->config,
                 $params,
                 $mime,
-                basename($filePath),
-                $checkCrc
+                basename($filePath)
             );
         }
 
diff --git a/tests/Qiniu/Tests/AuthTest.php b/tests/Qiniu/Tests/AuthTest.php
@@ -5,18 +5,17 @@
     function time()
     {
         return isset($_SERVER['override_qiniu_auth_time'])
-            ? 2234567890
+            ? 1234567890
             : \time();
     }
 }
 
 namespace Qiniu\Tests {
     use Qiniu\Auth;
-    use PHPUnit\Framework\TestCase;
 
     // @codingStandardsIgnoreEnd
 
-    class AuthTest extends TestCase
+    class AuthTest extends \PHPUnit_Framework_TestCase
     {
 
         public function testSign()
@@ -30,10 +29,7 @@ public function testSignWithData()
         {
             global $dummyAuth;
             $token = $dummyAuth->signWithData('test');
-            $this->assertEquals(
-                'abcdefghklmnopq:-jP8eEV9v48MkYiBGs81aDxl60E=:dGVzdA==',
-                $token
-            );
+            $this->assertEquals('abcdefghklmnopq:-jP8eEV9v48MkYiBGs81aDxl60E=:dGVzdA==', $token);
         }
 
         public function testSignRequest()
@@ -43,18 +39,15 @@ public function testSignRequest()
             $this->assertEquals('abcdefghklmnopq:cFyRVoWrE3IugPIMP5YJFTO-O-Y=', $token);
             $ctype = 'application/x-www-form-urlencoded';
             $token = $dummyAuth->signRequest('http://www.qiniu.com?go=1', 'test', $ctype);
-            $this->assertEquals(
-                $token,
-                'abcdefghklmnopq:svWRNcacOE-YMsc70nuIYdaa1e4='
-            );
+            $this->assertEquals($token, 'abcdefghklmnopq:svWRNcacOE-YMsc70nuIYdaa1e4=');
         }
 
         public function testPrivateDownloadUrl()
         {
             global $dummyAuth;
             $_SERVER['override_qiniu_auth_time'] = true;
             $url = $dummyAuth->privateDownloadUrl('http://www.qiniu.com?go=1');
-            $expect = 'http://www.qiniu.com?go=1&e=2234571490&token=abcdefghklmnopq:Hvi3R79Sl6wZy1c331nv0iIFoJk=';
+            $expect = 'http://www.qiniu.com?go=1&e=1234571490&token=abcdefghklmnopq:8vzBeLZ9W3E4kbBLFLW0Xe0u7v4=';
             $this->assertEquals($expect, $url);
             unset($_SERVER['override_qiniu_auth_time']);
         }
@@ -65,10 +58,14 @@ public function testUploadToken()
             $_SERVER['override_qiniu_auth_time'] = true;
             $token = $dummyAuth->uploadToken('1', '2', 3600, array('endUser' => 'y'));
             // @codingStandardsIgnoreStart
-            $exp = 'abcdefghklmnopq:GracWhW1iGwVL6haVH5dr4gjqeo=:eyJlbmRVc2VyIjoieSIsInNjb3BlIjoiMToyIiwiZGVhZGxpbmUiOjIyMzQ1NzE0OTB9';
+            $exp = 'abcdefghklmnopq:yyeexeUkPOROoTGvwBjJ0F0VLEo=:eyJlbmRVc2VyIjoieSIsInNjb3BlIjoiMToyIiwiZGVhZGxpbmUiOjEyMzQ1NzE0OTB9';
             // @codingStandardsIgnoreEnd
             $this->assertEquals($exp, $token);
             unset($_SERVER['override_qiniu_auth_time']);
         }
+
+        public function testVerifyCallback()
+        {
+        }
     }
 }
diff --git a/tests/Qiniu/Tests/Base64Test.php b/tests/Qiniu/Tests/Base64Test.php
@@ -2,9 +2,8 @@
 namespace Qiniu\Tests;
 
 use Qiniu;
-use PHPUnit\Framework\TestCase;
 
-class Base64Test extends TestCase
+class Base64Test extends \PHPUnit_Framework_TestCase
 {
     public function testUrlSafe()
     {
diff --git a/tests/Qiniu/Tests/BucketTest.php b/tests/Qiniu/Tests/BucketTest.php
@@ -2,17 +2,16 @@
 namespace Qiniu\Tests;
 
 use Qiniu\Storage\BucketManager;
-use PHPUnit\Framework\TestCase;
 
-class BucketTest extends TestCase
+class BucketTest extends \PHPUnit_Framework_TestCase
 {
     protected $bucketManager;
     protected $dummyBucketManager;
     protected $bucketName;
     protected $key;
     protected $key2;
 
-    protected function setUp(): void
+    protected function setUp()
     {
         global $bucketName;
         global $key;
diff --git a/tests/Qiniu/Tests/CdnManagerTest.php b/tests/Qiniu/Tests/CdnManagerTest.php
@@ -10,15 +10,14 @@
 
 use Qiniu\Cdn\CdnManager;
 use Qiniu\Http\Client;
-use PHPUnit\Framework\TestCase;
 
-class CdnManagerTest extends TestCase
+class CdnManagerTest extends \PHPUnit_Framework_TestCase
 {
     protected $cdnManager;
     protected $encryptKey;
     protected $imgUrl;
 
-    protected function setUp(): void
+    protected function setUp()
     {
         global $timestampAntiLeechEncryptKey;
         global $customDomain;
@@ -35,17 +34,8 @@ public function testCreateTimestampAntiLeechUrl()
         $signUrl = $this->cdnManager->createTimestampAntiLeechUrl($this->imgUrl, $this->encryptKey, 3600);
 
         $response = Client::get($signUrl);
+        
         $this->assertEquals($response->statusCode, 200);
         $this->assertNull($response->error);
-
-        $url2 = $this->imgUrl . '?imageInfo';
-        $signUrl2 = $this->cdnManager->createTimestampAntiLeechUrl($url2, $this->encryptKey, 3600);
-
-        $response = Client::get($signUrl2);
-        $imgInfo = $response->json();
-
-        $this->assertEquals($response->statusCode, 200);
-        $this->assertEquals($imgInfo['size'], 2196145);
-        $this->assertNull($response->error);
     }
 }
diff --git a/tests/Qiniu/Tests/Crc32Test.php b/tests/Qiniu/Tests/Crc32Test.php
@@ -2,9 +2,8 @@
 namespace Qiniu\Tests;
 
 use Qiniu;
-use PHPUnit\Framework\TestCase;
 
-class Crc32Test extends TestCase
+class Crc32Test extends \PHPUnit_Framework_TestCase
 {
     public function testData()
     {
diff --git a/tests/Qiniu/Tests/DownloadTest.php b/tests/Qiniu/Tests/DownloadTest.php
@@ -2,14 +2,13 @@
 namespace Qiniu\Tests;
 
 use Qiniu\Http\Client;
-use PHPUnit\Framework\TestCase;
 
-class DownloadTest extends TestCase
+class DownloadTest extends \PHPUnit_Framework_TestCase
 {
     public function test()
     {
         global $testAuth;
-        $base_url = 'http://pojiwyou0.bkt.clouddn.com/demo.png';
+        $base_url = 'http://private-res.qiniudn.com/gogopher.jpg';
         $private_url = $testAuth->privateDownloadUrl($base_url);
         $response = Client::get($private_url);
         $this->assertEquals(200, $response->statusCode);
@@ -18,7 +17,7 @@ public function test()
     public function testFop()
     {
         global $testAuth;
-        $base_url = 'http://pojiwyou0.bkt.clouddn.com/demo.png?imageInfo';
+        $base_url = 'http://private-res.qiniudn.com/gogopher.jpg?exif';
         $private_url = $testAuth->privateDownloadUrl($base_url);
         $response = Client::get($private_url);
         $this->assertEquals(200, $response->statusCode);
diff --git a/tests/Qiniu/Tests/EtagTest.php b/tests/Qiniu/Tests/EtagTest.php
@@ -2,9 +2,8 @@
 namespace Qiniu\Tests;
 
 use Qiniu\Etag;
-use PHPUnit\Framework\TestCase;
 
-class EtagTest extends TestCase
+class EtagTest extends \PHPUnit_Framework_TestCase
 {
     public function test0M()
     {
diff --git a/tests/Qiniu/Tests/FopTest.php b/tests/Qiniu/Tests/FopTest.php
@@ -3,14 +3,13 @@
 
 use Qiniu\Processing\Operation;
 use Qiniu\Processing\PersistentFop;
-use PHPUnit\Framework\TestCase;
 
-class FopTest extends TestCase
+class FopTest extends \PHPUnit_Framework_TestCase
 {
     public function testExifPub()
     {
-        $fop = new Operation('7xkv1q.com1.z0.glb.clouddn.com');
-        list($exif, $error) = $fop->execute('grape.jpg', 'exif');
+        $fop = new Operation('testres.qiniudn.com');
+        list($exif, $error) = $fop->execute('gogopher.jpg', 'exif');
         $this->assertNull($error);
         $this->assertNotNull($exif);
     }
@@ -27,12 +26,12 @@ public function testExifPrivate()
     public function testbuildUrl()
     {
         $fops = 'imageView2/2/h/200';
-        $fop = new Operation('7xkv1q.com1.z0.glb.clouddn.com');
-        $url = $fop->buildUrl('grape.jpg', $fops);
-        $this->assertEquals($url, 'http://7xkv1q.com1.z0.glb.clouddn.com/grape.jpg?imageView2/2/h/200');
+        $fop = new Operation('testres.qiniudn.com');
+        $url = $fop->buildUrl('gogopher.jpg', $fops);
+        $this->assertEquals($url, 'http://testres.qiniudn.com/gogopher.jpg?imageView2/2/h/200');
 
         $fops = array('imageView2/2/h/200', 'imageInfo');
-        $url = $fop->buildUrl('grape.jpg', $fops);
-        $this->assertEquals($url, 'http://7xkv1q.com1.z0.glb.clouddn.com/grape.jpg?imageView2/2/h/200|imageInfo');
+        $url = $fop->buildUrl('gogopher.jpg', $fops);
+        $this->assertEquals($url, 'http://testres.qiniudn.com/gogopher.jpg?imageView2/2/h/200|imageInfo');
     }
 }
diff --git a/tests/Qiniu/Tests/FormUpTest.php b/tests/Qiniu/Tests/FormUpTest.php
@@ -4,15 +4,14 @@
 use Qiniu\Storage\FormUploader;
 use Qiniu\Storage\UploadManager;
 use Qiniu\Config;
-use PHPUnit\Framework\TestCase;
 
-class FormUpTest extends TestCase
+class FormUpTest extends \PHPUnit_Framework_TestCase
 {
     protected $bucketName;
     protected $auth;
     protected $cfg;
 
-    protected function setUp(): void
+    protected function setUp()
     {
         global $bucketName;
         $this->bucketName = $bucketName;
@@ -25,16 +24,7 @@ protected function setUp(): void
     public function testData()
     {
         $token = $this->auth->uploadToken($this->bucketName);
-        list($ret, $error) = FormUploader::put(
-            $token,
-            'formput',
-            'hello world',
-            $this->cfg,
-            null,
-            'text/plain',
-            null,
-            false
-        );
+        list($ret, $error) = FormUploader::put($token, 'formput', 'hello world', $this->cfg, null, 'text/plain', null);
         $this->assertNull($error);
         $this->assertNotNull($ret['hash']);
     }
@@ -43,7 +33,7 @@ public function testData2()
     {
         $upManager = new UploadManager();
         $token = $this->auth->uploadToken($this->bucketName);
-        list($ret, $error) = $upManager->put($token, 'formput', 'hello world', null, 'text/plain', null, false);
+        list($ret, $error) = $upManager->put($token, 'formput', 'hello world', null, 'text/plain', null);
         $this->assertNull($error);
         $this->assertNotNull($ret['hash']);
     }
@@ -52,7 +42,7 @@ public function testFile()
     {
         $key = 'formPutFile';
         $token = $this->auth->uploadToken($this->bucketName, $key);
-        list($ret, $error) = FormUploader::putFile($token, $key, __file__, $this->cfg, null, 'text/plain', null, false);
+        list($ret, $error) = FormUploader::putFile($token, $key, __file__, $this->cfg, null, 'text/plain', null);
         $this->assertNull($error);
         $this->assertNotNull($ret['hash']);
     }
@@ -62,7 +52,7 @@ public function testFile2()
         $key = 'formPutFile';
         $token = $this->auth->uploadToken($this->bucketName, $key);
         $upManager = new UploadManager();
-        list($ret, $error) = $upManager->putFile($token, $key, __file__, null, 'text/plain', null, false);
+        list($ret, $error) = $upManager->putFile($token, $key, __file__, null, 'text/plain', null);
         $this->assertNull($error);
         $this->assertNotNull($ret['hash']);
     }
diff --git a/tests/Qiniu/Tests/HttpTest.php b/tests/Qiniu/Tests/HttpTest.php
@@ -2,9 +2,8 @@
 namespace Qiniu\Tests;
 
 use Qiniu\Http\Client;
-use PHPUnit\Framework\TestCase;
 
-class HttpTest extends TestCase
+class HttpTest extends \PHPUnit_Framework_TestCase
 {
     public function testGet()
     {
diff --git a/tests/Qiniu/Tests/ImageUrlBuilderTest.php b/tests/Qiniu/Tests/ImageUrlBuilderTest.php
@@ -2,16 +2,14 @@
 
 namespace Qiniu\Tests;
 
-use PHPUnit\Framework\TestCase;
-
 /**
  * imageprocess test
  *
  * @package Qiniu
  * @subpackage test
  * @author Sherlock Ren <sherlock_ren@icloud.com>
  */
-class ImageUrlBuilderTest extends TestCase
+class ImageUrlBuilderTest extends \PHPUnit_Framework_TestCase
 {
     /**
      * 缩略图测试
diff --git a/tests/Qiniu/Tests/PfopTest.php b/tests/Qiniu/Tests/PfopTest.php
@@ -3,9 +3,8 @@
 
 use Qiniu\Processing\Operation;
 use Qiniu\Processing\PersistentFop;
-use PHPUnit\Framework\TestCase;
 
-class PfopTest extends TestCase
+class PfopTest extends \PHPUnit_Framework_TestCase
 {
     public function testPfop()
     {
diff --git a/tests/Qiniu/Tests/ResumeUpTest.php b/tests/Qiniu/Tests/ResumeUpTest.php
diff --git a/tests/Qiniu/Tests/ZoneTest.php b/tests/Qiniu/Tests/ZoneTest.php
diff --git a/tests/bootstrap.php b/tests/bootstrap.php

Original file line number	Diff line number	Diff line change
`@@ -3,7 +3,7 @@`
`3`	`3`
`4`	`4`	`final class Config`
`5`	`5`	`{`
`6`		`- const SDK_VER = '7.3.0';`
	`6`	`+ const SDK_VER = '7.2.9';`
`7`	`7`
`8`	`8`	`const BLOCK_SIZE = 4194304; //410241024 分块上传块大小，该参数为接口规格，不能修改`
`9`	`9`
Original file line number	Diff line number	Diff line change
`@@ -5,18 +5,17 @@`
`5`	`5`	`function time()`
`6`	`6`	`{`
`7`	`7`	`return isset($_SERVER['override_qiniu_auth_time'])`
`8`		`- ? 2234567890`
	`8`	`+ ? 1234567890`
`9`	`9`	`: \time();`
`10`	`10`	`}`
`11`	`11`	`}`
`12`	`12`
`13`	`13`	`namespace Qiniu\Tests {`
`14`	`14`	`use Qiniu\Auth;`
`15`		`- use PHPUnit\Framework\TestCase;`
`16`	`15`
`17`	`16`	`// @codingStandardsIgnoreEnd`
`18`	`17`
`19`		`- class AuthTest extends TestCase`
	`18`	`+ class AuthTest extends \PHPUnit_Framework_TestCase`
`20`	`19`	`{`
`21`	`20`
`22`	`21`	`public function testSign()`
`@@ -30,10 +29,7 @@ public function testSignWithData()`
`30`	`29`	`{`
`31`	`30`	`global $dummyAuth;`
`32`	`31`	`$token = $dummyAuth->signWithData('test');`
`33`		`- $this->assertEquals(`
`34`		`- 'abcdefghklmnopq:-jP8eEV9v48MkYiBGs81aDxl60E=:dGVzdA==',`
`35`		`- $token`
`36`		`- );`
	`32`	`+ $this->assertEquals('abcdefghklmnopq:-jP8eEV9v48MkYiBGs81aDxl60E=:dGVzdA==', $token);`
`37`	`33`	`}`
`38`	`34`
`39`	`35`	`public function testSignRequest()`
`@@ -43,18 +39,15 @@ public function testSignRequest()`
`43`	`39`	`$this->assertEquals('abcdefghklmnopq:cFyRVoWrE3IugPIMP5YJFTO-O-Y=', $token);`
`44`	`40`	`$ctype = 'application/x-www-form-urlencoded';`
`45`	`41`	`$token = $dummyAuth->signRequest('http://www.qiniu.com?go=1', 'test', $ctype);`
`46`		`- $this->assertEquals(`
`47`		`- $token,`
`48`		`- 'abcdefghklmnopq:svWRNcacOE-YMsc70nuIYdaa1e4='`
`49`		`- );`
	`42`	`+ $this->assertEquals($token, 'abcdefghklmnopq:svWRNcacOE-YMsc70nuIYdaa1e4=');`
`50`	`43`	`}`
`51`	`44`
`52`	`45`	`public function testPrivateDownloadUrl()`
`53`	`46`	`{`
`54`	`47`	`global $dummyAuth;`
`55`	`48`	`$_SERVER['override_qiniu_auth_time'] = true;`
`56`	`49`	`$url = $dummyAuth->privateDownloadUrl('http://www.qiniu.com?go=1');`
`57`		`- $expect = 'http://www.qiniu.com?go=1&e=2234571490&token=abcdefghklmnopq:Hvi3R79Sl6wZy1c331nv0iIFoJk=';`
	`50`	`+ $expect = 'http://www.qiniu.com?go=1&e=1234571490&token=abcdefghklmnopq:8vzBeLZ9W3E4kbBLFLW0Xe0u7v4=';`
`58`	`51`	`$this->assertEquals($expect, $url);`
`59`	`52`	`unset($_SERVER['override_qiniu_auth_time']);`
`60`	`53`	`}`
`@@ -65,10 +58,14 @@ public function testUploadToken()`
`65`	`58`	`$_SERVER['override_qiniu_auth_time'] = true;`
`66`	`59`	`$token = $dummyAuth->uploadToken('1', '2', 3600, array('endUser' => 'y'));`
`67`	`60`	`// @codingStandardsIgnoreStart`
`68`		`- $exp = 'abcdefghklmnopq:GracWhW1iGwVL6haVH5dr4gjqeo=:eyJlbmRVc2VyIjoieSIsInNjb3BlIjoiMToyIiwiZGVhZGxpbmUiOjIyMzQ1NzE0OTB9';`
	`61`	`+ $exp = 'abcdefghklmnopq:yyeexeUkPOROoTGvwBjJ0F0VLEo=:eyJlbmRVc2VyIjoieSIsInNjb3BlIjoiMToyIiwiZGVhZGxpbmUiOjEyMzQ1NzE0OTB9';`
`69`	`62`	`// @codingStandardsIgnoreEnd`
`70`	`63`	`$this->assertEquals($exp, $token);`
`71`	`64`	`unset($_SERVER['override_qiniu_auth_time']);`
`72`	`65`	`}`
	`66`	`+`
	`67`	`+ public function testVerifyCallback()`
	`68`	`+ {`
	`69`	`+ }`
`73`	`70`	`}`
`74`	`71`	`}`
Original file line number	Diff line number	Diff line change
`@@ -2,9 +2,8 @@`
`2`	`2`	`namespace Qiniu\Tests;`
`3`	`3`
`4`	`4`	`use Qiniu;`
`5`		`-use PHPUnit\Framework\TestCase;`
`6`	`5`
`7`		`-class Base64Test extends TestCase`
	`6`	`+class Base64Test extends \PHPUnit_Framework_TestCase`
`8`	`7`	`{`
`9`	`8`	`public function testUrlSafe()`
`10`	`9`	`{`