Inspection of "- 拼多多接口增加" - GC0202/ThinkLibrary - Measure and Improve Code Quality continuously with Scrutinizer

Passed

Push — v6 ( fbfd37...6aa863 )

by 光春

created 2020-09-22 08:54 UTC

Status

Indentation +48 added lines, -48 removed lines patch added patch discarded remove patch

@@ -2,53 +2,53 @@
 block discarded – undo
 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

Please login to merge, or discard this patch.

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

Indentation +234 added lines, -234 removed lines patch added patch discarded remove patch

@@ -7,138 +7,138 @@  discard block
 block discarded – undo
 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 @@  discard block
 block discarded – undo
         $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 @@  discard block
 block discarded – undo
         $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 @@  discard block
 block discarded – undo
         $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 @@  discard block
 block discarded – undo
         $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 @@  discard block
 block discarded – undo
             "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 @@  discard block
 block discarded – undo
             "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 @@  discard block
 block discarded – undo
             "Key"=>$this->key,
             "SSEC"=>array(
                 "Key"=>$this->sseckey
-             )
+                )
             );
         $result = $this->client->getObjectMeta($args);
         $this->assertEquals($result["ObjectMeta"]["SSECAlgm"],"AES256");
@@ -677,7 +677,7 @@  discard block
 block discarded – undo
             "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 @@  discard block
 block discarded – undo
             "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 @@  discard block
 block discarded – undo
                 "Bucket"=>$this->bucket,
                 "Key"=>$this->key
                 ),
-             "SSECSource"=>array(
+                "SSECSource"=>array(
                 "Key"=>$this->sseckey
                 ),
-             "SSEC"=>array(
+                "SSEC"=>array(
                 "Key"=>$this->sseckey
                 )
             );
@@ -821,7 +821,7 @@  discard block
 block discarded – undo
             );
             $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 @@  discard block
 block discarded – undo
         );
         $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");

Please login to merge, or discard this patch.

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

Indentation +44 added lines, -44 removed lines patch added patch discarded remove patch

@@ -1,53 +1,53 @@
 block discarded – undo
 <?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

Please login to merge, or discard this patch.

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

Indentation +40 added lines, -40 removed lines patch added patch discarded remove patch

@@ -1,60 +1,60 @@
 block discarded – undo
 <?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

Please login to merge, or discard this patch.

		@@ -2,53 +2,53 @@
		block discarded – undo
2	2	require_once KS3_API_PATH.DIRECTORY_SEPARATOR."core".DIRECTORY_SEPARATOR."Headers.php";
3	3
4	4	class Consts {
5		- // static $Ks3EndPoint = "kss.ksyun.com";
6		- static $SubResource = array("acl", "lifecycle", "location", "logging", "notification", "policy", "requestPayment", "torrent", "uploadId", "uploads", "versionId","versioning", "versions", "website", "delete", "thumbnail","cors","pfop","querypfop","adp","queryadp");
7		- static $QueryParam = array("partNumber","response-content-type","response-content-language","response-expires", "response-cache-control","response-content-disposition", "response-content-encoding", );
8		- static $Acl = array("private","public-read","public-read-write");
9		- static $KS3HeaderPrefix = "x-kss-";
10		- static $CORSElements = array("AllowedMethod","AllowedOrigin","AllowedHeader","MaxAgeSeconds","ExposeHeader");
11		- static $BucketLoggingElements = array("TargetBucket","TargetPrefix");
12		- static $ObjectMeta = array("Cache-Control","Content-Disposition","Content-Encoding","Content-Length","Content-MD5","Content-Type","Expires");
13		- static $MultipartObjectMeta = array("Cache-Control","Content-Disposition","Content-Encoding","Content-Type","Expires");
14		- static $UserMetaPrefix = "x-kss-meta";
15		- static $ResponseObjectMeta = array(
16		- "cache-control"=>"Cache-Control",
17		- "content-disposition"=>"Content-Disposition",
18		- "content-encoding"=>"Content-Encoding",
19		- "etag"=>"ETag",
20		- "content-type"=>"Content-Type",
21		- "expires"=>"Expires",
22		- "last-modified"=>"Last-Modified",
23		- "content-range"=>"Content-Range",
24		- "content-length"=>"Content-Length",
25		- "x-kss-server-side-encryption"=>"SSEAlgm",
26		- "x-kss-server-side-encryption-kss-kms-key-id"=>"SSEKMSId",
27		- "x-kss-server-side-encryption-customer-algorithm"=>"SSECAlgm",
28		- "x-kss-server-side-encryption-customer-key-md5"=>"SSECKeyMD5"
29		- );
30		- static $PartsElement = array("PartNumber","ETag");
31		- static $UploadHandler = array(
32		- "etag"=>"ETag",
33		- "taskid"=>"TaskID",
34		- "x-kss-server-side-encryption"=>"SSEAlgm",
35		- "x-kss-server-side-encryption-kss-kms-key-id"=>"SSEKMSId",
36		- "x-kss-server-side-encryption-customer-algorithm"=>"SSECAlgm",
37		- "x-kss-server-side-encryption-customer-key-md5"=>"SSECKeyMD5"
38		- );
39		- static $SSEHandler = array(
40		- "x-kss-server-side-encryption"=>"SSEAlgm",
41		- "x-kss-server-side-encryption-kss-kms-key-id"=>"SSEKMSId",
42		- "x-kss-server-side-encryption-customer-algorithm"=>"SSECAlgm",
43		- "x-kss-server-side-encryption-customer-key-md5"=>"SSECKeyMD5"
44		- );
45		- static $Permission_Read = "READ";
46		- static $Permission_Write = "WRITE";
47		- static $Grantee_Group_All = "http://acs.ksyun.com/groups/global/AllUsers";
48		- static $ResponseOverrides = array("response-expires","response-content-encoding","response-content-disposition",
49		- "response-content-language","response-content-type","response-cache-control");
50		- static $CallBackMagics = array("bucket","key","etag","objectSize","mimeType","createTime");
51		- static $UserAgent = "ks3-kss-php-sdk";
52		- static $SSEDefaultAlgm = "AES256";
	5	+ // static $Ks3EndPoint = "kss.ksyun.com";
	6	+ static $SubResource = array("acl", "lifecycle", "location", "logging", "notification", "policy", "requestPayment", "torrent", "uploadId", "uploads", "versionId","versioning", "versions", "website", "delete", "thumbnail","cors","pfop","querypfop","adp","queryadp");
	7	+ static $QueryParam = array("partNumber","response-content-type","response-content-language","response-expires", "response-cache-control","response-content-disposition", "response-content-encoding", );
	8	+ static $Acl = array("private","public-read","public-read-write");
	9	+ static $KS3HeaderPrefix = "x-kss-";
	10	+ static $CORSElements = array("AllowedMethod","AllowedOrigin","AllowedHeader","MaxAgeSeconds","ExposeHeader");
	11	+ static $BucketLoggingElements = array("TargetBucket","TargetPrefix");
	12	+ static $ObjectMeta = array("Cache-Control","Content-Disposition","Content-Encoding","Content-Length","Content-MD5","Content-Type","Expires");
	13	+ static $MultipartObjectMeta = array("Cache-Control","Content-Disposition","Content-Encoding","Content-Type","Expires");
	14	+ static $UserMetaPrefix = "x-kss-meta";
	15	+ static $ResponseObjectMeta = array(
	16	+ "cache-control"=>"Cache-Control",
	17	+ "content-disposition"=>"Content-Disposition",
	18	+ "content-encoding"=>"Content-Encoding",
	19	+ "etag"=>"ETag",
	20	+ "content-type"=>"Content-Type",
	21	+ "expires"=>"Expires",
	22	+ "last-modified"=>"Last-Modified",
	23	+ "content-range"=>"Content-Range",
	24	+ "content-length"=>"Content-Length",
	25	+ "x-kss-server-side-encryption"=>"SSEAlgm",
	26	+ "x-kss-server-side-encryption-kss-kms-key-id"=>"SSEKMSId",
	27	+ "x-kss-server-side-encryption-customer-algorithm"=>"SSECAlgm",
	28	+ "x-kss-server-side-encryption-customer-key-md5"=>"SSECKeyMD5"
	29	+ );
	30	+ static $PartsElement = array("PartNumber","ETag");
	31	+ static $UploadHandler = array(
	32	+ "etag"=>"ETag",
	33	+ "taskid"=>"TaskID",
	34	+ "x-kss-server-side-encryption"=>"SSEAlgm",
	35	+ "x-kss-server-side-encryption-kss-kms-key-id"=>"SSEKMSId",
	36	+ "x-kss-server-side-encryption-customer-algorithm"=>"SSECAlgm",
	37	+ "x-kss-server-side-encryption-customer-key-md5"=>"SSECKeyMD5"
	38	+ );
	39	+ static $SSEHandler = array(
	40	+ "x-kss-server-side-encryption"=>"SSEAlgm",
	41	+ "x-kss-server-side-encryption-kss-kms-key-id"=>"SSEKMSId",
	42	+ "x-kss-server-side-encryption-customer-algorithm"=>"SSECAlgm",
	43	+ "x-kss-server-side-encryption-customer-key-md5"=>"SSECKeyMD5"
	44	+ );
	45	+ static $Permission_Read = "READ";
	46	+ static $Permission_Write = "WRITE";
	47	+ static $Grantee_Group_All = "http://acs.ksyun.com/groups/global/AllUsers";
	48	+ static $ResponseOverrides = array("response-expires","response-content-encoding","response-content-disposition",
	49	+ "response-content-language","response-content-type","response-cache-control");
	50	+ static $CallBackMagics = array("bucket","key","etag","objectSize","mimeType","createTime");
	51	+ static $UserAgent = "ks3-kss-php-sdk";
	52	+ static $SSEDefaultAlgm = "AES256";
53	53	}
54	54	?>
55	55	\ No newline at end of file

		@@ -1,53 +1,53 @@
		block discarded – undo
1	1	<?php
2	2	function rangeGetAndCheckMd5($client,$bucket,$key,$file,$expectedMd5){
3		- $args = array("Bucket"=>$bucket,"Key"=>$key);
4		- $meta = $client->getObjectMeta($args);
5		- $contentlength = $meta["ObjectMeta"]["Content-Length"];
	3	+ $args = array("Bucket"=>$bucket,"Key"=>$key);
	4	+ $meta = $client->getObjectMeta($args);
	5	+ $contentlength = $meta["ObjectMeta"]["Content-Length"];
6	6
7		- $filelist = array();
	7	+ $filelist = array();
8	8
9		- for($begin = 0;$begin <$contentlength;){
10		- $index = rand((int)($contentlength/20),(int)($contentlength/4));
11		- $range = array("start"=>$begin,"end"=>$begin+$index);
12		- $destFile = $file.$begin."-".($begin+$index);
13		- array_push($filelist,$destFile);
14		- $begin += ($index+1);
15		- $args = array(
16		- "Bucket"=>$bucket,
17		- "Key"=>$key,
18		- "Range"=>$range,
19		- "WriteTo"=>$destFile
20		- );
21		- $client->getObject($args);
22		- }
	9	+ for($begin = 0;$begin <$contentlength;){
	10	+ $index = rand((int)($contentlength/20),(int)($contentlength/4));
	11	+ $range = array("start"=>$begin,"end"=>$begin+$index);
	12	+ $destFile = $file.$begin."-".($begin+$index);
	13	+ array_push($filelist,$destFile);
	14	+ $begin += ($index+1);
	15	+ $args = array(
	16	+ "Bucket"=>$bucket,
	17	+ "Key"=>$key,
	18	+ "Range"=>$range,
	19	+ "WriteTo"=>$destFile
	20	+ );
	21	+ $client->getObject($args);
	22	+ }
23	23
24		- foreach ($filelist as $key => $value) {
25		- $handle = fopen($value,"r");
26		- $size = filesize($value);
27		- if($size > 0){
28		- $content = fread($handle,$size);
29		- file_put_contents($file,$content,FILE_APPEND);
30		- }
31		- fclose($handle);
32		- //@unlink($value);
33		- }
34		- $md5 = md5_file($file);
35		- //@unlink($file);
36		- if($md5 != $expectedMd5)
37		- throw new Exception("file md5 check error expected ".$expectedMd5." ,actual ".$md5, 1);
38		- foreach ($filelist as $key => $value) {
39		- @unlink($value);
40		- }
41		- @unlink($file);
	24	+ foreach ($filelist as $key => $value) {
	25	+ $handle = fopen($value,"r");
	26	+ $size = filesize($value);
	27	+ if($size > 0){
	28	+ $content = fread($handle,$size);
	29	+ file_put_contents($file,$content,FILE_APPEND);
	30	+ }
	31	+ fclose($handle);
	32	+ //@unlink($value);
	33	+ }
	34	+ $md5 = md5_file($file);
	35	+ //@unlink($file);
	36	+ if($md5 != $expectedMd5)
	37	+ throw new Exception("file md5 check error expected ".$expectedMd5." ,actual ".$md5, 1);
	38	+ foreach ($filelist as $key => $value) {
	39	+ @unlink($value);
	40	+ }
	41	+ @unlink($file);
42	42	}
43	43	function generateFile($sizeInBytes,$destFile){
44		- for($i = 0;$i < $sizeInBytes/10;$i++){
45		- $randpwd = "";
46		- for ($j = 0; $j < 10; $j++)
47		- {
48		- $randpwd .= chr(mt_rand(33, 126));
49		- }
50		- file_put_contents($destFile,$randpwd,FILE_APPEND);
51		- }
	44	+ for($i = 0;$i < $sizeInBytes/10;$i++){
	45	+ $randpwd = "";
	46	+ for ($j = 0; $j < 10; $j++)
	47	+ {
	48	+ $randpwd .= chr(mt_rand(33, 126));
	49	+ }
	50	+ file_put_contents($destFile,$randpwd,FILE_APPEND);
	51	+ }
52	52	}
53	53	?>
54	54	\ No newline at end of file

		@@ -1,60 +1,60 @@
		block discarded – undo
1	1	<?php
2	2	require_once "../core/Logger.php";
3	3	class PUnit{
4		- function assertEquals($value,$expected,$info = NULL){
5		- if($value != $expected){
6		- throw new Exception($info." expected ".$expected." but ".$value);
7		- }
8		- }
9		- function run($torun = NULL){
10		- $r = new ReflectionClass($this);
11		- foreach($r->getMethods() as $key=>$methodObj){
12		- if($methodObj->isPrivate())
13		- $methods[$key]['type'] = 'private';
14		- elseif($methodObj->isProtected())
15		- $methods[$key]['type'] = 'protected';
16		- else
17		- $methods[$key]['type'] = 'public';
18		- $methods[$key]['name'] = $methodObj->name;
19		- $methods[$key]['class'] = $methodObj->class;
20		- }
	4	+ function assertEquals($value,$expected,$info = NULL){
	5	+ if($value != $expected){
	6	+ throw new Exception($info." expected ".$expected." but ".$value);
	7	+ }
	8	+ }
	9	+ function run($torun = NULL){
	10	+ $r = new ReflectionClass($this);
	11	+ foreach($r->getMethods() as $key=>$methodObj){
	12	+ if($methodObj->isPrivate())
	13	+ $methods[$key]['type'] = 'private';
	14	+ elseif($methodObj->isProtected())
	15	+ $methods[$key]['type'] = 'protected';
	16	+ else
	17	+ $methods[$key]['type'] = 'public';
	18	+ $methods[$key]['name'] = $methodObj->name;
	19	+ $methods[$key]['class'] = $methodObj->class;
	20	+ }
21	21	$before = NULL;
22	22	$after = NULL;
23	23	foreach ($methods as $method) {
24		- if($method["class"] != "PUnit"&&$method["name"] == "before"){
	24	+ if($method["class"] != "PUnit"&&$method["name"] == "before"){
25	25	$before = $method;
26		- }
27		- if($method["class"] != "PUnit"&&$method["name"] == "after"){
	26	+ }
	27	+ if($method["class"] != "PUnit"&&$method["name"] == "after"){
28	28	$after = $method;
29		- }
	29	+ }
30	30	}
31		- $error = array();
32		- $success = array();
33		- foreach ($methods as $method) {
34		- if($method["class"] != "PUnit"&&substr($method["name"],0,4) == "test"){
	31	+ $error = array();
	32	+ $success = array();
	33	+ foreach ($methods as $method) {
	34	+ if($method["class"] != "PUnit"&&substr($method["name"],0,4) == "test"){
35	35	if($torun !== NULL){
36		- if(!in_array($method["name"],$torun))
	36	+ if(!in_array($method["name"],$torun))
37	37	continue;
38	38	}
39		- try{
40		- if($method["type"] == "public"){
	39	+ try{
	40	+ if($method["type"] == "public"){
41	41	$log = new Logger();
42	42	$log->info("Run unit --->".$method["name"]);
43	43	if($before!=NULL)
44		- $this->$before["name"]();
45		- $this->$method["name"]();
46		- array_push($success,$method["name"]);
47		- }
48		- }catch(Exception $e){
49		- $error[$method["name"]]="".$e;
50		- }
51		- }
52		- }
53		- echo "\r\nPHP Unit-----------error"."\r\n";
54		- print_r($error);
	44	+ $this->$before["name"]();
	45	+ $this->$method["name"]();
	46	+ array_push($success,$method["name"]);
	47	+ }
	48	+ }catch(Exception $e){
	49	+ $error[$method["name"]]="".$e;
	50	+ }
	51	+ }
	52	+ }
	53	+ echo "\r\nPHP Unit-----------error"."\r\n";
	54	+ print_r($error);
55	55	echo "PHP Unit-----------result"."\r\n";
56	56	echo "total:".(count($success)+count($error)).",success:".count($success).",error:".count($error)."\r\n";
57	57
58		- }
	58	+ }
59	59	}
60	60	?>
61	61	\ No newline at end of file

GC0202 / ThinkLibrary

Push — v6 ( fbfd37...6aa863 )

Status

Category

Indentation +48 added lines, -48 removed lines patch added patch discarded remove patch

Indentation +234 added lines, -234 removed lines patch added patch discarded remove patch

Indentation +44 added lines, -44 removed lines patch added patch discarded remove patch

Indentation +40 added lines, -40 removed lines patch added patch discarded remove patch