Merge pull request #114 from longbai/7.0

fixed copypolicy

Author: longbai

.travis.yml

@@ -10,8 +10,8 @@ php:
 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_BUCKET="phpsdk"
+  - export QINIU_TEST_KEY="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

@@ -79,8 +79,10 @@ 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);
     }
@@ -125,6 +127,7 @@ private static function copyPolicy($policy, $originPolicy, $strictPolicy)
                 $policy[$key] = $value;
             }
         }
+        return $policy;
     }
 
     public function authorization($url, $body = null, $contentType = null)

src/Qiniu/Storage/ResumeUploader.php

@@ -117,7 +117,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

@@ -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/bootstrap.php

@@ -7,8 +7,8 @@
 $accessKey = getenv('QINIU_ACCESS_KEY');
 $secretKey = getenv('QINIU_SECRET_KEY');
 $testAuth = new Auth($accessKey, $secretKey);
-$bucketName = getenv('QINIU_BUCKET_NAME');
-$key = getenv('QINIU_KEY_NAME');
+$bucketName = getenv('QINIU_TEST_BUCKET');
+$key = getenv('QINIU_TEST_KEY');
 
 $dummyAccessKey = 'abcdefghklmnopq';
 $dummySecretKey = '1234567890';