upyun / php-sdk

src/Upyun/Api/Rest.php

Spacing +4 added lines, -4 removed lines

@@ -29,13 +29,13 @@ 
     public function __construct(Config $config)
     {
         $this->config   = $config;
-        $this->endpoint = $config->getProtocol() . Config::$restApiEndPoint . '/' . $config->serviceName;
+        $this->endpoint = $config->getProtocol().Config::$restApiEndPoint.'/'.$config->serviceName;
     }
 
     public function request($method, $storagePath)
     {
         $this->method = strtoupper($method);
-        $this->storagePath = '/' . ltrim($storagePath, '/');
+        $this->storagePath = '/'.ltrim($storagePath, '/');
         return $this;
     }
 
@@ -62,7 +62,7 @@ 
             'timeout' => $this->config->timeout,
         ]);
 
-        $url = $this->endpoint . $this->storagePath;
+        $url = $this->endpoint.$this->storagePath;
         $body = null;
         if ($this->file && $this->method === 'PUT') {
             $body = $this->file;
@@ -108,7 +108,7 @@ 
 
     public function toRequest()
     {
-        $url = $this->endpoint . $this->storagePath;
+        $url = $this->endpoint.$this->storagePath;
         $body = null;
         if ($this->file && $this->method === 'PUT') {
             $body = $this->file;

src/Upyun/Uploader.php

Indentation +3 added lines, -3 removed lines

@@ -36,9 +36,9 @@
         if (! $useBlock) {
             $req = new Rest($this->config);
             return $req->request('PUT', $path)
-                       ->withHeaders($params)
-                       ->withFile($stream)
-                       ->send();
+                        ->withHeaders($params)
+                        ->withFile($stream)
+                        ->send();
         } elseif ($this->config->uploadType === 'BLOCK_PARALLEL') {
             return $this->concurrentPointUpload($path, $stream, $params);
         } else {

Spacing +6 added lines, -6 removed lines

@@ -33,7 +33,7 @@ 
             return $req->upload($path, $stream, $params);
         }
 
-        if (! $useBlock) {
+        if (!$useBlock) {
             $req = new Rest($this->config);
             return $req->request('PUT', $path)
                        ->withHeaders($params)
@@ -61,7 +61,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)
@@ -139,7 +139,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)
@@ -156,7 +156,7 @@ 
 
         $init = Util::getHeaderParams($res->getHeaders());
         $uuid = $init['x-upyun-multi-uuid'];
-        $requests = function ($req, $path, $stream, $uuid) {
+        $requests = function($req, $path, $stream, $uuid) {
             $blockSize = 1024 * 1024;
             $total = ceil($stream->getSize() / $blockSize);
             for ($i = 0; $i < $total; $i++) {
@@ -176,12 +176,12 @@ 
         ]);
         $pool = new Pool($client, $requests($req, $path, $stream, $uuid), [
             'concurrency' => $this->config->concurrency,
-            'fulfilled' => function ($res) {
+            'fulfilled' => function($res) {
                 if ($res->getStatusCode() !== 204) {
                     throw new \Exception('upload request failed when poinit upload!');
                 }
             },
-            'rejected' => function () {
+            'rejected' => function() {
                 throw new \Exception('upload request failed when poinit upload!');
             },
         ]);

tests/UpyunTest.php

Spacing +9 added lines, -9 removed lines

@@ -23,7 +23,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);
     }
 
@@ -44,7 +44,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!');
         }
@@ -57,7 +57,7 @@ 
     {
         $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!');
         }
@@ -81,7 +81,7 @@ 
         try {
             $fs->write('test.txt', 'test file content');
         } catch (\Exception $e) {
-            return ;
+            return;
         }
         throw new \Exception('should get sign error.');
     }
@@ -116,7 +116,7 @@ 
         try {
             self::$upyun->read('test-delete.txt');
         } catch (\Exception $e) {
-            return ;
+            return;
         }
         throw new \Exception('delete file failed');
     }
@@ -218,7 +218,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(array(
             array('type' => 'video', 'avopts' => '/s/240p(4:3)/as/1/r/30', 'return_info' => true, 'save_as' => '/video/result.mp4')
         ), Upyun::$PROCESS_TYPE_MEDIA, $source);
@@ -257,7 +257,7 @@ 
     public function testAvMeta()
     {
         $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->avMeta('/php-sdk-sample.mp4');
         $this->assertTrue(count($result) === 2);
         $this->assertTrue($result['streams'][0]['type'] === 'video');
@@ -266,7 +266,7 @@ 
     public function testSnapshot()
     {
         $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->snapshot('/php-sdk-sample.mp4', '/snapshot.jpg', '00:00:01', '720x480', 'jpg');
         $this->assertTrue($result['status_code'] === 200);
     }
@@ -277,7 +277,7 @@ 
         $config->setUploadType('BLOCK_PARALLEL');
         $upyun = new Upyun($config);
         $filename = 'test_parallel.jpeg';
-        $upyun->write($filename, fopen(__DIR__ . '/assets/sample.jpeg', 'rb'));
+        $upyun->write($filename, fopen(__DIR__.'/assets/sample.jpeg', 'rb'));
 
         $size = getUpyunFileSize($filename);
         $this->assertEquals($size, PIC_SIZE);