From: Christoph Wurst <christoph@winzerhof-wurst.at>
Date: Fri, 3 Jul 2020 07:02:58 +0000 (+0200)
Subject: Fix static method call for s3 bucket compat check
X-Git-Tag: v20.0.0beta1~326^2
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=refs%2Fpull%2F21662%2Fhead;p=nextcloud-server.git

Fix static method call for s3 bucket compat check

Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
---

diff --git a/lib/private/Files/ObjectStore/S3ConnectionTrait.php b/lib/private/Files/ObjectStore/S3ConnectionTrait.php
index 16a48ee82a0..b96a11833cd 100644
--- a/lib/private/Files/ObjectStore/S3ConnectionTrait.php
+++ b/lib/private/Files/ObjectStore/S3ConnectionTrait.php
@@ -110,7 +110,7 @@ trait S3ConnectionTrait {
 		}
 		$this->connection = new S3Client($options);
 
-		if (!$this->connection->isBucketDnsCompatible($this->bucket)) {
+		if (!$this->connection::isBucketDnsCompatible($this->bucket)) {
 			$logger = \OC::$server->getLogger();
 			$logger->debug('Bucket "' . $this->bucket . '" This bucket name is not dns compatible, it may contain invalid characters.',
 					 ['app' => 'objectstore']);
@@ -120,7 +120,7 @@ trait S3ConnectionTrait {
 			$logger = \OC::$server->getLogger();
 			try {
 				$logger->info('Bucket "' . $this->bucket . '" does not exist - creating it.', ['app' => 'objectstore']);
-				if (!$this->connection->isBucketDnsCompatible($this->bucket)) {
+				if (!$this->connection::isBucketDnsCompatible($this->bucket)) {
 					throw new \Exception("The bucket will not be created because the name is not dns compatible, please correct it: " . $this->bucket);
 				}
 				$this->connection->createBucket(['Bucket' => $this->bucket]);