nextcloud / server

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

Spacing +15 added lines, -15 removed lines

@@ -142,7 +142,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(
@@ -194,7 +194,7 @@ 
 		try {
 			$this->getConnection()->putObject(array(
 				'Bucket' => $this->bucket,
-				'Key' => $path . '/',
+				'Key' => $path.'/',
 				'Body' => '',
 				'ContentType' => 'httpd/unix-directory'
 			));
@@ -245,7 +245,7 @@ 
 			'Bucket' => $this->bucket
 		);
 		if ($path !== null) {
-			$params['Prefix'] = $path . '/';
+			$params['Prefix'] = $path.'/';
 		}
 		try {
 			$connection = $this->getConnection();
@@ -309,9 +309,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'],
 						];
 					}
 				}
@@ -393,7 +393,7 @@ 
 	public function is_dir($path) {
 		$path = $this->normalizePath($path);
 		try {
-			return $this->isRoot($path) || $this->headObject($path . '/');
+			return $this->isRoot($path) || $this->headObject($path.'/');
 		} catch (S3Exception $e) {
 			\OC::$server->getLogger()->logException($e, ['app' => 'files_external']);
 			return false;
@@ -411,7 +411,7 @@ 
 			if (isset($this->filesCache[$path]) || $this->headObject($path)) {
 				return 'file';
 			}
-			if ($this->headObject($path . '/')) {
+			if ($this->headObject($path.'/')) {
 				return 'dir';
 			}
 		} catch (S3Exception $e) {
@@ -465,7 +465,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':
@@ -490,7 +490,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);
 				});
 		}
@@ -518,7 +518,7 @@ 
 					'Bucket' => $this->bucket,
 					'Key' => $this->cleanKey($path),
 					'Metadata' => $metadata,
-					'CopySource' => $this->bucket . '/' . $path,
+					'CopySource' => $this->bucket.'/'.$path,
 					'MetadataDirective' => 'REPLACE',
 				]);
 				$this->testTimeout();
@@ -552,7 +552,7 @@ 
 				$this->getConnection()->copyObject(array(
 					'Bucket' => $this->bucket,
 					'Key' => $this->cleanKey($path2),
-					'CopySource' => S3Client::encodeKey($this->bucket . '/' . $path1)
+					'CopySource' => S3Client::encodeKey($this->bucket.'/'.$path1)
 				));
 				$this->testTimeout();
 			} catch (S3Exception $e) {
@@ -565,8 +565,8 @@ 
 			try {
 				$this->getConnection()->copyObject(array(
 					'Bucket' => $this->bucket,
-					'Key' => $path2 . '/',
-					'CopySource' => S3Client::encodeKey($this->bucket . '/' . $path1 . '/')
+					'Key' => $path2.'/',
+					'CopySource' => S3Client::encodeKey($this->bucket.'/'.$path1.'/')
 				));
 				$this->testTimeout();
 			} catch (S3Exception $e) {
@@ -581,8 +581,8 @@ 
 						continue;
 					}
 
-					$source = $path1 . '/' . $file;
-					$target = $path2 . '/' . $file;
+					$source = $path1.'/'.$file;
+					$target = $path2.'/'.$file;
 					$this->copy($source, $target);
 				}
 			}