upyun / php-sdk

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

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

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) {