add docs dir

Author: rwifeng

CHANGELOG.md

@@ -23,6 +23,9 @@ class Qiniu_PutExtra
 function Qiniu_Put($upToken, $key, $body, $putExtra) // => ($data, $err)
 {
 	global $QINIU_UP_HOST;
+	if ($key == null) {
+		$key = UNDEFINED_KEY;
+	}
 	$fields = array('key' => $key, 'token' => $upToken);
 
 	if ( $putExtra->CheckCrc == AUTO_CRC32 || $putExtra->CheckCrc == WITH_CRC32 ) {
@@ -37,6 +40,9 @@ function Qiniu_Put($upToken, $key, $body, $putExtra) // => ($data, $err)
 function Qiniu_PutFile($upToken, $key, $localFile, $putExtra) // => ($data, $err)
 {
 	global $QINIU_UP_HOST;
+	if ($key == null) {
+		$key = UNDEFINED_KEY;
+	}
 	$fields = array('key' => $key, 'token' => $upToken, 'file' => '@' . $localFile);
 
 	if ( $putExtra->CheckCrc == AUTO_CRC32 ) {

docs/README.md

@@ -5,7 +5,6 @@
 class IoTest extends PHPUnit_Framework_TestCase
 {
 	public $bucket;
-	public $key = "iotest";
 	public $client;
 
 	public function setUp()
@@ -16,29 +15,30 @@ public function setUp()
 
 	public function testPutFile()
 	{
+		$key = rand();
 		$putPolicy = new Qiniu_RS_PutPolicy($this->bucket);
 		$upToken = $putPolicy->Token(null);
 		$putExtra = new Qiniu_PutExtra();
 		$putExtra->CheckCrc = 1;
-		list($ret, $err) = Qiniu_PutFile($upToken, $this->key, __File__, $putExtra);
+		list($ret, $err) = Qiniu_PutFile($upToken, $key, __File__, $putExtra);
 		$this->assertArrayHasKey('hash', $ret);
 		$this->assertNull($err);
 
-		$err = Qiniu_RS_Delete($this->client, $this->bucket, $this->key);
+		$err = Qiniu_RS_Delete($this->client, $this->bucket, $key);
 		$this->assertNull($err);
 	}
 
 	public function testPut()
 	{
+		$key = rand();
 		$putPolicy = new Qiniu_RS_PutPolicy($this->bucket);
 		$upToken = $putPolicy->Token(null);
 		$putExtra = new Qiniu_PutExtra();
-		$putExtra->CheckCrc = 1;
-		list($ret, $err) = Qiniu_Put($upToken, $this->key, "hello world!", $putExtra);
+		list($ret, $err) = Qiniu_Put($upToken, $key, "hello world!", $putExtra);
 		$this->assertArrayHasKey('hash', $ret);
 		$this->assertNull($err);
 
-		$err = Qiniu_RS_Delete($this->client, $this->bucket, $this->key);
+		$err = Qiniu_RS_Delete($this->client, $this->bucket, $key);
 		$this->assertNull($err);
 	}
 }

qiniu/io.php

@@ -6,21 +6,19 @@ class RsTest extends PHPUnit_Framework_TestCase
 {
 	public $client;
 	public $bucket;
+	public $key;
 	public $notExistKey = "not_exist";
-	public $key1;
-	public $key2 = "file_name_2";
-	public $key3 = "file_name_3";
-	public $key4 = "file_name_4";
+
 	public function setUp()
 	{
 		$this->client = new Qiniu_Client(null);
 		$this->bucket = getenv("QINIU_BUCKET_NAME");
-		$this->key1 = getenv("QINIU_KEY_NAME");
+		$this->key = getenv("QINIU_KEY_NAME");
 	}
 
 	public function testStat()
 	{
-		list($ret, $err) = Qiniu_RS_Stat($this->client, $this->bucket, $this->key1);
+		list($ret, $err) = Qiniu_RS_Stat($this->client, $this->bucket, $this->key);
 		$this->assertArrayHasKey('hash', $ret);
 		$this->assertNull($err);
 		list($ret, $err) = Qiniu_RS_Stat($this->client, $this->bucket, $this->notExistKey);
@@ -30,22 +28,26 @@ public function testStat()
 
 	public function testDeleteMoveCopy()
 	{
-		Qiniu_RS_Delete($this->client, $this->bucket, $this->key2);
-		Qiniu_RS_Delete($this->client, $this->bucket, $this->key3);
+		$key2 = rand();
+		$key3 = rand();
+		Qiniu_RS_Delete($this->client, $this->bucket, $key2);
+		Qiniu_RS_Delete($this->client, $this->bucket, $key3);
 
-		$err = Qiniu_RS_Copy($this->client, $this->bucket, $this->key1, $this->bucket, $this->key2);
+		$err = Qiniu_RS_Copy($this->client, $this->bucket, $this->key, $this->bucket, $key2);
 		$this->assertNull($err);
-		$err = Qiniu_RS_Move($this->client, $this->bucket, $this->key2, $this->bucket, $this->key3);
+		$err = Qiniu_RS_Move($this->client, $this->bucket, $key2, $this->bucket, $key3);
 		$this->assertNull($err);
-		$err = Qiniu_RS_Delete($this->client, $this->bucket, $this->key3);
+		$err = Qiniu_RS_Delete($this->client, $this->bucket, $key3);
 		$this->assertNull($err);
-		$err = Qiniu_RS_Delete($this->client, $this->bucket, $this->key2);
+		$err = Qiniu_RS_Delete($this->client, $this->bucket, $key2);
 		$this->assertNotNull($err, "delete key2 false");
 	}
 
 	public function testBatchStat()
 	{
-		$entries = array(new Qiniu_RS_EntryPath($this->bucket, $this->key1), new Qiniu_RS_EntryPath($this->bucket, $this->key2));
+		$key2 = rand();
+		Qiniu_RS_Delete($this->client, $this->bucket, $key2);
+		$entries = array(new Qiniu_RS_EntryPath($this->bucket, $this->key), new Qiniu_RS_EntryPath($this->bucket, $key2));
 		list($ret, $err) = Qiniu_RS_BatchStat($this->client, $entries);
 		$this->assertNotNull($err);
 		$this->assertEquals($ret[0]['code'], 200);
@@ -54,10 +56,13 @@ public function testBatchStat()
 
 	public function testBatchDeleteMoveCopy()
 	{
-		$e1 = new Qiniu_RS_EntryPath($this->bucket, $this->key1);
-		$e2 = new Qiniu_RS_EntryPath($this->bucket, $this->key2);
-		$e3 = new Qiniu_RS_EntryPath($this->bucket, $this->key3);
-		$e4 = new Qiniu_RS_EntryPath($this->bucket, $this->key4);
+		$key2 = rand();
+		$key3 = rand();
+		$key4 = rand();
+		$e1 = new Qiniu_RS_EntryPath($this->bucket, $this->key);
+		$e2 = new Qiniu_RS_EntryPath($this->bucket, $key2);
+		$e3 = new Qiniu_RS_EntryPath($this->bucket, $key3);
+		$e4 = new Qiniu_RS_EntryPath($this->bucket, $key4);
 		Qiniu_RS_BatchDelete($this->client, array($e2, $e3,$e4));
 
 		$entryPairs = array(new Qiniu_RS_EntryPathPair($e1, $e2), new Qiniu_RS_EntryPathPair($e1, $e3));