@@ -47,7 +47,7 @@ discard block |
||
| 47 | 47 | * @param string $region |
| 48 | 48 | * @param array $options |
| 49 | 49 | * |
| 50 | - * @return callable |
|
| 50 | + * @return \Closure |
|
| 51 | 51 | */ |
| 52 | 52 | public static function wrap($region, array $options) |
| 53 | 53 | { |
@@ -56,6 +56,9 @@ discard block |
||
| 56 | 56 | }; |
| 57 | 57 | } |
| 58 | 58 | |
| 59 | + /** |
|
| 60 | + * @param string $region |
|
| 61 | + */ |
|
| 59 | 62 | public function __construct( |
| 60 | 63 | callable $nextHandler, |
| 61 | 64 | $region, |
@@ -150,6 +153,11 @@ discard block |
||
| 150 | 153 | && S3Client::isBucketDnsCompatible($command['Bucket']); |
| 151 | 154 | } |
| 152 | 155 | |
| 156 | + /** |
|
| 157 | + * @param string $host |
|
| 158 | + * |
|
| 159 | + * @return string |
|
| 160 | + */ |
|
| 153 | 161 | private function getBucketStyleHost(CommandInterface $command, $host) |
| 154 | 162 | { |
| 155 | 163 | // For operations on the base host (e.g. ListBuckets) |
@@ -195,11 +203,17 @@ discard block |
||
| 195 | 203 | return $request; |
| 196 | 204 | } |
| 197 | 205 | |
| 206 | + /** |
|
| 207 | + * @return string |
|
| 208 | + */ |
|
| 198 | 209 | private function getDualStackHost() |
| 199 | 210 | { |
| 200 | 211 | return "s3.dualstack.{$this->region}.amazonaws.com"; |
| 201 | 212 | } |
| 202 | 213 | |
| 214 | + /** |
|
| 215 | + * @param string $pattern |
|
| 216 | + */ |
|
| 203 | 217 | private function applyAccelerateEndpoint( |
| 204 | 218 | CommandInterface $command, |
| 205 | 219 | RequestInterface $request, |
@@ -216,11 +230,19 @@ discard block |
||
| 216 | 230 | return $request; |
| 217 | 231 | } |
| 218 | 232 | |
| 233 | + /** |
|
| 234 | + * @return string |
|
| 235 | + */ |
|
| 219 | 236 | private function getAccelerateHost(CommandInterface $command, $pattern) |
| 220 | 237 | { |
| 221 | 238 | return "{$command['Bucket']}.{$pattern}.amazonaws.com"; |
| 222 | 239 | } |
| 223 | 240 | |
| 241 | + /** |
|
| 242 | + * @param string $path |
|
| 243 | + * |
|
| 244 | + * @return string |
|
| 245 | + */ |
|
| 224 | 246 | private function getBucketlessPath($path, CommandInterface $command) |
| 225 | 247 | { |
| 226 | 248 | $pattern = '/^\\/' . preg_quote($command['Bucket'], '/') . '/'; |
@@ -2,7 +2,6 @@ |
||
| 2 | 2 | namespace Aws\S3; |
| 3 | 3 | |
| 4 | 4 | use Aws\CommandInterface; |
| 5 | -use Aws\S3\Exception\S3Exception; |
|
| 6 | 5 | use Psr\Http\Message\RequestInterface; |
| 7 | 6 | |
| 8 | 7 | /** |
@@ -286,6 +286,9 @@ |
||
| 286 | 286 | }); |
| 287 | 287 | } |
| 288 | 288 | |
| 289 | + /** |
|
| 290 | + * @return string |
|
| 291 | + */ |
|
| 289 | 292 | private function getCacheKey($bucketName) |
| 290 | 293 | { |
| 291 | 294 | return "aws:s3:{$bucketName}:location"; |
@@ -205,6 +205,9 @@ discard block |
||
| 205 | 205 | return $this->body->write($data); |
| 206 | 206 | } |
| 207 | 207 | |
| 208 | + /** |
|
| 209 | + * @param string $path |
|
| 210 | + */ |
|
| 208 | 211 | public function unlink($path) |
| 209 | 212 | { |
| 210 | 213 | $this->initProtocol($path); |
@@ -263,6 +266,9 @@ discard block |
||
| 263 | 266 | $this->protocol = $parts[0] ?: 's3'; |
| 264 | 267 | } |
| 265 | 268 | |
| 269 | + /** |
|
| 270 | + * @param string $path |
|
| 271 | + */ |
|
| 266 | 272 | private function createStat($path, $flags) |
| 267 | 273 | { |
| 268 | 274 | $this->initProtocol($path); |
@@ -442,7 +448,7 @@ discard block |
||
| 442 | 448 | /** |
| 443 | 449 | * This method is called in response to rewinddir() |
| 444 | 450 | * |
| 445 | - * @return boolean true on success |
|
| 451 | + * @return boolean|null true on success |
|
| 446 | 452 | */ |
| 447 | 453 | public function dir_rewinddir() |
| 448 | 454 | { |
@@ -558,6 +564,7 @@ discard block |
||
| 558 | 564 | /** |
| 559 | 565 | * Validates the provided stream arguments for fopen and returns an array |
| 560 | 566 | * of errors. |
| 567 | + * @param string $mode |
|
| 561 | 568 | */ |
| 562 | 569 | private function validate($path, $mode) |
| 563 | 570 | { |
@@ -214,6 +214,9 @@ discard block |
||
| 214 | 214 | return rtrim(str_replace('\\', '/', $path), '/'); |
| 215 | 215 | } |
| 216 | 216 | |
| 217 | + /** |
|
| 218 | + * @param string $uri |
|
| 219 | + */ |
|
| 217 | 220 | private function resolveUri($uri) |
| 218 | 221 | { |
| 219 | 222 | $resolved = []; |
@@ -380,6 +383,9 @@ discard block |
||
| 380 | 383 | return $relative_file_path; |
| 381 | 384 | } |
| 382 | 385 | |
| 386 | + /** |
|
| 387 | + * @param resource $debug |
|
| 388 | + */ |
|
| 383 | 389 | private function addDebugToBefore($debug) |
| 384 | 390 | { |
| 385 | 391 | $before = $this->before; |
@@ -5,7 +5,6 @@ |
||
| 5 | 5 | use Aws\CommandInterface; |
| 6 | 6 | use Aws\Exception\AwsException; |
| 7 | 7 | use GuzzleHttp\Promise; |
| 8 | -use GuzzleHttp\Psr7; |
|
| 9 | 8 | use GuzzleHttp\Promise\PromisorInterface; |
| 10 | 9 | use Iterator; |
| 11 | 10 | |
@@ -174,6 +174,12 @@ |
||
| 174 | 174 | return '/' . str_replace('%2F', '/', $doubleEncoded); |
| 175 | 175 | } |
| 176 | 176 | |
| 177 | + /** |
|
| 178 | + * @param string $longDate |
|
| 179 | + * @param string $creq |
|
| 180 | + * |
|
| 181 | + * @return string |
|
| 182 | + */ |
|
| 177 | 183 | private function createStringToSign($longDate, $credentialScope, $creq) |
| 178 | 184 | { |
| 179 | 185 | $hash = hash('sha256', $creq); |
@@ -121,6 +121,9 @@ discard block |
||
| 121 | 121 | $this->prevInput = $entry; |
| 122 | 122 | } |
| 123 | 123 | |
| 124 | + /** |
|
| 125 | + * @param double $start |
|
| 126 | + */ |
|
| 124 | 127 | private function stepOutput($start, $entry) |
| 125 | 128 | { |
| 126 | 129 | static $keys = ['result', 'error']; |
@@ -130,6 +133,9 @@ discard block |
||
| 130 | 133 | $this->prevOutput = $entry; |
| 131 | 134 | } |
| 132 | 135 | |
| 136 | + /** |
|
| 137 | + * @param string $title |
|
| 138 | + */ |
|
| 133 | 139 | private function compareStep(array $a, array $b, $title, array $keys) |
| 134 | 140 | { |
| 135 | 141 | $changes = []; |
@@ -280,6 +286,9 @@ discard block |
||
| 280 | 286 | } |
| 281 | 287 | } |
| 282 | 288 | |
| 289 | + /** |
|
| 290 | + * @param string $value |
|
| 291 | + */ |
|
| 283 | 292 | private function write($value) |
| 284 | 293 | { |
| 285 | 294 | if ($this->config['scrub_auth']) { |
@@ -226,7 +226,7 @@ |
||
| 226 | 226 | * |
| 227 | 227 | * @param string $path |
| 228 | 228 | * |
| 229 | - * @return resource |
|
| 229 | + * @return boolean |
|
| 230 | 230 | */ |
| 231 | 231 | public function createWriteStream($path) |
| 232 | 232 | { |
@@ -307,7 +307,7 @@ |
||
| 307 | 307 | * |
| 308 | 308 | * @param string $directoryPath |
| 309 | 309 | * |
| 310 | - * @return bool |
|
| 310 | + * @return boolean|null |
|
| 311 | 311 | */ |
| 312 | 312 | public function hasDirectory($directoryPath) |
| 313 | 313 | { |
@@ -16,7 +16,6 @@ |
||
| 16 | 16 | |
| 17 | 17 | use CKSource\CKFinder\Acl\AclInterface; |
| 18 | 18 | use CKSource\CKFinder\Acl\Permission; |
| 19 | -use CKSource\CKFinder\Backend\Adapter\AwsS3; |
|
| 20 | 19 | use CKSource\CKFinder\Backend\Adapter\EmulateRenameDirectoryInterface; |
| 21 | 20 | use CKSource\CKFinder\CKFinder; |
| 22 | 21 | use CKSource\CKFinder\Config; |
@@ -93,7 +93,7 @@ |
||
| 93 | 93 | * |
| 94 | 94 | * @param string $key |
| 95 | 95 | * |
| 96 | - * @return bool true if successful |
|
| 96 | + * @return false|null true if successful |
|
| 97 | 97 | */ |
| 98 | 98 | public function delete($key) |
| 99 | 99 | { |