upyun / php-sdk

tests/config.php

Spacing +1 added lines, -1 removed lines

@@ -3,5 +3,5 @@
     'user_name' => 'tester',
     'pwd' => 'grjxv2mxELR3',
     'bucket' => 'sdkimg',
-    'picture_path' => dirname(__FILE__) . '/assets/sample.jpeg'
+    'picture_path' => dirname(__FILE__).'/assets/sample.jpeg'
 );
\ No newline at end of file

tests/Api/MultiTest.php

Spacing +2 added lines, -2 removed lines

@@ -6,7 +6,7 @@ 
 use GuzzleHttp\Psr7;
 use Upyun\Upyun;
 
-class MultiTest extends \PHPUnit_Framework_TestCase{
+class MultiTest extends \PHPUnit_Framework_TestCase {
 
     /**
      * @var Multi;
@@ -20,7 +20,7 @@ 
     }
 
     public function testUpload() {
-        $filePath = __DIR__ . '/../assets/sample.jpeg';
+        $filePath = __DIR__.'/../assets/sample.jpeg';
         $stream = Psr7\stream_for(fopen($filePath, 'rb'));
         $r = $this->multiPart->upload('test-sample.jpeg', $stream, md5_file($filePath));
         $this->assertEquals($r->getStatusCode(), 200);

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 +5 added lines, -5 removed lines

@@ -28,7 +28,7 @@ 
             return $req->upload($path, $stream, $params);
         }
 
-        if(! $useBlock) {
+        if (!$useBlock) {
             $req = new Rest($this->config);
             return $req->request('PUT', $path)
                        ->withHeaders($params)
@@ -53,7 +53,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)
@@ -103,10 +103,10 @@ 
     }
 
     private function needUseBlock($fileSize) {
-        if($this->config->uploadType === 'BLOCK') {
+        if ($this->config->uploadType === 'BLOCK') {
             return true;
-        } else if($this->config->uploadType === 'AUTO' &&
-                  $fileSize >= $this->config->sizeBoundary ) {
+        } else if ($this->config->uploadType === 'AUTO' &&
+                  $fileSize >= $this->config->sizeBoundary) {
             return true;
         } else {
             return false;

src/Upyun/Config.php

Indentation +1 added lines, -1 removed lines

@@ -111,7 +111,7 @@
             throw new \Exception('form api key is empty.');
         }
 
-       return $this->formApiKey;
+        return $this->formApiKey;
     }
 
     public function setFormApiKey($key) {

Spacing +4 added lines, -4 removed lines

@@ -82,17 +82,17 @@ 
     /**
      * 分块上传接口请求地址
      */
-    const ED_FORM            = 'm0.api.upyun.com';
+    const ED_FORM = 'm0.api.upyun.com';
 
     /**
      * 异步云处理接口地址
      */
-    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/';
 
     public function __construct($bucketName, $operatorName, $operatorPassword) {
         $this->bucketName = $bucketName;
@@ -107,7 +107,7 @@ 
     }
 
     public function getFormApiKey() {
-        if(! $this->formApiKey) {
+        if (!$this->formApiKey) {
             throw new \Exception('form api key is empty.');
         }
 

src/Upyun/Api/Pretreat.php

Spacing +3 added lines, -3 removed lines

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

src/Upyun/Signature.php

Spacing +7 added lines, -7 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 签名需要的请求头
@@ -39,7 +39,7 @@ 
         $headers = array(
             'Authorization' => $sign,
             'Date' => $gmtDate,
-            'User-agent' => 'Php-Sdk/' . $bucketConfig->getVersion()
+            'User-agent' => 'Php-Sdk/'.$bucketConfig->getVersion()
         );
         return $headers;
     }
@@ -58,7 +58,7 @@ 
         return array(
             'Authorization' => "UpYun {$bucketConfig->bucketName}:{$bucketConfig->operatorName}:$sign",
             'Date' => $gmtDate,
-            'User-agent' => 'Php-Sdk/' . $bucketConfig->getVersion() . ' (purge api)'
+            'User-agent' => 'Php-Sdk/'.$bucketConfig->getVersion().' (purge api)'
         );
     }
 
@@ -90,7 +90,7 @@ 
             $data[] = $contentMd5;
         }
         $signature = base64_encode(hash_hmac('sha1', implode('&', $data), $bucketConfig->operatorPassword, true));
-        return 'UPYUN ' . $bucketConfig->operatorName . ':' . $signature;
+        return 'UPYUN '.$bucketConfig->operatorName.':'.$signature;
     }
 
     public static function getSignature(Config $bucketConfig, $data, $type, $tokenSecret = '') {
@@ -108,7 +108,7 @@ 
                     $string .= $tokenSecret ? $tokenSecret : $bucketConfig->getFormApiKey();
                     break;
                 case self::SIGN_VIDEO:
-                    $string = $bucketConfig->operatorName . $string . $bucketConfig->operatorPassword;
+                    $string = $bucketConfig->operatorName.$string.$bucketConfig->operatorPassword;
                     break;
                 case self::SIGN_VIDEO_NO_OPERATOR:
                     break;

src/Upyun/Api/Form.php

Spacing +3 added lines, -3 removed lines

@@ -6,7 +6,7 @@ 
 use Upyun\Util;
 use GuzzleHttp\Client;
 
-class Form extends Rest{
+class Form extends Rest {
 
     public function upload($path, $stream, $params) {
         $params['save-key'] = $path;
@@ -17,12 +17,12 @@ 
 
         $policy = Util::base64Json($params);
         $method = 'POST';
-        $signature = Signature::getBodySignature($this->config, $method, '/' . $params['bucket'], null, $policy);
+        $signature = Signature::getBodySignature($this->config, $method, '/'.$params['bucket'], null, $policy);
         $client = new Client([
             'timeout' => $this->config->timeout,
         ]);
 
-        $url = ($this->config->useSsl ? 'https://' : 'http://') . $this->endpoint;
+        $url = ($this->config->useSsl ? 'https://' : 'http://').$this->endpoint;
 
         $response = $client->request($method, $url, array(
             'multipart' => array(

src/Upyun/Util.php

Spacing +8 added lines, -8 removed lines

@@ -3,7 +3,7 @@ 
 class Util {
 
     public static function trim($str) {
-        if(is_array($str)) {
+        if (is_array($str)) {
             return array_map(array('Util', 'trim'), $str);
         } else {
             return trim($str);
@@ -14,7 +14,7 @@ 
         $params = [];
         foreach ($headers as $header => $value) {
             $header = strtolower($header);
-            if(strpos($header, 'x-upyun-') !== false) {
+            if (strpos($header, 'x-upyun-') !== false) {
                 $params[$header] = $value[0];
             }
         }
@@ -23,12 +23,12 @@ 
 
     public static function parseDir($body) {
         $files = array();
-        if(!$body) {
+        if (!$body) {
             return array();
         }
 
         $lines = explode("\n", $body);
-        foreach($lines as $line) {
+        foreach ($lines as $line) {
             $file = [];
             list($file['name'], $file['type'], $file['size'], $file['time']) = explode("\t", $line, 4);
             $files[] = $file;
@@ -64,16 +64,16 @@ 
      */
     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'=>'#'
         );
-        return strtr(rawurlencode($url), array_merge($reserved,$unescaped,$score));
+        return strtr(rawurlencode($url), array_merge($reserved, $unescaped, $score));
     }
 }

tests/SignatureTest.php

Spacing +1 added lines, -1 removed lines

@@ -3,7 +3,7 @@
 use Upyun\Signature;
 use Upyun\Config;
 
-class SignatureTest extends \PHPUnit_Framework_TestCase{
+class SignatureTest extends \PHPUnit_Framework_TestCase {
 
     /**
      * @var Config;