Merge pull request #45854 from nextcloud/chore-update-aws-sdk

chore(deps): Bump aws/aws-sdk-php from 3.240.8 to 3.311.2
nextcloud · Jun 16, 2024 · 424b51e · 424b51e
2 parents 55036a0 + ae1f5cc
commit 424b51e
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 4 deletions.
diff --git a/3rdparty b/3rdparty
diff --git a/lib/private/Files/ObjectStore/S3ConnectionTrait.php b/lib/private/Files/ObjectStore/S3ConnectionTrait.php
@@ -11,7 +11,7 @@
 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 @@ protected function paramCredentialProvider(): callable {
 			$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
@@ -93,7 +93,7 @@ public function presign(
 			}
 		}
 
-		$queryString = http_build_query($query, null, '&', PHP_QUERY_RFC3986);
+		$queryString = http_build_query($query, '', '&', PHP_QUERY_RFC3986);
 
 		return $request->withUri($request->getUri()->withQuery($queryString));
 	}
-Original file line number
+Diff line change
@@ Expand Up / @@ -93,7 +93,7 @@ public function presign( @@
     			}
     		}
-    		$queryString = http_build_query($query, null, '&', PHP_QUERY_RFC3986);
+    		$queryString = http_build_query($query, '', '&', PHP_QUERY_RFC3986);
     		return $request->withUri($request->getUri()->withQuery($queryString));
     	}
@@ Expand Down @@