diff options
| m--------- | 3rdparty | 0 | ||||
| -rw-r--r-- | lib/private/Files/ObjectStore/S3ConnectionTrait.php | 4 | ||||
| -rw-r--r-- | lib/private/Files/ObjectStore/S3Signature.php | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/3rdparty b/3rdparty -Subproject 070e933ab4385021a7fc5259000f303507bedbb +Subproject 45d8fc9e09fbb4d3c4de5819afd9a6f72ce00f5 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)); } |