add support for fname in form upload and resume upload

Author: jemygraw

src/Qiniu/Storage/FormUploader.php

@@ -31,15 +31,13 @@ public static function put(
         $config,
         $params,
         $mime,
-        $checkCrc,
-        $filePath
+        $fname
     ) {
 
         $fields = array('token' => $upToken);
         if ($key === null) {
-            $fname = $filePath;
+            $fname='nullkey';
         } else {
-            $fname = $filePath;
             $fields['key'] = $key;
         }
 

src/Qiniu/Storage/ResumeUploader.php

@@ -71,7 +71,7 @@ public function __construct(
     /**
      * 上传操作
      */
-    public function upload($filePath)
+    public function upload($fname)
     {
         $uploaded = 0;
         while ($uploaded < $this->size) {
@@ -106,7 +106,7 @@ public function upload($filePath)
             array_push($this->contexts, $ret['ctx']);
             $uploaded += $blockSize;
         }
-        return $this->makeFile($filePath);
+        return $this->makeFile($fname);
     }
 
     /**
@@ -118,14 +118,14 @@ private function makeBlock($block, $blockSize)
         return $this->post($url, $block);
     }
 
-    private function fileUrl($filePath)
+    private function fileUrl($fname)
     {
         $url = $this->host . '/mkfile/' . $this->size;
         $url .= '/mimeType/' . \Qiniu\base64_urlSafeEncode($this->mime);
         if ($this->key != null) {
             $url .= '/key/' . \Qiniu\base64_urlSafeEncode($this->key);
         }
-        $url .= '/fname/' . \Qiniu\base64_urlSafeEncode($filePath);
+        $url .= '/fname/' . \Qiniu\base64_urlSafeEncode($fname);
         if (!empty($this->params)) {
             foreach ($this->params as $key => $value) {
                 $val = \Qiniu\base64_urlSafeEncode($value);
@@ -138,9 +138,9 @@ private function fileUrl($filePath)
     /**
      * 创建文件
      */
-    private function makeFile($filePath)
+    private function makeFile($fname)
     {
-        $url = $this->fileUrl($filePath);
+        $url = $this->fileUrl($fname);
         $body = implode(',', $this->contexts);
         $response = $this->post($url, $body);
         if ($response->needRetry()) {

src/Qiniu/Storage/UploadManager.php

@@ -46,8 +46,9 @@ public function put(
         $data,
         $params = null,
         $mime = 'application/octet-stream',
-        $checkCrc = false
+        $fname = null
     ) {
+    
         $params = self::trimParams($params);
         return FormUploader::put(
             $upToken,
@@ -56,8 +57,7 @@ public function put(
             $this->config,
             $params,
             $mime,
-            $checkCrc,
-            $filePath
+            $fname
         );
     }
 
@@ -87,6 +87,7 @@ public function putFile(
         $mime = 'application/octet-stream',
         $checkCrc = false
     ) {
+    
         $file = fopen($filePath, 'rb');
         if ($file === false) {
             throw new \Exception("file can not open", 1);
@@ -108,7 +109,7 @@ public function putFile(
                 $params,
                 $mime,
                 $checkCrc,
-                $filePath
+                basename($filePath)
             );
         }
 
@@ -121,7 +122,7 @@ public function putFile(
             $mime,
             $this->config
         );
-        $ret = $up->upload($filePath);
+        $ret = $up->upload(basename($filePath));
         fclose($file);
         return $ret;
     }

tests/Qiniu/Tests/FormUpTest.php

@@ -24,7 +24,7 @@ protected function setUp()
     public function testData()
     {
         $token = $this->auth->uploadToken($this->bucketName);
-        list($ret, $error) = FormUploader::put($token, 'formput', 'hello world', $this->cfg, null, 'text/plain', true);
+        list($ret, $error) = FormUploader::put($token, 'formput', 'hello world', $this->cfg, null, 'text/plain', null);
         $this->assertNull($error);
         $this->assertNotNull($ret['hash']);
     }
@@ -33,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', true);
+        list($ret, $error) = $upManager->put($token, 'formput', 'hello world', null, 'text/plain', null);
         $this->assertNull($error);
         $this->assertNotNull($ret['hash']);
     }
@@ -42,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', true);
+        list($ret, $error) = FormUploader::putFile($token, $key, __file__, $this->cfg, null, 'text/plain', null);
         $this->assertNull($error);
         $this->assertNotNull($ret['hash']);
     }
@@ -52,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', true);
+        list($ret, $error) = $upManager->putFile($token, $key, __file__, null, 'text/plain', null);
         $this->assertNull($error);
         $this->assertNotNull($ret['hash']);
     }