GC0202 / ThinkLibrary

src/service/weishi/WatermarkService.php

Spacing +4 added lines, -4 removed lines

@@ -28,7 +28,7 @@ 
     {
         if (Pregs::isLink($url)) {
             $this->url = $url;
-        } else {
+        }else {
             preg_match_all('#\bhttps?://[^,\s()<>]+(?:\([\w\d]+\)|([^,[:punct:]\s]|/))#', $url, $match);
             $this->url = $match[0][0];
         }
@@ -90,17 +90,17 @@ 
             'Connection' => 'keep-alive',
             'User-Agent' => 'Mozilla/5.0 (iPhone; CPU iPhone OS 12_1_4 like Mac OS X) AppleWebKit/605.1.15 (KHTML, like Gecko) Mobile/16D57 Version/12.0 Safari/604.1'
         ];
-        $client = new Client(['timeout' => 2, 'headers' => $headers, 'http_errors' => false,]);
+        $client = new Client(['timeout' => 2, 'headers' => $headers, 'http_errors' => false, ]);
         $data = [];
         if ($headers) {
             $data['headers'] = $headers;
         }
-        $data['verify'] = __DIR__ . DIRECTORY_SEPARATOR . 'cacert.pem';
+        $data['verify'] = __DIR__.DIRECTORY_SEPARATOR.'cacert.pem';
         $jar = new CookieJar;
         $data['cookies'] = $jar;
         if (!$params) {
             $response = $client->request('GET', $url, $data);
-        } else {
+        }else {
             $data ['form_params'] = $params;
             $response = $client->request('POST', $url, $data);
         }

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

Indentation +67 added lines, -67 removed lines

@@ -5,31 +5,31 @@ 
 
 //检测API路径
 if (!defined("KS3_API_PATH")) {
-	define("KS3_API_PATH", __DIR__);
+    define("KS3_API_PATH", __DIR__);
 }
 //是否使用VHOST
 if (!defined("KS3_API_VHOST")) {
-	define("KS3_API_VHOST", FALSE);
+    define("KS3_API_VHOST", FALSE);
 }
 //是否开启日志(写入日志文件)
 if (!defined("KS3_API_LOG")) {
-	define("KS3_API_LOG", FALSE);
+    define("KS3_API_LOG", FALSE);
 }
 //是否显示日志(直接输出日志)
 if (!defined("KS3_API_DISPLAY_LOG")) {
-	define("KS3_API_DISPLAY_LOG", FALSE);
+    define("KS3_API_DISPLAY_LOG", FALSE);
 }
 //定义日志目录(默认是该项目log下)
 if (!defined("KS3_API_LOG_PATH")) {
-	define("KS3_API_LOG_PATH", "");
+    define("KS3_API_LOG_PATH", "");
 }
 //是否使用HTTPS
 if (!defined("KS3_API_USE_HTTPS")) {
-	define("KS3_API_USE_HTTPS", FALSE);
+    define("KS3_API_USE_HTTPS", FALSE);
 }
 //是否开启curl debug模式
 if (!defined("KS3_API_DEBUG_MODE")) {
-	define("KS3_API_DEBUG_MODE", FALSE);
+    define("KS3_API_DEBUG_MODE", FALSE);
 }
 define("KS3_API_Author", "lijunwei@kingsoft.com");
 define("KS3_API_Version", "1.2");
@@ -84,45 +84,45 @@ 
         $this->log = new Logger();
     }
 
-	/**
-	 * 方法列表:(具体使用请参考readme.md)
-	 * listBuckets,罗列bucket
-	 * deleteBucket，删除bucket
-	 * deleteBucketCORS，删除bucket跨域配置
-	 * createBucket,新建bucket
-	 * setBucketAcl，设置bucket访问权限
-	 * setBucketCORS,设置bucket跨域配置
-	 * setBucketLogging,设置bucket日志配置
-	 * listObjects,罗列object
-	 * getBucketAcl,获取bucket访问权限
-	 * getBucketCORS,获取bucket跨域配置
-	 * getBucketLocation,获取bucket地点配置
-	 * getBucketLogging,获取bucket日志配置
-	 * bucketExists,判断bucket是否存在
-	 * listMutipartUploads,罗列当前bucket下尚未结束的分块上传
-	 * putObjectByContent,上传文件
-	 * putObjectByFile,上传文件
-	 * setObjectAcl，设置object访问权限
-	 * copyObject,复制object
-	 * getObjectMeta，获取object元数据
-	 * objectExists，判断object是否存在
-	 * deleteObject，删除object
-	 * deleteObjects，删除多个object
-	 * getObject，下载object
-	 * getObjectAcl，获取object访问权限
-	 * initMultipartUpload，初始化分块上传
-	 * uploadPart，上传块
-	 * abortMultipartUpload，终止分块上传
-	 * listParts，罗列已经上传的块
-	 * completeMultipartUpload，完成分块上传
-	 * generatePresignedUrl，生成文件外链
-	 * putAdp,添加异步数据处理任务
-	 * getAdp,查询异步数据处理任务
-	 * @param $method
-	 * @param array $args
-	 * @return ResponseCore|string|string[]|null
-	 * @throws Exception
-	 */
+    /**
+     * 方法列表:(具体使用请参考readme.md)
+     * listBuckets,罗列bucket
+     * deleteBucket，删除bucket
+     * deleteBucketCORS，删除bucket跨域配置
+     * createBucket,新建bucket
+     * setBucketAcl，设置bucket访问权限
+     * setBucketCORS,设置bucket跨域配置
+     * setBucketLogging,设置bucket日志配置
+     * listObjects,罗列object
+     * getBucketAcl,获取bucket访问权限
+     * getBucketCORS,获取bucket跨域配置
+     * getBucketLocation,获取bucket地点配置
+     * getBucketLogging,获取bucket日志配置
+     * bucketExists,判断bucket是否存在
+     * listMutipartUploads,罗列当前bucket下尚未结束的分块上传
+     * putObjectByContent,上传文件
+     * putObjectByFile,上传文件
+     * setObjectAcl，设置object访问权限
+     * copyObject,复制object
+     * getObjectMeta，获取object元数据
+     * objectExists，判断object是否存在
+     * deleteObject，删除object
+     * deleteObjects，删除多个object
+     * getObject，下载object
+     * getObjectAcl，获取object访问权限
+     * initMultipartUpload，初始化分块上传
+     * uploadPart，上传块
+     * abortMultipartUpload，终止分块上传
+     * listParts，罗列已经上传的块
+     * completeMultipartUpload，完成分块上传
+     * generatePresignedUrl，生成文件外链
+     * putAdp,添加异步数据处理任务
+     * getAdp,查询异步数据处理任务
+     * @param $method
+     * @param array $args
+     * @return ResponseCore|string|string[]|null
+     * @throws Exception
+     */
     public function __call($method, $args = array())
     {
         $holder = new MessageHolder();
@@ -139,8 +139,8 @@ 
         $holder->msg .= "------------------Logging End-------------------------\r\n";
         $this->log->info($holder->msg);
         if ($ex != NULL) {
-			throw $ex;
-		}
+            throw $ex;
+        }
         return $result;
     }
 
@@ -167,8 +167,8 @@ 
         } else {
             $request->bucket = $args["Bucket"];
         }
-		$position = $api["objectPostion"] ?? "Key";
-		if (empty($args[$position])) {
+        $position = $api["objectPostion"] ?? "Key";
+        if (empty($args[$position])) {
             if ($api["needObject"]) {
                 throw new Ks3ClientException($method . " this api need " . $position);
             }
@@ -192,11 +192,11 @@ 
             $request->method = $api["method"];
         }
         if (KS3_API_USE_HTTPS) {
-			$request->scheme = "https://";
-		}
+            $request->scheme = "https://";
+        }
         else {
-			$request->scheme = "http://";
-		}
+            $request->scheme = "http://";
+        }
         $request->endpoint = $this->endpoint;
         //add subresource
         if (!empty($api["subResource"])) {
@@ -231,16 +231,16 @@ 
                             break;
                         }
 
-						$curIndexArg = $curIndexArg[$value1];
-					}
+                        $curIndexArg = $curIndexArg[$value1];
+                    }
                 }
                 if (!empty($curIndexArg) && $add) {
                     $request->addQueryParams($curkey, $curIndexArg);
                     continue;
                 }
                 if ($required) {
-					throw new Ks3ClientException($method . " param " . $value . " is required");
-				}
+                    throw new Ks3ClientException($method . " param " . $value . " is required");
+                }
             }
         }
         if (isset($api["body"])) {
@@ -286,12 +286,12 @@ 
         if ($signer === NULL || !($signer instanceof QueryAuthSigner)) {
             $url = $request->toUrl($this->endpoint);
             if ($location != NULL) {
-				$url = $location;
-			}
+                $url = $location;
+            }
             $httpRequest = new RequestCore($url);
             if (KS3_API_DEBUG_MODE === TRUE) {
-				$httpRequest->debug_mode = TRUE;
-			}
+                $httpRequest->debug_mode = TRUE;
+            }
             $httpRequest->set_method($request->method);
             foreach ($request->headers as $key => $value) {
                 $httpRequest->add_header($key, $value);
@@ -351,14 +351,14 @@ 
             return $data;
         }
 
-		$url = $request->toUrl($this->endpoint);
-		$holder->msg .= $url . "\r\n";
-		return $url;
-	}
+        $url = $request->toUrl($this->endpoint);
+        $holder->msg .= $url . "\r\n";
+        return $url;
+    }
 
     //用于生产表单上传时的签名信息
     public function postObject($bucket, $postFormData = array(), $unknowValueFormFiled = array(), $filename = NULL, $expire = 18000): array
-	{
+    {
         $policy = array();
 
         $expireTime = Utils::iso8601(time() + $expire);

Spacing +43 added lines, -43 removed lines

@@ -34,16 +34,16 @@ 
 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";
-require_once KS3_API_PATH . DIRECTORY_SEPARATOR . "core" . DIRECTORY_SEPARATOR . "Signers.php";
-require_once KS3_API_PATH . DIRECTORY_SEPARATOR . "core" . DIRECTORY_SEPARATOR . "Ks3Request.class.php";
-require_once KS3_API_PATH . DIRECTORY_SEPARATOR . "core" . DIRECTORY_SEPARATOR . "Handlers.php";
-require_once KS3_API_PATH . DIRECTORY_SEPARATOR . "core" . DIRECTORY_SEPARATOR . "Builders.php";
-require_once KS3_API_PATH . DIRECTORY_SEPARATOR . "core" . DIRECTORY_SEPARATOR . "Logger.php";
-require_once KS3_API_PATH . DIRECTORY_SEPARATOR . "core" . DIRECTORY_SEPARATOR . "MessageHolder.php";
-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";
+require_once KS3_API_PATH.DIRECTORY_SEPARATOR."config".DIRECTORY_SEPARATOR."Consts.php";
+require_once KS3_API_PATH.DIRECTORY_SEPARATOR."core".DIRECTORY_SEPARATOR."API.php";
+require_once KS3_API_PATH.DIRECTORY_SEPARATOR."core".DIRECTORY_SEPARATOR."Signers.php";
+require_once KS3_API_PATH.DIRECTORY_SEPARATOR."core".DIRECTORY_SEPARATOR."Ks3Request.class.php";
+require_once KS3_API_PATH.DIRECTORY_SEPARATOR."core".DIRECTORY_SEPARATOR."Handlers.php";
+require_once KS3_API_PATH.DIRECTORY_SEPARATOR."core".DIRECTORY_SEPARATOR."Builders.php";
+require_once KS3_API_PATH.DIRECTORY_SEPARATOR."core".DIRECTORY_SEPARATOR."Logger.php";
+require_once KS3_API_PATH.DIRECTORY_SEPARATOR."core".DIRECTORY_SEPARATOR."MessageHolder.php";
+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')) {
     //检测curl扩展
@@ -56,10 +56,10 @@ 
             throw new Ks3ClientException("please install mbstring extension");
 
         }
-    } else {
+    }else {
         throw new Ks3ClientException("please install extensions");
     }
-} else {
+}else {
     throw new Ks3ClientException();
 }
 
@@ -128,12 +128,12 @@ 
         $holder = new MessageHolder();
 
         $holder->msg = "------------------Logging Start-------------------------\r\n";
-        $holder->msg .= "method->" . $method . " args->" . serialize($args) . "\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";
+            $holder->msg .= $e."\r\n";
             $ex = $e;
         }
         $holder->msg .= "------------------Logging End-------------------------\r\n";
@@ -148,7 +148,7 @@ 
     {
         $api = API::$API[$method];
         if (!$api) {
-            throw new Ks3ClientException($method . " Not Found API");
+            throw new Ks3ClientException($method." Not Found API");
         }
         if (count($args) !== 0) {
             if (count($args) > 1 || !is_array($args[0])) {
@@ -162,20 +162,20 @@ 
         $request = new Ks3Request();
         if (empty($args["Bucket"])) {
             if ($api["needBucket"]) {
-                throw new Ks3ClientException($method . " this api need bucket");
+                throw new Ks3ClientException($method." this api need bucket");
             }
-        } else {
+        }else {
             $request->bucket = $args["Bucket"];
         }
 		$position = $api["objectPostion"] ?? "Key";
 		if (empty($args[$position])) {
             if ($api["needObject"]) {
-                throw new Ks3ClientException($method . " this api need " . $position);
+                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";
+            $holder->msg .= "key encoding ".$preEncoding."\r\n";
             if (strtolower($preEncoding) !== "utf-8") {
                 $key = iconv($preEncoding, "UTF-8", $key);
             }
@@ -185,10 +185,10 @@ 
         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) {
@@ -217,7 +217,7 @@ 
                 foreach ($index as $key1 => $value1) {
                     if (!isset($curIndexArg[$value1]) && $value1 !== "*") {
                         $add = FALSE;
-                    } else {
+                    }else {
                         $curkey = $value1;
                         //星号表示所有,按照暂时的业务，默认星号后面就没了
                         if ($curkey === "*") {
@@ -239,7 +239,7 @@ 
                     continue;
                 }
                 if ($required) {
-					throw new Ks3ClientException($method . " param " . $value . " is required");
+					throw new Ks3ClientException($method." param ".$value." is required");
 				}
             }
         }
@@ -248,7 +248,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;
@@ -257,7 +257,7 @@ 
                 foreach ($index as $key1 => $value1) {
                     if (!isset($curIndexArg[$value1])) {
                         $add = FALSE;
-                    } else {
+                    }else {
                         $curIndexArg = $curIndexArg[$value1];
                         $curkey = $value1;
                     }
@@ -278,7 +278,7 @@ 
                 $signer = new $value();
                 $log = $signer->sign($request, array("accessKey" => $this->accessKey, "secretKey" => $this->secretKey, "args" => $args));
                 if (!empty($log)) {
-                    $holder->msg .= $log . "\r\n";
+                    $holder->msg .= $log."\r\n";
                 }
             }
         }
@@ -318,31 +318,31 @@ 
                 $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());
+            $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 (strpos($location, "http") === 0) {
-                    $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";
+                    $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";
+            $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();
@@ -352,7 +352,7 @@ 
         }
 
 		$url = $request->toUrl($this->endpoint);
-		$holder->msg .= $url . "\r\n";
+		$holder->msg .= $url."\r\n";
 		return $url;
 	}
 
@@ -361,7 +361,7 @@ 
 	{
         $policy = array();
 
-        $expireTime = Utils::iso8601(time() + $expire);
+        $expireTime = Utils::iso8601(time()+$expire);
         $policy["expiration"] = $expireTime;
         $postFormData["bucket"] = $bucket;
         $conditions = array();
@@ -373,7 +373,7 @@ 
         foreach ($unknowValueFormFiled as $key => $value) {
             $condition = array();
             $condition[] = "starts-with";
-            $condition[] = "\$" . $value;
+            $condition[] = "\$".$value;
             $condition[] = "";
             $conditions[] = $condition;
         }

Braces +1 added lines, -2 removed lines

@@ -193,8 +193,7 @@
         }
         if (KS3_API_USE_HTTPS) {
 			$request->scheme = "https://";
-		}
-        else {
+		} else {
 			$request->scheme = "http://";
 		}
         $request->endpoint = $this->endpoint;

src/service/ksyun/Ks3Service.php

Spacing +3 added lines, -3 removed lines

@@ -83,7 +83,7 @@ 
      */
     public function upload(string $object, string $filePath): ?bool
     {
-        require_once(__DIR__ . "/bin/Ks3Client.class.php");
+        require_once(__DIR__."/bin/Ks3Client.class.php");
         $client = new Ks3Client($this->accessKeyID, $this->accessKeySecret, $this->endpoint);
         $content = fopen($filePath, 'rb');
         $args = [
@@ -91,10 +91,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"

src/service/kuaishou/WatermarkService.php

Spacing +3 added lines, -3 removed lines

@@ -46,7 +46,7 @@ 
     {
         if (Pregs::isLink($url)) {
             $this->url = $url;
-        } else {
+        }else {
             preg_match_all('#\bhttps?://[^,\s()<>]+(?:\([\w\d]+\)|([^,[:punct:]\s]|/))#', $url, $match);
             $this->url = $match[0][0];
         }
@@ -107,9 +107,9 @@ 
             'Connection' => 'keep-alive',
             'User-Agent' => 'Mozilla/5.0 (iPhone; CPU iPhone OS 12_1_4 like Mac OS X) AppleWebKit/605.1.15 (KHTML, like Gecko) Mobile/16D57 Version/12.0 Safari/604.1'
         ];
-        $client = new Client(['timeout' => 2, 'headers' => $headers, 'http_errors' => false,]);
+        $client = new Client(['timeout' => 2, 'headers' => $headers, 'http_errors' => false, ]);
         $data['headers'] = $headers;
-        $data['verify'] = __DIR__ . DIRECTORY_SEPARATOR . 'cacert.pem';
+        $data['verify'] = __DIR__.DIRECTORY_SEPARATOR.'cacert.pem';
         $jar = new CookieJar();
         $data['cookies'] = $jar;
         $response = $client->request('GET', $url, $data);