@@ -349,7 +349,7 @@ discard block |
||
| 349 | 349 | /** |
| 350 | 350 | * @param array $options |
| 351 | 351 | * |
| 352 | - * @return array |
|
| 352 | + * @return callable |
|
| 353 | 353 | * @throws OssException |
| 354 | 354 | */ |
| 355 | 355 | protected function retrieveListing(array $options) |
@@ -480,6 +480,7 @@ discard block |
||
| 480 | 480 | |
| 481 | 481 | /** |
| 482 | 482 | * {@inheritdoc} |
| 483 | + * @param string $prefix |
|
| 483 | 484 | */ |
| 484 | 485 | public function setPathPrefix($prefix) |
| 485 | 486 | { |
@@ -491,7 +492,7 @@ discard block |
||
| 491 | 492 | /** |
| 492 | 493 | * Get the object meta. |
| 493 | 494 | * |
| 494 | - * @param $path |
|
| 495 | + * @param string $path |
|
| 495 | 496 | * |
| 496 | 497 | * @return array|bool |
| 497 | 498 | */ |
@@ -562,7 +563,7 @@ discard block |
||
| 562 | 563 | * Normalize the object result array. |
| 563 | 564 | * |
| 564 | 565 | * @param array $response |
| 565 | - * @param null $path |
|
| 566 | + * @param string $path |
|
| 566 | 567 | * |
| 567 | 568 | * @return array |
| 568 | 569 | */ |
@@ -589,7 +590,7 @@ discard block |
||
| 589 | 590 | } |
| 590 | 591 | |
| 591 | 592 | /** |
| 592 | - * @param $location |
|
| 593 | + * @param string $location |
|
| 593 | 594 | * |
| 594 | 595 | * @return bool |
| 595 | 596 | */ |
@@ -8,13 +8,13 @@ |
||
| 8 | 8 | |
| 9 | 9 | namespace JimChen\Flysystem\AliyunOss; |
| 10 | 10 | |
| 11 | -use OSS\OssClient; |
|
| 12 | 11 | use GuzzleHttp\Psr7; |
| 13 | -use League\Flysystem\Util; |
|
| 14 | -use OSS\Core\OssException; |
|
| 15 | -use League\Flysystem\Config; |
|
| 16 | 12 | use League\Flysystem\Adapter\AbstractAdapter; |
| 17 | 13 | use League\Flysystem\Adapter\CanOverwriteFiles; |
| 14 | +use League\Flysystem\Config; |
|
| 15 | +use League\Flysystem\Util; |
|
| 16 | +use OSS\Core\OssException; |
|
| 17 | +use OSS\OssClient; |
|
| 18 | 18 | |
| 19 | 19 | class AliyunOssAdapter extends AbstractAdapter implements CanOverwriteFiles |
| 20 | 20 | { |
@@ -320,7 +320,7 @@ discard block |
||
| 320 | 320 | */ |
| 321 | 321 | public function listContents($directory = '', $recursive = false) |
| 322 | 322 | { |
| 323 | - $prefix = $this->applyPathPrefix(rtrim($directory, '/') . '/'); |
|
| 323 | + $prefix = $this->applyPathPrefix(rtrim($directory, '/').'/'); |
|
| 324 | 324 | |
| 325 | 325 | $options = [ |
| 326 | 326 | OssClient::OSS_PREFIX => ltrim($prefix, '/'), |
@@ -549,7 +549,7 @@ discard block |
||
| 549 | 549 | { |
| 550 | 550 | $options = $this->options; |
| 551 | 551 | |
| 552 | - foreach ((array)$keys as $key) { |
|
| 552 | + foreach ((array) $keys as $key) { |
|
| 553 | 553 | if ($value = $config->get($key)) { |
| 554 | 554 | $options[$key] = $value; |
| 555 | 555 | } |
@@ -599,7 +599,7 @@ discard block |
||
| 599 | 599 | // Do a prefix listing of objects to determine. |
| 600 | 600 | try { |
| 601 | 601 | $result = $this->ossClient->listObjects($this->bucket, [ |
| 602 | - OssClient::OSS_PREFIX => rtrim($location, '/') . '/', |
|
| 602 | + OssClient::OSS_PREFIX => rtrim($location, '/').'/', |
|
| 603 | 603 | OssClient::OSS_MAX_KEYS => 1, |
| 604 | 604 | ]); |
| 605 | 605 | |