nextcloud / server

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

Spacing +15 added lines, -15 removed lines

@@ -165,7 +165,7 @@ 
 					'MaxKeys' => 1,
 					'Delimiter' => '/',
 				]);
-				$this->directoryCache[$path] = ($result['Contents'][0]['Key'] === rtrim($path, '/') . '/') || $result['CommonPrefixes'];
+				$this->directoryCache[$path] = ($result['Contents'][0]['Key'] === rtrim($path, '/').'/') || $result['CommonPrefixes'];
 			} catch (S3Exception $e) {
 				if ($e->getStatusCode() === 403) {
 					$this->directoryCache[$path] = false;
@@ -184,7 +184,7 @@ 
 	 * @param array $params
 	 */
 	public function updateLegacyId(array $params) {
-		$oldId = 'amazon::' . $params['key'] . md5($params['secret']);
+		$oldId = 'amazon::'.$params['key'].md5($params['secret']);
 
 		// find by old id or bucket
 		$stmt = \OC::$server->getDatabaseConnection()->prepare(
@@ -236,7 +236,7 @@ 
 		try {
 			$this->getConnection()->putObject([
 				'Bucket' => $this->bucket,
-				'Key' => $path . '/',
+				'Key' => $path.'/',
 				'Body' => '',
 				'ContentType' => 'httpd/unix-directory'
 			]);
@@ -287,7 +287,7 @@ 
 			'Bucket' => $this->bucket
 		];
 		if ($path !== null) {
-			$params['Prefix'] = $path . '/';
+			$params['Prefix'] = $path.'/';
 		}
 		try {
 			$connection = $this->getConnection();
@@ -353,9 +353,9 @@ 
 						$files[] = $file;
 
 						// store this information for later usage
-						$this->filesCache[$path . $file] = [
+						$this->filesCache[$path.$file] = [
 							'ContentLength' => $object['Size'],
-							'LastModified' => (string)$object['LastModified'],
+							'LastModified' => (string) $object['LastModified'],
 						];
 					}
 				}
@@ -406,12 +406,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;
@@ -525,7 +525,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':
@@ -550,7 +550,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);
 				});
 		}
@@ -596,7 +596,7 @@ 
 				$this->getConnection()->copyObject([
 					'Bucket' => $this->bucket,
 					'Key' => $this->cleanKey($path2),
-					'CopySource' => S3Client::encodeKey($this->bucket . '/' . $path1)
+					'CopySource' => S3Client::encodeKey($this->bucket.'/'.$path1)
 				]);
 				$this->testTimeout();
 			} catch (S3Exception $e) {
@@ -609,8 +609,8 @@ 
 			try {
 				$this->getConnection()->copyObject([
 					'Bucket' => $this->bucket,
-					'Key' => $path2 . '/',
-					'CopySource' => S3Client::encodeKey($this->bucket . '/' . $path1 . '/')
+					'Key' => $path2.'/',
+					'CopySource' => S3Client::encodeKey($this->bucket.'/'.$path1.'/')
 				]);
 				$this->testTimeout();
 			} catch (S3Exception $e) {
@@ -625,8 +625,8 @@ 
 						continue;
 					}
 
-					$source = $path1 . '/' . $file;
-					$target = $path2 . '/' . $file;
+					$source = $path1.'/'.$file;
+					$target = $path2.'/'.$file;
 					$this->copy($source, $target);
 				}
 			}