upyun / php-sdk

src/Upyun/Uploader.php

Indentation +3 added lines, -3 removed lines

@@ -31,9 +31,9 @@
         if (! $useBlock) {
             $req = new Rest($this->config);
             return $req->request('PUT', $path)
-                       ->withHeaders($params)
-                       ->withFile($stream)
-                       ->send();
+                        ->withHeaders($params)
+                        ->withFile($stream)
+                        ->send();
         } else {
             return $this->pointUpload($path, $stream, $params);
         }

Spacing +2 added lines, -2 removed lines

@@ -31,7 +31,7 @@ 
             return $req->upload($path, $stream, $params);
         }
 
-        if (! $useBlock) {
+        if (!$useBlock) {
             $req = new Rest($this->config);
             return $req->request('PUT', $path)
                        ->withHeaders($params)
@@ -57,7 +57,7 @@ 
         $headers = array();
         if (is_array($params)) {
             foreach ($params as $key => $val) {
-                $headers['X-Upyun-Meta-' . $key] = $val;
+                $headers['X-Upyun-Meta-'.$key] = $val;
             }
         }
         $res = $req->request('PUT', $path)

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/Api/Rest.php

Spacing +3 added lines, -3 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;

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

Spacing +5 added lines, -5 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();
@@ -363,7 +363,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 +3 added lines, -3 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*，
@@ -297,7 +297,7 @@ 
     /**
      * 刷新缓存
      *
-     * @param array|string $urls 需要刷新的文件 url 列表
+     * @param string $urls 需要刷新的文件 url 列表
      *
      * @return array 刷新失败的 url 列表，若全部刷新成功则为空数组
      */
@@ -460,7 +460,7 @@ 
      * @param string $file 需要剪辑的又拍云云存储中的 m3u8 文件路径
      * @param string $saveAs 剪辑完成后新的 m3u8 文件保存路径
      * @param array $slice 需要被保留或删除的片段。
-     * @param bool $$isInclude 默认为 `true` 表示 `$slice` 参数描述的片段被保留，否则表示 `$slice` 参数描述的片段被删除
+     * @param bool $isInclude 默认为 `true` 表示 `$slice` 参数描述的片段被保留，否则表示 `$slice` 参数描述的片段被删除
      * @param bool $index 指定 `$slice` 参数的格式，默认为 `false` 表示使用时间范围描述片段，单位秒：`[<开始时间>, <结束时间>]`；`true` 表示使用 `m3u8` 文件的分片序号，从 0 开始，这种方式可以一次对多个片段操作
      *
      * @return array 见 [m3u8 剪辑 - 响应](http://docs.upyun.com/cloud/sync_video/#_6)

Unused Use Statements -1 removed lines

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

tests/UpyunTest.php

Spacing +8 added lines, -8 removed lines

@@ -23,7 +23,7 @@ 
         $config->setFormApiKey('Mv83tlocuzkmfKKUFbz2s04FzTw=');
         $config->processNotifyUrl = 'http://localhost:9999';
         self::$upyun        = new Upyun($config);
-        self::$tempFilePath = __DIR__ . '/assets/test.txt';
+        self::$tempFilePath = __DIR__.'/assets/test.txt';
         touch(self::$tempFilePath);
     }
 
@@ -44,7 +44,7 @@ 
     public function testWriteStream()
     {
         $filename = 'test.jpeg';
-        $f = fopen(__DIR__ . '/assets/sample.jpeg', 'rb');
+        $f = fopen(__DIR__.'/assets/sample.jpeg', 'rb');
         if (!$f) {
             throw new \Exception('open test file failed!');
         }
@@ -57,7 +57,7 @@ 
     {
         $filename = 'test_async.jpeg';
         $newFilename = 'test_async.png';
-        $f = fopen(__DIR__ . '/assets/sample.jpeg', 'rb');
+        $f = fopen(__DIR__.'/assets/sample.jpeg', 'rb');
         if (!$f) {
             throw new \Exception('open test file failed!');
         }
@@ -81,7 +81,7 @@ 
         try {
             $fs->write('test.txt', 'test file content');
         } catch (\Exception $e) {
-            return ;
+            return;
         }
         throw new \Exception('should get sign error.');
     }
@@ -115,7 +115,7 @@ 
         try {
             self::$upyun->read('test-delete.txt');
         } catch (\Exception $e) {
-            return ;
+            return;
         }
         throw new \Exception('delete file failed');
     }
@@ -217,7 +217,7 @@ 
     public function testProcess()
     {
         $source = 'php-sdk-sample.mp4';
-        self::$upyun->write($source, fopen(__DIR__ . '/assets/SampleVideo_640x360_1mb.mp4', 'r'));
+        self::$upyun->write($source, fopen(__DIR__.'/assets/SampleVideo_640x360_1mb.mp4', 'r'));
         $result = self::$upyun->process(array(
             array('type' => 'video', 'avopts' => '/s/240p(4:3)/as/1/r/30', 'return_info' => true, 'save_as' => '/video/result.mp4')
         ), Upyun::$PROCESS_TYPE_MEDIA, $source);
@@ -256,7 +256,7 @@ 
     public function testAvMeta()
     {
         $source = 'php-sdk-sample.mp4';
-        self::$upyun->write($source, fopen(__DIR__ . '/assets/SampleVideo_640x360_1mb.mp4', 'r'));
+        self::$upyun->write($source, fopen(__DIR__.'/assets/SampleVideo_640x360_1mb.mp4', 'r'));
         $result = self::$upyun->avMeta('/php-sdk-sample.mp4');
         $this->assertTrue(count($result) === 2);
         $this->assertTrue($result['streams'][0]['type'] === 'video');
@@ -265,7 +265,7 @@ 
     public function testSnapshot()
     {
         $source = 'php-sdk-sample.mp4';
-        self::$upyun->write($source, fopen(__DIR__ . '/assets/SampleVideo_640x360_1mb.mp4', 'r'));
+        self::$upyun->write($source, fopen(__DIR__.'/assets/SampleVideo_640x360_1mb.mp4', 'r'));
         $result = self::$upyun->snapshot('/php-sdk-sample.mp4', '/snapshot.jpg', '00:00:01', '720x480', 'jpg');
         $this->assertTrue($result['status_code'] === 200);
     }