upyun · sabakugaara · Feb 16, 2017 · Feb 16, 2017 · Feb 16, 2017
diff --git a/.gitignore b/.gitignore
@@ -3,3 +3,4 @@
 vendor
 composer.lock
 release*
+.php_cs.cache
diff --git a/RoboFile.php b/RoboFile.php
@@ -4,33 +4,35 @@
  *
  * @see http://robo.li/
  */
-class RoboFile extends \Robo\Tasks {
-	/**
-	 * Creates release zip
-	 *
+class RoboFile extends \Robo\Tasks
+{
+    /**
+     * Creates release zip
+     *
      * @param string $version
      * @see https://gist.github.com/Rarst/5a8a65478755539770df653c4575219a
-	 */
-	public function release($version) {
+     */
+    public function release($version)
+    {
         $package = 'upyun/sdk';
         $name = 'php-sdk';
         $collection = $this->collectionBuilder();
         $workingPath = __DIR__ . DIRECTORY_SEPARATOR . $collection->workDir("release");
         $collection->taskExec("composer create-project {$package} {$name} {$version}")
              ->dir($workingPath)
-		     ->arg('--prefer-dist')
+             ->arg('--prefer-dist')
              ->arg('--no-dev')
              ->arg('-vvv')
              ->taskExec('composer dump-autoload --optimize')
              ->dir($workingPath . DIRECTORY_SEPARATOR . $name)
              ->arg('-vvv');
         $collection->run();
 
-		$zipFile = "release/{$name}-{$version}.zip";
+        $zipFile = "release/{$name}-{$version}.zip";
         $this->_remove($zipFile);
         $this->taskPack($zipFile)
             ->addDir("php-sdk", __DIR__ . "/release/php-sdk")
             ->run();
         $this->_deleteDir("release/$name");
-	}
+    }
 }
diff --git a/examples/list-all-file.php b/examples/list-all-file.php
@@ -16,7 +16,7 @@
     ));
 
     if (is_array($list['files'])) {
-        foreach($list['files'] as $file) {
+        foreach ($list['files'] as $file) {
             $total++;
             if ($file['type'] === 'N') {
                 echo '文件名: ';
@@ -28,9 +28,8 @@
             echo ' 修改时间:' . date('Y-m-d H:i:s', $file['time']);
             echo "\n";
         }
-
     }
     $start = $list['iter'];
-} while(!$list['is_end']);
+} while (!$list['is_end']);
 
 echo '总共存有文件 ' . $total . ' 个';
diff --git a/src/Upyun/Api/Form.php b/src/Upyun/Api/Form.php
@@ -6,9 +6,10 @@
 use Upyun\Util;
 use GuzzleHttp\Client;
 
-class Form extends Rest{
-
-    public function upload($path, $stream, $params) {
+class Form extends Rest
+{
+    public function upload($path, $stream, $params)
+    {
         $params['save-key'] = $path;
         $params['bucket'] = $this->config->bucketName;
         if (!isset($params['expiration'])) {

diff --git a/src/Upyun/Api/Multi.php b/src/Upyun/Api/Multi.php
@@ -7,15 +7,17 @@
 use Upyun\Signature;
 use Upyun\Util;
 
-class Multi {
+class Multi
+{
     /**
      * @var Config
      */
     protected $config;
 
     protected $url;
 
-    public function __construct(Config $config) {
+    public function __construct(Config $config)
+    {
         $this->config = $config;
         $this->url = ($this->config->useSsl ? 'https://' : 'http://') . Config::ED_FORM . '/'.
                      $this->config->bucketName;
@@ -30,28 +32,30 @@ public function __construct(Config $config) {
      * @return Psr7\Response
      * @throws \Exception
      */
-    public function upload($path, $stream, $fileHash, $params = []) {
+    public function upload($path, $stream, $fileHash, $params = [])
+    {
         $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)));
         }
     }
 
-    private function initRequest($path, Psr7\Stream $stream, $fileHash, $params) {
+    private function initRequest($path, Psr7\Stream $stream, $fileHash, $params)
+    {
         $metaData = array(
             'expiration' => time() + $this->config->blockExpiration,
             'file_blocks' => ceil($stream->getSize() / $this->config->maxBlockSize),
@@ -78,7 +82,8 @@ private function initRequest($path, Psr7\Stream $stream, $fileHash, $params) {
         return $initInfo;
     }
 
-    private function blockUpload($blocksInfo, $blockId, Psr7\Stream $stream, $params = []) {
+    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;
 
@@ -93,6 +98,7 @@ private function blockUpload($blocksInfo, $blockId, Psr7\Stream $stream, $params
             'block_hash' => md5($fileBlock),
         );
         $metaData = array_merge($metaData, $params);
+        $postData = array();
         $postData['policy'] = Util::base64Json($metaData);
         $postData['signature'] = Signature::getSignature(
             $this->config,
@@ -102,8 +108,8 @@ private function blockUpload($blocksInfo, $blockId, Psr7\Stream $stream, $params
         );
 
         $multipart = [];
-        foreach($postData as $key => $value) {
-           $multipart[] = ['name' => $key, 'contents' => $value];
+        foreach ($postData as $key => $value) {
+            $multipart[] = ['name' => $key, 'contents' => $value];
         }
         $multipart[] = [
             'name' => 'file',
@@ -121,7 +127,9 @@ private function blockUpload($blocksInfo, $blockId, Psr7\Stream $stream, $params
         return json_decode($response->getBody()->getContents());
     }
 
-    private function endRequest($initInfo, $data = array()) {
+    private function endRequest($initInfo, $data = array())
+    {
+        $metaData = array();
         $metaData['save_token'] = $initInfo->save_token;
         $metaData['expiration'] = $initInfo->expired_at;
 

diff --git a/src/Upyun/Api/Pretreat.php b/src/Upyun/Api/Pretreat.php
@@ -7,16 +7,23 @@
 use Upyun\Signature;
 use Upyun\Util;
 
+class Pretreat
+{
 
-class Pretreat {
+    /**
+     * @var Config
+     */
+    protected $config;
 
     protected $url = 'http://p0.api.upyun.com';
 
-    public function __construct(Config $config) {
+    public function __construct(Config $config)
+    {
         $this->config = $config;
     }
 
-    public function process($source, $tasks) {
+    public function process($source, $tasks)
+    {
         $encodedTasks = Util::base64Json($tasks);
 
         $client = new Client([
@@ -45,7 +52,8 @@ public function process($source, $tasks) {
     }
 
 
-    public function query($taskIds, $path) {
+    public function query($taskIds, $path)
+    {
         $client = new Client([
             'timeout' => $this->config->timeout,
         ]);

diff --git a/src/Upyun/Api/Rest.php b/src/Upyun/Api/Rest.php
@@ -8,7 +8,8 @@
 use Upyun\Signature;
 use Upyun\Util;
 
-class Rest {
+class Rest
+{
     /**
      * @var Config
      */
@@ -25,12 +26,14 @@ class Rest {
     protected $file;
 
 
-    public function __construct(Config $config) {
+    public function __construct(Config $config)
+    {
         $this->config   = $config;
         $this->endpoint = Config::$restApiEndPoint . '/' . $config->bucketName;
     }
 
-    public function request($method, $storagePath) {
+    public function request($method, $storagePath)
+    {
         $this->method = strtoupper($method);
         $this->storagePath = '/' . ltrim($storagePath, '/');
         return $this;
@@ -42,7 +45,8 @@ public function request($method, $storagePath) {
      *
      * @return $this
      */
-    public function withFile($file) {
+    public function withFile($file)
+    {
         $stream = Psr7\stream_for($file);
         $this->file = $stream;
 
@@ -52,14 +56,15 @@ public function withFile($file) {
     /**
      * @return mixed|\Psr\Http\Message\ResponseInterface
      */
-    public function send() {
+    public function send()
+    {
         $client = new Client([
             'timeout' => $this->config->timeout,
         ]);
 
         $url = ($this->config->useSsl ? 'https://' : 'http://') . $this->endpoint . $this->storagePath;
         $body = null;
-        if($this->file && $this->method === 'PUT') {
+        if ($this->file && $this->method === 'PUT') {
             $body = $this->file;
         }
 
@@ -73,7 +78,7 @@ public function send() {
             $this->method,
             $request->getUri()->getPath()
         );
-        foreach($authHeader as $head => $value) {
+        foreach ($authHeader as $head => $value) {
             $request = $request->withHeader($head, $value);
         }
         $response = $client->send($request, [
@@ -83,15 +88,17 @@ public function send() {
         return $response;
     }
 
-    public function withHeader($header, $value) {
+    public function withHeader($header, $value)
+    {
         $header = strtolower(trim($header));
 
         $this->headers[$header] = $value;
         return $this;
     }
 
-    public function withHeaders($headers) {
-        if(is_array($headers)) {
+    public function withHeaders($headers)
+    {
+        if (is_array($headers)) {
             foreach ($headers as $header => $value) {
                 $this->withHeader($header, $value);
             }

diff --git a/src/Upyun/Config.php b/src/Upyun/Config.php
@@ -6,7 +6,8 @@
  *
  * @package Upyun
  */
-class Config {
+class Config
+{
     /**
      * @var string 服务名称
      */
@@ -73,7 +74,7 @@ class Config {
     /**
      * @var string rest api 和 form api 的接口地址
      */
-    static $restApiEndPoint;
+    public static $restApiEndPoint;
 
 
     /**
@@ -99,31 +100,36 @@ class Config {
      */
     const ED_PURGE           = 'http://purge.upyun.com/purge/';
 
-    public function __construct($bucketName, $operatorName, $operatorPassword) {
+    public function __construct($bucketName, $operatorName, $operatorPassword)
+    {
         $this->bucketName = $bucketName;
         $this->operatorName = $operatorName;
         $this->setOperatorPassword($operatorPassword);
         $this->useSsl          = false;
         self::$restApiEndPoint = self::ED_AUTO;
     }
 
-    public function setOperatorPassword($operatorPassword) {
+    public function setOperatorPassword($operatorPassword)
+    {
         $this->operatorPassword = md5($operatorPassword);
     }
 
-    public function getFormApiKey() {
-        if(! $this->formApiKey) {
+    public function getFormApiKey()
+    {
+        if (! $this->formApiKey) {
             throw new \Exception('form api key is empty.');
         }
 
-       return $this->formApiKey;
+        return $this->formApiKey;
     }
 
-    public function setFormApiKey($key) {
+    public function setFormApiKey($key)
+    {
         $this->formApiKey = $key;
     }
 
-    public function getVersion() {
+    public function getVersion()
+    {
         return $this->version;
     }
 }