Completed
Pull Request — master (#16)
by frey
02:26
created
src/Client/Auth.php 1 patch
Doc Comments   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -31,8 +31,8 @@
 block discarded – undo
31 31
     /**
32 32
      * 生成单次有效签名函数(用于删除和更新指定fileId资源,使用一次即失效).
33 33
      *
34
-     * @param string $fileId     文件路径,以 /{$appId}/{$bucketName} 开头
35 34
      * @param string $bucketName 文件所在bucket
35
+     * @param string $path
36 36
      *
37 37
      * @return string 签名
38 38
      */
Please login to merge, or discard this patch.
src/Client/Cosapi.php 2 patches
Doc Comments   +5 added lines, -1 removed lines patch added patch discarded remove patch
@@ -197,6 +197,10 @@  discard block
 block discarded – undo
197 197
      * 'Content-Language' => '*'
198 198
      * 'x-cos-meta-自定义内容' => '*'
199 199
      */
200
+
201
+    /**
202
+     * @param string $authority
203
+     */
200 204
     public static function update($bucketName, $path,
201 205
                   $bizAttr = null, $authority = null, $customer_headers_array = null)
202 206
     {
@@ -866,8 +870,8 @@  discard block
 block discarded – undo
866 870
     /**
867 871
      * 判断pattern值是否正确.
868 872
      *
869
-     * @param string $authority
870 873
      *
874
+     * @param string $pattern
871 875
      * @return [type] bool
872 876
      */
873 877
     private static function isPatternValid($pattern)
Please login to merge, or discard this patch.
Indentation   +7 added lines, -7 removed lines patch added patch discarded remove patch
@@ -53,7 +53,7 @@  discard block
 block discarded – undo
53 53
      * @return [type] [description]
54 54
      */
55 55
     public static function upload($bucketName, $srcPath, $dstPath,
56
-               $bizAttr = null, $slicesize = null, $insertOnly = null)
56
+                $bizAttr = null, $slicesize = null, $insertOnly = null)
57 57
     {
58 58
         if (!file_exists($srcPath)) {
59 59
             return [
@@ -160,7 +160,7 @@  discard block
 block discarded – undo
160 160
         return self::updateBase($bucketName, $path, $bizAttr);
161 161
     }
162 162
 
163
-   /*
163
+    /*
164 164
      * 查询目录信息
165 165
      * @param  string  $bucketName bucket名称
166 166
      * @param  string  $path       目录路径
@@ -198,7 +198,7 @@  discard block
 block discarded – undo
198 198
      * 'x-cos-meta-自定义内容' => '*'
199 199
      */
200 200
     public static function update($bucketName, $path,
201
-                  $bizAttr = null, $authority = null, $customer_headers_array = null)
201
+                    $bizAttr = null, $authority = null, $customer_headers_array = null)
202 202
     {
203 203
         $path = self::normalizerPath($path);
204 204
 
@@ -283,9 +283,9 @@  discard block
 block discarded – undo
283 283
 
284 284
         if (filesize($srcPath) >= self::MAX_UNSLICE_FILE_SIZE) {
285 285
             return [
286
-                   'code'    => self::COSAPI_PARAMS_ERROR,
287
-                   'message' => 'file '.$srcPath.' larger then 20M, please use upload_slice interface',
288
-                   'data'    => [], ];
286
+                    'code'    => self::COSAPI_PARAMS_ERROR,
287
+                    'message' => 'file '.$srcPath.' larger then 20M, please use upload_slice interface',
288
+                    'data'    => [], ];
289 289
         }
290 290
 
291 291
         $expired = time() + self::EXPIRED_SECONDS;
@@ -624,7 +624,7 @@  discard block
 block discarded – undo
624 624
      * 'x-cos-meta-自定义内容' => '*'
625 625
      */
626 626
     private static function updateBase($bucketName, $path,
627
-                  $bizAttr = null, $authority = null, $custom_headers_array = null)
627
+                    $bizAttr = null, $authority = null, $custom_headers_array = null)
628 628
     {
629 629
         $path = self::cosUrlEncode($path);
630 630
         $expired = time() + self::EXPIRED_SECONDS;
Please login to merge, or discard this patch.
src/ServiceProvider.php 2 patches
Indentation   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -30,9 +30,9 @@
 block discarded – undo
30 30
         });
31 31
 
32 32
         Storage::disk('cosv3')
33
-               ->addPlugin(new PutRemoteFile())
34
-               ->addPlugin(new PutRemoteFileAs())
35
-               ->addPlugin(new GetUrl());
33
+                ->addPlugin(new PutRemoteFile())
34
+                ->addPlugin(new PutRemoteFileAs())
35
+                ->addPlugin(new GetUrl());
36 36
     }
37 37
 
38 38
     /**
Please login to merge, or discard this patch.
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -25,7 +25,7 @@
 block discarded – undo
25 25
             __DIR__.'/filesystems.php' => config_path('filesystems.php'),
26 26
         ]);
27 27
 
28
-        Storage::extend('cosv3', function ($app, $config) {
28
+        Storage::extend('cosv3', function($app, $config) {
29 29
             return new Filesystem(new Adapter($config));
30 30
         });
31 31
 
Please login to merge, or discard this patch.
src/Client/Http.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -78,8 +78,8 @@
 block discarded – undo
78 78
                 curl_setopt(self::$_curlHandler, CURLOPT_SSLVERSION, 4);
79 79
             }
80 80
         } elseif ($ssl) {
81
-            curl_setopt(self::$_curlHandler, CURLOPT_SSL_VERIFYPEER, false);   //true any ca
82
-            curl_setopt(self::$_curlHandler, CURLOPT_SSL_VERIFYHOST, 1);       //check only host
81
+            curl_setopt(self::$_curlHandler, CURLOPT_SSL_VERIFYPEER, false); //true any ca
82
+            curl_setopt(self::$_curlHandler, CURLOPT_SSL_VERIFYHOST, 1); //check only host
83 83
             if (isset($rq['ssl_version'])) {
84 84
                 curl_setopt(self::$_curlHandler, CURLOPT_SSLVERSION, $rq['ssl_version']);
85 85
             } else {
Please login to merge, or discard this patch.
src/Adapter.php 3 patches
Doc Comments   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -45,7 +45,7 @@  discard block
 block discarded – undo
45 45
     }
46 46
 
47 47
     /**
48
-     * @return mixed
48
+     * @return string
49 49
      */
50 50
     public function getBucket()
51 51
     {
@@ -53,7 +53,7 @@  discard block
 block discarded – undo
53 53
     }
54 54
 
55 55
     /**
56
-     * @param $path
56
+     * @param string $path
57 57
      *
58 58
      * @return string
59 59
      */
@@ -287,7 +287,7 @@  discard block
 block discarded – undo
287 287
     /**
288 288
      * @param string $path
289 289
      *
290
-     * @return array
290
+     * @return string
291 291
      */
292 292
     public function read($path)
293 293
     {
Please login to merge, or discard this patch.
Indentation   +4 added lines, -4 removed lines patch added patch discarded remove patch
@@ -77,7 +77,7 @@  discard block
 block discarded – undo
77 77
 
78 78
         try {
79 79
             $response = Cosapi::upload($this->getBucket(), $tmpfname, $path,
80
-                                       null, null, $config->get('insertOnly', 1));
80
+                                        null, null, $config->get('insertOnly', 1));
81 81
 
82 82
             $this->deleteTempFile($tmpfname);
83 83
 
@@ -111,7 +111,7 @@  discard block
 block discarded – undo
111 111
         $uri = stream_get_meta_data($resource)['uri'];
112 112
 
113 113
         $response = Cosapi::upload($this->getBucket(), $uri, $path,
114
-                                   null, null, $config->get('insertOnly', 1));
114
+                                    null, null, $config->get('insertOnly', 1));
115 115
 
116 116
         $response = $this->normalizeResponse($response);
117 117
 
@@ -139,7 +139,7 @@  discard block
 block discarded – undo
139 139
 
140 140
         try {
141 141
             $response = Cosapi::upload($this->getBucket(), $tmpfname, $path,
142
-                                       null, null, $config->get('insertOnly', 0));
142
+                                        null, null, $config->get('insertOnly', 0));
143 143
 
144 144
             $this->deleteTempFile($tmpfname);
145 145
 
@@ -173,7 +173,7 @@  discard block
 block discarded – undo
173 173
         $uri = stream_get_meta_data($resource)['uri'];
174 174
 
175 175
         $response = Cosapi::upload($this->getBucket(), $uri, $path,
176
-                                   null, null, $config->get('insertOnly', 0));
176
+                                    null, null, $config->get('insertOnly', 0));
177 177
 
178 178
         $response = $this->normalizeResponse($response);
179 179
 
Please login to merge, or discard this patch.
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -39,7 +39,7 @@
 block discarded – undo
39 39
         $this->bucket = $config['bucket'];
40 40
         $this->debug  = $config['debug'];
41 41
 
42
-        $this->setPathPrefix($config['protocol'] . '://' . $config['domain'] . '/');
42
+        $this->setPathPrefix($config['protocol'].'://'.$config['domain'].'/');
43 43
 
44 44
         Cosapi::setTimeout($config['timeout']);
45 45
     }
Please login to merge, or discard this patch.
tests/AdapterTest.php 1 patch
Spacing   +7 added lines, -7 removed lines patch added patch discarded remove patch
@@ -45,12 +45,12 @@  discard block
 block discarded – undo
45 45
     {
46 46
         $temp = tmpfile();
47 47
         fwrite($temp, "writing to tempfile");
48
-        $this->assertTrue((bool)$adapter->writeStream('foo/bar.md', $temp, new Config(['insertOnly' => 0])));
48
+        $this->assertTrue((bool) $adapter->writeStream('foo/bar.md', $temp, new Config(['insertOnly' => 0])));
49 49
         fclose($temp);
50 50
         
51 51
         $temp = tmpfile();
52 52
         fwrite($temp, uniqid());
53
-        $this->assertFalse((bool)$adapter->writeStream('foo/bar.md', $temp, new Config(['insertOnly' => 1])));
53
+        $this->assertFalse((bool) $adapter->writeStream('foo/bar.md', $temp, new Config(['insertOnly' => 1])));
54 54
         fclose($temp);
55 55
     }
56 56
     
@@ -71,12 +71,12 @@  discard block
 block discarded – undo
71 71
     {
72 72
         $temp = tmpfile();
73 73
         fwrite($temp, "writing to tempfile");
74
-        $this->assertTrue((bool)$adapter->updateStream('foo/bar.md', $temp, new Config(['insertOnly' => 0])));
74
+        $this->assertTrue((bool) $adapter->updateStream('foo/bar.md', $temp, new Config(['insertOnly' => 0])));
75 75
         fclose($temp);
76 76
         
77 77
         $temp = tmpfile();
78 78
         fwrite($temp, uniqid());
79
-        $this->assertFalse((bool)$adapter->updateStream('foo/bar.md', $temp, new Config(['insertOnly' => 1])));
79
+        $this->assertFalse((bool) $adapter->updateStream('foo/bar.md', $temp, new Config(['insertOnly' => 1])));
80 80
         fclose($temp);
81 81
     }
82 82
 
@@ -115,8 +115,8 @@  discard block
 block discarded – undo
115 115
      */
116 116
     public function testCreateDir($adapter)
117 117
     {
118
-        $this->assertTrue((bool)$adapter->createDir('bar', new Config()));
119
-        $this->assertFalse((bool)$adapter->createDir('bar', new Config()));
118
+        $this->assertTrue((bool) $adapter->createDir('bar', new Config()));
119
+        $this->assertFalse((bool) $adapter->createDir('bar', new Config()));
120 120
     }
121 121
 
122 122
     /**
@@ -161,7 +161,7 @@  discard block
 block discarded – undo
161 161
     public function testGetUrl($adapter, $config)
162 162
     {
163 163
         $this->assertSame(
164
-            $config['protocol'] . '://' . $config['domain'] . '/foo/bar.md',
164
+            $config['protocol'].'://'.$config['domain'].'/foo/bar.md',
165 165
             $adapter->getUrl('foo/bar.md')
166 166
         );
167 167
     }
Please login to merge, or discard this patch.