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/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;

src/Upyun/Uploader.php

Indentation +3 added lines, -3 removed lines

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

Spacing +8 added lines, -8 removed lines

@@ -33,7 +33,7 @@ 
             return $req->upload($path, $stream, $params);
         }
 
-        if (! $useBlock) {
+        if (!$useBlock) {
             $req = new Rest($this->config);
             return $req->request('PUT', $path)
                        ->withHeaders($params)
@@ -61,7 +61,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)
@@ -118,13 +118,13 @@ 
      * @return mixed
      * @throws \Exception
      */
-    public function initiateMultipartUpload($path, $size, $params=[])
+    public function initiateMultipartUpload($path, $size, $params = [])
     {
         $req = new Rest($this->config);
         $headers = array();
         if (is_array($params)) {
             foreach ($params as $key => $val) {
-                $headers['X-Upyun-Meta-' . $key] = $val;
+                $headers['X-Upyun-Meta-'.$key] = $val;
             }
         }
 
@@ -224,7 +224,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)
@@ -241,7 +241,7 @@ 
 
         $init = Util::getHeaderParams($res->getHeaders());
         $uuid = $init['x-upyun-multi-uuid'];
-        $requests = function ($req, $path, $stream, $uuid) {
+        $requests = function($req, $path, $stream, $uuid) {
             $blockSize = 1024 * 1024;
             $total = ceil($stream->getSize() / $blockSize);
             for ($i = 0; $i < $total; $i++) {
@@ -261,12 +261,12 @@ 
         ]);
         $pool = new Pool($client, $requests($req, $path, $stream, $uuid), [
             'concurrency' => $this->config->concurrency,
-            'fulfilled' => function ($res) {
+            'fulfilled' => function($res) {
                 if ($res->getStatusCode() !== 204) {
                     throw new \Exception('upload request failed when poinit upload!');
                 }
             },
-            'rejected' => function () {
+            'rejected' => function() {
                 throw new \Exception('upload request failed when poinit upload!');
             },
         ]);

tests/UpyunTest.php

Spacing +9 added lines, -9 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.');
     }
@@ -116,7 +116,7 @@ 
         try {
             self::$upyun->read('test-delete.txt');
         } catch (\Exception $e) {
-            return ;
+            return;
         }
         throw new \Exception('delete file failed');
     }
@@ -246,7 +246,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);
@@ -285,7 +285,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');
@@ -295,7 +295,7 @@ 
     {
         sleep(5);
         $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);
     }
@@ -306,7 +306,7 @@ 
         $config->setUploadType('BLOCK_PARALLEL');
         $upyun = new Upyun($config);
         $filename = 'test_parallel.jpeg';
-        $upyun->write($filename, fopen(__DIR__ . '/assets/sample.jpeg', 'rb'));
+        $upyun->write($filename, fopen(__DIR__.'/assets/sample.jpeg', 'rb'));
 
         $size = getUpyunFileSize($filename);
         $this->assertEquals($size, PIC_SIZE);