Merge pull request #65 from qiniu/develop

Release v6.1.7
qiniu · Mar 11, 2014 · d1c0814 · d1c0814
2 parents fd9f03d + 91918a4
commit d1c0814
Show file tree

Hide file tree

Showing 5 changed files with 33 additions and 2 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,11 @@
 ## CHANGE LOG
 
+### v6.1.7
+
+2014-2-19 issues [#64](https://github.com/qiniu/php-sdk/pull/64)
+
+- 修复 PutExtra.Params 无效的问题
+
 ### v6.1.6
 
 2014-2-17 issues [#62](https://github.com/qiniu/php-sdk/pull/62)

diff --git a/qiniu/io.php b/qiniu/io.php
@@ -32,6 +32,11 @@ function Qiniu_Put($upToken, $key, $body, $putExtra) // => ($putRet, $err)
 	if ($putExtra->CheckCrc) {
 		$fields['crc32'] = $putExtra->Crc32;
 	}
+	if ($putExtra->Params) {
+		foreach ($putExtra->Params as $k=>$v) {
+			$fields[$k] = $v;	 
+		}
+	}
 
 	$files = array(array('file', $fname, $body, $putExtra->MimeType));
 
@@ -66,6 +71,11 @@ function Qiniu_PutFile($upToken, $key, $localFile, $putExtra) // => ($putRet, $e
 		}
 		$fields['crc32'] = sprintf('%u', $putExtra->Crc32);
 	}
+	if ($putExtra->Params) {
+		foreach ($putExtra->Params as $k=>$v) {
+			$fields[$k] = $v;	 
+		}
+	}
 
 	$client = new Qiniu_HttpClient;
 	return Qiniu_Client_CallWithForm($client, $QINIU_UP_HOST, $fields, 'multipart/form-data');

diff --git a/qiniu/resumable_io.php b/qiniu/resumable_io.php
@@ -70,6 +70,12 @@ function Qiniu_Rio_Mkfile($self, $host, $key, $fsize, $extra) // => ($putRet, $e
 		$url .= '/mimeType/' . Qiniu_Encode($extra->MimeType);
 	}
 
+	if (!empty($extra->Params)) {
+		foreach ($extra->Params as $k=>$v) {
+			$url .= "/" . $k . "/" . Qiniu_Encode($v);
+		}
+	}
+
 	$ctxs = array();
 	foreach ($extra->Progresses as $prog) {
 		$ctxs []= $prog['ctx'];

diff --git a/tests/IoTest.php b/tests/IoTest.php
@@ -22,10 +22,12 @@ public function testPutFile()
 		$putPolicy = new Qiniu_RS_PutPolicy($this->bucket);
 		$upToken = $putPolicy->Token(null);
 		$putExtra = new Qiniu_PutExtra();
+		$putExtra->Params = array('x:test'=>'test');
 		$putExtra->CheckCrc = 1;
 		list($ret, $err) = Qiniu_PutFile($upToken, $key, __file__, $putExtra);
 		$this->assertNull($err);
 		$this->assertArrayHasKey('hash', $ret);
+		$this->assertArrayHasKey('x:test', $ret);
 		var_dump($ret);
 
 		list($ret, $err) = Qiniu_RS_Stat($this->client, $this->bucket, $key);
@@ -43,9 +45,12 @@ public function testPut()
 
 		$putPolicy = new Qiniu_RS_PutPolicy($this->bucket);
 		$upToken = $putPolicy->Token(null);
-		list($ret, $err) = Qiniu_Put($upToken, $key, "hello world!", null);
+		$putExtra = new Qiniu_PutExtra();
+		$putExtra->Params = array('x:test'=>'test');
+		list($ret, $err) = Qiniu_Put($upToken, $key, "hello world!", $putExtra);
 		$this->assertNull($err);
 		$this->assertArrayHasKey('hash', $ret);
+		$this->assertArrayHasKey('x:test', $ret);
 		var_dump($ret);
 
 		list($ret, $err) = Qiniu_RS_Stat($this->client, $this->bucket, $key);
@@ -132,7 +137,7 @@ public function testPut_exclusive()
 		$this->assertNull($err);
 		list($ret, $err) = Qiniu_PutFile($upToken, $key, __file__, null);
 		$this->assertNull($ret);
-		$this->assertEquals($err->Err, 'file exists');
+		$this->assertEquals($err->Code, 614);
 		var_dump($err);
 
 		list($ret, $err) = Qiniu_RS_Stat($this->client, $this->bucket, $key);

diff --git a/tests/RioTest.php b/tests/RioTest.php
@@ -32,10 +32,12 @@ public function testPut()
 		$putPolicy = new Qiniu_RS_PutPolicy($this->bucket);
 		$upToken = $putPolicy->Token(null);
 		$putExtra = new Qiniu_Rio_PutExtra($this->bucket);
+		$putExtra->Params = array('x:test'=>'test');
 		$reader = new MockReader;
 		list($ret, $err) = Qiniu_Rio_Put($upToken, $key, $reader, 5, $putExtra);
 		$this->assertNull($err);
 		$this->assertEquals($ret['hash'], "Fnvgeq9GDVk6Mj0Nsz2gW2S_3LOl");
+		$this->assertEquals($ret['x:test'], "test");
 		var_dump($ret);
 
 		list($ret, $err) = Qiniu_RS_Stat($this->client, $this->bucket, $key);
@@ -54,10 +56,12 @@ public function testLargePut()
 		$putPolicy = new Qiniu_RS_PutPolicy($this->bucket);
 		$upToken = $putPolicy->Token(null);
 		$putExtra = new Qiniu_Rio_PutExtra($this->bucket);
+		$putExtra->Params = array('x:test'=>'test');
 		$reader = new MockReader;
 		list($ret, $err) = Qiniu_Rio_Put($upToken, $key, $reader, QINIU_RIO_BLOCK_SIZE + 5, $putExtra);
 		$this->assertNull($err);
 		$this->assertEquals($ret['hash'], "lgQEOCZ8Ievliq8XOfZmWTndgOll");
+		$this->assertEquals($ret['x:test'], "test");
 		var_dump($ret);
 
 		list($ret, $err) = Qiniu_RS_Stat($this->client, $this->bucket, $key);