nextcloud / server

apps/files_external/lib/Lib/Storage/AmazonS3.php

Spacing +15 added lines, -15 removed lines

@@ -83,7 +83,7 @@ 
 	public function __construct($parameters) {
 		parent::__construct($parameters);
 		$this->parseParams($parameters);
-		$this->id = 'amazon::external::' . md5($this->params['hostname'] . ':' . $this->params['bucket'] . ':' . $this->params['key']);
+		$this->id = 'amazon::external::'.md5($this->params['hostname'].':'.$this->params['bucket'].':'.$this->params['key']);
 		$this->objectCache = new CappedMemoryCache();
 		$this->directoryCache = new CappedMemoryCache();
 		$this->filesCache = new CappedMemoryCache();
@@ -187,7 +187,7 @@ 
 		if ($path === '.' || $path === '') {
 			return true;
 		}
-		$path = rtrim($path, '/') . '/';
+		$path = rtrim($path, '/').'/';
 
 		if (isset($this->directoryCache[$path])) {
 			return $this->directoryCache[$path];
@@ -253,7 +253,7 @@ 
 		try {
 			$this->getConnection()->putObject([
 				'Bucket' => $this->bucket,
-				'Key' => $path . '/',
+				'Key' => $path.'/',
 				'Body' => '',
 				'ContentType' => FileInfo::MIMETYPE_FOLDER
 			]);
@@ -302,7 +302,7 @@ 
 			'Bucket' => $this->bucket
 		];
 		if ($path !== null) {
-			$params['Prefix'] = $path . '/';
+			$params['Prefix'] = $path.'/';
 		}
 		try {
 			$connection = $this->getConnection();
@@ -339,7 +339,7 @@ 
 	public function opendir($path) {
 		try {
 			$content = iterator_to_array($this->getDirectoryContent($path));
-			return IteratorDirectory::wrap(array_map(function (array $item) {
+			return IteratorDirectory::wrap(array_map(function(array $item) {
 				return $item['name'];
 			}, $content));
 		} catch (S3Exception $e) {
@@ -375,12 +375,12 @@ 
 	 */
 	private function getContentLength($path) {
 		if (isset($this->filesCache[$path])) {
-			return (int)$this->filesCache[$path]['ContentLength'];
+			return (int) $this->filesCache[$path]['ContentLength'];
 		}
 
 		$result = $this->headObject($path);
 		if (isset($result['ContentLength'])) {
-			return (int)$result['ContentLength'];
+			return (int) $result['ContentLength'];
 		}
 
 		return 0;
@@ -509,7 +509,7 @@ 
 				$tmpFile = \OC::$server->getTempManager()->getTemporaryFile();
 
 				$handle = fopen($tmpFile, 'w');
-				return CallbackWrapper::wrap($handle, null, null, function () use ($path, $tmpFile) {
+				return CallbackWrapper::wrap($handle, null, null, function() use ($path, $tmpFile) {
 					$this->writeBack($tmpFile, $path);
 				});
 			case 'a':
@@ -534,7 +534,7 @@ 
 				}
 
 				$handle = fopen($tmpFile, $mode);
-				return CallbackWrapper::wrap($handle, null, null, function () use ($path, $tmpFile) {
+				return CallbackWrapper::wrap($handle, null, null, function() use ($path, $tmpFile) {
 					$this->writeBack($tmpFile, $path);
 				});
 		}
@@ -583,7 +583,7 @@ 
 				$this->getConnection()->copyObject([
 					'Bucket' => $this->bucket,
 					'Key' => $this->cleanKey($target),
-					'CopySource' => S3Client::encodeKey($this->bucket . '/' . $source)
+					'CopySource' => S3Client::encodeKey($this->bucket.'/'.$source)
 				]);
 				$this->testTimeout();
 			} catch (S3Exception $e) {
@@ -608,8 +608,8 @@ 
 			}
 
 			foreach ($this->getDirectoryContent($source) as $item) {
-				$childSource = $source . '/' . $item['name'];
-				$childTarget = $target . '/' . $item['name'];
+				$childSource = $source.'/'.$item['name'];
+				$childTarget = $target.'/'.$item['name'];
 				$this->copy($childSource, $childTarget, $item['mimetype'] !== FileInfo::MIMETYPE_FOLDER);
 			}
 		}
@@ -725,7 +725,7 @@ 
 			'storage_mtime' => strtotime($object['LastModified']),
 			'etag' => $object['ETag'],
 			'permissions' => Constants::PERMISSION_ALL - Constants::PERMISSION_CREATE,
-			'size' => (int)($object['Size'] ?? $object['ContentLength']),
+			'size' => (int) ($object['Size'] ?? $object['ContentLength']),
 		];
 	}
 
@@ -754,10 +754,10 @@ 
 
 	public function versioningEnabled(): bool {
 		if ($this->versioningEnabled === null) {
-			$cached = $this->memCache->get('versioning-enabled::' . $this->getBucket());
+			$cached = $this->memCache->get('versioning-enabled::'.$this->getBucket());
 			if ($cached === null) {
 				$this->versioningEnabled = $this->getVersioningStatusFromBucket();
-				$this->memCache->set('versioning-enabled::' . $this->getBucket(), $this->versioningEnabled, 60);
+				$this->memCache->set('versioning-enabled::'.$this->getBucket(), $this->versioningEnabled, 60);
 			} else {
 				$this->versioningEnabled = $cached;
 			}