nextcloud / server

lib/private/Files/ObjectStore/SwiftFactory.php

Spacing +5 added lines, -5 removed lines

@@ -1,5 +1,5 @@ 
 <?php
-declare(strict_types=1);
+declare(strict_types = 1);
 /**
  * @copyright Copyright (c) 2018 Robin Appelman <robin@icewind.nl>
  *
@@ -50,7 +50,7 @@ 
 	}
 
 	private function getCachedToken(string $cacheKey) {
-		$cachedTokenString = $this->cache->get($cacheKey . '/token');
+		$cachedTokenString = $this->cache->get($cacheKey.'/token');
 		if ($cachedTokenString) {
 			return json_decode($cachedTokenString);
 		} else {
@@ -59,7 +59,7 @@ 
 	}
 
 	private function cacheToken(Token $token, string $cacheKey) {
-		$this->cache->set($cacheKey . '/token', json_encode($token));
+		$this->cache->set($cacheKey.'/token', json_encode($token));
 	}
 
 	/**
@@ -84,7 +84,7 @@ 
 			$this->params['tenantName'] = $this->params['tenant'];
 		}
 
-		$cacheKey = $this->params['username'] . '@' . $this->params['url'] . '/' . $this->params['bucket'];
+		$cacheKey = $this->params['username'].'@'.$this->params['url'].'/'.$this->params['bucket'];
 		$token = $this->getCachedToken($cacheKey);
 		$hasToken = is_array($token) && (new \DateTimeImmutable($token['expires_at'])) > (new \DateTimeImmutable('now'));
 		if ($hasToken) {
@@ -166,7 +166,7 @@ 
 		} catch (ConnectException $e) {
 			/** @var RequestInterface $request */
 			$request = $e->getRequest();
-			$host = $request->getUri()->getHost() . ':' . $request->getUri()->getPort();
+			$host = $request->getUri()->getHost().':'.$request->getUri()->getPort();
 			\OC::$server->getLogger()->error("Can't connect to object storage server at $host");
 			throw new StorageNotAvailableException("Can't connect to object storage server at $host", StorageNotAvailableException::STATUS_ERROR, $e);
 		}

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

Spacing +19 added lines, -19 removed lines

@@ -1,5 +1,5 @@ 
 <?php
-declare(strict_types=1);
+declare(strict_types = 1);
 /**
  * @copyright Copyright (c) 2016, ownCloud, Inc.
  *
@@ -162,12 +162,12 @@ 
 			throw new StorageBadConfigException("API Key or password, Username, Bucket and Region have to be configured.");
 		}
 
-		$this->id = 'swift::' . $params['user'] . md5($params['bucket']);
+		$this->id = 'swift::'.$params['user'].md5($params['bucket']);
 
 		$bucketUrl = new Uri($params['bucket']);
 		if ($bucketUrl->getHost()) {
 			$params['bucket'] = basename($bucketUrl->getPath());
-			$params['endpoint_url'] = (string)$bucketUrl->withPath(dirname($bucketUrl->getPath()));
+			$params['endpoint_url'] = (string) $bucketUrl->withPath(dirname($bucketUrl->getPath()));
 		}
 
 		if (empty($params['url'])) {
@@ -242,16 +242,16 @@ 
 				continue;
 			}
 
-			if ($this->is_dir($path . '/' . $file)) {
-				$this->rmdir($path . '/' . $file);
+			if ($this->is_dir($path.'/'.$file)) {
+				$this->rmdir($path.'/'.$file);
 			} else {
-				$this->unlink($path . '/' . $file);
+				$this->unlink($path.'/'.$file);
 			}
 		}
 
 		try {
-			$this->objectStore->deleteObject($path . '/');
-			$this->objectCache->remove($path . '/');
+			$this->objectStore->deleteObject($path.'/');
+			$this->objectCache->remove($path.'/');
 		} catch (BadResponseError $e) {
 			\OC::$server->getLogger()->logException($e, [
 				'level' => \OCP\Util::ERROR,
@@ -334,7 +334,7 @@ 
 		}
 
 		$stat = array();
-		$stat['size'] = (int)$object->contentLength;
+		$stat['size'] = (int) $object->contentLength;
 		$stat['mtime'] = $mtime;
 		$stat['atime'] = time();
 		return $stat;
@@ -366,7 +366,7 @@ 
 		try {
 			$this->objectStore->deleteObject($path);
 			$this->objectCache->remove($path);
-			$this->objectCache->remove($path . '/');
+			$this->objectCache->remove($path.'/');
 		} catch (BadResponseError $e) {
 			if ($e->getResponse()->getStatusCode() !== 404) {
 				\OC::$server->getLogger()->logException($e, [
@@ -424,7 +424,7 @@ 
 					file_put_contents($tmpFile, $source);
 				}
 				$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);
 				});
 		}
@@ -474,11 +474,11 @@ 
 			try {
 				$source = $this->fetchObject($path1);
 				$source->copy([
-					'destination' => $this->bucket . '/' . $path2
+					'destination' => $this->bucket.'/'.$path2
 				]);
 				// invalidate target object to force repopulation on fetch
 				$this->objectCache->remove($path2);
-				$this->objectCache->remove($path2 . '/');
+				$this->objectCache->remove($path2.'/');
 			} catch (BadResponseError $e) {
 				\OC::$server->getLogger()->logException($e, [
 					'level' => \OCP\Util::ERROR,
@@ -489,13 +489,13 @@ 
 
 		} else if ($fileType === 'dir') {
 			try {
-				$source = $this->fetchObject($path1 . '/');
+				$source = $this->fetchObject($path1.'/');
 				$source->copy([
-					'destination' => $this->bucket . '/' . $path2 . '/'
+					'destination' => $this->bucket.'/'.$path2.'/'
 				]);
 				// invalidate target object to force repopulation on fetch
 				$this->objectCache->remove($path2);
-				$this->objectCache->remove($path2 . '/');
+				$this->objectCache->remove($path2.'/');
 			} catch (BadResponseError $e) {
 				\OC::$server->getLogger()->logException($e, [
 					'level' => \OCP\Util::ERROR,
@@ -510,8 +510,8 @@ 
 					continue;
 				}
 
-				$source = $path1 . '/' . $file;
-				$target = $path2 . '/' . $file;
+				$source = $path1.'/'.$file;
+				$target = $path2.'/'.$file;
 				$this->copy($source, $target);
 			}
 
@@ -592,7 +592,7 @@ 
 			$path = '';
 		}
 		$cachedContent = $this->getCache()->getFolderContents($path);
-		$cachedNames = array_map(function ($content) {
+		$cachedNames = array_map(function($content) {
 			return $content['name'];
 		}, $cachedContent);
 		sort($cachedNames);