merge qiniu

Author: rwifeng

.travis.yml

@@ -8,10 +8,6 @@ php:
   - 5.5
   - 5.6
 before_script:
-  - export QINIU_ACCESS_KEY="QWYn5TFQsLLU1pL5MFEmX3s5DmHdUThav9WyOWOm"
-  - export QINIU_SECRET_KEY="Bxckh6FA-Fbs9Yt3i3cbKVK22UPBmAOHJcL95pGz"
-  - export QINIU_BUCKET_NAME="phpsdk"
-  - export QINIU_KEY_NAME="php-logo.png"
   - export QINIU_TEST_ENV="travis"
   - travis_retry composer self-update
   - travis_retry composer install --no-interaction --prefer-source --dev

src/Qiniu/Auth.php

@@ -14,19 +14,19 @@ public function __construct($accessKey, $secretKey)
         $this->secretKey = $secretKey;
     }
 
-    public function token($data)
+    public function sign($data)
     {
         $hmac = hash_hmac('sha1', $data, $this->secretKey, true);
         return $this->accessKey . ':' . \Qiniu\base64_urlSafeEncode($hmac);
     }
 
-    public function tokenWithData($data)
+    public function signWithData($data)
     {
         $data = \Qiniu\base64_urlSafeEncode($data);
-        return $this->token($data) . ':' . $data;
+        return $this->sign($data) . ':' . $data;
     }
 
-    public function tokenOfRequest($urlString, $body, $contentType = null)
+    public function signRequest($urlString, $body, $contentType = null)
     {
         $url = parse_url($urlString);
         $data = '';
@@ -42,12 +42,12 @@ public function tokenOfRequest($urlString, $body, $contentType = null)
             ($contentType == 'application/x-www-form-urlencoded') ||  $contentType == 'application/json') {
             $data .= $body;
         }
-        return $this->token($data);
+        return $this->sign($data);
     }
 
     public function verifyCallback($contentType, $originAuthorization, $url, $body)
     {
-        $authorization = 'QBox ' . $this->tokenOfRequest($url, $body, $contentType);
+        $authorization = 'QBox ' . $this->signRequest($url, $body, $contentType);
         return $originAuthorization === $authorization;
     }
 
@@ -63,7 +63,7 @@ public function privateDownloadUrl($baseUrl, $expires = 3600)
         }
         $baseUrl .= $deadline;
 
-        $token = $this->token($baseUrl);
+        $token = $this->sign($baseUrl);
         return "$baseUrl&token=$token";
     }
 
@@ -79,10 +79,12 @@ public function uploadToken(
         if ($key != null) {
             $scope .= ':' . $key;
         }
-        $args = array('scope' => $scope, 'deadline' => $deadline);
-        self::copyPolicy($args, $policy, $strictPolicy);
+        $args = array();
+        $args = self::copyPolicy($args, $policy, $strictPolicy);
+        $args['scope'] = $scope;
+        $args['deadline'] = $deadline;
         $b = json_encode($args);
-        return $this->tokenWithData($b);
+        return $this->signWithData($b);
     }
 
     /**
@@ -129,11 +131,12 @@ private static function copyPolicy($policy, $originPolicy, $strictPolicy)
                 $policy[$key] = $value;
             }
         }
+        return $policy;
     }
 
     public function authorization($url, $body = null, $contentType = null)
     {
-        $authorization = 'QBox ' . $this->tokenOfRequest($url, $body, $contentType);
+        $authorization = 'QBox ' . $this->signRequest($url, $body, $contentType);
         return array('Authorization' => $authorization);
     }
 }

src/Qiniu/Http/Response.php

@@ -169,6 +169,7 @@ public function needRetry()
 
     private static function isJson($headers)
     {
-        return isset($headers['Content-Type']) && $headers['Content-Type'] == 'application/json';
+        return isset($headers['Content-Type']) &&
+        strpos($headers['Content-Type'], 'application/json') === 0;
     }
 }

src/Qiniu/Storage/ResumeUploader.php

@@ -143,7 +143,7 @@ private function post($url, $data)
     private function blockSize($uploaded)
     {
         if ($this->size < $uploaded + Config::BLOCK_SIZE) {
-            return $bsize = $this->size - $uploaded;
+            return $this->size - $uploaded;
         }
         return  Config::BLOCK_SIZE;
     }

tests/Qiniu/Tests/AuthTest.php

@@ -22,27 +22,27 @@ function time()
     class AuthTest extends \PHPUnit_Framework_TestCase
     {
 
-        public function testToken()
+        public function testSign()
         {
             global $dummyAuth;
-            $token = $dummyAuth->token('test');
+            $token = $dummyAuth->sign('test');
             $this->assertEquals('abcdefghklmnopq:mSNBTR7uS2crJsyFr2Amwv1LaYg=', $token);
         }
 
-        public function testTokenWithData()
+        public function testSignWithData()
         {
             global $dummyAuth;
-            $token = $dummyAuth->tokenWithData('test');
+            $token = $dummyAuth->signWithData('test');
             $this->assertEquals('abcdefghklmnopq:-jP8eEV9v48MkYiBGs81aDxl60E=:dGVzdA==', $token);
         }
 
-        public function testTokenOfRequest()
+        public function testSignRequest()
         {
             global $dummyAuth;
-            $token = $dummyAuth->tokenOfRequest('http://www.qiniu.com?go=1', 'test', '');
+            $token = $dummyAuth->signRequest('http://www.qiniu.com?go=1', 'test', '');
             $this->assertEquals('abcdefghklmnopq:cFyRVoWrE3IugPIMP5YJFTO-O-Y=', $token);
             $ctype = 'application/x-www-form-urlencoded';
-            $token = $dummyAuth->tokenOfRequest('http://www.qiniu.com?go=1', 'test', $ctype);
+            $token = $dummyAuth->signRequest('http://www.qiniu.com?go=1', 'test', $ctype);
             $this->assertEquals($token, 'abcdefghklmnopq:svWRNcacOE-YMsc70nuIYdaa1e4=');
         }
 
@@ -71,7 +71,9 @@ public function testUploadToken()
             global $dummyAuth;
             $_SERVER['override_qiniu_auth_time'] = true;
             $token = $dummyAuth->uploadToken('1', '2', 3600, array('endUser'=> 'y'));
-            $exp = 'abcdefghklmnopq:x53hx7845_pygLochtRWlnrL-90=:eyJzY29wZSI6IjE6MiIsImRlYWRsaW5lIjoxMjM0NTcxNDkwfQ==';
+            // @codingStandardsIgnoreStart
+            $exp = 'abcdefghklmnopq:yyeexeUkPOROoTGvwBjJ0F0VLEo=:eyJlbmRVc2VyIjoieSIsInNjb3BlIjoiMToyIiwiZGVhZGxpbmUiOjEyMzQ1NzE0OTB9';
+            // @codingStandardsIgnoreEnd
             $this->assertEquals($exp, $token);
             unset($_SERVER['override_qiniu_auth_time']);
         }

tests/Qiniu/Tests/HttpTest.php

@@ -16,7 +16,7 @@ public function testGet()
     public function testGetQiniu()
     {
         $response = Client::get('up.qiniu.com');
-        $this->assertEquals($response->statusCode, 405);
+        $this->assertEquals(405, $response->statusCode);
         $this->assertNotNull($response->body);
         $this->assertNotNull($response->xReqId());
         $this->assertNotNull($response->xLog());

tests/bootstrap.php

@@ -4,11 +4,11 @@
 
 use Qiniu\Auth;
 
-$accessKey = getenv('QINIU_ACCESS_KEY');
-$secretKey = getenv('QINIU_SECRET_KEY');
+$accessKey = 'QWYn5TFQsLLU1pL5MFEmX3s5DmHdUThav9WyOWOm';
+$secretKey = 'Bxckh6FA-Fbs9Yt3i3cbKVK22UPBmAOHJcL95pGz';
 $testAuth = new Auth($accessKey, $secretKey);
-$bucketName = getenv('QINIU_BUCKET_NAME');
-$key = getenv('QINIU_KEY_NAME');
+$bucketName = 'phpsdk';
+$key = 'php-logo.png';
 
 $dummyAccessKey = 'abcdefghklmnopq';
 $dummySecretKey = '1234567890';