diff options
| author | Ferdinand Thiessen <opensource@fthiessen.de> | 2024-06-14 20:20:19 +0200 |
|---|---|---|
| committer | Ferdinand Thiessen <opensource@fthiessen.de> | 2024-06-16 15:54:44 +0200 |
| commit | ae1f5cc56dffb8323c29838b76b9cded39ae99e6 (patch) | |
| tree | ef50c4a0a2e322f5423d6f0e4891a91ea1751554 /lib/private | |
| parent | 232279a55116c9bf92e666b6b15507f73ff3313e (diff) | |
| download | nextcloud-server-ae1f5cc56dffb8323c29838b76b9cded39ae99e6.tar.gz nextcloud-server-ae1f5cc56dffb8323c29838b76b9cded39ae99e6.zip | |
fix(S3): Adjust usage of guzzle promise
`Promise\promise_for` was deprecated and is now removed and replaced with the static API (`Create::promiseFor`).
Signed-off-by: Ferdinand Thiessen <opensource@fthiessen.de>
Diffstat (limited to 'lib/private')
| -rw-r--r-- | lib/private/Files/ObjectStore/S3ConnectionTrait.php | 4 | ||||
| -rw-r--r-- | lib/private/Files/ObjectStore/S3Signature.php | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/lib/private/Files/ObjectStore/S3ConnectionTrait.php b/lib/private/Files/ObjectStore/S3ConnectionTrait.php index c7a5a8a1add..4609ad18905 100644 --- a/lib/private/Files/ObjectStore/S3ConnectionTrait.php +++ b/lib/private/Files/ObjectStore/S3ConnectionTrait.php @@ -11,7 +11,7 @@ use Aws\Credentials\Credentials; use Aws\Exception\CredentialsException; use Aws\S3\Exception\S3Exception; use Aws\S3\S3Client; -use GuzzleHttp\Promise; +use GuzzleHttp\Promise\Create; use GuzzleHttp\Promise\RejectedPromise; use OCP\ICertificateManager; use Psr\Log\LoggerInterface; @@ -178,7 +178,7 @@ trait S3ConnectionTrait { $secret = empty($this->params['secret']) ? null : $this->params['secret']; if ($key && $secret) { - return Promise\promise_for( + return Create::promiseFor( new Credentials($key, $secret) ); } diff --git a/lib/private/Files/ObjectStore/S3Signature.php b/lib/private/Files/ObjectStore/S3Signature.php index fd24a34b090..e3a522b6581 100644 --- a/lib/private/Files/ObjectStore/S3Signature.php +++ b/lib/private/Files/ObjectStore/S3Signature.php @@ -93,7 +93,7 @@ class S3Signature implements SignatureInterface { } } - $queryString = http_build_query($query, null, '&', PHP_QUERY_RFC3986); + $queryString = http_build_query($query, '', '&', PHP_QUERY_RFC3986); return $request->withUri($request->getUri()->withQuery($queryString)); } |