upyun / php-sdk

src/Upyun/Api/Multi.php

Doc Comments +7 added lines

@@ -51,6 +51,10 @@ 
         }
     }
 
+    /**
+     * @param string $path
+     * @param string $fileHash
+     */
     private function initRequest($path, Psr7\Stream $stream, $fileHash, $params) {
         $metaData = array(
             'expiration' => time() + $this->config->blockExpiration,
@@ -78,6 +82,9 @@ 
         return $initInfo;
     }
 
+    /**
+     * @param integer $blockId
+     */
     private function blockUpload($blocksInfo, $blockId, Psr7\Stream $stream, $params = []) {
         $startPosition = $blockId * $this->config->maxBlockSize;
         $endPosition   = $blockId >= $blocksInfo->blocks - 1 ? $stream->getSize() : $startPosition + $this->config->maxBlockSize;

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;
     }
 
     /**
@@ -103,7 +103,7 @@ 
 
         $multipart = [];
         foreach($postData as $key => $value) {
-           $multipart[] = ['name' => $key, 'contents' => $value];
+            $multipart[] = ['name' => $key, 'contents' => $value];
         }
         $multipart[] = [
             'name' => 'file',

Spacing +7 added lines, -7 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,20 +31,20 @@ 
      * @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;
 
         $newBlockStatus = $blockStatus;
 
-        for($blockId = 0; $blockId < $initInfo->blocks; $blockId++) {
-            if($blockStatus[$blockId] === 0) {
+        for ($blockId = 0; $blockId < $initInfo->blocks; $blockId++) {
+            if ($blockStatus[$blockId] === 0) {
                 $return = $this->blockUpload($initInfo, $blockId, $stream);
                 $newBlockStatus = $return->status;
             }
         }
 
-        if(array_sum($newBlockStatus) === $initInfo->blocks) {
+        if (array_sum($newBlockStatus) === $initInfo->blocks) {
             return $this->endRequest($initInfo, $params);
         } else {
             throw new \Exception(sprintf("chunk upload failed! current every block status is : [%s]", implode(',', $newBlockStatus)));
@@ -102,13 +102,13 @@ 
         );
 
         $multipart = [];
-        foreach($postData as $key => $value) {
+        foreach ($postData as $key => $value) {
            $multipart[] = ['name' => $key, 'contents' => $value];
         }
         $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;

src/Upyun/Api/Pretreat.php

Doc Comments +6 added lines

@@ -16,6 +16,9 @@ 
         $this->config = $config;
     }
 
+    /**
+     * @param string $source
+     */
     public function process($source, $tasks) {
         $encodedTasks = Util::base64Json($tasks);
 
@@ -43,6 +46,9 @@ 
     }
 
 
+    /**
+     * @param string $path
+     */
     public function query($taskIds, $path) {
         $client = new Client([
             'timeout' => $this->config->timeout,

Unused Use Statements -1 removed lines

@@ -1,7 +1,6 @@
 <?php
 namespace Upyun\Api;
 
-use GuzzleHttp\Psr7;
 use GuzzleHttp\Client;
 use Upyun\Config;
 use Upyun\Signature;

Spacing +2 added lines, -2 removed lines

@@ -31,7 +31,7 @@ 
             'accept' => 'json'
         );
 
-        $url = $this->url . '/pretreatment';
+        $url = $this->url.'/pretreatment';
         $signature = Signature::getSignature($this->config, $params, Signature::SIGN_VIDEO);
         $response = $client->request('POST', $url, [
             'headers' => array('Authorization' => "UPYUN {$this->config->operatorName}:$signature"),
@@ -53,7 +53,7 @@ 
             'task_ids' => implode(',', $taskIds)
         );
 
-        $url = $this->url . $path;
+        $url = $this->url.$path;
         $signature = Signature::getSignature($this->config, $params, Signature::SIGN_VIDEO);
         $response = $client->request('GET', $url, [
             'headers' => array('Authorization' => "UPYUN {$this->config->operatorName}:$signature"),

src/Upyun/Api/Rest.php

Doc Comments +5 added lines, -2 removed lines

@@ -29,6 +29,9 @@ 
         $this->endpoint = Config::$restApiEndPoint . '/' . $config->bucketName;
     }
     
+    /**
+     * @param string $method
+     */
     public function request($method, $storagePath) {
         $this->method = strtoupper($method);
         $this->storagePath = '/' . ltrim($storagePath, '/');
@@ -37,7 +40,7 @@ 
 
 
     /**
-     * @param string|resource $file
+     * @param Psr7\Stream $file
      *
      * @return $this
      */
@@ -49,7 +52,7 @@ 
     }
 
     /**
-     * @return mixed|\Psr\Http\Message\ResponseInterface
+     * @return \Psr\Http\Message\ResponseInterface
      */
     public function send() {
         $client = new Client([

Spacing +5 added lines, -5 removed lines

@@ -26,12 +26,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;
     }
 
@@ -56,10 +56,10 @@ 
             'timeout' => $this->config->timeout,
         ]);
 
-        $url = ($this->config->useSsl ? 'https://' : 'http://') . $this->endpoint . $this->storagePath;
+        $url = ($this->config->useSsl ? 'https://' : 'http://').$this->endpoint.$this->storagePath;
         $bodySize = 0;
         $body = null;
-        if($this->file && $this->method === 'PUT') {
+        if ($this->file && $this->method === 'PUT') {
             $bodySize = $this->file->getSize();
             $body = $this->file;
         }
@@ -81,7 +81,7 @@ 
     }
 
     public function withHeaders($headers) {
-        if(is_array($headers)) {
+        if (is_array($headers)) {
             foreach ($headers as $header => $value) {
                 $this->withHeader($header, $value);
             }

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

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;