Merge pull request #308 from qiniu/develop

delete checkCrc

Author: rwifeng

.travis.yml

@@ -6,7 +6,6 @@ php:
   - 5.5
   - 5.6
   - 7.0
-  - 7.2
 
 before_script:
   - export QINIU_TEST_ENV="travis"

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": {

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 分块上传块大小，该参数为接口规格，不能修改
 

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) {

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)
             );
         }
 

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()
+        {
+        }
     }
 }

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()
     {

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;

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);
     }
 }

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()
     {