upyun / php-sdk

tests/bootstrap.php

Spacing +3 added lines, -3 removed lines

@@ -1,15 +1,15 @@
 <?php
-require dirname(__DIR__) . '/vendor/autoload.php';
+require dirname(__DIR__).'/vendor/autoload.php';
 
 define('USER_NAME', 'tester');
 define('PWD', 'grjxv2mxELR3');
 define('BUCKET', 'sdkimg');
-define('PIC_PATH', dirname(__FILE__) . '/assets/sample.jpeg');
+define('PIC_PATH', dirname(__FILE__).'/assets/sample.jpeg');
 define('PIC_SIZE', filesize(PIC_PATH));
 
 function getFileUrl($path)
 {
-    return "http://" . BUCKET . ".b0.upaiyun.com/" . ltrim($path, '/');
+    return "http://".BUCKET.".b0.upaiyun.com/".ltrim($path, '/');
 }
 
 function getUpyunFileSize($path)

src/Upyun/Util.php

Spacing +3 added lines, -3 removed lines

@@ -72,12 +72,12 @@
     public static function encodeURI($url)
     {
         $unescaped = array(
-            '%2D'=>'-','%5F'=>'_','%2E'=>'.','%21'=>'!', '%7E'=>'~',
+            '%2D'=>'-', '%5F'=>'_', '%2E'=>'.', '%21'=>'!', '%7E'=>'~',
             '%2A'=>'*', '%27'=>"'", '%28'=>'(', '%29'=>')'
         );
         $reserved = array(
-            '%3B'=>';','%2C'=>',','%2F'=>'/','%3F'=>'?','%3A'=>':',
-            '%40'=>'@','%26'=>'&','%3D'=>'=','%2B'=>'+','%24'=>'$'
+            '%3B'=>';', '%2C'=>',', '%2F'=>'/', '%3F'=>'?', '%3A'=>':',
+            '%40'=>'@', '%26'=>'&', '%3D'=>'=', '%2B'=>'+', '%24'=>'$'
         );
         $score = array(
             '%23'=>'#'

src/Upyun/Api/Form.php

Spacing +1 added lines, -1 removed lines

@@ -18,7 +18,7 @@
 
         $policy = Util::base64Json($params);
         $method = 'POST';
-        $signature = Signature::getBodySignature($this->config, $method, '/' . $params['service'], null, $policy);
+        $signature = Signature::getBodySignature($this->config, $method, '/'.$params['service'], null, $policy);
         $client = new Client([
             'timeout' => $this->config->timeout,
         ]);

src/Upyun/Api/Pretreat.php

Spacing +3 added lines, -3 removed lines

@@ -43,7 +43,7 @@ 
         $method = 'POST';
         $signedHeaders = Signature::getHeaderSign($this->config, $method, $path);
 
-        $url = $this->config->getPretreatEndPoint() . $path;
+        $url = $this->config->getPretreatEndPoint().$path;
         $response = $client->request($method, $url, [
             'headers' => $signedHeaders,
             'form_params' => $params
@@ -64,10 +64,10 @@ 
             'service' => $this->config->serviceName,
             'task_ids' => implode(',', $taskIds)
         );
-        $path = $path . '?' . http_build_query($params);
+        $path = $path.'?'.http_build_query($params);
 
         $method = 'GET';
-        $url = $this->config->getPretreatEndPoint() . $path;
+        $url = $this->config->getPretreatEndPoint().$path;
         $signedHeaders = Signature::getHeaderSign($this->config, $method, $path);
         $response = $client->request($method, $url, [
             'headers' => $signedHeaders

src/Upyun/Signature.php

Spacing +6 added lines, -6 removed lines

@@ -10,15 +10,15 @@ 
     /**
      * 获取分块上传接口的签名
      */
-    const SIGN_MULTIPART     = 1;
+    const SIGN_MULTIPART = 1;
     /**
      * 生成视频处理接口的签名
      */
-    const SIGN_VIDEO         = 2;
+    const SIGN_VIDEO = 2;
     /**
      * 生成视频处理接口的签名（不需要操作员时使用）
      */
-    const SIGN_VIDEO_NO_OPERATOR   = 3;
+    const SIGN_VIDEO_NO_OPERATOR = 3;
 
     /**
      * 获取 Header 签名需要的请求头
@@ -40,7 +40,7 @@ 
         $headers = array(
             'Authorization' => $sign,
             'Date' => $gmtDate,
-            'User-agent' => 'Php-Sdk/' . $serviceConfig->getVersion()
+            'User-agent' => 'Php-Sdk/'.$serviceConfig->getVersion()
         );
         return $headers;
     }
@@ -60,7 +60,7 @@ 
         return array(
             'Authorization' => "UpYun {$serviceConfig->serviceName}:{$serviceConfig->operatorName}:$sign",
             'Date' => $gmtDate,
-            'User-agent' => 'Php-Sdk/' . $serviceConfig->getVersion() . ' (purge api)'
+            'User-agent' => 'Php-Sdk/'.$serviceConfig->getVersion().' (purge api)'
         );
     }
 
@@ -93,6 +93,6 @@ 
             $data[] = $contentMd5;
         }
         $signature = base64_encode(hash_hmac('sha1', implode('&', $data), $serviceConfig->operatorPassword, true));
-        return 'UPYUN ' . $serviceConfig->operatorName . ':' . $signature;
+        return 'UPYUN '.$serviceConfig->operatorName.':'.$signature;
     }
 }

src/Upyun/Upyun.php

Unused Use Statements -1 removed lines

@@ -5,7 +5,6 @@
 namespace Upyun;
 
 use Upyun\Api\Rest;
-
 use GuzzleHttp\Client;
 use GuzzleHttp\Psr7;
 use GuzzleHttp;

Spacing +7 added lines, -7 removed lines

@@ -152,7 +152,7 @@ 
         $params = Util::getHeaderParams($response->getHeaders());
 
 
-        if (! isset($params['x-upyun-list-iter'])) {
+        if (!isset($params['x-upyun-list-iter'])) {
             if (is_resource($saveHandler)) {
                 Psr7\copy_to_stream($response->getBody(), Psr7\stream_for($saveHandler));
                 return true;
@@ -256,7 +256,7 @@ 
      */
     public function createDir($path)
     {
-        $path = rtrim($path, '/') . '/';
+        $path = rtrim($path, '/').'/';
         $req = new Rest($this->config);
         $res = $req->request('POST', $path)
             ->withHeader('folder', 'true')
@@ -286,9 +286,9 @@ 
      */
     public function usage($path = '/')
     {
-        $path = rtrim($path, '/') . '/';
+        $path = rtrim($path, '/').'/';
         $req = new Rest($this->config);
-        $response = $req->request('GET', $path . '?usage')
+        $response = $req->request('GET', $path.'?usage')
             ->send();
 
         return $response->getBody()->getContents();
@@ -304,7 +304,7 @@ 
      */
     public function copy($source, $target)
     {
-        $source = '/' . $this->config->serviceName . '/' . ltrim($source, '/');
+        $source = '/'.$this->config->serviceName.'/'.ltrim($source, '/');
         $req = new Rest($this->config);
         $response = $req->request('PUT', $target)
             ->withHeader('X-Upyun-Copy-Source', $source)
@@ -322,7 +322,7 @@ 
      */
     public function move($source, $target)
     {
-        $source = '/' . $this->config->serviceName . '/' . ltrim($source, '/');
+        $source = '/'.$this->config->serviceName.'/'.ltrim($source, '/');
         $req = new Rest($this->config);
         $response = $req->request('PUT', $target)
             ->withHeader('X-Upyun-Move-Source', $source)
@@ -399,7 +399,7 @@ 
         $video = new Api\Pretreat($this->config);
 
         $options = array();
-        switch($type) {
+        switch ($type) {
             case self::$PROCESS_TYPE_MEDIA:
                 $options['accept'] = 'json';
                 $options['source'] = $source;

Doc Comments +2 added lines, -2 removed lines

@@ -197,7 +197,7 @@ 
      * 获取云存储文件/目录的基本信息
      *
      * @param string $path 云存储的文件路径
-     * @param array $otherHeaders 设置了后，方法将返回其他 http header 中的信息，默认为空
+     * @param string[] $otherHeaders 设置了后，方法将返回其他 http header 中的信息，默认为空
      *
      * @return array 返回一个数组，默认包含以下 key
      * - `x-upyun-file-type` 当 $path 是目录时，值为 *folder*，当 $path 是文件时，值为 *file*，
@@ -333,7 +333,7 @@ 
     /**
      * 刷新缓存
      *
-     * @param array|string $urls 需要刷新的文件 url 列表
+     * @param string $urls 需要刷新的文件 url 列表
      *
      * @return array 刷新失败的 url 列表，若全部刷新成功则为空数组
      */

src/Upyun/Api/SyncVideo.php

Spacing +2 added lines, -2 removed lines

@@ -26,11 +26,11 @@
             'timeout' => $this->config->timeout,
         ]);
 
-        $path = '/' . $this->config->serviceName . $path;
+        $path = '/'.$this->config->serviceName.$path;
         $method = 'POST';
         $signedHeaders = Signature::getHeaderSign($this->config, $method, $path);
 
-        $url = $this->config->getSyncVideoEndPoint() . $path;
+        $url = $this->config->getSyncVideoEndPoint().$path;
         $response = $client->request($method, $url, [
             'headers' => $signedHeaders,
             'json' => $params

src/Upyun/Config.php

Spacing +6 added lines, -6 removed lines

@@ -84,17 +84,17 @@ 
     /**
      * 异步云处理接口地址
      */
-    const ED_VIDEO           = 'p0.api.upyun.com';
+    const ED_VIDEO = 'p0.api.upyun.com';
 
     /**
      * 刷新接口地址
      */
-    const ED_PURGE           = 'http://purge.upyun.com/purge/';
+    const ED_PURGE = 'http://purge.upyun.com/purge/';
 
     /**
      * 同步视频处理接口地址
      */
-    const ED_SYNC_VIDEO           = 'p1.api.upyun.com';
+    const ED_SYNC_VIDEO = 'p1.api.upyun.com';
 
     public function __construct($serviceName, $operatorName, $operatorPassword)
     {
@@ -113,7 +113,7 @@ 
 
     public function getFormApiKey()
     {
-        if (! $this->formApiKey) {
+        if (!$this->formApiKey) {
             throw new \Exception('form api key is empty.');
         }
 
@@ -132,12 +132,12 @@ 
 
     public function getPretreatEndPoint()
     {
-        return $this->getProtocol() . self::ED_VIDEO;
+        return $this->getProtocol().self::ED_VIDEO;
     }
 
     public function getSyncVideoEndPoint()
     {
-        return $this->getProtocol() . self::ED_SYNC_VIDEO;
+        return $this->getProtocol().self::ED_SYNC_VIDEO;
     }
 
     public function getProtocol()

src/Upyun/Api/Rest.php

Spacing +4 added lines, -4 removed lines

@@ -29,13 +29,13 @@ 
     public function __construct(Config $config)
     {
         $this->config   = $config;
-        $this->endpoint = $config->getProtocol() . Config::$restApiEndPoint . '/' . $config->serviceName;
+        $this->endpoint = $config->getProtocol().Config::$restApiEndPoint.'/'.$config->serviceName;
     }
 
     public function request($method, $storagePath)
     {
         $this->method = strtoupper($method);
-        $this->storagePath = '/' . ltrim($storagePath, '/');
+        $this->storagePath = '/'.ltrim($storagePath, '/');
         return $this;
     }
 
@@ -62,7 +62,7 @@ 
             'timeout' => $this->config->timeout,
         ]);
 
-        $url = $this->endpoint . $this->storagePath;
+        $url = $this->endpoint.$this->storagePath;
         $body = null;
         if ($this->file && $this->method === 'PUT') {
             $body = $this->file;
@@ -108,7 +108,7 @@ 
 
     public function toRequest()
     {
-        $url = $this->endpoint . $this->storagePath;
+        $url = $this->endpoint.$this->storagePath;
         $body = null;
         if ($this->file && $this->method === 'PUT') {
             $body = $this->file;

Doc Comments +5 added lines, -2 removed lines

@@ -32,6 +32,9 @@ 
         $this->endpoint = $config->getProtocol() . Config::$restApiEndPoint . '/' . $config->serviceName;
     }
 
+    /**
+     * @param string $method
+     */
     public function request($method, $storagePath)
     {
         $this->method = strtoupper($method);
@@ -41,7 +44,7 @@ 
 
 
     /**
-     * @param string|resource $file
+     * @param \Psr\Http\Message\StreamInterface $file
      *
      * @return $this
      */
@@ -54,7 +57,7 @@ 
     }
 
     /**
-     * @return mixed|\Psr\Http\Message\ResponseInterface
+     * @return \Psr\Http\Message\ResponseInterface
      */
     public function send()
     {