upyun / php-sdk

tests/UpyunTest.php

Spacing +11 added lines, -11 removed lines

@@ -3,7 +3,7 @@ 
 use Upyun\Config;
 use Upyun\Upyun;
 
-class UpyunTest extends \PHPUnit_Framework_TestCase{
+class UpyunTest extends \PHPUnit_Framework_TestCase {
 
     /**
      * @var Upyun
@@ -20,7 +20,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);
     }
 
@@ -38,8 +38,8 @@ 
 
     public function testWriteStream() {
         $filename = 'test.jpeg';
-        $f = fopen(__DIR__ . '/assets/sample.jpeg', 'rb');
-        if(!$f) {
+        $f = fopen(__DIR__.'/assets/sample.jpeg', 'rb');
+        if (!$f) {
             throw new \Exception('open test file failed!');
         }
         self::$upyun->write($filename, $f);
@@ -50,8 +50,8 @@ 
     public function testWriteWithAsyncProcess() {
         $filename = 'test_async.jpeg';
         $newFilename = 'test_async.png';
-        $f = fopen(__DIR__ . '/assets/sample.jpeg', 'rb');
-        if(!$f) {
+        $f = fopen(__DIR__.'/assets/sample.jpeg', 'rb');
+        if (!$f) {
             throw new \Exception('open test file failed!');
         }
         $result = self::$upyun->write($filename, $f, array(
@@ -72,8 +72,8 @@ 
         $fs = new Upyun(new Config(BUCKET, USER_NAME, 'error-password'));
         try {
             $fs->write('test.txt', 'test file content');
-        } catch(\Exception $e) {
-            return ;
+        } catch (\Exception $e) {
+            return;
         }
         throw new \Exception('should get sign error.');
     }
@@ -104,8 +104,8 @@ 
         $r = self::$upyun->delete('test-delete.txt');
         try {
             self::$upyun->read('test-delete.txt');
-        } catch(\Exception $e) {
-            return ;
+        } catch (\Exception $e) {
+            return;
         }
         throw new \Exception('delete file failed');
     }
@@ -189,7 +189,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($source, array(
             array('type' => 'video', 'avopts' => '/s/240p(4:3)/as/1/r/30', 'return_info' => true, 'save_as' => '/video/result.mp4')
         ));

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/SignatureTest.php

Spacing +2 added lines, -2 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;
@@ -16,6 +16,6 @@ 
 
     public function testGetSignature() {
         $sign = Signature::getSignature($this->config, array('a' => 'a', 'b' => 'b'), Signature::SIGN_MULTIPART, '123');
-        $this->assertEquals($sign , '2aa0afd612df8fab4b3fded36c396234');
+        $this->assertEquals($sign, '2aa0afd612df8fab4b3fded36c396234');
     }
 }
\ No newline at end of file

tests/bootstrap.php

Spacing +6 added lines, -6 removed lines

@@ -1,15 +1,15 @@ 
 <?php
-require dirname(__DIR__) . '/vendor/autoload.php';
-$config = require_once __DIR__ . '/config.php';
+require dirname(__DIR__).'/vendor/autoload.php';
+$config = require_once __DIR__.'/config.php';
 
 define('USER_NAME', $config['user_name']);
 define('PWD', $config['pwd']);
 define('BUCKET', $config['bucket']);
-define('PIC_PATH' , $config['picture_path']);
-define('PIC_SIZE' , filesize(PIC_PATH));
+define('PIC_PATH', $config['picture_path']);
+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) {
@@ -22,7 +22,7 @@ 
     preg_match('~^HTTP/1.1 (\d{3})~', $return, $match1);
     preg_match('~Content-Length: (\d+)~', $return, $match2);
 
-    if(isset($match1[1]) && $match1[1] == 200) {
+    if (isset($match1[1]) && $match1[1] == 200) {
         return isset($match2[1]) ? intval($match2[1]) : false;
     } else {
         return false;

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

Spacing +7 added lines, -7 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)
@@ -52,8 +52,8 @@ 
         $req = new Rest($this->config);
         $headers = array();
         if (is_array($params)) {
-            foreach($params as $key => $val) {
-                $headers['X-Upyun-Meta-' . $key] = $val;
+            foreach ($params as $key => $val) {
+                $headers['X-Upyun-Meta-'.$key] = $val;
             }
         }
         $res = $req->request('PUT', $path)
@@ -87,7 +87,7 @@ 
             }
             $data   = Util::getHeaderParams($res->getHeaders());
             $partId = $data['x-upyun-next-part-id'];
-        } while($partId != -1);
+        } while ($partId != -1);
 
         $res = $req->request('PUT', $path)
             ->withHeaders(array(
@@ -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

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/Signature.php

Spacing +14 added lines, -14 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;
 
     /**
      * 获取 RESET API 请求需要的签名头
@@ -32,14 +32,14 @@ 
      */
     public static function getRestApiSignHeader($bucketConfig, $method, $remotePath, $contentLength) {
         $gmtDate = gmdate('D, d M Y H:i:s \G\M\T');
-        $path = '/' . $bucketConfig->bucketName . '/' . ltrim($remotePath, '/');
+        $path = '/'.$bucketConfig->bucketName.'/'.ltrim($remotePath, '/');
 
         $sign = md5("$method&$path&$gmtDate&$contentLength&{$bucketConfig->operatorPassword}");
 
         $headers = array(
             'Authorization' => "UpYun {$bucketConfig->operatorName}:$sign",
             'Date' => $gmtDate,
-            'User-agent' => 'Php-Sdk/' . $bucketConfig->getVersion() . ' (rest api)'
+            'User-agent' => 'Php-Sdk/'.$bucketConfig->getVersion().' (rest api)'
         );
         return $headers;
     }
@@ -52,42 +52,42 @@ 
      *
      * @return array
      */
-    public static function getPurgeSignHeader( Config $bucketConfig, $urlString) {
+    public static function getPurgeSignHeader(Config $bucketConfig, $urlString) {
         $gmtDate = gmdate('D, d M Y H:i:s \G\M\T');
         $sign = md5("$urlString&{$bucketConfig->bucketName}&$gmtDate&{$bucketConfig->operatorPassword}");
         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)'
         );
     }
 
     public static function getFormSignature(Config $bucketConfig, $data) {
         $data['bucket'] = $bucketConfig->bucketName;
         $policy = Util::base64Json($data);
-        $signature = md5($policy . '&' . $bucketConfig->getFormApiKey());
+        $signature = md5($policy.'&'.$bucketConfig->getFormApiKey());
         return array(
             'policy' => $policy,
             'signature' => $signature
         );
     }
 
-    public static function getSignature( Config $bucketConfig, $data, $type, $tokenSecret = '') {
-        if(is_array($data)) {
+    public static function getSignature(Config $bucketConfig, $data, $type, $tokenSecret = '') {
+        if (is_array($data)) {
             ksort($data);
             $string = '';
-            foreach($data as $k => $v) {
-                if(is_array($v)) {
+            foreach ($data as $k => $v) {
+                if (is_array($v)) {
                     $v = implode('', $v);
                 }
                 $string .= "$k$v";
             }
-            switch($type) {
+            switch ($type) {
                 case self::SIGN_MULTIPART:
                     $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/Upyun.php

Spacing +10 added lines, -10 removed lines

@@ -86,7 +86,7 @@ 
      * @throws \Exception 上传失败时，抛出异常
      */
     public function write($path, $content, $params = array(), $withAsyncProcess = false) {
-        if(!$content) {
+        if (!$content) {
             throw new \Exception('write content can not be empty.');
         }
 
@@ -122,8 +122,8 @@ 
         $params = Util::getHeaderParams($response->getHeaders());
 
 
-        if(! isset($params['x-upyun-list-iter'])) {
-            if(is_resource($saveHandler)) {
+        if (!isset($params['x-upyun-list-iter'])) {
+            if (is_resource($saveHandler)) {
                 Psr7\copy_to_stream($response->getBody(), Psr7\stream_for($saveHandler));
                 return true;
             } else {
@@ -150,9 +150,9 @@ 
         try {
             $req->request('HEAD', $path)
                             ->send();
-        } catch(GuzzleHttp\Exception\BadResponseException $e) {
+        } catch (GuzzleHttp\Exception\BadResponseException $e) {
             $statusCode = $e->getResponse()->getStatusCode();
-            if($statusCode === 404) {
+            if ($statusCode === 404) {
                 return false;
             } else {
                 throw $e;
@@ -191,7 +191,7 @@ 
     public function delete($path, $async = false) {
         $req = new Rest($this->config);
         $req->request('DELETE', $path);
-        if($async) {
+        if ($async) {
             $req->withHeader('x-upyun-async', 'true');
         }
         $res = $req->send();
@@ -207,7 +207,7 @@ 
      * @throws \Exception
      */
     public function createDir($path) {
-        $path = rtrim($path, '/') . '/';
+        $path = rtrim($path, '/').'/';
         $req = new Rest($this->config);
         $res = $req->request('POST', $path)
             ->withHeader('folder', 'true')
@@ -236,9 +236,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')
             ->withHeader('folder', 'true')
             ->send();
 
@@ -254,7 +254,7 @@ 
      */
     public function purge($urls) {
         $urlString = $urls;
-        if(is_array($urls)) {
+        if (is_array($urls)) {
             $urlString = implode("\n", $urls);
         }