GC0202 / ThinkLibrary

src/service/ksyun/bin/unit/Test.php

Indentation +234 added lines, -234 removed lines

@@ -7,138 +7,138 @@ 
 require_once "PUnit.php";
 require_once "../lib/RequestCore.class.php";
 class SDKTest extends PUnit{
-	protected $bucket = "php-sdk-test";
-	protected $key = "test==中/文？";
-	protected $key_copy = "test中/文_copy？";
-	protected $accesskey = "";
-	protected $secrectkey = "";
-	protected $client;
+    protected $bucket = "php-sdk-test";
+    protected $key = "test==中/文？";
+    protected $key_copy = "test中/文_copy？";
+    protected $accesskey = "";
+    protected $secrectkey = "";
+    protected $client;
     protected $encryptionClient;
-	protected $cachedir;
+    protected $cachedir;
     protected $sseckey;
-	public function __construct(){
-		$this->client=new Ks3Client($this->accesskey,$this->secrectkey);
-		$this->cachedir=KS3_API_PATH.DIRECTORY_SEPARATOR."unit".DIRECTORY_SEPARATOR."cache".DIRECTORY_SEPARATOR;
+    public function __construct(){
+        $this->client=new Ks3Client($this->accesskey,$this->secrectkey);
+        $this->cachedir=KS3_API_PATH.DIRECTORY_SEPARATOR."unit".DIRECTORY_SEPARATOR."cache".DIRECTORY_SEPARATOR;
         $filename = "secret.key";
         $handle = fopen($filename, "r");
         $sseckey = fread($handle, filesize ($filename));
         fclose($handle);
         $this->sseckey = $sseckey;
         $this->encryptionClient = new Ks3EncryptionClient($this->accesskey,$this->secrectkey,$sseckey);
-	}
-	public function before(){
-		if($this->client->bucketExists(array("Bucket"=>$this->bucket))){
-			$keys = array();
-			$objects = $this->client->listObjects(array("Bucket"=>$this->bucket));
-			foreach ($objects["Contents"] as $object) {
-				array_push($keys, $object["Key"]);
-			}
-			$this->client->deleteObjects(array("Bucket"=>$this->bucket,"DeleteKeys"=>$keys));
-		}else{
-			$this->client->createBucket(array("Bucket"=>$this->bucket));
-		}
-	}
-	public function testListBuckets(){
-		$buckets = $this->client->listBuckets();
-		$found = FALSE;
-		foreach ($buckets as $bucket) {
-			if($bucket["Name"] == $this->bucket)
-				$found = TRUE;
-		}
-		if(!$found)
-			throw new Exception("list buckets expected found ".$this->bucket.",but not found");
+    }
+    public function before(){
+        if($this->client->bucketExists(array("Bucket"=>$this->bucket))){
+            $keys = array();
+            $objects = $this->client->listObjects(array("Bucket"=>$this->bucket));
+            foreach ($objects["Contents"] as $object) {
+                array_push($keys, $object["Key"]);
+            }
+            $this->client->deleteObjects(array("Bucket"=>$this->bucket,"DeleteKeys"=>$keys));
+        }else{
+            $this->client->createBucket(array("Bucket"=>$this->bucket));
+        }
+    }
+    public function testListBuckets(){
+        $buckets = $this->client->listBuckets();
+        $found = FALSE;
+        foreach ($buckets as $bucket) {
+            if($bucket["Name"] == $this->bucket)
+                $found = TRUE;
+        }
+        if(!$found)
+            throw new Exception("list buckets expected found ".$this->bucket.",but not found");
 			
-	}
-	public function testDeleteBucket(){
-		$this->client->putObjectByContent(array("Bucket"=>$this->bucket,"Key"=>"test","Content"=>""));
-		$ex = NULL;
-		try{
-			$this->client->deleteBucket(array("Bucket"=>$this->bucket));
-		}catch(Exception $e){
-			$ex = $e;
-		}
-		if($ex == NULL||!($ex->errorCode === "BucketNotEmpty")){
-			throw new Exception("delete bucket expected BucketNotEmpty but ".$ex);
-		}
-	}
-	public function testBucketCORS(){
-		$this->client->setBucketCORS($args = array(
-       		"Bucket"=>$this->bucket,
-        	"CORS"=>array(
-        		array(
-           			"AllowedMethod"=>array("GET","PUT"),
-            		"AllowedOrigin"=>array("http://www.kingsoft.com"),
-            		"AllowedHeader"=>array("*"),
-            		"ExposeHeader"=>array("*"),
-            		"MaxAgeSeconds"=>10
-        		),
-        		array(
-         		  "AllowedMethod"=>array("GET","PUT"),
-          		  "AllowedOrigin"=>array("*"),
-          		  "AllowedHeader"=>array("*"),
-          		  "ExposeHeader"=>array("*"),
-          		  "MaxAgeSeconds"=>10
-        		)
-    		)));
- 	    $cors = $this->client->getBucketCORS(array("Bucket"=>$this->bucket));
- 	    $this->assertEquals(count($cors),2,"bucket cors count ");
-   		$this->client->deleteBucketCORS(array("Bucket"=>$this->bucket));
-   		$cors = $this->client->getBucketCORS(array("Bucket"=>$this->bucket));
-		$this->assertEquals(count($cors),0,"bucket cors count ");
-	}
-	public function testCreateBucket(){
-		$ex = NULL;
-		try{
-			$this->client->createBucket(array("Bucket"=>$this->bucket));
-		}catch(Exception $e){
-			$ex = $e;
-		}
-		if($ex == NULL||!($ex->errorCode === "BucketAlreadyExists")){
-			throw new Exception("create bucket expected BucketAlreadyExists but ".$ex);
-		}
-	}
-	public function testACL(){
-		$this->client->setBucketAcl(array("Bucket"=>$this->bucket,"ACL"=>"public-read"));
-		$acl = $this->client->getBucketAcl(array("Bucket"=>$this->bucket));
-		$this->assertEquals($acl,"public-read","bucket acl");
-	}
-	public function testBucketLogging(){
-		$this->client->setBucketLogging(array(
-        	"Bucket"=>$this->bucket,
-        	"BucketLogging"=>array(
-            	"Enable"=>TRUE,
-            	"TargetBucket"=>$this->bucket,
-            	"TargetPrefix"=>"X-KSS"
+    }
+    public function testDeleteBucket(){
+        $this->client->putObjectByContent(array("Bucket"=>$this->bucket,"Key"=>"test","Content"=>""));
+        $ex = NULL;
+        try{
+            $this->client->deleteBucket(array("Bucket"=>$this->bucket));
+        }catch(Exception $e){
+            $ex = $e;
+        }
+        if($ex == NULL||!($ex->errorCode === "BucketNotEmpty")){
+            throw new Exception("delete bucket expected BucketNotEmpty but ".$ex);
+        }
+    }
+    public function testBucketCORS(){
+        $this->client->setBucketCORS($args = array(
+                "Bucket"=>$this->bucket,
+            "CORS"=>array(
+                array(
+                        "AllowedMethod"=>array("GET","PUT"),
+                    "AllowedOrigin"=>array("http://www.kingsoft.com"),
+                    "AllowedHeader"=>array("*"),
+                    "ExposeHeader"=>array("*"),
+                    "MaxAgeSeconds"=>10
+                ),
+                array(
+                    "AllowedMethod"=>array("GET","PUT"),
+                    "AllowedOrigin"=>array("*"),
+                    "AllowedHeader"=>array("*"),
+                    "ExposeHeader"=>array("*"),
+                    "MaxAgeSeconds"=>10
+                )
+            )));
+            $cors = $this->client->getBucketCORS(array("Bucket"=>$this->bucket));
+            $this->assertEquals(count($cors),2,"bucket cors count ");
+            $this->client->deleteBucketCORS(array("Bucket"=>$this->bucket));
+            $cors = $this->client->getBucketCORS(array("Bucket"=>$this->bucket));
+        $this->assertEquals(count($cors),0,"bucket cors count ");
+    }
+    public function testCreateBucket(){
+        $ex = NULL;
+        try{
+            $this->client->createBucket(array("Bucket"=>$this->bucket));
+        }catch(Exception $e){
+            $ex = $e;
+        }
+        if($ex == NULL||!($ex->errorCode === "BucketAlreadyExists")){
+            throw new Exception("create bucket expected BucketAlreadyExists but ".$ex);
+        }
+    }
+    public function testACL(){
+        $this->client->setBucketAcl(array("Bucket"=>$this->bucket,"ACL"=>"public-read"));
+        $acl = $this->client->getBucketAcl(array("Bucket"=>$this->bucket));
+        $this->assertEquals($acl,"public-read","bucket acl");
+    }
+    public function testBucketLogging(){
+        $this->client->setBucketLogging(array(
+            "Bucket"=>$this->bucket,
+            "BucketLogging"=>array(
+                "Enable"=>TRUE,
+                "TargetBucket"=>$this->bucket,
+                "TargetPrefix"=>"X-KSS"
             )
         ));
-    	$logging = $this->client->getBucketLogging(array("Bucket"=>$this->bucket));
-    	$this->assertEquals($logging["Enable"],TRUE,"bucket logging enable");
+        $logging = $this->client->getBucketLogging(array("Bucket"=>$this->bucket));
+        $this->assertEquals($logging["Enable"],TRUE,"bucket logging enable");
 
-    	$this->client->setBucketLogging(array(
-    		"Bucket"=>$this->bucket,
-    		"BucketLogging"=>array(
-        		"Enable"=>FALSE,//是否开启
-        	)
-    	));
-    	$logging = $this->client->getBucketLogging(array("Bucket"=>$this->bucket));
-    	$this->assertEquals($logging["Enable"],FALSE,"bucket logging enable");
-	}
-	public function testBucketLocation(){
-		$location = $this->client->getBucketLocation(array("Bucket"=>$this->bucket));
-		$this->assertEquals($location,"HANGZHOU","bucket location ");
-	}
-	public function testPutObjectByContentAndGetObjectContent(){
-		$args = array(
-        	"Bucket"=>$this->bucket,
-        	"Key"=>$this->key,
-        	"Content"=>"1234",//要上传的内容
-        	"ACL"=>"public-read",//可以设置访问权限,合法值,private、public-read
-        	"ObjectMeta"=>array(
-            	"Content-Type"=>"application/xml",
-            	"Content-Length"=>3
+        $this->client->setBucketLogging(array(
+            "Bucket"=>$this->bucket,
+            "BucketLogging"=>array(
+                "Enable"=>FALSE,//是否开启
+            )
+        ));
+        $logging = $this->client->getBucketLogging(array("Bucket"=>$this->bucket));
+        $this->assertEquals($logging["Enable"],FALSE,"bucket logging enable");
+    }
+    public function testBucketLocation(){
+        $location = $this->client->getBucketLocation(array("Bucket"=>$this->bucket));
+        $this->assertEquals($location,"HANGZHOU","bucket location ");
+    }
+    public function testPutObjectByContentAndGetObjectContent(){
+        $args = array(
+            "Bucket"=>$this->bucket,
+            "Key"=>$this->key,
+            "Content"=>"1234",//要上传的内容
+            "ACL"=>"public-read",//可以设置访问权限,合法值,private、public-read
+            "ObjectMeta"=>array(
+                "Content-Type"=>"application/xml",
+                "Content-Length"=>3
             ),
-        	"UserMeta"=>array(//可以设置object的用户元数据，需要以x-kss-meta-开头
-            	"x-kss-meta-test"=>"test"
+            "UserMeta"=>array(//可以设置object的用户元数据，需要以x-kss-meta-开头
+                "x-kss-meta-test"=>"test"
             )
         );
         $this->client->putObjectByContent($args);
@@ -156,21 +156,21 @@ 
         $this->assertEquals($meta["ObjectMeta"]["Content-Type"],"application/xml","Content-Type");
         $this->assertEquals($meta["ObjectMeta"]["Content-Length"],3,"Content-Length");
 
-	}
-	public function testPutObjectByFile(){
-		$args = array(
-        	"Bucket"=>$this->bucket,
-        	"Key"=>$this->key,
-        	"Content"=>array(
-        		"content"=>$this->cachedir."test_file"
-        	),//要上传的内容
-        	"ACL"=>"public-read",//可以设置访问权限,合法值,private、public-read
-        	"ObjectMeta"=>array(
-            	"Content-Type"=>"application/xml",
-            	"Content-Length"=>100
+    }
+    public function testPutObjectByFile(){
+        $args = array(
+            "Bucket"=>$this->bucket,
+            "Key"=>$this->key,
+            "Content"=>array(
+                "content"=>$this->cachedir."test_file"
+            ),//要上传的内容
+            "ACL"=>"public-read",//可以设置访问权限,合法值,private、public-read
+            "ObjectMeta"=>array(
+                "Content-Type"=>"application/xml",
+                "Content-Length"=>100
             ),
-        	"UserMeta"=>array(//可以设置object的用户元数据，需要以x-kss-meta-开头
-            	"x-kss-meta-test"=>"test"
+            "UserMeta"=>array(//可以设置object的用户元数据，需要以x-kss-meta-开头
+                "x-kss-meta-test"=>"test"
             )
         );
         $this->client->putObjectByFile($args);
@@ -180,47 +180,47 @@ 
         $this->assertEquals($meta["ObjectMeta"]["Content-Type"],"application/xml","Content-Type");
         $this->assertEquals($meta["ObjectMeta"]["Content-Length"],100,"Content-Length");
         $this->assertEquals($this->client->getObjectAcl(array("Bucket"=>$this->bucket,"Key"=>$this->key)),"public-read","object acl ");
-	}
-	public function testObjectAcl(){
-		$this->client->putObjectByContent(array("Bucket"=>$this->bucket,"Key"=>$this->key,
+    }
+    public function testObjectAcl(){
+        $this->client->putObjectByContent(array("Bucket"=>$this->bucket,"Key"=>$this->key,
 "Content"=>"1234","ACL"=>"private"));
-		$this->assertEquals($this->client->getObjectAcl(array("Bucket"=>$this->bucket,"Key"=>$this->key)),"private","object acl");
-		$this->client->setObjectAcl(array("Bucket"=>$this->bucket,"Key"=>$this->key,"ACL"=>"public-read"));
-		$this->assertEquals($this->client->getObjectAcl(array("Bucket"=>$this->bucket,"Key"=>$this->key)),"public-read","object acl");
-	}
-	public function testDeleteObject(){
-		$this->client->putObjectByContent(array("Bucket"=>$this->bucket,"Key"=>$this->key,
+        $this->assertEquals($this->client->getObjectAcl(array("Bucket"=>$this->bucket,"Key"=>$this->key)),"private","object acl");
+        $this->client->setObjectAcl(array("Bucket"=>$this->bucket,"Key"=>$this->key,"ACL"=>"public-read"));
+        $this->assertEquals($this->client->getObjectAcl(array("Bucket"=>$this->bucket,"Key"=>$this->key)),"public-read","object acl");
+    }
+    public function testDeleteObject(){
+        $this->client->putObjectByContent(array("Bucket"=>$this->bucket,"Key"=>$this->key,
 "Content"=>"1234"));
-		$this->client->deleteObject(array("Bucket"=>$this->bucket,"Key"=>$this->key));
-		$this->assertEquals($this->client->objectExists(array("Bucket"=>$this->bucket,"Key"=>$this->key)),FALSE,"object exits");
-	}
-	public function testDeleteObjects(){
-		$this->client->putObjectByContent(array("Bucket"=>$this->bucket,"Key"=>$this->key,
+        $this->client->deleteObject(array("Bucket"=>$this->bucket,"Key"=>$this->key));
+        $this->assertEquals($this->client->objectExists(array("Bucket"=>$this->bucket,"Key"=>$this->key)),FALSE,"object exits");
+    }
+    public function testDeleteObjects(){
+        $this->client->putObjectByContent(array("Bucket"=>$this->bucket,"Key"=>$this->key,
 "Content"=>"1234"));
-		$this->client->deleteObjects(array("Bucket"=>$this->bucket,"DeleteKeys"=>array($this->key)));
-		$this->assertEquals($this->client->objectExists(array("Bucket"=>$this->bucket,"Key"=>$this->key)),FALSE,"object exits");		
-	}
-	public function testCopyObject(){
-		$this->client->putObjectByContent(array("Bucket"=>$this->bucket,"Key"=>$this->key,
+        $this->client->deleteObjects(array("Bucket"=>$this->bucket,"DeleteKeys"=>array($this->key)));
+        $this->assertEquals($this->client->objectExists(array("Bucket"=>$this->bucket,"Key"=>$this->key)),FALSE,"object exits");		
+    }
+    public function testCopyObject(){
+        $this->client->putObjectByContent(array("Bucket"=>$this->bucket,"Key"=>$this->key,
 "Content"=>"1234"));
-		$this->client->copyObject(array("Bucket"=>$this->bucket,"Key"=>$this->key_copy,"CopySource"=>array("Bucket"=>$this->bucket,"Key"=>$this->key)));
-		$this->assertEquals($this->client->objectExists(array("Bucket"=>$this->bucket,"Key"=>$this->key)),TRUE,"object exits");
-		$this->assertEquals($this->client->objectExists(array("Bucket"=>$this->bucket,"Key"=>$this->key_copy)),TRUE
-			,"object exits");
-	}
-	public function testPutAndGetObject(){
-		$args = array(
-        	"Bucket"=>$this->bucket,
-        	"Key"=>$this->key,
-        	"Content"=>array(
-        		"content"=>$this->cachedir."test_file"
-        	),//要上传的内容
-        	"ACL"=>"public-read",//可以设置访问权限,合法值,private、public-read
-        	"ObjectMeta"=>array(
-            	"Content-Type"=>"application/xml",
+        $this->client->copyObject(array("Bucket"=>$this->bucket,"Key"=>$this->key_copy,"CopySource"=>array("Bucket"=>$this->bucket,"Key"=>$this->key)));
+        $this->assertEquals($this->client->objectExists(array("Bucket"=>$this->bucket,"Key"=>$this->key)),TRUE,"object exits");
+        $this->assertEquals($this->client->objectExists(array("Bucket"=>$this->bucket,"Key"=>$this->key_copy)),TRUE
+            ,"object exits");
+    }
+    public function testPutAndGetObject(){
+        $args = array(
+            "Bucket"=>$this->bucket,
+            "Key"=>$this->key,
+            "Content"=>array(
+                "content"=>$this->cachedir."test_file"
+            ),//要上传的内容
+            "ACL"=>"public-read",//可以设置访问权限,合法值,private、public-read
+            "ObjectMeta"=>array(
+                "Content-Type"=>"application/xml",
             ),
-        	"UserMeta"=>array(//可以设置object的用户元数据，需要以x-kss-meta-开头
-            	"x-kss-meta-test"=>"test"
+            "UserMeta"=>array(//可以设置object的用户元数据，需要以x-kss-meta-开头
+                "x-kss-meta-test"=>"test"
             )
         );
         $this->client->putObjectByFile($args);
@@ -229,49 +229,49 @@ 
         $md5pre = md5_file($this->cachedir."test_file");
         @unlink($this->cachedir."down");
         $this->assertEquals($md5,$md5pre,"contentmd5");
-	}
-	public function testPutAndGetObjectRanges(){
-		$args = array(
-        	"Bucket"=>$this->bucket,
-        	"Key"=>$this->key,
-        	"Content"=>array(
-        		"content"=>$this->cachedir."test_file"
-        	),//要上传的内容
-        	"ACL"=>"public-read",//可以设置访问权限,合法值,private、public-read
-        	"ObjectMeta"=>array(
-            	"Content-Type"=>"application/xml",
+    }
+    public function testPutAndGetObjectRanges(){
+        $args = array(
+            "Bucket"=>$this->bucket,
+            "Key"=>$this->key,
+            "Content"=>array(
+                "content"=>$this->cachedir."test_file"
+            ),//要上传的内容
+            "ACL"=>"public-read",//可以设置访问权限,合法值,private、public-read
+            "ObjectMeta"=>array(
+                "Content-Type"=>"application/xml",
             ),
-        	"UserMeta"=>array(//可以设置object的用户元数据，需要以x-kss-meta-开头
-            	"x-kss-meta-test"=>"test"
+            "UserMeta"=>array(//可以设置object的用户元数据，需要以x-kss-meta-开头
+                "x-kss-meta-test"=>"test"
             )
         );
         $this->client->putObjectByFile($args);
         rangeGetAndCheckMd5($this->client,$this->bucket,$this->key,$this->cachedir."down",md5_file($this->cachedir."test_file"));
-	}
-	public function testInitAndAbortMultipart(){
-		$initResult = $this->client->initMultipartUpload(array("Bucket"=>$this->bucket,"Key"=>$this->key));
-		$uid = $initResult["UploadId"];
-		$listParts = $this->client->listParts(array("Bucket"=>$this->bucket,"Key"=>$this->key,"Options"=>array("uploadId"=>$uid)));
-		$this->client->abortMultipartUpload(array("Bucket"=>$this->bucket,"Key"=>$this->key,"Options"=>array("uploadId"=>$uid)));
-		$ex = NULL;
-		try{
-			$this->client->listParts(array("Bucket"=>$this->bucket,"Key"=>$this->key,"Options"=>array("uploadId"=>$uid)));
-		}catch(Exception $e){
-			$ex = $e;
-		}
-		if($ex == NULL||!($ex->errorCode === "NoSuchUpload")){
-			throw new Exception("create bucket expected NoSuchUpload but ".$ex);
-		}
-	}
-	public function testMultipartUpload(){
-		generateFile(1024*1024,$this->cachedir."multi");
-		//初始化分开上传，获取uploadid
+    }
+    public function testInitAndAbortMultipart(){
+        $initResult = $this->client->initMultipartUpload(array("Bucket"=>$this->bucket,"Key"=>$this->key));
+        $uid = $initResult["UploadId"];
+        $listParts = $this->client->listParts(array("Bucket"=>$this->bucket,"Key"=>$this->key,"Options"=>array("uploadId"=>$uid)));
+        $this->client->abortMultipartUpload(array("Bucket"=>$this->bucket,"Key"=>$this->key,"Options"=>array("uploadId"=>$uid)));
+        $ex = NULL;
+        try{
+            $this->client->listParts(array("Bucket"=>$this->bucket,"Key"=>$this->key,"Options"=>array("uploadId"=>$uid)));
+        }catch(Exception $e){
+            $ex = $e;
+        }
+        if($ex == NULL||!($ex->errorCode === "NoSuchUpload")){
+            throw new Exception("create bucket expected NoSuchUpload but ".$ex);
+        }
+    }
+    public function testMultipartUpload(){
+        generateFile(1024*1024,$this->cachedir."multi");
+        //初始化分开上传，获取uploadid
         $args = array(
             "Bucket"=>$this->bucket,
             "Key"=>$this->key,
             "ACL"=>"public-read",
             "UserMeta"=>array(
-            	"x-kss-meta-test"=>"example"
+                "x-kss-meta-test"=>"example"
             ),
         "ObjectMeta"=>array(
             "Content-Type"=>"application/xml"
@@ -323,21 +323,21 @@ 
         $this->assertEquals($meta["UserMeta"]["x-kss-meta-test"],"example","x-kss-meta-test");
         rangeGetAndCheckMd5($this->client,$this->bucket,$this->key,$this->cachedir."down",md5_file($this->cachedir."multi"));
         @unlink($this->cachedir."multi");
-	}
-	public function testListBucketsPresignedUrl(){
-		$url = $this->client->generatePresignedUrl(
-			array(
-				"Method"=>"GET",
-				"Options"=>array("Expires"=>60*10),
-				"Headers"=>array("Content-Type"=>"text/plain")
-				));
-		$httpRequest = new RequestCore($url);
-		$httpRequest->set_method("GET");
+    }
+    public function testListBucketsPresignedUrl(){
+        $url = $this->client->generatePresignedUrl(
+            array(
+                "Method"=>"GET",
+                "Options"=>array("Expires"=>60*10),
+                "Headers"=>array("Content-Type"=>"text/plain")
+                ));
+        $httpRequest = new RequestCore($url);
+        $httpRequest->set_method("GET");
         $httpRequest->add_header("Content-Type","text/plain");
-		$httpRequest->send_request();
-		$body = $httpRequest->get_response_body ();	
-		$this->assertEquals($httpRequest->get_response_code()." body:".$body,200,"list buckets status code");
-	}
+        $httpRequest->send_request();
+        $body = $httpRequest->get_response_body ();	
+        $this->assertEquals($httpRequest->get_response_code()." body:".$body,200,"list buckets status code");
+    }
     public function testHeadBucketPresignedUrl(){
         $url = $this->client->generatePresignedUrl(
             array(
@@ -618,16 +618,16 @@ 
             "Bucket"=>$this->bucket,
             "Key"=>$this->key,
             "Content"=>"12345",//要上传的内容
-             "ACL"=>"public-read",//可以设置访问权限,合法值,private、public-read
-             "ObjectMeta"=>array(//设置object的元数据,可以设置"Cache-Control","Content-Disposition","Content-Encoding","Content-Length","Content-MD5","Content-Type","Expires"。当设置了Content-Length时，请勿大于实际长度，如果小于实际长度，将只上传部分内容。
+                "ACL"=>"public-read",//可以设置访问权限,合法值,private、public-read
+                "ObjectMeta"=>array(//设置object的元数据,可以设置"Cache-Control","Content-Disposition","Content-Encoding","Content-Length","Content-MD5","Content-Type","Expires"。当设置了Content-Length时，请勿大于实际长度，如果小于实际长度，将只上传部分内容。
                 "Content-Type"=>"binay/ocet-stream"
             ),
             "UserMeta"=>array(//可以设置object的用户元数据，需要以x-kss-meta-开头
-              "x-kss-meta-test"=>"test"
+                "x-kss-meta-test"=>"test"
             ),
             "SSE"=>array(
                 "Algm"=>"AES256"//暂时支持AES256
-             )
+                )
         );
         $result = $this->client->putObjectByContent($args);
         $this->assertEquals($result["SSEAlgm"],"AES256");
@@ -645,16 +645,16 @@ 
             "Bucket"=>$this->bucket,
             "Key"=>$this->key,
             "Content"=>"12345",//要上传的内容
-             "ACL"=>"public-read",//可以设置访问权限,合法值,private、public-read
-             "ObjectMeta"=>array(//设置object的元数据,可以设置"Cache-Control","Content-Disposition","Content-Encoding","Content-Length","Content-MD5","Content-Type","Expires"。当设置了Content-Length时，请勿大于实际长度，如果小于实际长度，将只上传部分内容。
+                "ACL"=>"public-read",//可以设置访问权限,合法值,private、public-read
+                "ObjectMeta"=>array(//设置object的元数据,可以设置"Cache-Control","Content-Disposition","Content-Encoding","Content-Length","Content-MD5","Content-Type","Expires"。当设置了Content-Length时，请勿大于实际长度，如果小于实际长度，将只上传部分内容。
                 "Content-Type"=>"binay/ocet-stream"
             ),
             "UserMeta"=>array(//可以设置object的用户元数据，需要以x-kss-meta-开头
-              "x-kss-meta-test"=>"test"
+                "x-kss-meta-test"=>"test"
             ),
             "SSEC"=>array(
                 "Key"=>$this->sseckey
-             )
+                )
         );
         $result = $this->client->putObjectByContent($args);
         $this->assertEquals($result["SSECAlgm"],"AES256");
@@ -665,7 +665,7 @@ 
             "Key"=>$this->key,
             "SSEC"=>array(
                 "Key"=>$this->sseckey
-             )
+                )
             );
         $result = $this->client->getObjectMeta($args);
         $this->assertEquals($result["ObjectMeta"]["SSECAlgm"],"AES256");
@@ -677,7 +677,7 @@ 
             "WriteTo"=>$this->cachedir."down", //文件保存路径,必须提供。可以是resource
             "SSEC"=>array(
                 "Key"=>$this->sseckey
-             )
+                )
         );
         $this->client->getObject($args);
         $this->assertEquals("12345",file_get_contents($this->cachedir."down"));
@@ -779,16 +779,16 @@ 
             "Bucket"=>$this->bucket,
             "Key"=>$this->key,
             "Content"=>"12345",//要上传的内容
-             "ACL"=>"public-read",//可以设置访问权限,合法值,private、public-read
-             "ObjectMeta"=>array(//设置object的元数据,可以设置"Cache-Control","Content-Disposition","Content-Encoding","Content-Length","Content-MD5","Content-Type","Expires"。当设置了Content-Length时，请勿大于实际长度，如果小于实际长度，将只上传部分内容。
+                "ACL"=>"public-read",//可以设置访问权限,合法值,private、public-read
+                "ObjectMeta"=>array(//设置object的元数据,可以设置"Cache-Control","Content-Disposition","Content-Encoding","Content-Length","Content-MD5","Content-Type","Expires"。当设置了Content-Length时，请勿大于实际长度，如果小于实际长度，将只上传部分内容。
                 "Content-Type"=>"binay/ocet-stream"
             ),
             "UserMeta"=>array(//可以设置object的用户元数据，需要以x-kss-meta-开头
-              "x-kss-meta-test"=>"test"
+                "x-kss-meta-test"=>"test"
             ),
             "SSEC"=>array(
                 "Key"=>$this->sseckey
-             )
+                )
         );
         $result = $this->client->putObjectByContent($args);
 
@@ -799,10 +799,10 @@ 
                 "Bucket"=>$this->bucket,
                 "Key"=>$this->key
                 ),
-             "SSECSource"=>array(
+                "SSECSource"=>array(
                 "Key"=>$this->sseckey
                 ),
-             "SSEC"=>array(
+                "SSEC"=>array(
                 "Key"=>$this->sseckey
                 )
             );
@@ -821,7 +821,7 @@ 
             );
             $this->encryptionClient->putObjectByContent($args);
             rangeGetAndCheckMd5($this->encryptionClient,$this->bucket,$this->key,
-               $this->cachedir."down",md5($args["Content"]));
+                $this->cachedir."down",md5($args["Content"]));
         }
     }
     public function testPutObjectByFileAndGetObjectUsingEncyptionMeta(){
@@ -835,7 +835,7 @@ 
         );
         $this->encryptionClient->putObjectByFile($args);
         rangeGetAndCheckMd5($this->encryptionClient,$this->bucket,$this->key,
-               $this->cachedir."down",md5_file($this->cachedir."test_file"));
+                $this->cachedir."down",md5_file($this->cachedir."test_file"));
     }
     public function testMultipartUploadUsingEncyptionMeta(){
         generateFile(1024*1024,$this->cachedir."multi");

Spacing +258 added lines, -258 removed lines

@@ -1,12 +1,12 @@ 
 <?php
-define("ENCRYPTPTION_STORAGE_MODE","InstructionFile");
+define("ENCRYPTPTION_STORAGE_MODE", "InstructionFile");
 require_once "../encryption/EncryptionUtil.php";
 require_once "../Ks3Client.class.php";
 require_once "../Ks3EncryptionClient.class.php";
 require_once "TestUtil.php";
 require_once "PUnit.php";
 require_once "../lib/RequestCore.class.php";
-class SDKTest extends PUnit{
+class SDKTest extends PUnit {
 	protected $bucket = "php-sdk-test";
 	protected $key = "test==中/文？";
 	protected $key_copy = "test中/文_copy？";
@@ -16,64 +16,64 @@ 
     protected $encryptionClient;
 	protected $cachedir;
     protected $sseckey;
-	public function __construct(){
-		$this->client=new Ks3Client($this->accesskey,$this->secrectkey);
-		$this->cachedir=KS3_API_PATH.DIRECTORY_SEPARATOR."unit".DIRECTORY_SEPARATOR."cache".DIRECTORY_SEPARATOR;
+	public function __construct() {
+		$this->client = new Ks3Client($this->accesskey, $this->secrectkey);
+		$this->cachedir = KS3_API_PATH.DIRECTORY_SEPARATOR."unit".DIRECTORY_SEPARATOR."cache".DIRECTORY_SEPARATOR;
         $filename = "secret.key";
         $handle = fopen($filename, "r");
-        $sseckey = fread($handle, filesize ($filename));
+        $sseckey = fread($handle, filesize($filename));
         fclose($handle);
         $this->sseckey = $sseckey;
-        $this->encryptionClient = new Ks3EncryptionClient($this->accesskey,$this->secrectkey,$sseckey);
+        $this->encryptionClient = new Ks3EncryptionClient($this->accesskey, $this->secrectkey, $sseckey);
 	}
-	public function before(){
-		if($this->client->bucketExists(array("Bucket"=>$this->bucket))){
+	public function before() {
+		if ($this->client->bucketExists(array("Bucket"=>$this->bucket))) {
 			$keys = array();
 			$objects = $this->client->listObjects(array("Bucket"=>$this->bucket));
 			foreach ($objects["Contents"] as $object) {
 				array_push($keys, $object["Key"]);
 			}
-			$this->client->deleteObjects(array("Bucket"=>$this->bucket,"DeleteKeys"=>$keys));
-		}else{
+			$this->client->deleteObjects(array("Bucket"=>$this->bucket, "DeleteKeys"=>$keys));
+		}else {
 			$this->client->createBucket(array("Bucket"=>$this->bucket));
 		}
 	}
-	public function testListBuckets(){
+	public function testListBuckets() {
 		$buckets = $this->client->listBuckets();
 		$found = FALSE;
 		foreach ($buckets as $bucket) {
-			if($bucket["Name"] == $this->bucket)
+			if ($bucket["Name"] == $this->bucket)
 				$found = TRUE;
 		}
-		if(!$found)
+		if (!$found)
 			throw new Exception("list buckets expected found ".$this->bucket.",but not found");
 			
 	}
-	public function testDeleteBucket(){
-		$this->client->putObjectByContent(array("Bucket"=>$this->bucket,"Key"=>"test","Content"=>""));
+	public function testDeleteBucket() {
+		$this->client->putObjectByContent(array("Bucket"=>$this->bucket, "Key"=>"test", "Content"=>""));
 		$ex = NULL;
-		try{
+		try {
 			$this->client->deleteBucket(array("Bucket"=>$this->bucket));
-		}catch(Exception $e){
+		} catch (Exception $e) {
 			$ex = $e;
 		}
-		if($ex == NULL||!($ex->errorCode === "BucketNotEmpty")){
+		if ($ex == NULL || !($ex->errorCode === "BucketNotEmpty")) {
 			throw new Exception("delete bucket expected BucketNotEmpty but ".$ex);
 		}
 	}
-	public function testBucketCORS(){
+	public function testBucketCORS() {
 		$this->client->setBucketCORS($args = array(
        		"Bucket"=>$this->bucket,
         	"CORS"=>array(
         		array(
-           			"AllowedMethod"=>array("GET","PUT"),
+           			"AllowedMethod"=>array("GET", "PUT"),
             		"AllowedOrigin"=>array("http://www.kingsoft.com"),
             		"AllowedHeader"=>array("*"),
             		"ExposeHeader"=>array("*"),
             		"MaxAgeSeconds"=>10
         		),
         		array(
-         		  "AllowedMethod"=>array("GET","PUT"),
+         		  "AllowedMethod"=>array("GET", "PUT"),
           		  "AllowedOrigin"=>array("*"),
           		  "AllowedHeader"=>array("*"),
           		  "ExposeHeader"=>array("*"),
@@ -81,28 +81,28 @@ 
         		)
     		)));
  	    $cors = $this->client->getBucketCORS(array("Bucket"=>$this->bucket));
- 	    $this->assertEquals(count($cors),2,"bucket cors count ");
+ 	    $this->assertEquals(count($cors), 2, "bucket cors count ");
    		$this->client->deleteBucketCORS(array("Bucket"=>$this->bucket));
    		$cors = $this->client->getBucketCORS(array("Bucket"=>$this->bucket));
-		$this->assertEquals(count($cors),0,"bucket cors count ");
+		$this->assertEquals(count($cors), 0, "bucket cors count ");
 	}
-	public function testCreateBucket(){
+	public function testCreateBucket() {
 		$ex = NULL;
-		try{
+		try {
 			$this->client->createBucket(array("Bucket"=>$this->bucket));
-		}catch(Exception $e){
+		} catch (Exception $e) {
 			$ex = $e;
 		}
-		if($ex == NULL||!($ex->errorCode === "BucketAlreadyExists")){
+		if ($ex == NULL || !($ex->errorCode === "BucketAlreadyExists")) {
 			throw new Exception("create bucket expected BucketAlreadyExists but ".$ex);
 		}
 	}
-	public function testACL(){
-		$this->client->setBucketAcl(array("Bucket"=>$this->bucket,"ACL"=>"public-read"));
+	public function testACL() {
+		$this->client->setBucketAcl(array("Bucket"=>$this->bucket, "ACL"=>"public-read"));
 		$acl = $this->client->getBucketAcl(array("Bucket"=>$this->bucket));
-		$this->assertEquals($acl,"public-read","bucket acl");
+		$this->assertEquals($acl, "public-read", "bucket acl");
 	}
-	public function testBucketLogging(){
+	public function testBucketLogging() {
 		$this->client->setBucketLogging(array(
         	"Bucket"=>$this->bucket,
         	"BucketLogging"=>array(
@@ -112,27 +112,27 @@ 
             )
         ));
     	$logging = $this->client->getBucketLogging(array("Bucket"=>$this->bucket));
-    	$this->assertEquals($logging["Enable"],TRUE,"bucket logging enable");
+    	$this->assertEquals($logging["Enable"], TRUE, "bucket logging enable");
 
     	$this->client->setBucketLogging(array(
     		"Bucket"=>$this->bucket,
     		"BucketLogging"=>array(
-        		"Enable"=>FALSE,//是否开启
+        		"Enable"=>FALSE, //是否开启
         	)
     	));
     	$logging = $this->client->getBucketLogging(array("Bucket"=>$this->bucket));
-    	$this->assertEquals($logging["Enable"],FALSE,"bucket logging enable");
+    	$this->assertEquals($logging["Enable"], FALSE, "bucket logging enable");
 	}
-	public function testBucketLocation(){
+	public function testBucketLocation() {
 		$location = $this->client->getBucketLocation(array("Bucket"=>$this->bucket));
-		$this->assertEquals($location,"HANGZHOU","bucket location ");
+		$this->assertEquals($location, "HANGZHOU", "bucket location ");
 	}
-	public function testPutObjectByContentAndGetObjectContent(){
+	public function testPutObjectByContentAndGetObjectContent() {
 		$args = array(
         	"Bucket"=>$this->bucket,
         	"Key"=>$this->key,
-        	"Content"=>"1234",//要上传的内容
-        	"ACL"=>"public-read",//可以设置访问权限,合法值,private、public-read
+        	"Content"=>"1234", //要上传的内容
+        	"ACL"=>"public-read", //可以设置访问权限,合法值,private、public-read
         	"ObjectMeta"=>array(
             	"Content-Type"=>"application/xml",
             	"Content-Length"=>3
@@ -142,29 +142,29 @@ 
             )
         );
         $this->client->putObjectByContent($args);
-        $this->assertEquals($this->client->objectExists(array("Bucket"=>$this->bucket,"Key"=>$this->key)),TRUE,"object exists ");
-        $meta = $this->client->getObjectMeta(array("Bucket"=>$this->bucket,"Key"=>$this->key));
-        $this->assertEquals($meta["UserMeta"]["x-kss-meta-test"],"test","x-kss-meta-test");
-        $this->assertEquals($meta["ObjectMeta"]["Content-Type"],"application/xml","Content-Type");
-        $this->assertEquals($meta["ObjectMeta"]["Content-Length"],3,"Content-Length");
-        $this->assertEquals($this->client->getObjectAcl(array("Bucket"=>$this->bucket,"Key"=>$this->key)),"public-read","object acl ");
+        $this->assertEquals($this->client->objectExists(array("Bucket"=>$this->bucket, "Key"=>$this->key)), TRUE, "object exists ");
+        $meta = $this->client->getObjectMeta(array("Bucket"=>$this->bucket, "Key"=>$this->key));
+        $this->assertEquals($meta["UserMeta"]["x-kss-meta-test"], "test", "x-kss-meta-test");
+        $this->assertEquals($meta["ObjectMeta"]["Content-Type"], "application/xml", "Content-Type");
+        $this->assertEquals($meta["ObjectMeta"]["Content-Length"], 3, "Content-Length");
+        $this->assertEquals($this->client->getObjectAcl(array("Bucket"=>$this->bucket, "Key"=>$this->key)), "public-read", "object acl ");
 
-        $s3Object = $this->client->getObject(array("Bucket"=>$this->bucket,"Key"=>$this->key));
-        $this->assertEquals($s3Object["Content"],"123","s3 object content");
+        $s3Object = $this->client->getObject(array("Bucket"=>$this->bucket, "Key"=>$this->key));
+        $this->assertEquals($s3Object["Content"], "123", "s3 object content");
         $meta = $s3Object["Meta"];
-        $this->assertEquals($meta["UserMeta"]["x-kss-meta-test"],"test","x-kss-meta-test");
-        $this->assertEquals($meta["ObjectMeta"]["Content-Type"],"application/xml","Content-Type");
-        $this->assertEquals($meta["ObjectMeta"]["Content-Length"],3,"Content-Length");
+        $this->assertEquals($meta["UserMeta"]["x-kss-meta-test"], "test", "x-kss-meta-test");
+        $this->assertEquals($meta["ObjectMeta"]["Content-Type"], "application/xml", "Content-Type");
+        $this->assertEquals($meta["ObjectMeta"]["Content-Length"], 3, "Content-Length");
 
 	}
-	public function testPutObjectByFile(){
+	public function testPutObjectByFile() {
 		$args = array(
         	"Bucket"=>$this->bucket,
         	"Key"=>$this->key,
         	"Content"=>array(
         		"content"=>$this->cachedir."test_file"
-        	),//要上传的内容
-        	"ACL"=>"public-read",//可以设置访问权限,合法值,private、public-read
+        	), //要上传的内容
+        	"ACL"=>"public-read", //可以设置访问权限,合法值,private、public-read
         	"ObjectMeta"=>array(
             	"Content-Type"=>"application/xml",
             	"Content-Length"=>100
@@ -174,48 +174,48 @@ 
             )
         );
         $this->client->putObjectByFile($args);
-        $this->assertEquals($this->client->objectExists(array("Bucket"=>$this->bucket,"Key"=>$this->key)),TRUE,"object exists ");
-        $meta = $this->client->getObjectMeta(array("Bucket"=>$this->bucket,"Key"=>$this->key));
-        $this->assertEquals($meta["UserMeta"]["x-kss-meta-test"],"test","x-kss-meta-test");
-        $this->assertEquals($meta["ObjectMeta"]["Content-Type"],"application/xml","Content-Type");
-        $this->assertEquals($meta["ObjectMeta"]["Content-Length"],100,"Content-Length");
-        $this->assertEquals($this->client->getObjectAcl(array("Bucket"=>$this->bucket,"Key"=>$this->key)),"public-read","object acl ");
+        $this->assertEquals($this->client->objectExists(array("Bucket"=>$this->bucket, "Key"=>$this->key)), TRUE, "object exists ");
+        $meta = $this->client->getObjectMeta(array("Bucket"=>$this->bucket, "Key"=>$this->key));
+        $this->assertEquals($meta["UserMeta"]["x-kss-meta-test"], "test", "x-kss-meta-test");
+        $this->assertEquals($meta["ObjectMeta"]["Content-Type"], "application/xml", "Content-Type");
+        $this->assertEquals($meta["ObjectMeta"]["Content-Length"], 100, "Content-Length");
+        $this->assertEquals($this->client->getObjectAcl(array("Bucket"=>$this->bucket, "Key"=>$this->key)), "public-read", "object acl ");
 	}
-	public function testObjectAcl(){
-		$this->client->putObjectByContent(array("Bucket"=>$this->bucket,"Key"=>$this->key,
-"Content"=>"1234","ACL"=>"private"));
-		$this->assertEquals($this->client->getObjectAcl(array("Bucket"=>$this->bucket,"Key"=>$this->key)),"private","object acl");
-		$this->client->setObjectAcl(array("Bucket"=>$this->bucket,"Key"=>$this->key,"ACL"=>"public-read"));
-		$this->assertEquals($this->client->getObjectAcl(array("Bucket"=>$this->bucket,"Key"=>$this->key)),"public-read","object acl");
+	public function testObjectAcl() {
+		$this->client->putObjectByContent(array("Bucket"=>$this->bucket, "Key"=>$this->key,
+"Content"=>"1234", "ACL"=>"private"));
+		$this->assertEquals($this->client->getObjectAcl(array("Bucket"=>$this->bucket, "Key"=>$this->key)), "private", "object acl");
+		$this->client->setObjectAcl(array("Bucket"=>$this->bucket, "Key"=>$this->key, "ACL"=>"public-read"));
+		$this->assertEquals($this->client->getObjectAcl(array("Bucket"=>$this->bucket, "Key"=>$this->key)), "public-read", "object acl");
 	}
-	public function testDeleteObject(){
-		$this->client->putObjectByContent(array("Bucket"=>$this->bucket,"Key"=>$this->key,
+	public function testDeleteObject() {
+		$this->client->putObjectByContent(array("Bucket"=>$this->bucket, "Key"=>$this->key,
 "Content"=>"1234"));
-		$this->client->deleteObject(array("Bucket"=>$this->bucket,"Key"=>$this->key));
-		$this->assertEquals($this->client->objectExists(array("Bucket"=>$this->bucket,"Key"=>$this->key)),FALSE,"object exits");
+		$this->client->deleteObject(array("Bucket"=>$this->bucket, "Key"=>$this->key));
+		$this->assertEquals($this->client->objectExists(array("Bucket"=>$this->bucket, "Key"=>$this->key)), FALSE, "object exits");
 	}
-	public function testDeleteObjects(){
-		$this->client->putObjectByContent(array("Bucket"=>$this->bucket,"Key"=>$this->key,
+	public function testDeleteObjects() {
+		$this->client->putObjectByContent(array("Bucket"=>$this->bucket, "Key"=>$this->key,
 "Content"=>"1234"));
-		$this->client->deleteObjects(array("Bucket"=>$this->bucket,"DeleteKeys"=>array($this->key)));
-		$this->assertEquals($this->client->objectExists(array("Bucket"=>$this->bucket,"Key"=>$this->key)),FALSE,"object exits");		
+		$this->client->deleteObjects(array("Bucket"=>$this->bucket, "DeleteKeys"=>array($this->key)));
+		$this->assertEquals($this->client->objectExists(array("Bucket"=>$this->bucket, "Key"=>$this->key)), FALSE, "object exits");		
 	}
-	public function testCopyObject(){
-		$this->client->putObjectByContent(array("Bucket"=>$this->bucket,"Key"=>$this->key,
+	public function testCopyObject() {
+		$this->client->putObjectByContent(array("Bucket"=>$this->bucket, "Key"=>$this->key,
 "Content"=>"1234"));
-		$this->client->copyObject(array("Bucket"=>$this->bucket,"Key"=>$this->key_copy,"CopySource"=>array("Bucket"=>$this->bucket,"Key"=>$this->key)));
-		$this->assertEquals($this->client->objectExists(array("Bucket"=>$this->bucket,"Key"=>$this->key)),TRUE,"object exits");
-		$this->assertEquals($this->client->objectExists(array("Bucket"=>$this->bucket,"Key"=>$this->key_copy)),TRUE
+		$this->client->copyObject(array("Bucket"=>$this->bucket, "Key"=>$this->key_copy, "CopySource"=>array("Bucket"=>$this->bucket, "Key"=>$this->key)));
+		$this->assertEquals($this->client->objectExists(array("Bucket"=>$this->bucket, "Key"=>$this->key)), TRUE, "object exits");
+		$this->assertEquals($this->client->objectExists(array("Bucket"=>$this->bucket, "Key"=>$this->key_copy)), TRUE
 			,"object exits");
 	}
-	public function testPutAndGetObject(){
+	public function testPutAndGetObject() {
 		$args = array(
         	"Bucket"=>$this->bucket,
         	"Key"=>$this->key,
         	"Content"=>array(
         		"content"=>$this->cachedir."test_file"
-        	),//要上传的内容
-        	"ACL"=>"public-read",//可以设置访问权限,合法值,private、public-read
+        	), //要上传的内容
+        	"ACL"=>"public-read", //可以设置访问权限,合法值,private、public-read
         	"ObjectMeta"=>array(
             	"Content-Type"=>"application/xml",
             ),
@@ -224,20 +224,20 @@ 
             )
         );
         $this->client->putObjectByFile($args);
-        $this->client->getObject(array("Bucket"=>$this->bucket,"Key"=>$this->key,"WriteTo"=>$this->cachedir."down"));
+        $this->client->getObject(array("Bucket"=>$this->bucket, "Key"=>$this->key, "WriteTo"=>$this->cachedir."down"));
         $md5 = md5_file($this->cachedir."down");
         $md5pre = md5_file($this->cachedir."test_file");
         @unlink($this->cachedir."down");
-        $this->assertEquals($md5,$md5pre,"contentmd5");
+        $this->assertEquals($md5, $md5pre, "contentmd5");
 	}
-	public function testPutAndGetObjectRanges(){
+	public function testPutAndGetObjectRanges() {
 		$args = array(
         	"Bucket"=>$this->bucket,
         	"Key"=>$this->key,
         	"Content"=>array(
         		"content"=>$this->cachedir."test_file"
-        	),//要上传的内容
-        	"ACL"=>"public-read",//可以设置访问权限,合法值,private、public-read
+        	), //要上传的内容
+        	"ACL"=>"public-read", //可以设置访问权限,合法值,private、public-read
         	"ObjectMeta"=>array(
             	"Content-Type"=>"application/xml",
             ),
@@ -246,25 +246,25 @@ 
             )
         );
         $this->client->putObjectByFile($args);
-        rangeGetAndCheckMd5($this->client,$this->bucket,$this->key,$this->cachedir."down",md5_file($this->cachedir."test_file"));
+        rangeGetAndCheckMd5($this->client, $this->bucket, $this->key, $this->cachedir."down", md5_file($this->cachedir."test_file"));
 	}
-	public function testInitAndAbortMultipart(){
-		$initResult = $this->client->initMultipartUpload(array("Bucket"=>$this->bucket,"Key"=>$this->key));
+	public function testInitAndAbortMultipart() {
+		$initResult = $this->client->initMultipartUpload(array("Bucket"=>$this->bucket, "Key"=>$this->key));
 		$uid = $initResult["UploadId"];
-		$listParts = $this->client->listParts(array("Bucket"=>$this->bucket,"Key"=>$this->key,"Options"=>array("uploadId"=>$uid)));
-		$this->client->abortMultipartUpload(array("Bucket"=>$this->bucket,"Key"=>$this->key,"Options"=>array("uploadId"=>$uid)));
+		$listParts = $this->client->listParts(array("Bucket"=>$this->bucket, "Key"=>$this->key, "Options"=>array("uploadId"=>$uid)));
+		$this->client->abortMultipartUpload(array("Bucket"=>$this->bucket, "Key"=>$this->key, "Options"=>array("uploadId"=>$uid)));
 		$ex = NULL;
-		try{
-			$this->client->listParts(array("Bucket"=>$this->bucket,"Key"=>$this->key,"Options"=>array("uploadId"=>$uid)));
-		}catch(Exception $e){
+		try {
+			$this->client->listParts(array("Bucket"=>$this->bucket, "Key"=>$this->key, "Options"=>array("uploadId"=>$uid)));
+		} catch (Exception $e) {
 			$ex = $e;
 		}
-		if($ex == NULL||!($ex->errorCode === "NoSuchUpload")){
+		if ($ex == NULL || !($ex->errorCode === "NoSuchUpload")) {
 			throw new Exception("create bucket expected NoSuchUpload but ".$ex);
 		}
 	}
-	public function testMultipartUpload(){
-		generateFile(1024*1024,$this->cachedir."multi");
+	public function testMultipartUpload() {
+		generateFile(1024*1024, $this->cachedir."multi");
 		//初始化分开上传，获取uploadid
         $args = array(
             "Bucket"=>$this->bucket,
@@ -278,18 +278,18 @@ 
             )
         );
         $uploadid = $this->client->initMultipartUpload($args);
-        $uploadid = $uploadid["UploadId"];//获取到uploadid
+        $uploadid = $uploadid["UploadId"]; //获取到uploadid
         //开始上传
-        $file = $this->cachedir."multi";//要上传的文件
+        $file = $this->cachedir."multi"; //要上传的文件
         $partsize = 1024*100;
-        $resource = fopen($file,"r");
+        $resource = fopen($file, "r");
         $stat = fstat($resource);
-        $total = $stat["size"];//获取文件的总大小
+        $total = $stat["size"]; //获取文件的总大小
         fclose($resource);
-        $count = (int)(($total-1)/$partsize)+1;;//计算文件需要分几块上传
-        for($i = 0;$i < $count;$i++){
+        $count = (int)(($total-1)/$partsize)+1; ;//计算文件需要分几块上传
+        for ($i = 0; $i < $count; $i++) {
             //依次上传每一块
-            $args=array(
+            $args = array(
                 "Bucket"=>$this->bucket,
                 "Key"=>$this->key,
                 "Options"=>array(
@@ -297,7 +297,7 @@ 
                     "uploadId"=>$uploadid
                 ),
                 "ObjectMeta"=>array(
-                    "Content-Length"=>min($partsize,$total-$partsize*$i)//每次上传$partsize大小
+                    "Content-Length"=>min($partsize, $total-$partsize*$i)//每次上传$partsize大小
                 ),
                 "Content"=>array(
                     "content"=>$file,
@@ -307,24 +307,24 @@ 
             $etag = $this->client->uploadPart($args);
             $etag = $etag["ETag"];
         }
-        $parts = $this->client->listParts(array("Bucket"=>$this->bucket,"Key"=>$this->key,"Options"=>array("uploadId"=>$uploadid)));
+        $parts = $this->client->listParts(array("Bucket"=>$this->bucket, "Key"=>$this->key, "Options"=>array("uploadId"=>$uploadid)));
         //结束上传
-        $args=array(
+        $args = array(
             "Bucket"=>$this->bucket,
             "Key"=>$this->key,
             "Options"=>array("uploadId"=>$uploadid),
             "Parts"=>$parts["Parts"]//使用之前列出的块完成分开上传
         );
         $result = $this->client->completeMultipartUpload($args);
-        $this->assertEquals($this->client->getObjectAcl(array("Bucket"=>$this->bucket,"Key"=>$this->key)),"public-read","object acl");
-        $meta = $this->client->getObjectMeta(array("Bucket"=>$this->bucket,"Key"=>$this->key));
-        $this->assertEquals($meta["ObjectMeta"]["Content-Type"],"application/xml","Content-Type");
-        $this->assertEquals($meta["ObjectMeta"]["Content-Length"],filesize($this->cachedir."multi"),"Content-Length");
-        $this->assertEquals($meta["UserMeta"]["x-kss-meta-test"],"example","x-kss-meta-test");
-        rangeGetAndCheckMd5($this->client,$this->bucket,$this->key,$this->cachedir."down",md5_file($this->cachedir."multi"));
+        $this->assertEquals($this->client->getObjectAcl(array("Bucket"=>$this->bucket, "Key"=>$this->key)), "public-read", "object acl");
+        $meta = $this->client->getObjectMeta(array("Bucket"=>$this->bucket, "Key"=>$this->key));
+        $this->assertEquals($meta["ObjectMeta"]["Content-Type"], "application/xml", "Content-Type");
+        $this->assertEquals($meta["ObjectMeta"]["Content-Length"], filesize($this->cachedir."multi"), "Content-Length");
+        $this->assertEquals($meta["UserMeta"]["x-kss-meta-test"], "example", "x-kss-meta-test");
+        rangeGetAndCheckMd5($this->client, $this->bucket, $this->key, $this->cachedir."down", md5_file($this->cachedir."multi"));
         @unlink($this->cachedir."multi");
 	}
-	public function testListBucketsPresignedUrl(){
+	public function testListBucketsPresignedUrl() {
 		$url = $this->client->generatePresignedUrl(
 			array(
 				"Method"=>"GET",
@@ -333,12 +333,12 @@ 
 				));
 		$httpRequest = new RequestCore($url);
 		$httpRequest->set_method("GET");
-        $httpRequest->add_header("Content-Type","text/plain");
+        $httpRequest->add_header("Content-Type", "text/plain");
 		$httpRequest->send_request();
-		$body = $httpRequest->get_response_body ();	
-		$this->assertEquals($httpRequest->get_response_code()." body:".$body,200,"list buckets status code");
+		$body = $httpRequest->get_response_body();	
+		$this->assertEquals($httpRequest->get_response_code()." body:".$body, 200, "list buckets status code");
 	}
-    public function testHeadBucketPresignedUrl(){
+    public function testHeadBucketPresignedUrl() {
         $url = $this->client->generatePresignedUrl(
             array(
                 "Method"=>"HEAD",
@@ -349,12 +349,12 @@ 
             );
         $httpRequest = new RequestCore($url);
         $httpRequest->set_method("HEAD");
-        $httpRequest->add_header("Content-Type","text/plain");
+        $httpRequest->add_header("Content-Type", "text/plain");
         $httpRequest->send_request();
-        $body = $httpRequest->get_response_body (); 
-        $this->assertEquals($httpRequest->get_response_code()." body:".$body,200,"head bucket status code");
+        $body = $httpRequest->get_response_body(); 
+        $this->assertEquals($httpRequest->get_response_code()." body:".$body, 200, "head bucket status code");
     }
-    public function testDeleteBucketPresignedUrl(){
+    public function testDeleteBucketPresignedUrl() {
         $this->client->putObjectByContent(array(
             "Bucket"=>$this->bucket,
             "Key"=>$this->key,
@@ -371,28 +371,28 @@ 
             );
         $httpRequest = new RequestCore($url);
         $httpRequest->set_method("DELETE");
-        $httpRequest->add_header("Content-Type","text/plain");
+        $httpRequest->add_header("Content-Type", "text/plain");
         $httpRequest->send_request();
-        $body = $httpRequest->get_response_body (); 
-        $this->assertEquals($httpRequest->get_response_code()." body:".$body,409,"delete bucket status code");      
+        $body = $httpRequest->get_response_body(); 
+        $this->assertEquals($httpRequest->get_response_code()." body:".$body, 409, "delete bucket status code");      
     }
-    public function testGetBucketAclPresignedUrl(){
+    public function testGetBucketAclPresignedUrl() {
         $url = $this->client->generatePresignedUrl(
             array(
                 "Method"=>"GET",
                 "Bucket"=>$this->bucket,
-                "Options"=>array("Expires"=>60*10,"acl"=>NULL),
+                "Options"=>array("Expires"=>60*10, "acl"=>NULL),
                 "Headers"=>array("Content-Type"=>"text/plain")
                 )
             );
         $httpRequest = new RequestCore($url);
         $httpRequest->set_method("GET");
-        $httpRequest->add_header("Content-Type","text/plain");
+        $httpRequest->add_header("Content-Type", "text/plain");
         $httpRequest->send_request();
-        $body = $httpRequest->get_response_body (); 
-        $this->assertEquals($httpRequest->get_response_code()." body:".$body,200,"get bucket acl status code");      
+        $body = $httpRequest->get_response_body(); 
+        $this->assertEquals($httpRequest->get_response_code()." body:".$body, 200, "get bucket acl status code");      
     }
-    public function testPutBucketPresignedUrl(){
+    public function testPutBucketPresignedUrl() {
         $url = $this->client->generatePresignedUrl(
             array(
                 "Method"=>"PUT",
@@ -403,96 +403,96 @@ 
             );
         $httpRequest = new RequestCore($url);
         $httpRequest->set_method("PUT");
-        $httpRequest->add_header("Content-Type","text/plain");
+        $httpRequest->add_header("Content-Type", "text/plain");
         $httpRequest->send_request();
-        $body = $httpRequest->get_response_body (); 
-        $this->assertEquals($httpRequest->get_response_code()." body:".$body,409,"delete bucket status code");      
+        $body = $httpRequest->get_response_body(); 
+        $this->assertEquals($httpRequest->get_response_code()." body:".$body, 409, "delete bucket status code");      
     }
-    public function testPutBucketAclPresignedUrl(){
+    public function testPutBucketAclPresignedUrl() {
         $url = $this->client->generatePresignedUrl(
             array(
                 "Method"=>"PUT",
                 "Bucket"=>$this->bucket,
-                "Options"=>array("Expires"=>60*10,"acl"=>NULL),
-                "Headers"=>array("Content-Type"=>"text/plain","x-kss-acl"=>"public-read")
+                "Options"=>array("Expires"=>60*10, "acl"=>NULL),
+                "Headers"=>array("Content-Type"=>"text/plain", "x-kss-acl"=>"public-read")
                 )
             );
         $httpRequest = new RequestCore($url);
         $httpRequest->set_method("PUT");
-        $httpRequest->add_header("Content-Type","text/plain");
-        $httpRequest->add_header("x-kss-acl","public-read");
+        $httpRequest->add_header("Content-Type", "text/plain");
+        $httpRequest->add_header("x-kss-acl", "public-read");
         $httpRequest->send_request();
-        $body = $httpRequest->get_response_body (); 
-        $this->assertEquals($httpRequest->get_response_code()." body:".$body,200,"put bucket acl status code"); 
-        $this->assertEquals($this->client->getBucketAcl(array("Bucket"=>$this->bucket)),"public-read","bucket acl");
+        $body = $httpRequest->get_response_body(); 
+        $this->assertEquals($httpRequest->get_response_code()." body:".$body, 200, "put bucket acl status code"); 
+        $this->assertEquals($this->client->getBucketAcl(array("Bucket"=>$this->bucket)), "public-read", "bucket acl");
     }
-    public function testListObjectsPresignedUrl(){
+    public function testListObjectsPresignedUrl() {
         $url = $this->client->generatePresignedUrl(array(
             "Method"=>"GET",
             "Bucket"=>$this->bucket,
-            "Options"=>array("Expires"=>60*10,"delimiter"=>"/"),
+            "Options"=>array("Expires"=>60*10, "delimiter"=>"/"),
             "Headers"=>array("Content-Type"=>"text/plain")
             )
         );
         $httpRequest = new RequestCore($url);
         $httpRequest->set_method("GET");
-        $httpRequest->add_header("Content-Type","text/plain");
+        $httpRequest->add_header("Content-Type", "text/plain");
         $httpRequest->send_request();
-        $body = $httpRequest->get_response_body (); 
-        $this->assertEquals($httpRequest->get_response_code()." body:".$body,200,"list objects status code"); 
+        $body = $httpRequest->get_response_body(); 
+        $this->assertEquals($httpRequest->get_response_code()." body:".$body, 200, "list objects status code"); 
     }
-    public function testGetBucketLoggingPresignedUrl(){
+    public function testGetBucketLoggingPresignedUrl() {
         $url = $this->client->generatePresignedUrl(array(
             "Method"=>"GET",
             "Bucket"=>$this->bucket,
-            "Options"=>array("Expires"=>60*10,"logging"=>""),
+            "Options"=>array("Expires"=>60*10, "logging"=>""),
             "Headers"=>array("Content-Type"=>"text/plain")
             )
         );
         $httpRequest = new RequestCore($url);
         $httpRequest->set_method("GET");
-        $httpRequest->add_header("Content-Type","text/plain");
+        $httpRequest->add_header("Content-Type", "text/plain");
         $httpRequest->send_request();
-        $body = $httpRequest->get_response_body (); 
-        $this->assertEquals($httpRequest->get_response_code()." body:".$body,200,"get bucket logging status code"); 
+        $body = $httpRequest->get_response_body(); 
+        $this->assertEquals($httpRequest->get_response_code()." body:".$body, 200, "get bucket logging status code"); 
     }
-    public function testPutBucketLoggingPresignedUrl(){
+    public function testPutBucketLoggingPresignedUrl() {
         $xml = new SimpleXmlElement('<BucketLoggingStatus xmlns="http://s3.amazonaws.com/doc/2006-03-01/" />');
         $xml = $xml->asXml();
         $url = $this->client->generatePresignedUrl(
             array(
                 "Method"=>"PUT",
                 "Bucket"=>$this->bucket,
-                "Options"=>array("Expires"=>60*10,"logging"=>NULL),
+                "Options"=>array("Expires"=>60*10, "logging"=>NULL),
                 "Headers"=>array("Content-Type"=>"application/xml")
             )
         );
         $httpRequest = new RequestCore($url);
         $httpRequest->set_method("PUT");
-        $httpRequest->add_header("Content-Type","application/xml");
-        $httpRequest->add_header("Content-Length",strlen($xml));
-        $httpRequest->request_body=$xml;
+        $httpRequest->add_header("Content-Type", "application/xml");
+        $httpRequest->add_header("Content-Length", strlen($xml));
+        $httpRequest->request_body = $xml;
         $httpRequest->send_request();
-        $body = $httpRequest->get_response_body (); 
-        $this->assertEquals($httpRequest->get_response_code()." body:".$body,200,"put bucket logging status code"); 
+        $body = $httpRequest->get_response_body(); 
+        $this->assertEquals($httpRequest->get_response_code()." body:".$body, 200, "put bucket logging status code"); 
     }
-    public function testGetBucketLocationPresignedUrl(){
+    public function testGetBucketLocationPresignedUrl() {
         $url = $this->client->generatePresignedUrl(
             array(
                 "Method"=>"GET",
                 "Bucket"=>$this->bucket,
-                "Options"=>array("Expires"=>60*10,"location"=>NULL),
+                "Options"=>array("Expires"=>60*10, "location"=>NULL),
                 "Headers"=>array("Content-Type"=>"text/plain")
             )
         );
         $httpRequest = new RequestCore($url);
         $httpRequest->set_method("GET");
-        $httpRequest->add_header("Content-Type","text/plain");
+        $httpRequest->add_header("Content-Type", "text/plain");
         $httpRequest->send_request();
-        $body = $httpRequest->get_response_body (); 
-        $this->assertEquals($httpRequest->get_response_code()." body:".$body,200,"get bucket location status code"); 
+        $body = $httpRequest->get_response_body(); 
+        $this->assertEquals($httpRequest->get_response_code()." body:".$body, 200, "get bucket location status code"); 
     }
-    public function testDeleteObjectPresignedUrl(){
+    public function testDeleteObjectPresignedUrl() {
         $this->client->putObjectByContent(array(
             "Bucket"=>$this->bucket,
             "Key"=>$this->key,
@@ -510,12 +510,12 @@ 
         );
         $httpRequest = new RequestCore($url);
         $httpRequest->set_method("DELETE");
-        $httpRequest->add_header("Content-Type","text/plain");
+        $httpRequest->add_header("Content-Type", "text/plain");
         $httpRequest->send_request();
-        $body = $httpRequest->get_response_body (); 
-        $this->assertEquals($httpRequest->get_response_code()." body:".$body,204,"delete object status code"); 
+        $body = $httpRequest->get_response_body(); 
+        $this->assertEquals($httpRequest->get_response_code()." body:".$body, 204, "delete object status code"); 
     }
-    public function testGetObjectPresignedUrl(){
+    public function testGetObjectPresignedUrl() {
         $this->client->putObjectByContent(array(
             "Bucket"=>$this->bucket,
             "Key"=>$this->key,
@@ -532,13 +532,13 @@ 
         );
         $httpRequest = new RequestCore($url);
         $httpRequest->set_method("GET");
-        $httpRequest->add_header("Content-Type","text/plain");
+        $httpRequest->add_header("Content-Type", "text/plain");
         $httpRequest->send_request();
-        $body = $httpRequest->get_response_body (); 
-        $this->assertEquals($httpRequest->get_response_code()." body:".$body,200,"get object status code"); 
-        $this->assertEquals($body,"123","get object body"); 
+        $body = $httpRequest->get_response_body(); 
+        $this->assertEquals($httpRequest->get_response_code()." body:".$body, 200, "get object status code"); 
+        $this->assertEquals($body, "123", "get object body"); 
     }
-    public function testPutObjectPresignedUrl(){
+    public function testPutObjectPresignedUrl() {
         $body = "123";
         $url = $this->client->generatePresignedUrl(
             array(
@@ -551,14 +551,14 @@ 
         );
         $httpRequest = new RequestCore($url);
         $httpRequest->set_method("PUT");
-        $httpRequest->add_header("Content-Type","application/ocet-stream");
-        $httpRequest->add_header("Content-Length",strlen($body));
-        $httpRequest->request_body=$body;
+        $httpRequest->add_header("Content-Type", "application/ocet-stream");
+        $httpRequest->add_header("Content-Length", strlen($body));
+        $httpRequest->request_body = $body;
         $httpRequest->send_request();
-        $body = $httpRequest->get_response_body (); 
-        $this->assertEquals($httpRequest->get_response_code()." body:".$body,200,"put object status code"); 
+        $body = $httpRequest->get_response_body(); 
+        $this->assertEquals($httpRequest->get_response_code()." body:".$body, 200, "put object status code"); 
     }
-    public function testHeadObjectPresignedUrl(){
+    public function testHeadObjectPresignedUrl() {
         $this->testPutObjectPresignedUrl();
         $url = $this->client->generatePresignedUrl(
             array(
@@ -571,54 +571,54 @@ 
         );
         $httpRequest = new RequestCore($url);
         $httpRequest->set_method("HEAD");
-        $httpRequest->add_header("Content-Type","text/plain");
+        $httpRequest->add_header("Content-Type", "text/plain");
         $httpRequest->send_request();
-        $body = $httpRequest->get_response_body (); 
-        $this->assertEquals($httpRequest->get_response_code()." body:".$body,200,"head object status code"); 
+        $body = $httpRequest->get_response_body(); 
+        $this->assertEquals($httpRequest->get_response_code()." body:".$body, 200, "head object status code"); 
     }
-    public function testGetObjectAclPresignedUrl(){
+    public function testGetObjectAclPresignedUrl() {
         $this->testPutObjectPresignedUrl();
         $url = $this->client->generatePresignedUrl(
             array(
                 "Method"=>"GET",
                 "Bucket"=>$this->bucket,
                 "Key"=>$this->key,
-                "Options"=>array("Expires"=>60*10,"acl"=>NULL),
+                "Options"=>array("Expires"=>60*10, "acl"=>NULL),
                 "Headers"=>array("Content-Type"=>"text/plain")
             )
         );
         $httpRequest = new RequestCore($url);
         $httpRequest->set_method("GET");
-        $httpRequest->add_header("Content-Type","text/plain");
+        $httpRequest->add_header("Content-Type", "text/plain");
         $httpRequest->send_request();
-        $body = $httpRequest->get_response_body (); 
-        $this->assertEquals($httpRequest->get_response_code()." body:".$body,200,"get object acl status code");         
+        $body = $httpRequest->get_response_body(); 
+        $this->assertEquals($httpRequest->get_response_code()." body:".$body, 200, "get object acl status code");         
     }
-    public function testPutObjectAclPresignedUrl(){
+    public function testPutObjectAclPresignedUrl() {
         $this->testPutObjectPresignedUrl();
         $url = $this->client->generatePresignedUrl(
             array(
                 "Method"=>"PUT",
                 "Bucket"=>$this->bucket,
                 "Key"=>$this->key,
-                "Options"=>array("Expires"=>60*10,"acl"=>NULL),
-                "Headers"=>array("Content-Type"=>"text/plain","x-kss-acl"=>"public-read")
+                "Options"=>array("Expires"=>60*10, "acl"=>NULL),
+                "Headers"=>array("Content-Type"=>"text/plain", "x-kss-acl"=>"public-read")
             )
         );
         $httpRequest = new RequestCore($url);
         $httpRequest->set_method("PUT");
-        $httpRequest->add_header("Content-Type","text/plain");
-        $httpRequest->add_header("x-kss-acl","public-read");
+        $httpRequest->add_header("Content-Type", "text/plain");
+        $httpRequest->add_header("x-kss-acl", "public-read");
         $httpRequest->send_request();
-        $body = $httpRequest->get_response_body (); 
-        $this->assertEquals($httpRequest->get_response_code()." body:".$body,200,"put object acl status code");         
+        $body = $httpRequest->get_response_body(); 
+        $this->assertEquals($httpRequest->get_response_code()." body:".$body, 200, "put object acl status code");         
     }
-    public function testPutObjectSSEAndGetHeadObject(){
+    public function testPutObjectSSEAndGetHeadObject() {
         $args = array(
             "Bucket"=>$this->bucket,
             "Key"=>$this->key,
-            "Content"=>"12345",//要上传的内容
-             "ACL"=>"public-read",//可以设置访问权限,合法值,private、public-read
+            "Content"=>"12345", //要上传的内容
+             "ACL"=>"public-read", //可以设置访问权限,合法值,private、public-read
              "ObjectMeta"=>array(//设置object的元数据,可以设置"Cache-Control","Content-Disposition","Content-Encoding","Content-Length","Content-MD5","Content-Type","Expires"。当设置了Content-Length时，请勿大于实际长度，如果小于实际长度，将只上传部分内容。
                 "Content-Type"=>"binay/ocet-stream"
             ),
@@ -630,22 +630,22 @@ 
              )
         );
         $result = $this->client->putObjectByContent($args);
-        $this->assertEquals($result["SSEAlgm"],"AES256");
+        $this->assertEquals($result["SSEAlgm"], "AES256");
 
         $args = array(
             "Bucket"=>$this->bucket,
             "Key"=>$this->key
             );
         $result = $this->client->getObjectMeta($args);
-        $this->assertEquals($result["ObjectMeta"]["SSEAlgm"],"AES256");
-        rangeGetAndCheckMd5($this->client,$this->bucket,$this->key,$this->cachedir."down",md5("12345"));
+        $this->assertEquals($result["ObjectMeta"]["SSEAlgm"], "AES256");
+        rangeGetAndCheckMd5($this->client, $this->bucket, $this->key, $this->cachedir."down", md5("12345"));
     }
-    public function testPutObjectSSECAndGetHeadObject(){
+    public function testPutObjectSSECAndGetHeadObject() {
         $args = array(
             "Bucket"=>$this->bucket,
             "Key"=>$this->key,
-            "Content"=>"12345",//要上传的内容
-             "ACL"=>"public-read",//可以设置访问权限,合法值,private、public-read
+            "Content"=>"12345", //要上传的内容
+             "ACL"=>"public-read", //可以设置访问权限,合法值,private、public-read
              "ObjectMeta"=>array(//设置object的元数据,可以设置"Cache-Control","Content-Disposition","Content-Encoding","Content-Length","Content-MD5","Content-Type","Expires"。当设置了Content-Length时，请勿大于实际长度，如果小于实际长度，将只上传部分内容。
                 "Content-Type"=>"binay/ocet-stream"
             ),
@@ -657,8 +657,8 @@ 
              )
         );
         $result = $this->client->putObjectByContent($args);
-        $this->assertEquals($result["SSECAlgm"],"AES256");
-        $this->assertEquals($result["SSECKeyMD5"],Utils::hex_to_base64(md5($this->sseckey)));
+        $this->assertEquals($result["SSECAlgm"], "AES256");
+        $this->assertEquals($result["SSECKeyMD5"], Utils::hex_to_base64(md5($this->sseckey)));
 
         $args = array(
             "Bucket"=>$this->bucket,
@@ -668,8 +668,8 @@ 
              )
             );
         $result = $this->client->getObjectMeta($args);
-        $this->assertEquals($result["ObjectMeta"]["SSECAlgm"],"AES256");
-        $this->assertEquals($result["ObjectMeta"]["SSECKeyMD5"],Utils::hex_to_base64(md5($this->sseckey)));
+        $this->assertEquals($result["ObjectMeta"]["SSECAlgm"], "AES256");
+        $this->assertEquals($result["ObjectMeta"]["SSECKeyMD5"], Utils::hex_to_base64(md5($this->sseckey)));
 
         $args = array(
             "Bucket"=>$this->bucket,
@@ -680,10 +680,10 @@ 
              )
         );
         $this->client->getObject($args);
-        $this->assertEquals("12345",file_get_contents($this->cachedir."down"));
+        $this->assertEquals("12345", file_get_contents($this->cachedir."down"));
         @unlink($this->cachedir."down");
     }
-    public function testMultipartUploadSSE(){
+    public function testMultipartUploadSSE() {
         $file = $this->cachedir."test_file";
         $args = array(
             "Bucket"=>$this->bucket,
@@ -694,11 +694,11 @@ 
         );
         $uploadid = $this->client->initMultipartUpload($args);
 
-        $this->assertEquals($uploadid["SSEAlgm"],"AES256");
+        $this->assertEquals($uploadid["SSEAlgm"], "AES256");
 
         $uploadid = $uploadid["UploadId"];
         //开始上传
-        $args=array(
+        $args = array(
             "Bucket"=>$this->bucket,
             "Key"=>$this->key,
             "Options"=>array(
@@ -711,21 +711,21 @@ 
             );
         $etag = $this->client->uploadPart($args);
 
-        $this->assertEquals($etag["SSEAlgm"],"AES256");
+        $this->assertEquals($etag["SSEAlgm"], "AES256");
         $etag = $etag["ETag"];
 
-        $parts = $this->client->listParts(array("Bucket"=>$this->bucket,"Key"=>$this->key,"Options"=>array("uploadId"=>$uploadid)));
+        $parts = $this->client->listParts(array("Bucket"=>$this->bucket, "Key"=>$this->key, "Options"=>array("uploadId"=>$uploadid)));
         //结束上传
-        $args=array(
+        $args = array(
             "Bucket"=>$this->bucket,
             "Key"=>$this->key,
             "Options"=>array("uploadId"=>$uploadid),
             "Parts"=>$parts["Parts"],
         );
         $result = $this->client->completeMultipartUpload($args);
-        $this->assertEquals($result["SSEAlgm"],"AES256");
+        $this->assertEquals($result["SSEAlgm"], "AES256");
     }
-    public function testMultipartUploadSSEC(){
+    public function testMultipartUploadSSEC() {
         $file = $this->cachedir."test_file";
         $args = array(
             "Bucket"=>$this->bucket,
@@ -736,12 +736,12 @@ 
         );
         $uploadid = $this->client->initMultipartUpload($args);
 
-        $this->assertEquals($uploadid["SSECAlgm"],"AES256");
-        $this->assertEquals($uploadid["SSECKeyMD5"],Utils::hex_to_base64(md5($this->sseckey)));
+        $this->assertEquals($uploadid["SSECAlgm"], "AES256");
+        $this->assertEquals($uploadid["SSECKeyMD5"], Utils::hex_to_base64(md5($this->sseckey)));
 
         $uploadid = $uploadid["UploadId"];
         //开始上传
-        $args=array(
+        $args = array(
             "Bucket"=>$this->bucket,
             "Key"=>$this->key,
             "Options"=>array(
@@ -757,29 +757,29 @@ 
             );
         $etag = $this->client->uploadPart($args);
 
-        $this->assertEquals($etag["SSECAlgm"],"AES256");
-        $this->assertEquals($etag["SSECKeyMD5"],Utils::hex_to_base64(md5($this->sseckey)));
+        $this->assertEquals($etag["SSECAlgm"], "AES256");
+        $this->assertEquals($etag["SSECKeyMD5"], Utils::hex_to_base64(md5($this->sseckey)));
 
         $etag = $etag["ETag"];
 
-        $parts = $this->client->listParts(array("Bucket"=>$this->bucket,"Key"=>$this->key,"Options"=>array("uploadId"=>$uploadid)));
+        $parts = $this->client->listParts(array("Bucket"=>$this->bucket, "Key"=>$this->key, "Options"=>array("uploadId"=>$uploadid)));
         //结束上传
-        $args=array(
+        $args = array(
             "Bucket"=>$this->bucket,
             "Key"=>$this->key,
             "Options"=>array("uploadId"=>$uploadid),
             "Parts"=>$parts["Parts"],
         );
         $result = $this->client->completeMultipartUpload($args);
-        $this->assertEquals($result["SSECAlgm"],"AES256");
-        $this->assertEquals($result["SSECKeyMD5"],Utils::hex_to_base64(md5($this->sseckey)));
+        $this->assertEquals($result["SSECAlgm"], "AES256");
+        $this->assertEquals($result["SSECKeyMD5"], Utils::hex_to_base64(md5($this->sseckey)));
     }
-    public function testCopySSECObject(){
+    public function testCopySSECObject() {
         $args = array(
             "Bucket"=>$this->bucket,
             "Key"=>$this->key,
-            "Content"=>"12345",//要上传的内容
-             "ACL"=>"public-read",//可以设置访问权限,合法值,private、public-read
+            "Content"=>"12345", //要上传的内容
+             "ACL"=>"public-read", //可以设置访问权限,合法值,private、public-read
              "ObjectMeta"=>array(//设置object的元数据,可以设置"Cache-Control","Content-Disposition","Content-Encoding","Content-Length","Content-MD5","Content-Type","Expires"。当设置了Content-Length时，请勿大于实际长度，如果小于实际长度，将只上传部分内容。
                 "Content-Type"=>"binay/ocet-stream"
             ),
@@ -808,8 +808,8 @@ 
             );
         $result = $this->client->copyObject($args);
     }
-    public function testPutObjectByContentAndGetObjectUsingEncyptionMeta(){
-        for($i = 45 ;$i < 60;$i++){
+    public function testPutObjectByContentAndGetObjectUsingEncyptionMeta() {
+        for ($i = 45; $i < 60; $i++) {
 
             $content = EncryptionUtil::genereateOnceUsedKey($i);
 
@@ -820,11 +820,11 @@ 
                 "Content"=>$content
             );
             $this->encryptionClient->putObjectByContent($args);
-            rangeGetAndCheckMd5($this->encryptionClient,$this->bucket,$this->key,
-               $this->cachedir."down",md5($args["Content"]));
+            rangeGetAndCheckMd5($this->encryptionClient, $this->bucket, $this->key,
+               $this->cachedir."down", md5($args["Content"]));
         }
     }
-    public function testPutObjectByFileAndGetObjectUsingEncyptionMeta(){
+    public function testPutObjectByFileAndGetObjectUsingEncyptionMeta() {
         $args = array(
             "Bucket"=>$this->bucket,
             "Key"=>$this->key,
@@ -834,40 +834,40 @@ 
             )
         );
         $this->encryptionClient->putObjectByFile($args);
-        rangeGetAndCheckMd5($this->encryptionClient,$this->bucket,$this->key,
-               $this->cachedir."down",md5_file($this->cachedir."test_file"));
+        rangeGetAndCheckMd5($this->encryptionClient, $this->bucket, $this->key,
+               $this->cachedir."down", md5_file($this->cachedir."test_file"));
     }
-    public function testMultipartUploadUsingEncyptionMeta(){
-        generateFile(1024*1024,$this->cachedir."multi");
+    public function testMultipartUploadUsingEncyptionMeta() {
+        generateFile(1024*1024, $this->cachedir."multi");
         //初始化分开上传，获取uploadid
         $args = array(
             "Bucket"=>$this->bucket,
             "Key"=>$this->key,
         );
         $uploadid = $this->encryptionClient->initMultipartUpload($args);
-        $uploadid = $uploadid["UploadId"];//获取到uploadid
+        $uploadid = $uploadid["UploadId"]; //获取到uploadid
         //开始上传
 
-        $file = $this->cachedir."multi";//要上传的文件
+        $file = $this->cachedir."multi"; //要上传的文件
         $partsize = 1024*100;
-        $resource = fopen($file,"r");
+        $resource = fopen($file, "r");
         $stat = fstat($resource);
-        $total = $stat["size"];//获取文件的总大小
+        $total = $stat["size"]; //获取文件的总大小
         fclose($resource);
-        $count = (int)(($total-1)/$partsize)+1;//计算文件需要分几块上传
-        for($i = 0;$i < $count;$i++){
+        $count = (int)(($total-1)/$partsize)+1; //计算文件需要分几块上传
+        for ($i = 0; $i < $count; $i++) {
             //依次上传每一块
             echo "upload".$i."\r\n";
-            $args=array(
+            $args = array(
                 "Bucket"=>$this->bucket,
                 "Key"=>$this->key,
-                "LastPart"=>($i===$count-1),
+                "LastPart"=>($i === $count-1),
                 "Options"=>array(
                     "partNumber"=>$i+1,
                     "uploadId"=>$uploadid
                 ),
                 "ObjectMeta"=>array(
-                    "Content-Length"=>min($partsize,$total-$partsize*$i)//每次上传$partsize大小
+                    "Content-Length"=>min($partsize, $total-$partsize*$i)//每次上传$partsize大小
                 ),
                 "Content"=>array(
                     "content"=>$file,
@@ -877,9 +877,9 @@ 
             $etag = $this->encryptionClient->uploadPart($args);
             $etag = $etag["ETag"];
         }
-        $parts = $this->encryptionClient->listParts(array("Bucket"=>$this->bucket,"Key"=>$this->key,"Options"=>array("uploadId"=>$uploadid)));
+        $parts = $this->encryptionClient->listParts(array("Bucket"=>$this->bucket, "Key"=>$this->key, "Options"=>array("uploadId"=>$uploadid)));
         //结束上传
-        $args=array(
+        $args = array(
             "Bucket"=>$this->bucket,
             "Key"=>$this->key,
             "Options"=>array("uploadId"=>$uploadid),
@@ -887,11 +887,11 @@ 
         );
         $result = $this->encryptionClient->completeMultipartUpload($args);
 
-        rangeGetAndCheckMd5($this->encryptionClient,$this->bucket,$this->key,
-            $this->cachedir."down",md5_file($file));
+        rangeGetAndCheckMd5($this->encryptionClient, $this->bucket, $this->key,
+            $this->cachedir."down", md5_file($file));
         @unlink($this->cachedir."multi");
     }
-    public function testPutObjectByContentAndGetObject(){
+    public function testPutObjectByContentAndGetObject() {
         @unlink($this->cachedir."down");
         $content = EncryptionUtil::genereateOnceUsedKey(500);
         $args = array(
@@ -901,15 +901,15 @@ 
             "Content"=>$content
         );
         $this->encryptionClient->putObjectByContent($args);
-        $start = (int)rand(0,520);
-        $end = (int)rand($start,520);
+        $start = (int)rand(0, 520);
+        $end = (int)rand($start, 520);
         $s3Object = $this->encryptionClient->getObject(
-        array("Bucket"=>$this->bucket,"Key"=>$this->key,
+        array("Bucket"=>$this->bucket, "Key"=>$this->key,
             "Range"=>"bytes=".$start."-".$end)
         );
-        $this->assertEquals(substr($content,$start,$end-$start+1),$s3Object["Content"]);
+        $this->assertEquals(substr($content, $start, $end-$start+1), $s3Object["Content"]);
     }
-    public function test01(){
+    public function test01() {
         $this->client->listObjects(array("Bucket"=>$this->bucket));
     }
 }

Braces +10 added lines, -8 removed lines

@@ -34,7 +34,7 @@ 
 				array_push($keys, $object["Key"]);
 			}
 			$this->client->deleteObjects(array("Bucket"=>$this->bucket,"DeleteKeys"=>$keys));
-		}else{
+		} else{
 			$this->client->createBucket(array("Bucket"=>$this->bucket));
 		}
 	}
@@ -42,11 +42,13 @@ 
 		$buckets = $this->client->listBuckets();
 		$found = FALSE;
 		foreach ($buckets as $bucket) {
-			if($bucket["Name"] == $this->bucket)
-				$found = TRUE;
+			if($bucket["Name"] == $this->bucket) {
+							$found = TRUE;
+			}
+		}
+		if(!$found) {
+					throw new Exception("list buckets expected found ".$this->bucket.",but not found");
 		}
-		if(!$found)
-			throw new Exception("list buckets expected found ".$this->bucket.",but not found");
 			
 	}
 	public function testDeleteBucket(){
@@ -54,7 +56,7 @@ 
 		$ex = NULL;
 		try{
 			$this->client->deleteBucket(array("Bucket"=>$this->bucket));
-		}catch(Exception $e){
+		} catch(Exception $e){
 			$ex = $e;
 		}
 		if($ex == NULL||!($ex->errorCode === "BucketNotEmpty")){
@@ -90,7 +92,7 @@ 
 		$ex = NULL;
 		try{
 			$this->client->createBucket(array("Bucket"=>$this->bucket));
-		}catch(Exception $e){
+		} catch(Exception $e){
 			$ex = $e;
 		}
 		if($ex == NULL||!($ex->errorCode === "BucketAlreadyExists")){
@@ -256,7 +258,7 @@ 
 		$ex = NULL;
 		try{
 			$this->client->listParts(array("Bucket"=>$this->bucket,"Key"=>$this->key,"Options"=>array("uploadId"=>$uid)));
-		}catch(Exception $e){
+		} catch(Exception $e){
 			$ex = $e;
 		}
 		if($ex == NULL||!($ex->errorCode === "NoSuchUpload")){

src/service/ksyun/bin/unit/TestUtil.php

Indentation +44 added lines, -44 removed lines

@@ -1,53 +1,53 @@
 <?php
 function rangeGetAndCheckMd5($client,$bucket,$key,$file,$expectedMd5){
-	$args = array("Bucket"=>$bucket,"Key"=>$key);
-	$meta = $client->getObjectMeta($args);
-	$contentlength = $meta["ObjectMeta"]["Content-Length"];
+    $args = array("Bucket"=>$bucket,"Key"=>$key);
+    $meta = $client->getObjectMeta($args);
+    $contentlength = $meta["ObjectMeta"]["Content-Length"];
 
-	$filelist = array();
+    $filelist = array();
 
-	for($begin = 0;$begin <$contentlength;){
-		$index = rand((int)($contentlength/20),(int)($contentlength/4));
-		$range = array("start"=>$begin,"end"=>$begin+$index);
-		$destFile = $file.$begin."-".($begin+$index);
-		array_push($filelist,$destFile);
-		$begin += ($index+1);
-		$args = array(
-			"Bucket"=>$bucket,
-			"Key"=>$key,
-			"Range"=>$range,
-			"WriteTo"=>$destFile
-		);
-		$client->getObject($args);
-	}
+    for($begin = 0;$begin <$contentlength;){
+        $index = rand((int)($contentlength/20),(int)($contentlength/4));
+        $range = array("start"=>$begin,"end"=>$begin+$index);
+        $destFile = $file.$begin."-".($begin+$index);
+        array_push($filelist,$destFile);
+        $begin += ($index+1);
+        $args = array(
+            "Bucket"=>$bucket,
+            "Key"=>$key,
+            "Range"=>$range,
+            "WriteTo"=>$destFile
+        );
+        $client->getObject($args);
+    }
 
-	foreach ($filelist as $key => $value) {
-		$handle = fopen($value,"r");
-		$size = filesize($value);
-		if($size > 0){
-			$content = fread($handle,$size);
-			file_put_contents($file,$content,FILE_APPEND);
-		}
-		fclose($handle);
-		//@unlink($value);
-	}
-	$md5 = md5_file($file);
-	//@unlink($file);	
-	if($md5 != $expectedMd5)
-		throw new Exception("file md5 check error expected ".$expectedMd5." ,actual ".$md5, 1);
-	foreach ($filelist as $key => $value) {
-		@unlink($value);
-	}
-	@unlink($file);
+    foreach ($filelist as $key => $value) {
+        $handle = fopen($value,"r");
+        $size = filesize($value);
+        if($size > 0){
+            $content = fread($handle,$size);
+            file_put_contents($file,$content,FILE_APPEND);
+        }
+        fclose($handle);
+        //@unlink($value);
+    }
+    $md5 = md5_file($file);
+    //@unlink($file);	
+    if($md5 != $expectedMd5)
+        throw new Exception("file md5 check error expected ".$expectedMd5." ,actual ".$md5, 1);
+    foreach ($filelist as $key => $value) {
+        @unlink($value);
+    }
+    @unlink($file);
 }
 function generateFile($sizeInBytes,$destFile){
-	for($i = 0;$i < $sizeInBytes/10;$i++){
-		$randpwd = "";  
-		for ($j = 0; $j < 10; $j++)  
-		{  
-			$randpwd .= chr(mt_rand(33, 126));  
-		}  
-		file_put_contents($destFile,$randpwd,FILE_APPEND);
-	}
+    for($i = 0;$i < $sizeInBytes/10;$i++){
+        $randpwd = "";  
+        for ($j = 0; $j < 10; $j++)  
+        {  
+            $randpwd .= chr(mt_rand(33, 126));  
+        }  
+        file_put_contents($destFile,$randpwd,FILE_APPEND);
+    }
 }
 ?>
\ No newline at end of file

Spacing +14 added lines, -14 removed lines

@@ -1,16 +1,16 @@ 
 <?php
-function rangeGetAndCheckMd5($client,$bucket,$key,$file,$expectedMd5){
-	$args = array("Bucket"=>$bucket,"Key"=>$key);
+function rangeGetAndCheckMd5($client, $bucket, $key, $file, $expectedMd5) {
+	$args = array("Bucket"=>$bucket, "Key"=>$key);
 	$meta = $client->getObjectMeta($args);
 	$contentlength = $meta["ObjectMeta"]["Content-Length"];
 
 	$filelist = array();
 
-	for($begin = 0;$begin <$contentlength;){
-		$index = rand((int)($contentlength/20),(int)($contentlength/4));
-		$range = array("start"=>$begin,"end"=>$begin+$index);
+	for ($begin = 0; $begin < $contentlength;) {
+		$index = rand((int)($contentlength/20), (int)($contentlength/4));
+		$range = array("start"=>$begin, "end"=>$begin+$index);
 		$destFile = $file.$begin."-".($begin+$index);
-		array_push($filelist,$destFile);
+		array_push($filelist, $destFile);
 		$begin += ($index+1);
 		$args = array(
 			"Bucket"=>$bucket,
@@ -22,32 +22,32 @@ 
 	}
 
 	foreach ($filelist as $key => $value) {
-		$handle = fopen($value,"r");
+		$handle = fopen($value, "r");
 		$size = filesize($value);
-		if($size > 0){
-			$content = fread($handle,$size);
-			file_put_contents($file,$content,FILE_APPEND);
+		if ($size > 0) {
+			$content = fread($handle, $size);
+			file_put_contents($file, $content, FILE_APPEND);
 		}
 		fclose($handle);
 		//@unlink($value);
 	}
 	$md5 = md5_file($file);
 	//@unlink($file);	
-	if($md5 != $expectedMd5)
+	if ($md5 != $expectedMd5)
 		throw new Exception("file md5 check error expected ".$expectedMd5." ,actual ".$md5, 1);
 	foreach ($filelist as $key => $value) {
 		@unlink($value);
 	}
 	@unlink($file);
 }
-function generateFile($sizeInBytes,$destFile){
-	for($i = 0;$i < $sizeInBytes/10;$i++){
+function generateFile($sizeInBytes, $destFile) {
+	for ($i = 0; $i < $sizeInBytes/10; $i++) {
 		$randpwd = "";  
 		for ($j = 0; $j < 10; $j++)  
 		{  
 			$randpwd .= chr(mt_rand(33, 126));  
 		}  
-		file_put_contents($destFile,$randpwd,FILE_APPEND);
+		file_put_contents($destFile, $randpwd, FILE_APPEND);
 	}
 }
 ?>
\ No newline at end of file

Braces +3 added lines, -2 removed lines

@@ -33,8 +33,9 @@
 	}
 	$md5 = md5_file($file);
 	//@unlink($file);	
-	if($md5 != $expectedMd5)
-		throw new Exception("file md5 check error expected ".$expectedMd5." ,actual ".$md5, 1);
+	if($md5 != $expectedMd5) {
+			throw new Exception("file md5 check error expected ".$expectedMd5." ,actual ".$md5, 1);
+	}
 	foreach ($filelist as $key => $value) {
 		@unlink($value);
 	}

src/service/ksyun/bin/unit/PUnit.php

Indentation +40 added lines, -40 removed lines

@@ -1,60 +1,60 @@
 <?php
 require_once "../core/Logger.php";
 class PUnit{
-	function assertEquals($value,$expected,$info = NULL){
-		if($value != $expected){
-			throw new Exception($info." expected ".$expected." but ".$value);
-		}
-	}
-	function run($torun = NULL){
-   		$r = new ReflectionClass($this);
-    	foreach($r->getMethods() as $key=>$methodObj){
-      	  if($methodObj->isPrivate())
-           		 $methods[$key]['type'] = 'private';
-        	elseif($methodObj->isProtected())
-        	     $methods[$key]['type'] = 'protected';
-      		else
-           		 $methods[$key]['type'] = 'public';
-        	$methods[$key]['name'] = $methodObj->name;
-       		$methods[$key]['class'] = $methodObj->class;
-       	}
+    function assertEquals($value,$expected,$info = NULL){
+        if($value != $expected){
+            throw new Exception($info." expected ".$expected." but ".$value);
+        }
+    }
+    function run($torun = NULL){
+            $r = new ReflectionClass($this);
+        foreach($r->getMethods() as $key=>$methodObj){
+            if($methodObj->isPrivate())
+                    $methods[$key]['type'] = 'private';
+            elseif($methodObj->isProtected())
+                    $methods[$key]['type'] = 'protected';
+                else
+                    $methods[$key]['type'] = 'public';
+            $methods[$key]['name'] = $methodObj->name;
+                $methods[$key]['class'] = $methodObj->class;
+            }
         $before = NULL;
         $after = NULL;
         foreach ($methods as $method) {
-          if($method["class"] != "PUnit"&&$method["name"] == "before"){
+            if($method["class"] != "PUnit"&&$method["name"] == "before"){
             $before = $method;
-          }
-          if($method["class"] != "PUnit"&&$method["name"] == "after"){
+            }
+            if($method["class"] != "PUnit"&&$method["name"] == "after"){
             $after = $method;
-          }
+            }
         }
-       	$error = array();
-       	$success = array();
-       	foreach ($methods as $method) {
-       		if($method["class"] != "PUnit"&&substr($method["name"],0,4) == "test"){
+            $error = array();
+            $success = array();
+            foreach ($methods as $method) {
+                if($method["class"] != "PUnit"&&substr($method["name"],0,4) == "test"){
             if($torun !== NULL){
-              if(!in_array($method["name"],$torun))
+                if(!in_array($method["name"],$torun))
                 continue;
             }
-       			try{
-       				if($method["type"] == "public"){
+                    try{
+                        if($method["type"] == "public"){
                 $log = new Logger();
                 $log->info("Run unit --->".$method["name"]);
                 if($before!=NULL)
-                  $this->$before["name"]();
-       					$this->$method["name"]();
-       					array_push($success,$method["name"]);
-       				}
-       			}catch(Exception $e){
-       				$error[$method["name"]]="".$e;
-       			}
-       		}
-       	}
-       	echo "\r\nPHP Unit-----------error"."\r\n";
-       	print_r($error);
+                    $this->$before["name"]();
+                            $this->$method["name"]();
+                            array_push($success,$method["name"]);
+                        }
+                    }catch(Exception $e){
+                        $error[$method["name"]]="".$e;
+                    }
+                }
+            }
+            echo "\r\nPHP Unit-----------error"."\r\n";
+            print_r($error);
         echo "PHP Unit-----------result"."\r\n";
         echo "total:".(count($success)+count($error)).",success:".count($success).",error:".count($error)."\r\n";
 
-	}
+    }
 }
 ?>
\ No newline at end of file

Spacing +18 added lines, -18 removed lines

@@ -1,17 +1,17 @@ 
 <?php
 require_once "../core/Logger.php";
-class PUnit{
-	function assertEquals($value,$expected,$info = NULL){
-		if($value != $expected){
+class PUnit {
+	function assertEquals($value, $expected, $info = NULL) {
+		if ($value != $expected) {
 			throw new Exception($info." expected ".$expected." but ".$value);
 		}
 	}
-	function run($torun = NULL){
+	function run($torun = NULL) {
    		$r = new ReflectionClass($this);
-    	foreach($r->getMethods() as $key=>$methodObj){
-      	  if($methodObj->isPrivate())
+    	foreach ($r->getMethods() as $key=>$methodObj) {
+      	  if ($methodObj->isPrivate())
            		 $methods[$key]['type'] = 'private';
-        	elseif($methodObj->isProtected())
+        	elseif ($methodObj->isProtected())
         	     $methods[$key]['type'] = 'protected';
       		else
            		 $methods[$key]['type'] = 'public';
@@ -21,32 +21,32 @@ 
         $before = NULL;
         $after = NULL;
         foreach ($methods as $method) {
-          if($method["class"] != "PUnit"&&$method["name"] == "before"){
+          if ($method["class"] != "PUnit" && $method["name"] == "before") {
             $before = $method;
           }
-          if($method["class"] != "PUnit"&&$method["name"] == "after"){
+          if ($method["class"] != "PUnit" && $method["name"] == "after") {
             $after = $method;
           }
         }
        	$error = array();
        	$success = array();
        	foreach ($methods as $method) {
-       		if($method["class"] != "PUnit"&&substr($method["name"],0,4) == "test"){
-            if($torun !== NULL){
-              if(!in_array($method["name"],$torun))
+       		if ($method["class"] != "PUnit" && substr($method["name"], 0, 4) == "test") {
+            if ($torun !== NULL) {
+              if (!in_array($method["name"], $torun))
                 continue;
             }
-       			try{
-       				if($method["type"] == "public"){
+       			try {
+       				if ($method["type"] == "public") {
                 $log = new Logger();
                 $log->info("Run unit --->".$method["name"]);
-                if($before!=NULL)
+                if ($before != NULL)
                   $this->$before["name"]();
        					$this->$method["name"]();
-       					array_push($success,$method["name"]);
+       					array_push($success, $method["name"]);
        				}
-       			}catch(Exception $e){
-       				$error[$method["name"]]="".$e;
+       			} catch (Exception $e) {
+       				$error[$method["name"]] = "".$e;
        			}
        		}
        	}

Braces +14 added lines, -11 removed lines

@@ -9,12 +9,13 @@ 
 	function run($torun = NULL){
    		$r = new ReflectionClass($this);
     	foreach($r->getMethods() as $key=>$methodObj){
-      	  if($methodObj->isPrivate())
-           		 $methods[$key]['type'] = 'private';
-        	elseif($methodObj->isProtected())
-        	     $methods[$key]['type'] = 'protected';
-      		else
-           		 $methods[$key]['type'] = 'public';
+      	  if($methodObj->isPrivate()) {
+      	             		 $methods[$key]['type'] = 'private';
+      	  } elseif($methodObj->isProtected()) {
+        	        	     $methods[$key]['type'] = 'protected';
+        	} else {
+      		           		 $methods[$key]['type'] = 'public';
+      		}
         	$methods[$key]['name'] = $methodObj->name;
        		$methods[$key]['class'] = $methodObj->class;
        	}
@@ -33,19 +34,21 @@ 
        	foreach ($methods as $method) {
        		if($method["class"] != "PUnit"&&substr($method["name"],0,4) == "test"){
             if($torun !== NULL){
-              if(!in_array($method["name"],$torun))
-                continue;
+              if(!in_array($method["name"],$torun)) {
+                              continue;
+              }
             }
        			try{
        				if($method["type"] == "public"){
                 $log = new Logger();
                 $log->info("Run unit --->".$method["name"]);
-                if($before!=NULL)
-                  $this->$before["name"]();
+                if($before!=NULL) {
+                                  $this->$before["name"]();
+                }
        					$this->$method["name"]();
        					array_push($success,$method["name"]);
        				}
-       			}catch(Exception $e){
+       			} catch(Exception $e){
        				$error[$method["name"]]="".$e;
        			}
        		}

src/service/ksyun/Ks3Service.php

Spacing +4 added lines, -4 removed lines

@@ -81,7 +81,7 @@ 
         if (empty($this->accessKeyID) || empty($this->accessKeySecret) || empty($this->endpoint)) {
             $this->getConfig();
         }
-        require_once(__DIR__ . "/bin/Ks3Client.class.php");
+        require_once(__DIR__."/bin/Ks3Client.class.php");
         $client = new Ks3Client($this->accessKeyID, $this->accessKeySecret, $this->endpoint);
         if (empty($this->bucket)) {
             $this->getConfig();
@@ -92,10 +92,10 @@ 
             "Key" => $object,
             "Content" => [
                 //要上传的内容
-                "content" => $content,//可以是文件路径或者resource,如果文件大于2G，请提供文件路径
+                "content" => $content, //可以是文件路径或者resource,如果文件大于2G，请提供文件路径
                 "seek_position" => 0//跳过文件开头?个字节
             ],
-            "ACL" => "public-read",//可以设置访问权限,合法值,private、public-read
+            "ACL" => "public-read", //可以设置访问权限,合法值,private、public-read
             "ObjectMeta" => [
                 //设置object的元数据,可以设置"Cache-Control","Content-Disposition","Content-Encoding","Content-Length","Content-MD5","Content-Type","Expires"。当设置了Content-Length时，最后上传的为从seek_position开始向后Content-Length个字节的内容。当设置了Content-MD5时，系统会在服务端进行md5校验。
                 "Content-Type" => "binay/ocet-stream"
@@ -108,7 +108,7 @@ 
         ];
         try {
             $client->putObjectByFile($args);
-            return config('dtapp.ksyun.ks3.url', '') . $object;
+            return config('dtapp.ksyun.ks3.url', '').$object;
         } catch (Ks3ServiceException $e) {
             return false;
         }

src/service/DingTalkService.php

Spacing +1 added lines, -1 removed lines

@@ -83,7 +83,7 @@
             $data['msgtype'] = $this->msg_type;
         }
         $result = HttpService::instance()
-            ->url("{$this->oapi_url}robot/send?access_token=" . $this->access_token)
+            ->url("{$this->oapi_url}robot/send?access_token=".$this->access_token)
             ->data($data)
             ->post()
             ->toArray();

src/service/upyun/UssService.php

Spacing +1 added lines, -1 removed lines

@@ -80,6 +80,6 @@
         $client = new Upyun($serviceConfig);
         $file = fopen($filePath, 'r');
         $client->write($object, $file);
-        return config('dtapp.upyun.uss.url', '') . $object;
+        return config('dtapp.upyun.uss.url', '').$object;
     }
 }

src/service/baidu/BosService.php

Spacing +1 added lines, -1 removed lines

@@ -96,6 +96,6 @@
             $this->getConfig();
         }
         $client->putObjectFromFile($this->bucket, $object, $filePath);
-        return config('dtapp.baidu.bos.url', '') . $object;
+        return config('dtapp.baidu.bos.url', '').$object;
     }
 }

src/service/QqWryService.php

Spacing +34 added lines, -34 removed lines

@@ -79,10 +79,10 @@ 
             throw new DtaException('请检查配置文件是否配置了IP数据库文件存放位置');
         }
         $this->fp = 0;
-        if (($this->fp = fopen($this->ipPath . 'qqwry.dat', 'rb')) !== false) {
+        if (($this->fp = fopen($this->ipPath.'qqwry.dat', 'rb')) !== false) {
             $this->firstIp = $this->getLong();
             $this->lastIp = $this->getLong();
-            $this->totalIp = ($this->lastIp - $this->firstIp) / 7;
+            $this->totalIp = ($this->lastIp-$this->firstIp)/7;
         }
         parent::__construct($app);
     }
@@ -163,49 +163,49 @@ 
                 // 如果数据文件没有被正确打开，则直接返回错误
                 throw new DtaException('数据库文件不存在!');
             }
-            $location['ip'] = $ip;   // 将输入的域名转化为IP地址
-            $ip = $this->packIp($location['ip']);   // 将输入的IP地址转化为可比较的IP地址
+            $location['ip'] = $ip; // 将输入的域名转化为IP地址
+            $ip = $this->packIp($location['ip']); // 将输入的IP地址转化为可比较的IP地址
             // 不合法的IP地址会被转化为255.255.255.255
             // 对分搜索
-            $l = 0;                         // 搜索的下边界
-            $u = $this->totalIp;            // 搜索的上边界
-            $findip = $this->lastIp;        // 如果没有找到就返回最后一条IP记录（QQWry.Dat的版本信息）
+            $l = 0; // 搜索的下边界
+            $u = $this->totalIp; // 搜索的上边界
+            $findip = $this->lastIp; // 如果没有找到就返回最后一条IP记录（QQWry.Dat的版本信息）
             while ($l <= $u) {              // 当上边界小于下边界时，查找失败
-                $i = floor(($l + $u) / 2);  // 计算近似中间记录
-                fseek($this->fp, $this->firstIp + $i * 7);
-                $beginip = strrev(fread($this->fp, 4));     // 获取中间记录的开始IP地址
+                $i = floor(($l+$u)/2); // 计算近似中间记录
+                fseek($this->fp, $this->firstIp+$i*7);
+                $beginip = strrev(fread($this->fp, 4)); // 获取中间记录的开始IP地址
                 // strrev函数在这里的作用是将little-endian的压缩IP地址转化为big-endian的格式
                 // 以便用于比较，后面相同。
                 if ($ip < $beginip) {       // 用户的IP小于中间记录的开始IP地址时
-                    $u = $i - 1;            // 将搜索的上边界修改为中间记录减一
-                } else {
+                    $u = $i-1; // 将搜索的上边界修改为中间记录减一
+                }else {
                     fseek($this->fp, $this->getLong3());
-                    $endip = strrev(fread($this->fp, 4));   // 获取中间记录的结束IP地址
+                    $endip = strrev(fread($this->fp, 4)); // 获取中间记录的结束IP地址
                     if ($ip > $endip) {     // 用户的IP大于中间记录的结束IP地址时
-                        $l = $i + 1;        // 将搜索的下边界修改为中间记录加一
-                    } else {                  // 用户的IP在中间记录的IP范围内时
-                        $findip = $this->firstIp + $i * 7;
-                        break;              // 则表示找到结果，退出循环
+                        $l = $i+1; // 将搜索的下边界修改为中间记录加一
+                    }else {                  // 用户的IP在中间记录的IP范围内时
+                        $findip = $this->firstIp+$i*7;
+                        break; // 则表示找到结果，退出循环
                     }
                 }
             }
             //获取查找到的IP地理位置信息
             fseek($this->fp, $findip);
-            $location['beginip'] = long2ip($this->getLong());   // 用户IP所在范围的开始地址
+            $location['beginip'] = long2ip($this->getLong()); // 用户IP所在范围的开始地址
             $offset = $this->getLong3();
             fseek($this->fp, $offset);
-            $location['endip'] = long2ip($this->getLong());     // 用户IP所在范围的结束地址
-            $byte = fread($this->fp, 1);    // 标志字节
+            $location['endip'] = long2ip($this->getLong()); // 用户IP所在范围的结束地址
+            $byte = fread($this->fp, 1); // 标志字节
             switch (ord($byte)) {
                 case 1:                     // 标志字节为1，表示国家和区域信息都被同时重定向
-                    $countryOffset = $this->getLong3();         // 重定向地址
+                    $countryOffset = $this->getLong3(); // 重定向地址
                     fseek($this->fp, $countryOffset);
-                    $byte = fread($this->fp, 1);    // 标志字节
+                    $byte = fread($this->fp, 1); // 标志字节
                     switch (ord($byte)) {
                         case 2:             // 标志字节为2，表示国家信息又被重定向
                             fseek($this->fp, $this->getLong3());
                             $location['all'] = $this->getString();
-                            fseek($this->fp, $countryOffset + 4);
+                            fseek($this->fp, $countryOffset+4);
                             $location['extend'] = $this->getExtendString();
                             break;
                         default:            // 否则，表示国家信息没有被重定向
@@ -217,7 +217,7 @@ 
                 case 2:                     // 标志字节为2，表示国家信息被重定向
                     fseek($this->fp, $this->getLong3());
                     $location['all'] = $this->getString();
-                    fseek($this->fp, $offset + 8);
+                    fseek($this->fp, $offset+8);
                     $location['extend'] = $this->getExtendString();
                     break;
                 default:                    // 否则，表示国家信息没有被重定向
@@ -275,14 +275,14 @@ 
             if (count($preg) == 4) {        //匹配 "浙江省杭州市"
                 $state = $preg[1] ? $preg[1] : ($preg[2] ? $preg[2] : $preg[3]);
                 $city = $preg[3];
-            } else if (count($preg) == 7) { //匹配 "浙江省杭州市江干区"
+            }else if (count($preg) == 7) { //匹配 "浙江省杭州市江干区"
                 $state = $preg[1] ? $preg[1] : ($preg[2] ? $preg[2] : $preg[3]);
                 $city = $preg[3];
                 $area = $preg[5];
-            } else if (count($preg) == 3) { //匹配 "香港"
+            }else if (count($preg) == 3) { //匹配 "香港"
                 $state = $preg[1] ? $preg[1] : $preg[2];
                 $city = $state;
-            } else if (count($preg) == 2) {  //匹配 "浙江省"
+            }else if (count($preg) == 2) {  //匹配 "浙江省"
                 $state = $preg[1] ? $preg[1] : $this->unknown;
             }
         }
@@ -307,7 +307,7 @@ 
     private function getLong3()
     {
         //将读取的little-endian编码的3个字节转化为长整型数
-        $result = unpack('Vlong', fread($this->fp, 3) . chr(0));
+        $result = unpack('Vlong', fread($this->fp, 3).chr(0));
         return $result['long'];
     }
 
@@ -334,7 +334,7 @@ 
     {
         $char = fread($this->fp, 1);
         while (ord($char) > 0) {        // 字符串按照C格式保存，以\0结束
-            $data .= $char;             // 将读取的字符连接到给定字符串之后
+            $data .= $char; // 将读取的字符连接到给定字符串之后
             $char = fread($this->fp, 1);
         }
         return $data;
@@ -346,7 +346,7 @@ 
      */
     private function getExtendString()
     {
-        $byte = fread($this->fp, 1);    // 标志字节
+        $byte = fread($this->fp, 1); // 标志字节
         switch (ord($byte)) {
             case 0:                     // 没有区域信息
                 $area = "";
@@ -393,7 +393,7 @@ 
                 }
                 $IPParts[$i] = str_pad(decHex($IPPart), 2, '0', STR_PAD_LEFT);
             }
-            return '0000:0000:0000:0000:0000:ffff:' . $IPParts[1] . $IPParts[2] . ':' . $IPParts[3] . $IPParts[4];
+            return '0000:0000:0000:0000:0000:ffff:'.$IPParts[1].$IPParts[2].':'.$IPParts[3].$IPParts[4];
         }
         return '';
     }
@@ -425,7 +425,7 @@ 
         $district['lng'] = '';
 
         if (!empty($province_name)) {
-            $json_province = json_decode(file_get_contents($this->ipPath . 'province.json'), true);
+            $json_province = json_decode(file_get_contents($this->ipPath.'province.json'), true);
             foreach ($json_province['rows'] as $key => $value) {
                 if ($value['name'] == $province_name) {
                     $province['name'] = $value['name'];
@@ -436,7 +436,7 @@ 
             }
         }
         if (!empty($city_name)) {
-            $json_city = json_decode(file_get_contents($this->ipPath . 'city.json'), true);
+            $json_city = json_decode(file_get_contents($this->ipPath.'city.json'), true);
             foreach ($json_city['rows'] as $key => $value) {
                 if ($value['name'] == $city_name) {
                     $city['name'] = $value['name'];
@@ -447,7 +447,7 @@ 
             }
         }
         if (!empty($district_name)) {
-            $json_district = json_decode(file_get_contents($this->ipPath . 'district.json'), true);
+            $json_district = json_decode(file_get_contents($this->ipPath.'district.json'), true);
             foreach ($json_district['rows'] as $key => $value) {
                 if ($value['name'] == $district_name) {
                     $district['name'] = $value['name'];

src/cache/Mysql.php

Spacing +2 added lines, -2 removed lines

@@ -135,7 +135,7 @@ 
         $result = Db::table($this->table)
             ->where('cache_name', $this->cache_name)
             ->update([
-                'cache_value' => $cache_value + $int
+                'cache_value' => $cache_value+$int
             ]);
         return $result ? true : false;
     }
@@ -153,7 +153,7 @@ 
         $result = Db::table($this->table)
             ->where('cache_name', $this->cache_name)
             ->update([
-                'cache_value' => $cache_value - $int
+                'cache_value' => $cache_value-$int
             ]);
         return $result ? true : false;
     }