upyun / php-sdk

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;

tests/UpyunTest.php

Spacing +7 added lines, -7 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,7 +38,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!');
         }
@@ -50,7 +50,7 @@ 
     public function testWriteWithAsyncProcess() {
         $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!');
         }
@@ -73,7 +73,7 @@ 
         try {
             $fs->write('test.txt', 'test file content');
         } catch (\Exception $e) {
-            return ;
+            return;
         }
         throw new \Exception('should get sign error.');
     }
@@ -105,7 +105,7 @@ 
         try {
             self::$upyun->read('test-delete.txt');
         } catch (\Exception $e) {
-            return ;
+            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')
         ));

src/Upyun/Api/Rest.php

Spacing +3 added lines, -3 removed lines

@@ -27,12 +27,12 @@ 
 
     public function __construct(Config $config) {
         $this->config   = $config;
-        $this->endpoint = Config::$restApiEndPoint . '/' . $config->bucketName;
+        $this->endpoint = Config::$restApiEndPoint.'/'.$config->bucketName;
     }
 
     public function request($method, $storagePath) {
         $this->method = strtoupper($method);
-        $this->storagePath = '/' . ltrim($storagePath, '/');
+        $this->storagePath = '/'.ltrim($storagePath, '/');
         return $this;
     }
 
@@ -57,7 +57,7 @@ 
             'timeout' => $this->config->timeout,
         ]);
 
-        $url = ($this->config->useSsl ? 'https://' : 'http://') . $this->endpoint . $this->storagePath;
+        $url = ($this->config->useSsl ? 'https://' : 'http://').$this->endpoint.$this->storagePath;
         $body = null;
         if ($this->file && $this->method === 'PUT') {
             $body = $this->file;

src/Upyun/Api/Multi.php

Indentation +2 added lines, -2 removed lines

@@ -18,7 +18,7 @@ 
     public function __construct(Config $config) {
         $this->config = $config;
         $this->url = ($this->config->useSsl ? 'https://' : 'http://') . Config::ED_FORM . '/'.
-                     $this->config->bucketName;
+                        $this->config->bucketName;
     }
 
     /**
@@ -104,7 +104,7 @@ 
 
         $multipart = [];
         foreach ($postData as $key => $value) {
-           $multipart[] = ['name' => $key, 'contents' => $value];
+            $multipart[] = ['name' => $key, 'contents' => $value];
         }
         $multipart[] = [
             'name' => 'file',

Spacing +3 added lines, -3 removed lines

@@ -17,7 +17,7 @@ 
 
     public function __construct(Config $config) {
         $this->config = $config;
-        $this->url = ($this->config->useSsl ? 'https://' : 'http://') . Config::ED_FORM . '/'.
+        $this->url = ($this->config->useSsl ? 'https://' : 'http://').Config::ED_FORM.'/'.
                      $this->config->bucketName;
     }
 
@@ -31,7 +31,7 @@ 
      * @throws \Exception
      */
     public function upload($path, $stream, $fileHash, $params = []) {
-        $path = '/' . ltrim($path, '/');
+        $path = '/'.ltrim($path, '/');
         $initInfo = $this->initRequest($path, $stream, $fileHash, $params);
         $blockStatus = $initInfo->status;
 
@@ -109,7 +109,7 @@ 
         $multipart[] = [
             'name' => 'file',
             'contents' => $fileBlock,
-            'filename' => 'file',  //this value must be file
+            'filename' => 'file', //this value must be file
             'headers' => ['Content-Type' => 'application/octet-stream']
         ];
         $postData['file'] = $fileBlock;

tests/bootstrap.php

Spacing +3 added lines, -3 removed lines

@@ -1,14 +1,14 @@
 <?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/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 +3 added lines, -3 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)
@@ -106,7 +106,7 @@ 
         if ($this->config->uploadType === 'BLOCK') {
             return true;
         } else if ($this->config->uploadType === 'AUTO' &&
-                  $fileSize >= $this->config->sizeBoundary ) {
+                  $fileSize >= $this->config->sizeBoundary) {
             return true;
         } else {
             return false;

src/Upyun/Config.php

Spacing +4 added lines, -4 removed lines

@@ -87,17 +87,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;
@@ -112,7 +112,7 @@ 
     }
 
     public function getFormApiKey() {
-        if (! $this->formApiKey) {
+        if (!$this->formApiKey) {
             throw new \Exception('form api key is empty.');
         }
 

src/Upyun/Upyun.php

Spacing +4 added lines, -4 removed lines

@@ -121,7 +121,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;
@@ -206,7 +206,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')
@@ -234,9 +234,9 @@ 
      * @throws \Exception
      */
     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();

src/Upyun/Util.php

Spacing +4 added lines, -4 removed lines

@@ -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));
     }
 }