GC0202 / ThinkLibrary

src/service/ksyun/bin/Ks3Client.class.php

Indentation +278 added lines, -278 removed lines

@@ -39,41 +39,41 @@ 
 require_once KS3_API_PATH.DIRECTORY_SEPARATOR."exceptions".DIRECTORY_SEPARATOR."Exceptions.php";
 
 if(function_exists('get_loaded_extensions')){
-	//检测curl扩展
-	$extensions = get_loaded_extensions();
-	if($extensions){
-		if(!in_array('curl', $extensions)){
-			throw new Ks3ClientException("please install curl extension");
-		}
-		if(!in_array('mbstring', $extensions)){
-			throw new Ks3ClientException("please install mbstring extension");
+    //检测curl扩展
+    $extensions = get_loaded_extensions();
+    if($extensions){
+        if(!in_array('curl', $extensions)){
+            throw new Ks3ClientException("please install curl extension");
+        }
+        if(!in_array('mbstring', $extensions)){
+            throw new Ks3ClientException("please install mbstring extension");
 			
-		}
-	}else{
-		throw new Ks3ClientException("please install extensions");
-	}
+        }
+    }else{
+        throw new Ks3ClientException("please install extensions");
+    }
 }else{
-	throw new Ks3ClientException();
+    throw new Ks3ClientException();
 }
 
 class Ks3Client{
-	private $accessKey;
-	private $secretKey;
-	private $endpoint;
-	private $log;
-	public function __construct($accessKey = NULL, $secretKey = NULL, $endpoint = NULL ){
-		$this->accessKey = $accessKey;
-		$this->secretKey = $secretKey;
+    private $accessKey;
+    private $secretKey;
+    private $endpoint;
+    private $log;
+    public function __construct($accessKey = NULL, $secretKey = NULL, $endpoint = NULL ){
+        $this->accessKey = $accessKey;
+        $this->secretKey = $secretKey;
 
-		if(empty($endpoint)){
-			throw new Ks3ClientException("must set endpoint, please see http://ks3.ksyun.com/doc/api/index.html Region part");
-		}
-		$this->endpoint = $endpoint;
+        if(empty($endpoint)){
+            throw new Ks3ClientException("must set endpoint, please see http://ks3.ksyun.com/doc/api/index.html Region part");
+        }
+        $this->endpoint = $endpoint;
 
-		$this->signers = array();
-		$this->log = new Logger();
-	}
-	/**
+        $this->signers = array();
+        $this->log = new Logger();
+    }
+    /**
 	方法列表:(具体使用请参考readme.md)
 	listBuckets,罗列bucket
 	deleteBucket，删除bucket
@@ -107,264 +107,264 @@ 
 	generatePresignedUrl，生成文件外链
 	putAdp,添加异步数据处理任务
 	getAdp,查询异步数据处理任务
-	*/
-	public function __call($method,$args=array()){
-		$holder = new MessageHolder();
+     */
+    public function __call($method,$args=array()){
+        $holder = new MessageHolder();
 
-		$holder->msg = "------------------Logging Start-------------------------\r\n";
-		$holder->msg .= "method->".$method." args->".serialize($args)."\r\n";
-		$ex = NULL;
-		try{
-			$result = $this->invoke($method,$args,$holder);
-		}catch(Exception $e){
-			$holder->msg.=$e."\r\n";
-			$ex = $e;
-		}
-		$holder->msg .= "------------------Logging End-------------------------\r\n";
-		$this->log->info($holder->msg);
-		if($ex !=NULL)
-			throw $ex;
-		return $result;
-	}
-	private function invoke($method,$args=array(),$holder,$location=NULL){
-		$api = API::$API[$method];
-		if(!$api){
-			throw new Ks3ClientException($method." Not Found API");
-		}
-		if(count($args) !== 0){
-			if(count($args)>1||!is_array($args[0])){
-				throw new Ks3ClientException("this method only needs one array argument");
-			}
-			$args = $args[0];
-		}
-		if(isset($api["redirect"])){
-			$api = API::$API[$api["redirect"]];
-		}
-		$request = new Ks3Request();
-		if(empty($args["Bucket"])){
-			if($api["needBucket"]){
-				throw new Ks3ClientException($method." this api need bucket");
-			}
-		}else{
-			$request->bucket = $args["Bucket"];
-		}
-		$position = "Key";
-		//position主要为queryadp接口用的
-		if(isset($api["objectPostion"])){
-			$position = $api["objectPostion"];
-		}
-		if(empty($args[$position])){
-			if($api["needObject"]){
-				throw new Ks3ClientException($method." this api need ".$position);
-			}
-		}else{
-			$key = $args[$position];
-			$preEncoding = mb_detect_encoding($key, array("ASCII","UTF-8","GB2312","GBK","BIG5"));
-			$holder->msg.="key encoding ".$preEncoding."\r\n";
-			if(strtolower($preEncoding) != "utf-8"){
-				$key = iconv($preEncoding, "UTF-8",$key);
-			}
-			$request->key = $key;
-		}
-		$method = $api["method"];
-		if($method == "Method"){
-			if(empty($args["Method"])){
-				$request->method="GET";
-			}else{
-				$request->method=$args["Method"];
-			}
-		}else{
-			$request->method=$api["method"];
-		}
-		if(KS3_API_USE_HTTPS)
-			$request->scheme="https://";
-		else
-			$request->scheme="http://";
-		$request->endpoint=$this->endpoint;
-		//add subresource
-		if(!empty($api["subResource"])){
-			$request->subResource=$api["subResource"];
-		}
-		//add query params
-		if(isset($api["queryParams"] )){ 
-			foreach ($api["queryParams"] as $key => $value) {
-				$required = FALSE;
-				if(substr($value,0,1)==="!"){
-					$required = TRUE;
-					$value=substr($value,1);
-				}
-				$index = explode("->",$value);
-				$curIndexArg = $args;
-				$add = TRUE;
-				$curkey = "";
-				foreach ($index as $key1 => $value1) {
-					if(!isset($curIndexArg[$value1])&&$value1 !== "*"){
-						$add = FALSE;
-					}else{
-						$curkey = $value1;
-						//星号表示所有,按照暂时的业务，默认星号后面就没了
-						if($curkey == "*"){
-							foreach ($curIndexArg as $queryK => $queryV) {
-								if(!is_array($queryV)){
-									$request->addQueryParams($queryK,$queryV);
-								}
-							}
-							$add = FALSE;
-							$required = FALSE;
-							break;
-						}else{
-							$curIndexArg = $curIndexArg[$value1];
-						}
-					}
-				}
-				if(!empty($curIndexArg)&&$add){
-					$request->addQueryParams($curkey,$curIndexArg);
-					continue;
-				}
-				if($required)
-					throw new Ks3ClientException($method." param ".$value." is required");
-			}
-		}
-		if(isset($api["body"])){
-			if(isset($api["body"]["builder"])){
-				$builderName = $api["body"]["builder"];
-				$builder = new $builderName();
-				$request->body = $builder->build($args);
-			}else if(isset($api["body"]["position"])){
-				$position = $api["body"]["position"];
-				$index = explode("->",$position);
-				$curIndexArg = $args;
-				$add = TRUE;
-				$curkey = "";
-				foreach ($index as $key1 => $value1) {
-					if(!isset($curIndexArg[$value1])){
-						$add = FALSE;
-					}else{
-						$curIndexArg = $curIndexArg[$value1];
-						$curkey = $value1;
-					}
-				}
-				if(!empty($curIndexArg)&&$add){
-					$request->body=$curIndexArg;
-				}
-			}
-		}
+        $holder->msg = "------------------Logging Start-------------------------\r\n";
+        $holder->msg .= "method->".$method." args->".serialize($args)."\r\n";
+        $ex = NULL;
+        try{
+            $result = $this->invoke($method,$args,$holder);
+        }catch(Exception $e){
+            $holder->msg.=$e."\r\n";
+            $ex = $e;
+        }
+        $holder->msg .= "------------------Logging End-------------------------\r\n";
+        $this->log->info($holder->msg);
+        if($ex !=NULL)
+            throw $ex;
+        return $result;
+    }
+    private function invoke($method,$args=array(),$holder,$location=NULL){
+        $api = API::$API[$method];
+        if(!$api){
+            throw new Ks3ClientException($method." Not Found API");
+        }
+        if(count($args) !== 0){
+            if(count($args)>1||!is_array($args[0])){
+                throw new Ks3ClientException("this method only needs one array argument");
+            }
+            $args = $args[0];
+        }
+        if(isset($api["redirect"])){
+            $api = API::$API[$api["redirect"]];
+        }
+        $request = new Ks3Request();
+        if(empty($args["Bucket"])){
+            if($api["needBucket"]){
+                throw new Ks3ClientException($method." this api need bucket");
+            }
+        }else{
+            $request->bucket = $args["Bucket"];
+        }
+        $position = "Key";
+        //position主要为queryadp接口用的
+        if(isset($api["objectPostion"])){
+            $position = $api["objectPostion"];
+        }
+        if(empty($args[$position])){
+            if($api["needObject"]){
+                throw new Ks3ClientException($method." this api need ".$position);
+            }
+        }else{
+            $key = $args[$position];
+            $preEncoding = mb_detect_encoding($key, array("ASCII","UTF-8","GB2312","GBK","BIG5"));
+            $holder->msg.="key encoding ".$preEncoding."\r\n";
+            if(strtolower($preEncoding) != "utf-8"){
+                $key = iconv($preEncoding, "UTF-8",$key);
+            }
+            $request->key = $key;
+        }
+        $method = $api["method"];
+        if($method == "Method"){
+            if(empty($args["Method"])){
+                $request->method="GET";
+            }else{
+                $request->method=$args["Method"];
+            }
+        }else{
+            $request->method=$api["method"];
+        }
+        if(KS3_API_USE_HTTPS)
+            $request->scheme="https://";
+        else
+            $request->scheme="http://";
+        $request->endpoint=$this->endpoint;
+        //add subresource
+        if(!empty($api["subResource"])){
+            $request->subResource=$api["subResource"];
+        }
+        //add query params
+        if(isset($api["queryParams"] )){ 
+            foreach ($api["queryParams"] as $key => $value) {
+                $required = FALSE;
+                if(substr($value,0,1)==="!"){
+                    $required = TRUE;
+                    $value=substr($value,1);
+                }
+                $index = explode("->",$value);
+                $curIndexArg = $args;
+                $add = TRUE;
+                $curkey = "";
+                foreach ($index as $key1 => $value1) {
+                    if(!isset($curIndexArg[$value1])&&$value1 !== "*"){
+                        $add = FALSE;
+                    }else{
+                        $curkey = $value1;
+                        //星号表示所有,按照暂时的业务，默认星号后面就没了
+                        if($curkey == "*"){
+                            foreach ($curIndexArg as $queryK => $queryV) {
+                                if(!is_array($queryV)){
+                                    $request->addQueryParams($queryK,$queryV);
+                                }
+                            }
+                            $add = FALSE;
+                            $required = FALSE;
+                            break;
+                        }else{
+                            $curIndexArg = $curIndexArg[$value1];
+                        }
+                    }
+                }
+                if(!empty($curIndexArg)&&$add){
+                    $request->addQueryParams($curkey,$curIndexArg);
+                    continue;
+                }
+                if($required)
+                    throw new Ks3ClientException($method." param ".$value." is required");
+            }
+        }
+        if(isset($api["body"])){
+            if(isset($api["body"]["builder"])){
+                $builderName = $api["body"]["builder"];
+                $builder = new $builderName();
+                $request->body = $builder->build($args);
+            }else if(isset($api["body"]["position"])){
+                $position = $api["body"]["position"];
+                $index = explode("->",$position);
+                $curIndexArg = $args;
+                $add = TRUE;
+                $curkey = "";
+                foreach ($index as $key1 => $value1) {
+                    if(!isset($curIndexArg[$value1])){
+                        $add = FALSE;
+                    }else{
+                        $curIndexArg = $curIndexArg[$value1];
+                        $curkey = $value1;
+                    }
+                }
+                if(!empty($curIndexArg)&&$add){
+                    $request->body=$curIndexArg;
+                }
+            }
+        }
 		
-		//add ext headers
-		//TODO
-		//sign request
-		$signer = NULL;
-		if(isset($api["signer"])){
-			$signers = explode("->",$api["signer"]);
-			foreach ($signers as $key => $value) {
-				$signer = new $value();
-				$log = $signer->sign($request,array("accessKey"=>$this->accessKey,"secretKey"=>$this->secretKey,"args"=>$args));
-				if(!empty($log)){
-					$holder->msg.=$log."\r\n";
-				}
-			}
-		}
+        //add ext headers
+        //TODO
+        //sign request
+        $signer = NULL;
+        if(isset($api["signer"])){
+            $signers = explode("->",$api["signer"]);
+            foreach ($signers as $key => $value) {
+                $signer = new $value();
+                $log = $signer->sign($request,array("accessKey"=>$this->accessKey,"secretKey"=>$this->secretKey,"args"=>$args));
+                if(!empty($log)){
+                    $holder->msg.=$log."\r\n";
+                }
+            }
+        }
 
-		if($signer===NULL||!($signer instanceof QueryAuthSigner)){
-			$url = $request->toUrl($this->endpoint);
-			if($location!=NULL)
-				$url = $location;
-			$httpRequest = new RequestCore($url);
-			if(KS3_API_DEBUG_MODE===TRUE)
-				$httpRequest->debug_mode=TRUE;
-			$httpRequest->set_method($request->method);
-			foreach ($request->headers as $key => $value) {
-				$httpRequest->add_header($key,$value);
-			}
-			$httpRequest->request_body=$request->body;
+        if($signer===NULL||!($signer instanceof QueryAuthSigner)){
+            $url = $request->toUrl($this->endpoint);
+            if($location!=NULL)
+                $url = $location;
+            $httpRequest = new RequestCore($url);
+            if(KS3_API_DEBUG_MODE===TRUE)
+                $httpRequest->debug_mode=TRUE;
+            $httpRequest->set_method($request->method);
+            foreach ($request->headers as $key => $value) {
+                $httpRequest->add_header($key,$value);
+            }
+            $httpRequest->request_body=$request->body;
 
-			if(isset($args["writeCallBack"])){
-				$httpRequest->register_streaming_write_callback($args["writeCallBack"]);
-			}
-			if(isset($args["readCallBack"])){
-				$httpRequest->register_streaming_read_callback($args["readCallBack"]);
-			}
+            if(isset($args["writeCallBack"])){
+                $httpRequest->register_streaming_write_callback($args["writeCallBack"]);
+            }
+            if(isset($args["readCallBack"])){
+                $httpRequest->register_streaming_read_callback($args["readCallBack"]);
+            }
 
-			$read_stream = $request->read_stream;
-			$read_length = $request->getHeader(Headers::$ContentLength);
-			$seek_position = $request->seek_position;
-			if(isset($read_stream))
-			{
-				$httpRequest->set_read_stream($read_stream,$read_length);
-				$httpRequest->set_seek_position($seek_position);
-				$httpRequest->remove_header(Headers::$ContentLength);
-			}
-			$write_stream = $request->write_stream;
-			if(isset($write_stream)){
-				$httpRequest->set_write_stream($write_stream);
-			}
+            $read_stream = $request->read_stream;
+            $read_length = $request->getHeader(Headers::$ContentLength);
+            $seek_position = $request->seek_position;
+            if(isset($read_stream))
+            {
+                $httpRequest->set_read_stream($read_stream,$read_length);
+                $httpRequest->set_seek_position($seek_position);
+                $httpRequest->remove_header(Headers::$ContentLength);
+            }
+            $write_stream = $request->write_stream;
+            if(isset($write_stream)){
+                $httpRequest->set_write_stream($write_stream);
+            }
 
-			$holder->msg.="request url->".serialize($httpRequest->request_url)."\r\n";
-			$holder->msg.="request headers->".serialize($httpRequest->request_headers)."\r\n";
-			$holder->msg.="request body->".$httpRequest->request_body."\r\n";
-			$holder->msg.="request read stream length->".$read_length."\r\n";
-			$holder->msg.="request read stream seek position->".$seek_position."\r\n";
-			$httpRequest->send_request();
-			//print_r($httpRequest);
-			$body = $httpRequest->get_response_body ();	
-			$data =  new ResponseCore ( $httpRequest->get_response_header() , Utils::replaceNS2($body), $httpRequest->get_response_code () );
+            $holder->msg.="request url->".serialize($httpRequest->request_url)."\r\n";
+            $holder->msg.="request headers->".serialize($httpRequest->request_headers)."\r\n";
+            $holder->msg.="request body->".$httpRequest->request_body."\r\n";
+            $holder->msg.="request read stream length->".$read_length."\r\n";
+            $holder->msg.="request read stream seek position->".$seek_position."\r\n";
+            $httpRequest->send_request();
+            //print_r($httpRequest);
+            $body = $httpRequest->get_response_body ();	
+            $data =  new ResponseCore ( $httpRequest->get_response_header() , Utils::replaceNS2($body), $httpRequest->get_response_code () );
 
-			if($data->status == 307){
-				$respHeaders = $httpRequest->get_response_header();
-				$location = $respHeaders["location"];
-				if(substr($location,0,4) == "http"){
-					$holder->msg.="response code->".$httpRequest->get_response_code ()."\r\n";
-					$holder->msg.="response headers->".serialize($httpRequest->get_response_header())."\r\n";
-					$holder->msg.="response body->".$body."\r\n";
-					$holder->msg.="retry request to ".$location."\r\n";
-					//array($args)详见invoke开头
-					return $this->invoke($method,array($args),$holder,$location);
-				}
-			}
-			$holder->msg.="response code->".$httpRequest->get_response_code ()."\r\n";
-			$holder->msg.="response headers->".serialize($httpRequest->get_response_header())."\r\n";
-			$holder->msg.="response body->".$body."\r\n";
-			$handlers = explode("->",$api["handler"]);
-			foreach ($handlers as $key => $value) {
-				$handler = new $value();
-				$data = $handler->handle($data);
-			}
-			return $data;
-		}else{
-			$url = $request->toUrl($this->endpoint);
-			$holder->msg.=$url."\r\n";
-			return $url;
-		}
-	}
-	//用于生产表单上传时的签名信息
-	public function postObject($bucket ,$postFormData=array(),$unknowValueFormFiled=array(),$filename=NULL,$expire=18000){
-		$policy = array();
+            if($data->status == 307){
+                $respHeaders = $httpRequest->get_response_header();
+                $location = $respHeaders["location"];
+                if(substr($location,0,4) == "http"){
+                    $holder->msg.="response code->".$httpRequest->get_response_code ()."\r\n";
+                    $holder->msg.="response headers->".serialize($httpRequest->get_response_header())."\r\n";
+                    $holder->msg.="response body->".$body."\r\n";
+                    $holder->msg.="retry request to ".$location."\r\n";
+                    //array($args)详见invoke开头
+                    return $this->invoke($method,array($args),$holder,$location);
+                }
+            }
+            $holder->msg.="response code->".$httpRequest->get_response_code ()."\r\n";
+            $holder->msg.="response headers->".serialize($httpRequest->get_response_header())."\r\n";
+            $holder->msg.="response body->".$body."\r\n";
+            $handlers = explode("->",$api["handler"]);
+            foreach ($handlers as $key => $value) {
+                $handler = new $value();
+                $data = $handler->handle($data);
+            }
+            return $data;
+        }else{
+            $url = $request->toUrl($this->endpoint);
+            $holder->msg.=$url."\r\n";
+            return $url;
+        }
+    }
+    //用于生产表单上传时的签名信息
+    public function postObject($bucket ,$postFormData=array(),$unknowValueFormFiled=array(),$filename=NULL,$expire=18000){
+        $policy = array();
 
-		$expireTime = Utils::iso8601(time()+$expire);
-		$policy["expiration"] = $expireTime;
-		$postFormData["bucket"]=$bucket;
-		$conditions = array();
-		foreach ($postFormData as $key => $value) {
-			$condition = array();
-			$condition[$key] = str_replace("\${filename}",$filename, $value);
-			array_push($conditions,$condition);
-		}
-		foreach ($unknowValueFormFiled as $key => $value) {
-			$condition = array();
-			array_push($condition,"starts-with");
-			array_push($condition,"\$".$value);
-			array_push($condition,"");
-			array_push($conditions,$condition);
-		}
-		$policy["conditions"] = $conditions;
-		$json = json_encode($policy);
-		$signature = base64_encode(hash_hmac('sha1', base64_encode($json), $this->secretKey, true));
-		$result = array();
-		$result["Policy"] = base64_encode($json);
-		$result["Signature"] = $signature;
-		$result["KSSAccessKeyId"] = $this->accessKey;
-		return $result;
-	}
+        $expireTime = Utils::iso8601(time()+$expire);
+        $policy["expiration"] = $expireTime;
+        $postFormData["bucket"]=$bucket;
+        $conditions = array();
+        foreach ($postFormData as $key => $value) {
+            $condition = array();
+            $condition[$key] = str_replace("\${filename}",$filename, $value);
+            array_push($conditions,$condition);
+        }
+        foreach ($unknowValueFormFiled as $key => $value) {
+            $condition = array();
+            array_push($condition,"starts-with");
+            array_push($condition,"\$".$value);
+            array_push($condition,"");
+            array_push($conditions,$condition);
+        }
+        $policy["conditions"] = $conditions;
+        $json = json_encode($policy);
+        $signature = base64_encode(hash_hmac('sha1', base64_encode($json), $this->secretKey, true));
+        $result = array();
+        $result["Policy"] = base64_encode($json);
+        $result["Signature"] = $signature;
+        $result["KSSAccessKeyId"] = $this->accessKey;
+        return $result;
+    }
 }
 
 ?>

Spacing +123 added lines, -123 removed lines

@@ -4,28 +4,28 @@ 
 date_default_timezone_set('Asia/Shanghai');
 
 //检测API路径
-if(!defined("KS3_API_PATH"))
+if (!defined("KS3_API_PATH"))
 define("KS3_API_PATH", dirname(__FILE__));
 //是否使用VHOST
-if(!defined("KS3_API_VHOST"))
-define("KS3_API_VHOST",TRUE);
+if (!defined("KS3_API_VHOST"))
+define("KS3_API_VHOST", TRUE);
 //是否开启日志(写入日志文件)
-if(!defined("KS3_API_LOG"))
-define("KS3_API_LOG",TRUE);
+if (!defined("KS3_API_LOG"))
+define("KS3_API_LOG", TRUE);
 //是否显示日志(直接输出日志)
-if(!defined("KS3_API_DISPLAY_LOG"))
+if (!defined("KS3_API_DISPLAY_LOG"))
 define("KS3_API_DISPLAY_LOG", TRUE);
 //定义日志目录(默认是该项目log下)
-if(!defined("KS3_API_LOG_PATH"))
-define("KS3_API_LOG_PATH","");
+if (!defined("KS3_API_LOG_PATH"))
+define("KS3_API_LOG_PATH", "");
 //是否使用HTTPS
-if(!defined("KS3_API_USE_HTTPS"))
-define("KS3_API_USE_HTTPS",FALSE);
+if (!defined("KS3_API_USE_HTTPS"))
+define("KS3_API_USE_HTTPS", FALSE);
 //是否开启curl debug模式
-if(!defined("KS3_API_DEBUG_MODE"))
-define("KS3_API_DEBUG_MODE",FALSE);
-define("KS3_API_Author","lijunwei@kingsoft.com");
-define("KS3_API_Version","1.2");
+if (!defined("KS3_API_DEBUG_MODE"))
+define("KS3_API_DEBUG_MODE", FALSE);
+define("KS3_API_Author", "lijunwei@kingsoft.com");
+define("KS3_API_Version", "1.2");
 
 require_once KS3_API_PATH.DIRECTORY_SEPARATOR."config".DIRECTORY_SEPARATOR."Consts.php";
 require_once KS3_API_PATH.DIRECTORY_SEPARATOR."core".DIRECTORY_SEPARATOR."API.php";
@@ -38,34 +38,34 @@ 
 require_once KS3_API_PATH.DIRECTORY_SEPARATOR."lib".DIRECTORY_SEPARATOR."RequestCore.class.php";
 require_once KS3_API_PATH.DIRECTORY_SEPARATOR."exceptions".DIRECTORY_SEPARATOR."Exceptions.php";
 
-if(function_exists('get_loaded_extensions')){
+if (function_exists('get_loaded_extensions')) {
 	//检测curl扩展
 	$extensions = get_loaded_extensions();
-	if($extensions){
-		if(!in_array('curl', $extensions)){
+	if ($extensions) {
+		if (!in_array('curl', $extensions)) {
 			throw new Ks3ClientException("please install curl extension");
 		}
-		if(!in_array('mbstring', $extensions)){
+		if (!in_array('mbstring', $extensions)) {
 			throw new Ks3ClientException("please install mbstring extension");
 			
 		}
-	}else{
+	}else {
 		throw new Ks3ClientException("please install extensions");
 	}
-}else{
+}else {
 	throw new Ks3ClientException();
 }
 
-class Ks3Client{
+class Ks3Client {
 	private $accessKey;
 	private $secretKey;
 	private $endpoint;
 	private $log;
-	public function __construct($accessKey = NULL, $secretKey = NULL, $endpoint = NULL ){
+	public function __construct($accessKey = NULL, $secretKey = NULL, $endpoint = NULL) {
 		$this->accessKey = $accessKey;
 		$this->secretKey = $secretKey;
 
-		if(empty($endpoint)){
+		if (empty($endpoint)) {
 			throw new Ks3ClientException("must set endpoint, please see http://ks3.ksyun.com/doc/api/index.html Region part");
 		}
 		$this->endpoint = $endpoint;
@@ -108,144 +108,144 @@ 
 	putAdp,添加异步数据处理任务
 	getAdp,查询异步数据处理任务
 	*/
-	public function __call($method,$args=array()){
+	public function __call($method, $args = array()) {
 		$holder = new MessageHolder();
 
 		$holder->msg = "------------------Logging Start-------------------------\r\n";
 		$holder->msg .= "method->".$method." args->".serialize($args)."\r\n";
 		$ex = NULL;
-		try{
-			$result = $this->invoke($method,$args,$holder);
-		}catch(Exception $e){
-			$holder->msg.=$e."\r\n";
+		try {
+			$result = $this->invoke($method, $args, $holder);
+		} catch (Exception $e) {
+			$holder->msg .= $e."\r\n";
 			$ex = $e;
 		}
 		$holder->msg .= "------------------Logging End-------------------------\r\n";
 		$this->log->info($holder->msg);
-		if($ex !=NULL)
+		if ($ex != NULL)
 			throw $ex;
 		return $result;
 	}
-	private function invoke($method,$args=array(),$holder,$location=NULL){
+	private function invoke($method, $args = array(), $holder, $location = NULL) {
 		$api = API::$API[$method];
-		if(!$api){
+		if (!$api) {
 			throw new Ks3ClientException($method." Not Found API");
 		}
-		if(count($args) !== 0){
-			if(count($args)>1||!is_array($args[0])){
+		if (count($args) !== 0) {
+			if (count($args) > 1 || !is_array($args[0])) {
 				throw new Ks3ClientException("this method only needs one array argument");
 			}
 			$args = $args[0];
 		}
-		if(isset($api["redirect"])){
+		if (isset($api["redirect"])) {
 			$api = API::$API[$api["redirect"]];
 		}
 		$request = new Ks3Request();
-		if(empty($args["Bucket"])){
-			if($api["needBucket"]){
+		if (empty($args["Bucket"])) {
+			if ($api["needBucket"]) {
 				throw new Ks3ClientException($method." this api need bucket");
 			}
-		}else{
+		}else {
 			$request->bucket = $args["Bucket"];
 		}
 		$position = "Key";
 		//position主要为queryadp接口用的
-		if(isset($api["objectPostion"])){
+		if (isset($api["objectPostion"])) {
 			$position = $api["objectPostion"];
 		}
-		if(empty($args[$position])){
-			if($api["needObject"]){
+		if (empty($args[$position])) {
+			if ($api["needObject"]) {
 				throw new Ks3ClientException($method." this api need ".$position);
 			}
-		}else{
+		}else {
 			$key = $args[$position];
-			$preEncoding = mb_detect_encoding($key, array("ASCII","UTF-8","GB2312","GBK","BIG5"));
-			$holder->msg.="key encoding ".$preEncoding."\r\n";
-			if(strtolower($preEncoding) != "utf-8"){
-				$key = iconv($preEncoding, "UTF-8",$key);
+			$preEncoding = mb_detect_encoding($key, array("ASCII", "UTF-8", "GB2312", "GBK", "BIG5"));
+			$holder->msg .= "key encoding ".$preEncoding."\r\n";
+			if (strtolower($preEncoding) != "utf-8") {
+				$key = iconv($preEncoding, "UTF-8", $key);
 			}
 			$request->key = $key;
 		}
 		$method = $api["method"];
-		if($method == "Method"){
-			if(empty($args["Method"])){
-				$request->method="GET";
-			}else{
-				$request->method=$args["Method"];
+		if ($method == "Method") {
+			if (empty($args["Method"])) {
+				$request->method = "GET";
+			}else {
+				$request->method = $args["Method"];
 			}
-		}else{
-			$request->method=$api["method"];
+		}else {
+			$request->method = $api["method"];
 		}
-		if(KS3_API_USE_HTTPS)
-			$request->scheme="https://";
+		if (KS3_API_USE_HTTPS)
+			$request->scheme = "https://";
 		else
-			$request->scheme="http://";
-		$request->endpoint=$this->endpoint;
+			$request->scheme = "http://";
+		$request->endpoint = $this->endpoint;
 		//add subresource
-		if(!empty($api["subResource"])){
-			$request->subResource=$api["subResource"];
+		if (!empty($api["subResource"])) {
+			$request->subResource = $api["subResource"];
 		}
 		//add query params
-		if(isset($api["queryParams"] )){ 
+		if (isset($api["queryParams"])) { 
 			foreach ($api["queryParams"] as $key => $value) {
 				$required = FALSE;
-				if(substr($value,0,1)==="!"){
+				if (substr($value, 0, 1) === "!") {
 					$required = TRUE;
-					$value=substr($value,1);
+					$value = substr($value, 1);
 				}
-				$index = explode("->",$value);
+				$index = explode("->", $value);
 				$curIndexArg = $args;
 				$add = TRUE;
 				$curkey = "";
 				foreach ($index as $key1 => $value1) {
-					if(!isset($curIndexArg[$value1])&&$value1 !== "*"){
+					if (!isset($curIndexArg[$value1]) && $value1 !== "*") {
 						$add = FALSE;
-					}else{
+					}else {
 						$curkey = $value1;
 						//星号表示所有,按照暂时的业务，默认星号后面就没了
-						if($curkey == "*"){
+						if ($curkey == "*") {
 							foreach ($curIndexArg as $queryK => $queryV) {
-								if(!is_array($queryV)){
-									$request->addQueryParams($queryK,$queryV);
+								if (!is_array($queryV)) {
+									$request->addQueryParams($queryK, $queryV);
 								}
 							}
 							$add = FALSE;
 							$required = FALSE;
 							break;
-						}else{
+						}else {
 							$curIndexArg = $curIndexArg[$value1];
 						}
 					}
 				}
-				if(!empty($curIndexArg)&&$add){
-					$request->addQueryParams($curkey,$curIndexArg);
+				if (!empty($curIndexArg) && $add) {
+					$request->addQueryParams($curkey, $curIndexArg);
 					continue;
 				}
-				if($required)
+				if ($required)
 					throw new Ks3ClientException($method." param ".$value." is required");
 			}
 		}
-		if(isset($api["body"])){
-			if(isset($api["body"]["builder"])){
+		if (isset($api["body"])) {
+			if (isset($api["body"]["builder"])) {
 				$builderName = $api["body"]["builder"];
 				$builder = new $builderName();
 				$request->body = $builder->build($args);
-			}else if(isset($api["body"]["position"])){
+			}else if (isset($api["body"]["position"])) {
 				$position = $api["body"]["position"];
-				$index = explode("->",$position);
+				$index = explode("->", $position);
 				$curIndexArg = $args;
 				$add = TRUE;
 				$curkey = "";
 				foreach ($index as $key1 => $value1) {
-					if(!isset($curIndexArg[$value1])){
+					if (!isset($curIndexArg[$value1])) {
 						$add = FALSE;
-					}else{
+					}else {
 						$curIndexArg = $curIndexArg[$value1];
 						$curkey = $value1;
 					}
 				}
-				if(!empty($curIndexArg)&&$add){
-					$request->body=$curIndexArg;
+				if (!empty($curIndexArg) && $add) {
+					$request->body = $curIndexArg;
 				}
 			}
 		}
@@ -254,107 +254,107 @@ 
 		//TODO
 		//sign request
 		$signer = NULL;
-		if(isset($api["signer"])){
-			$signers = explode("->",$api["signer"]);
+		if (isset($api["signer"])) {
+			$signers = explode("->", $api["signer"]);
 			foreach ($signers as $key => $value) {
 				$signer = new $value();
-				$log = $signer->sign($request,array("accessKey"=>$this->accessKey,"secretKey"=>$this->secretKey,"args"=>$args));
-				if(!empty($log)){
-					$holder->msg.=$log."\r\n";
+				$log = $signer->sign($request, array("accessKey"=>$this->accessKey, "secretKey"=>$this->secretKey, "args"=>$args));
+				if (!empty($log)) {
+					$holder->msg .= $log."\r\n";
 				}
 			}
 		}
 
-		if($signer===NULL||!($signer instanceof QueryAuthSigner)){
+		if ($signer === NULL || !($signer instanceof QueryAuthSigner)) {
 			$url = $request->toUrl($this->endpoint);
-			if($location!=NULL)
+			if ($location != NULL)
 				$url = $location;
 			$httpRequest = new RequestCore($url);
-			if(KS3_API_DEBUG_MODE===TRUE)
-				$httpRequest->debug_mode=TRUE;
+			if (KS3_API_DEBUG_MODE === TRUE)
+				$httpRequest->debug_mode = TRUE;
 			$httpRequest->set_method($request->method);
 			foreach ($request->headers as $key => $value) {
-				$httpRequest->add_header($key,$value);
+				$httpRequest->add_header($key, $value);
 			}
-			$httpRequest->request_body=$request->body;
+			$httpRequest->request_body = $request->body;
 
-			if(isset($args["writeCallBack"])){
+			if (isset($args["writeCallBack"])) {
 				$httpRequest->register_streaming_write_callback($args["writeCallBack"]);
 			}
-			if(isset($args["readCallBack"])){
+			if (isset($args["readCallBack"])) {
 				$httpRequest->register_streaming_read_callback($args["readCallBack"]);
 			}
 
 			$read_stream = $request->read_stream;
 			$read_length = $request->getHeader(Headers::$ContentLength);
 			$seek_position = $request->seek_position;
-			if(isset($read_stream))
+			if (isset($read_stream))
 			{
-				$httpRequest->set_read_stream($read_stream,$read_length);
+				$httpRequest->set_read_stream($read_stream, $read_length);
 				$httpRequest->set_seek_position($seek_position);
 				$httpRequest->remove_header(Headers::$ContentLength);
 			}
 			$write_stream = $request->write_stream;
-			if(isset($write_stream)){
+			if (isset($write_stream)) {
 				$httpRequest->set_write_stream($write_stream);
 			}
 
-			$holder->msg.="request url->".serialize($httpRequest->request_url)."\r\n";
-			$holder->msg.="request headers->".serialize($httpRequest->request_headers)."\r\n";
-			$holder->msg.="request body->".$httpRequest->request_body."\r\n";
-			$holder->msg.="request read stream length->".$read_length."\r\n";
-			$holder->msg.="request read stream seek position->".$seek_position."\r\n";
+			$holder->msg .= "request url->".serialize($httpRequest->request_url)."\r\n";
+			$holder->msg .= "request headers->".serialize($httpRequest->request_headers)."\r\n";
+			$holder->msg .= "request body->".$httpRequest->request_body."\r\n";
+			$holder->msg .= "request read stream length->".$read_length."\r\n";
+			$holder->msg .= "request read stream seek position->".$seek_position."\r\n";
 			$httpRequest->send_request();
 			//print_r($httpRequest);
-			$body = $httpRequest->get_response_body ();	
-			$data =  new ResponseCore ( $httpRequest->get_response_header() , Utils::replaceNS2($body), $httpRequest->get_response_code () );
+			$body = $httpRequest->get_response_body();	
+			$data = new ResponseCore($httpRequest->get_response_header(), Utils::replaceNS2($body), $httpRequest->get_response_code());
 
-			if($data->status == 307){
+			if ($data->status == 307) {
 				$respHeaders = $httpRequest->get_response_header();
 				$location = $respHeaders["location"];
-				if(substr($location,0,4) == "http"){
-					$holder->msg.="response code->".$httpRequest->get_response_code ()."\r\n";
-					$holder->msg.="response headers->".serialize($httpRequest->get_response_header())."\r\n";
-					$holder->msg.="response body->".$body."\r\n";
-					$holder->msg.="retry request to ".$location."\r\n";
+				if (substr($location, 0, 4) == "http") {
+					$holder->msg .= "response code->".$httpRequest->get_response_code()."\r\n";
+					$holder->msg .= "response headers->".serialize($httpRequest->get_response_header())."\r\n";
+					$holder->msg .= "response body->".$body."\r\n";
+					$holder->msg .= "retry request to ".$location."\r\n";
 					//array($args)详见invoke开头
-					return $this->invoke($method,array($args),$holder,$location);
+					return $this->invoke($method, array($args), $holder, $location);
 				}
 			}
-			$holder->msg.="response code->".$httpRequest->get_response_code ()."\r\n";
-			$holder->msg.="response headers->".serialize($httpRequest->get_response_header())."\r\n";
-			$holder->msg.="response body->".$body."\r\n";
-			$handlers = explode("->",$api["handler"]);
+			$holder->msg .= "response code->".$httpRequest->get_response_code()."\r\n";
+			$holder->msg .= "response headers->".serialize($httpRequest->get_response_header())."\r\n";
+			$holder->msg .= "response body->".$body."\r\n";
+			$handlers = explode("->", $api["handler"]);
 			foreach ($handlers as $key => $value) {
 				$handler = new $value();
 				$data = $handler->handle($data);
 			}
 			return $data;
-		}else{
+		}else {
 			$url = $request->toUrl($this->endpoint);
-			$holder->msg.=$url."\r\n";
+			$holder->msg .= $url."\r\n";
 			return $url;
 		}
 	}
 	//用于生产表单上传时的签名信息
-	public function postObject($bucket ,$postFormData=array(),$unknowValueFormFiled=array(),$filename=NULL,$expire=18000){
+	public function postObject($bucket, $postFormData = array(), $unknowValueFormFiled = array(), $filename = NULL, $expire = 18000) {
 		$policy = array();
 
 		$expireTime = Utils::iso8601(time()+$expire);
 		$policy["expiration"] = $expireTime;
-		$postFormData["bucket"]=$bucket;
+		$postFormData["bucket"] = $bucket;
 		$conditions = array();
 		foreach ($postFormData as $key => $value) {
 			$condition = array();
-			$condition[$key] = str_replace("\${filename}",$filename, $value);
-			array_push($conditions,$condition);
+			$condition[$key] = str_replace("\${filename}", $filename, $value);
+			array_push($conditions, $condition);
 		}
 		foreach ($unknowValueFormFiled as $key => $value) {
 			$condition = array();
-			array_push($condition,"starts-with");
-			array_push($condition,"\$".$value);
-			array_push($condition,"");
-			array_push($conditions,$condition);
+			array_push($condition, "starts-with");
+			array_push($condition, "\$".$value);
+			array_push($condition, "");
+			array_push($conditions, $condition);
 		}
 		$policy["conditions"] = $conditions;
 		$json = json_encode($policy);

Braces +50 added lines, -38 removed lines

@@ -4,26 +4,33 @@ 
 date_default_timezone_set('Asia/Shanghai');
 
 //检测API路径
-if(!defined("KS3_API_PATH"))
-define("KS3_API_PATH", dirname(__FILE__));
+if(!defined("KS3_API_PATH")) {
+    define("KS3_API_PATH", dirname(__FILE__));
+}
 //是否使用VHOST
-if(!defined("KS3_API_VHOST"))
-define("KS3_API_VHOST",TRUE);
+if(!defined("KS3_API_VHOST")) {
+    define("KS3_API_VHOST",TRUE);
+}
 //是否开启日志(写入日志文件)
-if(!defined("KS3_API_LOG"))
-define("KS3_API_LOG",TRUE);
+if(!defined("KS3_API_LOG")) {
+    define("KS3_API_LOG",TRUE);
+}
 //是否显示日志(直接输出日志)
-if(!defined("KS3_API_DISPLAY_LOG"))
-define("KS3_API_DISPLAY_LOG", TRUE);
+if(!defined("KS3_API_DISPLAY_LOG")) {
+    define("KS3_API_DISPLAY_LOG", TRUE);
+}
 //定义日志目录(默认是该项目log下)
-if(!defined("KS3_API_LOG_PATH"))
-define("KS3_API_LOG_PATH","");
+if(!defined("KS3_API_LOG_PATH")) {
+    define("KS3_API_LOG_PATH","");
+}
 //是否使用HTTPS
-if(!defined("KS3_API_USE_HTTPS"))
-define("KS3_API_USE_HTTPS",FALSE);
+if(!defined("KS3_API_USE_HTTPS")) {
+    define("KS3_API_USE_HTTPS",FALSE);
+}
 //是否开启curl debug模式
-if(!defined("KS3_API_DEBUG_MODE"))
-define("KS3_API_DEBUG_MODE",FALSE);
+if(!defined("KS3_API_DEBUG_MODE")) {
+    define("KS3_API_DEBUG_MODE",FALSE);
+}
 define("KS3_API_Author","lijunwei@kingsoft.com");
 define("KS3_API_Version","1.2");
 
@@ -49,10 +56,10 @@ 
 			throw new Ks3ClientException("please install mbstring extension");
 			
 		}
-	}else{
+	} else{
 		throw new Ks3ClientException("please install extensions");
 	}
-}else{
+} else{
 	throw new Ks3ClientException();
 }
 
@@ -116,14 +123,15 @@ 
 		$ex = NULL;
 		try{
 			$result = $this->invoke($method,$args,$holder);
-		}catch(Exception $e){
+		} catch(Exception $e){
 			$holder->msg.=$e."\r\n";
 			$ex = $e;
 		}
 		$holder->msg .= "------------------Logging End-------------------------\r\n";
 		$this->log->info($holder->msg);
-		if($ex !=NULL)
-			throw $ex;
+		if($ex !=NULL) {
+					throw $ex;
+		}
 		return $result;
 	}
 	private function invoke($method,$args=array(),$holder,$location=NULL){
@@ -145,7 +153,7 @@ 
 			if($api["needBucket"]){
 				throw new Ks3ClientException($method." this api need bucket");
 			}
-		}else{
+		} else{
 			$request->bucket = $args["Bucket"];
 		}
 		$position = "Key";
@@ -157,7 +165,7 @@ 
 			if($api["needObject"]){
 				throw new Ks3ClientException($method." this api need ".$position);
 			}
-		}else{
+		} else{
 			$key = $args[$position];
 			$preEncoding = mb_detect_encoding($key, array("ASCII","UTF-8","GB2312","GBK","BIG5"));
 			$holder->msg.="key encoding ".$preEncoding."\r\n";
@@ -170,16 +178,17 @@ 
 		if($method == "Method"){
 			if(empty($args["Method"])){
 				$request->method="GET";
-			}else{
+			} else{
 				$request->method=$args["Method"];
 			}
-		}else{
+		} else{
 			$request->method=$api["method"];
 		}
-		if(KS3_API_USE_HTTPS)
-			$request->scheme="https://";
-		else
-			$request->scheme="http://";
+		if(KS3_API_USE_HTTPS) {
+					$request->scheme="https://";
+		} else {
+					$request->scheme="http://";
+		}
 		$request->endpoint=$this->endpoint;
 		//add subresource
 		if(!empty($api["subResource"])){
@@ -200,7 +209,7 @@ 
 				foreach ($index as $key1 => $value1) {
 					if(!isset($curIndexArg[$value1])&&$value1 !== "*"){
 						$add = FALSE;
-					}else{
+					} else{
 						$curkey = $value1;
 						//星号表示所有,按照暂时的业务，默认星号后面就没了
 						if($curkey == "*"){
@@ -212,7 +221,7 @@ 
 							$add = FALSE;
 							$required = FALSE;
 							break;
-						}else{
+						} else{
 							$curIndexArg = $curIndexArg[$value1];
 						}
 					}
@@ -221,8 +230,9 @@ 
 					$request->addQueryParams($curkey,$curIndexArg);
 					continue;
 				}
-				if($required)
-					throw new Ks3ClientException($method." param ".$value." is required");
+				if($required) {
+									throw new Ks3ClientException($method." param ".$value." is required");
+				}
 			}
 		}
 		if(isset($api["body"])){
@@ -230,7 +240,7 @@ 
 				$builderName = $api["body"]["builder"];
 				$builder = new $builderName();
 				$request->body = $builder->build($args);
-			}else if(isset($api["body"]["position"])){
+			} else if(isset($api["body"]["position"])){
 				$position = $api["body"]["position"];
 				$index = explode("->",$position);
 				$curIndexArg = $args;
@@ -239,7 +249,7 @@ 
 				foreach ($index as $key1 => $value1) {
 					if(!isset($curIndexArg[$value1])){
 						$add = FALSE;
-					}else{
+					} else{
 						$curIndexArg = $curIndexArg[$value1];
 						$curkey = $value1;
 					}
@@ -267,11 +277,13 @@ 
 
 		if($signer===NULL||!($signer instanceof QueryAuthSigner)){
 			$url = $request->toUrl($this->endpoint);
-			if($location!=NULL)
-				$url = $location;
+			if($location!=NULL) {
+							$url = $location;
+			}
 			$httpRequest = new RequestCore($url);
-			if(KS3_API_DEBUG_MODE===TRUE)
-				$httpRequest->debug_mode=TRUE;
+			if(KS3_API_DEBUG_MODE===TRUE) {
+							$httpRequest->debug_mode=TRUE;
+			}
 			$httpRequest->set_method($request->method);
 			foreach ($request->headers as $key => $value) {
 				$httpRequest->add_header($key,$value);
@@ -330,7 +342,7 @@ 
 				$data = $handler->handle($data);
 			}
 			return $data;
-		}else{
+		} else{
 			$url = $request->toUrl($this->endpoint);
 			$holder->msg.=$url."\r\n";
 			return $url;

src/service/ksyun/bin/config/Consts.php

Indentation +48 added lines, -48 removed lines

@@ -2,53 +2,53 @@
 require_once KS3_API_PATH.DIRECTORY_SEPARATOR."core".DIRECTORY_SEPARATOR."Headers.php";
 
 class Consts {
-	// static $Ks3EndPoint = "kss.ksyun.com";
-	static $SubResource = array("acl", "lifecycle", "location", "logging", "notification", "policy", "requestPayment", "torrent", "uploadId", "uploads", "versionId","versioning", "versions", "website", "delete", "thumbnail","cors","pfop","querypfop","adp","queryadp");	
-	static $QueryParam = array("partNumber","response-content-type","response-content-language","response-expires", "response-cache-control","response-content-disposition", "response-content-encoding", );
-	static $Acl = array("private","public-read","public-read-write");
-	static $KS3HeaderPrefix = "x-kss-";
-	static $CORSElements = array("AllowedMethod","AllowedOrigin","AllowedHeader","MaxAgeSeconds","ExposeHeader");
-	static $BucketLoggingElements = array("TargetBucket","TargetPrefix");
-	static $ObjectMeta = array("Cache-Control","Content-Disposition","Content-Encoding","Content-Length","Content-MD5","Content-Type","Expires");
-	static $MultipartObjectMeta = array("Cache-Control","Content-Disposition","Content-Encoding","Content-Type","Expires");
-	static $UserMetaPrefix = "x-kss-meta";
-	static $ResponseObjectMeta = array(
-		"cache-control"=>"Cache-Control",
-		"content-disposition"=>"Content-Disposition",
-		"content-encoding"=>"Content-Encoding",
-		"etag"=>"ETag",
-		"content-type"=>"Content-Type",
-		"expires"=>"Expires",
-		"last-modified"=>"Last-Modified",
-		"content-range"=>"Content-Range",
-		"content-length"=>"Content-Length",
-		"x-kss-server-side-encryption"=>"SSEAlgm",
-		"x-kss-server-side-encryption-kss-kms-key-id"=>"SSEKMSId",
-		"x-kss-server-side-encryption-customer-algorithm"=>"SSECAlgm",
-		"x-kss-server-side-encryption-customer-key-md5"=>"SSECKeyMD5"
-		);
-	static $PartsElement = array("PartNumber","ETag");
-	static $UploadHandler = array(
-		"etag"=>"ETag",
-		"taskid"=>"TaskID",
-		"x-kss-server-side-encryption"=>"SSEAlgm",
-		"x-kss-server-side-encryption-kss-kms-key-id"=>"SSEKMSId",
-		"x-kss-server-side-encryption-customer-algorithm"=>"SSECAlgm",
-		"x-kss-server-side-encryption-customer-key-md5"=>"SSECKeyMD5"
-		);
-	static $SSEHandler = array(
-		"x-kss-server-side-encryption"=>"SSEAlgm",
-		"x-kss-server-side-encryption-kss-kms-key-id"=>"SSEKMSId",
-		"x-kss-server-side-encryption-customer-algorithm"=>"SSECAlgm",
-		"x-kss-server-side-encryption-customer-key-md5"=>"SSECKeyMD5"
-		);
-	static $Permission_Read = "READ";
-	static $Permission_Write = "WRITE";
-	static $Grantee_Group_All = "http://acs.ksyun.com/groups/global/AllUsers";
-	static $ResponseOverrides = array("response-expires","response-content-encoding","response-content-disposition",
-		"response-content-language","response-content-type","response-cache-control");
-	static $CallBackMagics = array("bucket","key","etag","objectSize","mimeType","createTime");
-	static $UserAgent = "ks3-kss-php-sdk";
-	static $SSEDefaultAlgm = "AES256";
+    // static $Ks3EndPoint = "kss.ksyun.com";
+    static $SubResource = array("acl", "lifecycle", "location", "logging", "notification", "policy", "requestPayment", "torrent", "uploadId", "uploads", "versionId","versioning", "versions", "website", "delete", "thumbnail","cors","pfop","querypfop","adp","queryadp");	
+    static $QueryParam = array("partNumber","response-content-type","response-content-language","response-expires", "response-cache-control","response-content-disposition", "response-content-encoding", );
+    static $Acl = array("private","public-read","public-read-write");
+    static $KS3HeaderPrefix = "x-kss-";
+    static $CORSElements = array("AllowedMethod","AllowedOrigin","AllowedHeader","MaxAgeSeconds","ExposeHeader");
+    static $BucketLoggingElements = array("TargetBucket","TargetPrefix");
+    static $ObjectMeta = array("Cache-Control","Content-Disposition","Content-Encoding","Content-Length","Content-MD5","Content-Type","Expires");
+    static $MultipartObjectMeta = array("Cache-Control","Content-Disposition","Content-Encoding","Content-Type","Expires");
+    static $UserMetaPrefix = "x-kss-meta";
+    static $ResponseObjectMeta = array(
+        "cache-control"=>"Cache-Control",
+        "content-disposition"=>"Content-Disposition",
+        "content-encoding"=>"Content-Encoding",
+        "etag"=>"ETag",
+        "content-type"=>"Content-Type",
+        "expires"=>"Expires",
+        "last-modified"=>"Last-Modified",
+        "content-range"=>"Content-Range",
+        "content-length"=>"Content-Length",
+        "x-kss-server-side-encryption"=>"SSEAlgm",
+        "x-kss-server-side-encryption-kss-kms-key-id"=>"SSEKMSId",
+        "x-kss-server-side-encryption-customer-algorithm"=>"SSECAlgm",
+        "x-kss-server-side-encryption-customer-key-md5"=>"SSECKeyMD5"
+        );
+    static $PartsElement = array("PartNumber","ETag");
+    static $UploadHandler = array(
+        "etag"=>"ETag",
+        "taskid"=>"TaskID",
+        "x-kss-server-side-encryption"=>"SSEAlgm",
+        "x-kss-server-side-encryption-kss-kms-key-id"=>"SSEKMSId",
+        "x-kss-server-side-encryption-customer-algorithm"=>"SSECAlgm",
+        "x-kss-server-side-encryption-customer-key-md5"=>"SSECKeyMD5"
+        );
+    static $SSEHandler = array(
+        "x-kss-server-side-encryption"=>"SSEAlgm",
+        "x-kss-server-side-encryption-kss-kms-key-id"=>"SSEKMSId",
+        "x-kss-server-side-encryption-customer-algorithm"=>"SSECAlgm",
+        "x-kss-server-side-encryption-customer-key-md5"=>"SSECKeyMD5"
+        );
+    static $Permission_Read = "READ";
+    static $Permission_Write = "WRITE";
+    static $Grantee_Group_All = "http://acs.ksyun.com/groups/global/AllUsers";
+    static $ResponseOverrides = array("response-expires","response-content-encoding","response-content-disposition",
+        "response-content-language","response-content-type","response-cache-control");
+    static $CallBackMagics = array("bucket","key","etag","objectSize","mimeType","createTime");
+    static $UserAgent = "ks3-kss-php-sdk";
+    static $SSEDefaultAlgm = "AES256";
 }
 ?>
\ No newline at end of file

Spacing +11 added lines, -11 removed lines

@@ -3,14 +3,14 @@ 
 
 class Consts {
 	// static $Ks3EndPoint = "kss.ksyun.com";
-	static $SubResource = array("acl", "lifecycle", "location", "logging", "notification", "policy", "requestPayment", "torrent", "uploadId", "uploads", "versionId","versioning", "versions", "website", "delete", "thumbnail","cors","pfop","querypfop","adp","queryadp");	
-	static $QueryParam = array("partNumber","response-content-type","response-content-language","response-expires", "response-cache-control","response-content-disposition", "response-content-encoding", );
-	static $Acl = array("private","public-read","public-read-write");
+	static $SubResource = array("acl", "lifecycle", "location", "logging", "notification", "policy", "requestPayment", "torrent", "uploadId", "uploads", "versionId", "versioning", "versions", "website", "delete", "thumbnail", "cors", "pfop", "querypfop", "adp", "queryadp");	
+	static $QueryParam = array("partNumber", "response-content-type", "response-content-language", "response-expires", "response-cache-control", "response-content-disposition", "response-content-encoding",);
+	static $Acl = array("private", "public-read", "public-read-write");
 	static $KS3HeaderPrefix = "x-kss-";
-	static $CORSElements = array("AllowedMethod","AllowedOrigin","AllowedHeader","MaxAgeSeconds","ExposeHeader");
-	static $BucketLoggingElements = array("TargetBucket","TargetPrefix");
-	static $ObjectMeta = array("Cache-Control","Content-Disposition","Content-Encoding","Content-Length","Content-MD5","Content-Type","Expires");
-	static $MultipartObjectMeta = array("Cache-Control","Content-Disposition","Content-Encoding","Content-Type","Expires");
+	static $CORSElements = array("AllowedMethod", "AllowedOrigin", "AllowedHeader", "MaxAgeSeconds", "ExposeHeader");
+	static $BucketLoggingElements = array("TargetBucket", "TargetPrefix");
+	static $ObjectMeta = array("Cache-Control", "Content-Disposition", "Content-Encoding", "Content-Length", "Content-MD5", "Content-Type", "Expires");
+	static $MultipartObjectMeta = array("Cache-Control", "Content-Disposition", "Content-Encoding", "Content-Type", "Expires");
 	static $UserMetaPrefix = "x-kss-meta";
 	static $ResponseObjectMeta = array(
 		"cache-control"=>"Cache-Control",
@@ -27,7 +27,7 @@ 
 		"x-kss-server-side-encryption-customer-algorithm"=>"SSECAlgm",
 		"x-kss-server-side-encryption-customer-key-md5"=>"SSECKeyMD5"
 		);
-	static $PartsElement = array("PartNumber","ETag");
+	static $PartsElement = array("PartNumber", "ETag");
 	static $UploadHandler = array(
 		"etag"=>"ETag",
 		"taskid"=>"TaskID",
@@ -45,9 +45,9 @@ 
 	static $Permission_Read = "READ";
 	static $Permission_Write = "WRITE";
 	static $Grantee_Group_All = "http://acs.ksyun.com/groups/global/AllUsers";
-	static $ResponseOverrides = array("response-expires","response-content-encoding","response-content-disposition",
-		"response-content-language","response-content-type","response-cache-control");
-	static $CallBackMagics = array("bucket","key","etag","objectSize","mimeType","createTime");
+	static $ResponseOverrides = array("response-expires", "response-content-encoding", "response-content-disposition",
+		"response-content-language", "response-content-type", "response-cache-control");
+	static $CallBackMagics = array("bucket", "key", "etag", "objectSize", "mimeType", "createTime");
 	static $UserAgent = "ks3-kss-php-sdk";
 	static $SSEDefaultAlgm = "AES256";
 }

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/jd/UnionService.php

Spacing +5 added lines, -5 removed lines

@@ -145,7 +145,7 @@ 
         $sign = $this->createSign();
         //组织参数
         $strParam = $this->createStrParam();
-        $strParam .= 'sign=' . $sign;
+        $strParam .= 'sign='.$sign;
         //访问服务
         $result = file_get_contents("{$this->url}?{$strParam}");
         $result = json_decode($result, true);
@@ -351,7 +351,7 @@ 
         $this->params['sign_method'] = $this->sign_method;
         $this->params['param_json'] = json_encode($this->param, JSON_UNESCAPED_UNICODE);
         $this->http();
-        $response = Strings::replace('.', '_', $this->method) . "_response";
+        $response = Strings::replace('.', '_', $this->method)."_response";
         if (isset($this->output["$response"]['result'])) {
             if (is_array($this->output["$response"]['result'])) {
                 return $this->output["$response"]['result'];
@@ -360,7 +360,7 @@ 
                 $this->output = json_encode($this->output["$response"]['result'], JSON_UNESCAPED_UNICODE);
             }
             return json_decode($this->output["$response"]['result'], true);
-        } else {
+        }else {
             if (is_array($this->output)) {
                 return $this->output;
             }
@@ -388,7 +388,7 @@ 
         ksort($this->params);
         foreach ($this->params as $key => $val) {
             if ($key != '' && $val != '') {
-                $sign .= $key . $val;
+                $sign .= $key.$val;
             }
         }
         $sign .= $this->secret_key;
@@ -405,7 +405,7 @@ 
         $strParam = '';
         foreach ($this->params as $key => $val) {
             if ($key != '' && $val != '') {
-                $strParam .= $key . '=' . urlencode($val) . '&';
+                $strParam .= $key.'='.urlencode($val).'&';
             }
         }
         return $strParam;

src/service/pinduoduo/JinBaoService.php

Spacing +6 added lines, -6 removed lines

@@ -137,9 +137,9 @@ 
         $sign = $this->createSign();
         //组织参数
         $strParam = $this->createStrParam();
-        $strParam .= 'sign=' . $sign;
+        $strParam .= 'sign='.$sign;
         //访问服务
-        $url = "{$this->url}?" . $strParam;
+        $url = "{$this->url}?".$strParam;
         $result = file_get_contents($url);
         $result = json_decode($result, true);
         $this->output = $result;
@@ -465,7 +465,7 @@ 
                 return $this->object2array($this->output);
             }
             return json_decode($this->output, true);
-        } else {
+        }else {
             // 正常
             if (is_array($this->output)) {
                 if (isset($this->output["{$this->response}"])) {
@@ -496,7 +496,7 @@ 
     {
         if (is_object($object)) {
             $arr = (array)($object);
-        } else {
+        }else {
             $arr = &$object;
         }
         if (is_array($arr)) {
@@ -524,7 +524,7 @@ 
         ksort($this->param);
         foreach ($this->param as $key => $val) {
             if ($key != '' && $val != '') {
-                $sign .= $key . $val;
+                $sign .= $key.$val;
             }
         }
         $sign .= $this->client_secret;
@@ -541,7 +541,7 @@ 
         $strParam = '';
         foreach ($this->param as $key => $val) {
             if ($key != '' && $val != '' && !is_array($val)) {
-                $strParam .= $key . '=' . urlencode($val) . '&';
+                $strParam .= $key.'='.urlencode($val).'&';
             }
         }
         return $strParam;