Completed
Pull Request — master (#607)
by Romain
01:50
created
src/Gaufrette/Adapter/Zip.php 2 patches
Doc Comments   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -135,7 +135,7 @@
 block discarded – undo
135 135
      * Returns the stat of a file in the zip archive
136 136
      *  (name, index, crc, mtime, compression size, compression method, filesize).
137 137
      *
138
-     * @param $key
138
+     * @param string $key
139 139
      *
140 140
      * @return array|bool
141 141
      */
Please login to merge, or discard this patch.
Switch Indentation   +30 added lines, -30 removed lines patch added patch discarded remove patch
@@ -166,46 +166,46 @@
 block discarded – undo
166 166
 
167 167
         if (true !== ($resultCode = $this->zipArchive->open($this->zipFile, ZipArchive::CREATE))) {
168 168
             switch ($resultCode) {
169
-            case ZipArchive::ER_EXISTS:
170
-                $errMsg = 'File already exists.';
169
+                case ZipArchive::ER_EXISTS:
170
+                    $errMsg = 'File already exists.';
171 171
 
172
-                break;
173
-            case ZipArchive::ER_INCONS:
174
-                $errMsg = 'Zip archive inconsistent.';
172
+                    break;
173
+                case ZipArchive::ER_INCONS:
174
+                    $errMsg = 'Zip archive inconsistent.';
175 175
 
176
-                break;
177
-            case ZipArchive::ER_INVAL:
178
-                $errMsg = 'Invalid argument.';
176
+                    break;
177
+                case ZipArchive::ER_INVAL:
178
+                    $errMsg = 'Invalid argument.';
179 179
 
180
-                break;
181
-            case ZipArchive::ER_MEMORY:
182
-                $errMsg = 'Malloc failure.';
180
+                    break;
181
+                case ZipArchive::ER_MEMORY:
182
+                    $errMsg = 'Malloc failure.';
183 183
 
184
-                break;
185
-            case ZipArchive::ER_NOENT:
186
-                $errMsg = 'Invalid argument.';
184
+                    break;
185
+                case ZipArchive::ER_NOENT:
186
+                    $errMsg = 'Invalid argument.';
187 187
 
188
-                break;
189
-            case ZipArchive::ER_NOZIP:
190
-                $errMsg = 'Not a zip archive.';
188
+                    break;
189
+                case ZipArchive::ER_NOZIP:
190
+                    $errMsg = 'Not a zip archive.';
191 191
 
192
-                break;
193
-            case ZipArchive::ER_OPEN:
194
-                $errMsg = 'Can\'t open file.';
192
+                    break;
193
+                case ZipArchive::ER_OPEN:
194
+                    $errMsg = 'Can\'t open file.';
195 195
 
196
-                break;
197
-            case ZipArchive::ER_READ:
198
-                $errMsg = 'Read error.';
196
+                    break;
197
+                case ZipArchive::ER_READ:
198
+                    $errMsg = 'Read error.';
199 199
 
200
-                break;
201
-            case ZipArchive::ER_SEEK:
202
-                $errMsg = 'Seek error.';
200
+                    break;
201
+                case ZipArchive::ER_SEEK:
202
+                    $errMsg = 'Seek error.';
203 203
 
204
-                break;
205
-            default:
206
-                $errMsg = 'Unknown error.';
204
+                    break;
205
+                default:
206
+                    $errMsg = 'Unknown error.';
207 207
 
208
-                break;
208
+                    break;
209 209
             }
210 210
 
211 211
             throw new \RuntimeException(sprintf('%s', $errMsg));
Please login to merge, or discard this patch.
src/Gaufrette/StreamWrapper.php 2 patches
Doc Comments   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -213,7 +213,7 @@
 block discarded – undo
213 213
     /**
214 214
      * @param string $path
215 215
      *
216
-     * @return mixed
216
+     * @return boolean
217 217
      */
218 218
     public function unlink($path)
219 219
     {
Please login to merge, or discard this patch.
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -257,11 +257,11 @@
 block discarded – undo
257 257
         $key = substr($parts['path'], 1);
258 258
 
259 259
         if (null !== $parts['query']) {
260
-            $key .= '?' . $parts['query'];
260
+            $key .= '?'.$parts['query'];
261 261
         }
262 262
 
263 263
         if (null !== $parts['fragment']) {
264
-            $key .= '#' . $parts['fragment'];
264
+            $key .= '#'.$parts['fragment'];
265 265
         }
266 266
 
267 267
         if (empty($domain) || empty($key)) {
Please login to merge, or discard this patch.
src/Gaufrette/Adapter/AwsS3.php 2 patches
Doc Comments   +3 added lines patch added patch discarded remove patch
@@ -287,6 +287,9 @@
 block discarded – undo
287 287
         return true;
288 288
     }
289 289
 
290
+    /**
291
+     * @param string $key
292
+     */
290 293
     protected function getOptions($key, array $options = [])
291 294
     {
292 295
         $options['ACL'] = $this->options['acl'];
Please login to merge, or discard this patch.
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -139,7 +139,7 @@  discard block
 block discarded – undo
139 139
         $this->ensureBucketExists();
140 140
         $options = $this->getOptions(
141 141
             $targetKey,
142
-            ['CopySource' => $this->bucket . '/' . $this->computePath($sourceKey)]
142
+            ['CopySource' => $this->bucket.'/'.$this->computePath($sourceKey)]
143 143
         );
144 144
 
145 145
         try {
@@ -268,7 +268,7 @@  discard block
 block discarded – undo
268 268
     {
269 269
         $result = $this->service->listObjects([
270 270
             'Bucket' => $this->bucket,
271
-            'Prefix' => rtrim($this->computePath($key), '/') . '/',
271
+            'Prefix' => rtrim($this->computePath($key), '/').'/',
272 272
             'MaxKeys' => 1,
273 273
         ]);
274 274
         if (isset($result['Contents'])) {
Please login to merge, or discard this patch.
src/Gaufrette/Adapter/AclAwareAmazonS3.php 2 patches
Doc Comments   +3 added lines patch added patch discarded remove patch
@@ -186,6 +186,9 @@
 block discarded – undo
186 186
         return $this->users;
187 187
     }
188 188
 
189
+    /**
190
+     * @param string $key
191
+     */
189 192
     private function updateAcl($key)
190 193
     {
191 194
         $response = $this->s3->set_object_acl($this->bucketName, $key, $this->getAcl());
Please login to merge, or discard this patch.
Spacing   +5 added lines, -5 removed lines patch added patch discarded remove patch
@@ -5,7 +5,7 @@  discard block
 block discarded – undo
5 5
 use AmazonS3 as AmazonClient;
6 6
 use Gaufrette\Adapter;
7 7
 
8
-@trigger_error('The ' . __NAMESPACE__ . '\AclAwareAmazonS3 adapter is deprecated since version 0.4 and will be removed in 1.0. Use the AwsS3 adapter instead.', E_USER_DEPRECATED);
8
+@trigger_error('The '.__NAMESPACE__.'\AclAwareAmazonS3 adapter is deprecated since version 0.4 and will be removed in 1.0. Use the AwsS3 adapter instead.', E_USER_DEPRECATED);
9 9
 
10 10
 /**
11 11
  * Makes the AmazonS3 adapter ACL aware. Uses the AWS SDK for PHP v1.x.
@@ -37,7 +37,7 @@  discard block
 block discarded – undo
37 37
 
38 38
     public function setAclConstant($constant)
39 39
     {
40
-        if (!defined($constant = 'AmazonS3::ACL_' . strtoupper($constant))) {
40
+        if (!defined($constant = 'AmazonS3::ACL_'.strtoupper($constant))) {
41 41
             throw new \InvalidArgumentException(sprintf('The ACL constant "%s" does not exist on AmazonS3.', $constant));
42 42
         }
43 43
 
@@ -53,13 +53,13 @@  discard block
 block discarded – undo
53 53
                 throw new \InvalidArgumentException(sprintf('setUsers() expects an array where each item contains a "permission" key, but got %s.', json_encode($user)));
54 54
             }
55 55
 
56
-            if (!defined($constant = 'AmazonS3::GRANT_' . strtoupper($user['permission']))) {
56
+            if (!defined($constant = 'AmazonS3::GRANT_'.strtoupper($user['permission']))) {
57 57
                 throw new \InvalidArgumentException('The permission must be the suffix for one of the AmazonS3::GRANT_ constants.');
58 58
             }
59 59
             $user['permission'] = constant($constant);
60 60
 
61 61
             if (isset($user['group'])) {
62
-                if (!defined($constant = 'AmazonS3::USERS_' . strtoupper($user['group']))) {
62
+                if (!defined($constant = 'AmazonS3::USERS_'.strtoupper($user['group']))) {
63 63
                     throw new \InvalidArgumentException('The group must be the suffix for one of the AmazonS3::USERS_ constants.');
64 64
                 }
65 65
                 $user['id'] = constant($constant);
@@ -191,7 +191,7 @@  discard block
 block discarded – undo
191 191
     {
192 192
         $response = $this->s3->set_object_acl($this->bucketName, $key, $this->getAcl());
193 193
         if (200 != $response->status) {
194
-            throw new \RuntimeException('S3-ACL change failed: ' . print_r($response, true));
194
+            throw new \RuntimeException('S3-ACL change failed: '.print_r($response, true));
195 195
         }
196 196
     }
197 197
 }
Please login to merge, or discard this patch.
src/Gaufrette/Adapter/AzureBlobStorage.php 2 patches
Doc Comments   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -466,7 +466,7 @@  discard block
 block discarded – undo
466 466
     }
467 467
 
468 468
     /**
469
-     * @param string|resource $content
469
+     * @param string $content
470 470
      *
471 471
      * @return string
472 472
      */
@@ -484,7 +484,7 @@  discard block
 block discarded – undo
484 484
     /**
485 485
      * @param string $key
486 486
      *
487
-     * @return array
487
+     * @return string[]
488 488
      * @throws \InvalidArgumentException
489 489
      */
490 490
     private function tokenizeKey($key)
@@ -508,7 +508,7 @@  discard block
 block discarded – undo
508 508
 
509 509
     /**
510 510
      * @param string $containerName
511
-     * @param null   $prefix
511
+     * @param string   $prefix
512 512
      *
513 513
      * @return array
514 514
      */
Please login to merge, or discard this patch.
Spacing   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -273,7 +273,7 @@  discard block
 block discarded – undo
273 273
                 $containersList = $this->blobProxy->listContainers();
274 274
 
275 275
                 return call_user_func_array('array_merge', array_map(
276
-                    function (Container $container) {
276
+                    function(Container $container) {
277 277
                         $containerName = $container->getName();
278 278
 
279 279
                         return $this->fetchBlobs($containerName, $containerName);
@@ -567,10 +567,10 @@  discard block
 block discarded – undo
567 567
         $blobList = $this->blobProxy->listBlobs($containerName);
568 568
 
569 569
         return array_map(
570
-            function (Blob $blob) use ($prefix) {
570
+            function(Blob $blob) use ($prefix) {
571 571
                 $name = $blob->getName();
572 572
                 if (null !== $prefix) {
573
-                    $name = $prefix . '/' . $name;
573
+                    $name = $prefix.'/'.$name;
574 574
                 }
575 575
 
576 576
                 return $name;
Please login to merge, or discard this patch.
src/Gaufrette/Filesystem.php 1 patch
Doc Comments   +1 added lines patch added patch discarded remove patch
@@ -241,6 +241,7 @@
 block discarded – undo
241 241
 
242 242
     /**
243 243
      * {@inheritdoc}
244
+     * @param string $key
244 245
      */
245 246
     public function createFile($key)
246 247
     {
Please login to merge, or discard this patch.
src/Gaufrette/Adapter/PhpseclibSftp.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -200,7 +200,7 @@  discard block
 block discarded – undo
200 200
 
201 201
     protected function computePath($key)
202 202
     {
203
-        return $this->directory . '/' . ltrim($key, '/');
203
+        return $this->directory.'/'.ltrim($key, '/');
204 204
     }
205 205
 
206 206
     protected function fetchKeys($directory = '', $onlyKeys = true)
@@ -218,7 +218,7 @@  discard block
 block discarded – undo
218 218
                 continue;
219 219
             }
220 220
 
221
-            $path = ltrim($directory . '/' . $filename, '/');
221
+            $path = ltrim($directory.'/'.$filename, '/');
222 222
             if (isset($stat['type']) && $stat['type'] === NET_SFTP_TYPE_DIRECTORY) {
223 223
                 $keys['dirs'][] = $path;
224 224
             } else {
Please login to merge, or discard this patch.
src/Gaufrette/Adapter/GridFS.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -171,7 +171,7 @@  discard block
 block discarded – undo
171 171
         if (isset($this->metadata[$key])) {
172 172
             return $this->metadata[$key];
173 173
         }
174
-        $meta = $this->bucket->findOne(['filename' => $key], ['projection' => ['metadata' => 1,'_id' => 0]]);
174
+        $meta = $this->bucket->findOne(['filename' => $key], ['projection' => ['metadata' => 1, '_id' => 0]]);
175 175
 
176 176
         if ($meta === null || !isset($meta['metadata'])) {
177 177
             return [];
@@ -215,7 +215,7 @@  discard block
 block discarded – undo
215 215
         if (!$this->exists($key)) {
216 216
             return false;
217 217
         }
218
-        $size = $this->bucket->findOne(['filename' => $key], ['projection' => ['length' => 1,'_id' => 0]]);
218
+        $size = $this->bucket->findOne(['filename' => $key], ['projection' => ['length' => 1, '_id' => 0]]);
219 219
         if (!isset($size['length'])) {
220 220
             return false;
221 221
         }
Please login to merge, or discard this patch.
src/Gaufrette/Adapter/AmazonS3.php 1 patch
Spacing   +4 added lines, -4 removed lines patch added patch discarded remove patch
@@ -5,7 +5,7 @@  discard block
 block discarded – undo
5 5
 use AmazonS3 as AmazonClient;
6 6
 use Gaufrette\Adapter;
7 7
 
8
-@trigger_error('The ' . __NAMESPACE__ . '\AmazonS3 adapter is deprecated since version 0.4 and will be removed in 1.0. Use the AwsS3 adapter instead.', E_USER_DEPRECATED);
8
+@trigger_error('The '.__NAMESPACE__.'\AmazonS3 adapter is deprecated since version 0.4 and will be removed in 1.0. Use the AwsS3 adapter instead.', E_USER_DEPRECATED);
9 9
 
10 10
 /**
11 11
  * Amazon S3 adapter using the AWS SDK for PHP v1.x.
@@ -125,11 +125,11 @@  discard block
 block discarded – undo
125 125
         $this->ensureBucketExists();
126 126
 
127 127
         $response = $this->service->copy_object(
128
-            [ // source
128
+            [// source
129 129
                 'bucket' => $this->bucket,
130 130
                 'filename' => $this->computePath($sourceKey),
131 131
             ],
132
-            [ // target
132
+            [// target
133 133
                 'bucket' => $this->bucket,
134 134
                 'filename' => $this->computePath($targetKey),
135 135
             ],
@@ -236,7 +236,7 @@  discard block
 block discarded – undo
236 236
      */
237 237
     public function isDirectory($key)
238 238
     {
239
-        if ($this->exists($key . '/')) {
239
+        if ($this->exists($key.'/')) {
240 240
             return true;
241 241
         }
242 242
 
Please login to merge, or discard this patch.