nextcloud / server

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

Spacing +3 added lines, -3 removed lines

@@ -47,10 +47,10 @@
 				return false;
 			}
 			while (($file = readdir($dh)) !== false) {
-				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);
 				}
 			}
 			$url = $this->constructUrl($path);

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

Spacing +15 added lines, -15 removed lines

@@ -36,8 +36,8 @@ 
 
 namespace OCA\Files_External\Lib\Storage;
 
-set_include_path(get_include_path() . PATH_SEPARATOR .
-	\OC_App::getAppPath('files_external') . '/3rdparty/aws-sdk-php');
+set_include_path(get_include_path().PATH_SEPARATOR.
+	\OC_App::getAppPath('files_external').'/3rdparty/aws-sdk-php');
 require_once 'aws-autoloader.php';
 
 use Aws\S3\S3Client;
@@ -95,8 +95,8 @@ 
 	 *
 	 * @param array $params
 	 */
-	public function updateLegacyId (array $params) {
-		$oldId = 'amazon::' . $params['key'] . md5($params['secret']);
+	public function updateLegacyId(array $params) {
+		$oldId = 'amazon::'.$params['key'].md5($params['secret']);
 
 		// find by old id or bucket
 		$stmt = \OC::$server->getDatabaseConnection()->prepare(
@@ -148,7 +148,7 @@ 
 		try {
 			$this->getConnection()->putObject(array(
 				'Bucket' => $this->bucket,
-				'Key' => $path . '/',
+				'Key' => $path.'/',
 				'Body' => '',
 				'ContentType' => 'httpd/unix-directory'
 			));
@@ -191,12 +191,12 @@ 
 		return false;
 	}
 
-	private function batchDelete ($path = null) {
+	private function batchDelete($path = null) {
 		$params = array(
 			'Bucket' => $this->bucket
 		);
 		if ($path !== null) {
-			$params['Prefix'] = $path . '/';
+			$params['Prefix'] = $path.'/';
 		}
 		try {
 			// Since there are no real directories on S3, we need
@@ -279,7 +279,7 @@ 
 			$stat['atime'] = time();
 
 			return $stat;
-		} catch(S3Exception $e) {
+		} catch (S3Exception $e) {
 			\OCP\Util::logException('files_external', $e);
 			return false;
 		}
@@ -394,14 +394,14 @@ 
 		$fileType = $this->filetype($path);
 		try {
 			if ($fileType !== false) {
-				if ($fileType === 'dir' && ! $this->isRoot($path)) {
+				if ($fileType === 'dir' && !$this->isRoot($path)) {
 					$path .= '/';
 				}
 				$this->getConnection()->copyObject([
 					'Bucket' => $this->bucket,
 					'Key' => $this->cleanKey($path),
 					'Metadata' => $metadata,
-					'CopySource' => $this->bucket . '/' . $path,
+					'CopySource' => $this->bucket.'/'.$path,
 					'MetadataDirective' => 'REPLACE',
 				]);
 				$this->testTimeout();
@@ -434,7 +434,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) {
@@ -447,8 +447,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) {
@@ -463,8 +463,8 @@ 
 						continue;
 					}
 
-					$source = $path1 . '/' . $file;
-					$target = $path2 . '/' . $file;
+					$source = $path1.'/'.$file;
+					$target = $path2.'/'.$file;
 					$this->copy($source, $target);
 				}
 			}

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

Spacing +12 added lines, -12 removed lines

@@ -84,7 +84,7 @@ 
 
 			$this->root = isset($params['root']) ? $params['root'] : '/';
 			if (!$this->root || $this->root[0] != '/') {
-				$this->root = '/' . $this->root;
+				$this->root = '/'.$this->root;
 			}
 			if (substr($this->root, -1, 1) != '/') {
 				$this->root .= '/';
@@ -102,7 +102,7 @@ 
 		// FIXME: double slash to keep compatible with the old storage ids,
 		// failure to do so will lead to creation of a new storage id and
 		// loss of shares from the storage
-		return 'smb::' . $this->server->getUser() . '@' . $this->server->getHost() . '//' . $this->share->getName() . '/' . $this->root;
+		return 'smb::'.$this->server->getUser().'@'.$this->server->getHost().'//'.$this->share->getName().'/'.$this->root;
 	}
 
 	/**
@@ -110,7 +110,7 @@ 
 	 * @return string
 	 */
 	protected function buildPath($path) {
-		return Filesystem::normalizePath($this->root . '/' . $path, true, false, true);
+		return Filesystem::normalizePath($this->root.'/'.$path, true, false, true);
 	}
 
 	protected function relativePath($fullPath) {
@@ -150,9 +150,9 @@ 
 			$path = $this->buildPath($path);
 			$files = $this->share->dir($path);
 			foreach ($files as $file) {
-				$this->statCache[$path . '/' . $file->getName()] = $file;
+				$this->statCache[$path.'/'.$file->getName()] = $file;
 			}
-			return array_filter($files, function (IFileInfo $file) {
+			return array_filter($files, function(IFileInfo $file) {
 				return !$file->isHidden();
 			});
 		} catch (ConnectException $e) {
@@ -297,7 +297,7 @@ 
 				case 'w':
 				case 'wb':
 					$source = $this->share->write($fullPath);
-					return CallBackWrapper::wrap($source, null, null, function () use ($fullPath) {
+					return CallBackWrapper::wrap($source, null, null, function() use ($fullPath) {
 						unset($this->statCache[$fullPath]);
 					});
 				case 'a':
@@ -329,7 +329,7 @@ 
 					}
 					$source = fopen($tmpFile, $mode);
 					$share = $this->share;
-					return CallbackWrapper::wrap($source, null, null, function () use ($tmpFile, $fullPath, $share) {
+					return CallbackWrapper::wrap($source, null, null, function() use ($tmpFile, $fullPath, $share) {
 						unset($this->statCache[$fullPath]);
 						$share->put($tmpFile, $fullPath);
 						unlink($tmpFile);
@@ -351,7 +351,7 @@ 
 			$content = $this->share->dir($this->buildPath($path));
 			foreach ($content as $file) {
 				if ($file->isDirectory()) {
-					$this->rmdir($path . '/' . $file->getName());
+					$this->rmdir($path.'/'.$file->getName());
 				} else {
 					$this->share->del($file->getPath());
 				}
@@ -388,7 +388,7 @@ 
 		} catch (ForbiddenException $e) {
 			return false;
 		}
-		$names = array_map(function ($info) {
+		$names = array_map(function($info) {
 			/** @var \Icewind\SMB\IFileInfo $info */
 			return $info->getName();
 		}, $files);
@@ -470,7 +470,7 @@ 
 	 */
 	public static function checkDependencies() {
 		return (
-			(bool)\OC_Helper::findBinaryPath('smbclient')
+			(bool) \OC_Helper::findBinaryPath('smbclient')
 			|| Server::NativeAvailable()
 		) ? true : ['smbclient'];
 	}
@@ -489,7 +489,7 @@ 
 	}
 
 	public function listen($path, callable $callback) {
-		$this->notify($path)->listen(function (IChange $change) use ($callback) {
+		$this->notify($path)->listen(function(IChange $change) use ($callback) {
 			if ($change instanceof IRenameChange) {
 				return $callback($change->getType(), $change->getPath(), $change->getTargetPath());
 			} else {
@@ -499,7 +499,7 @@ 
 	}
 
 	public function notify($path) {
-		$path = '/' . ltrim($path, '/');
+		$path = '/'.ltrim($path, '/');
 		$shareNotifyHandler = $this->share->notify($this->buildPath($path));
 		return new SMBNotifyHandler($shareNotifyHandler, $this->root);
 	}

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

Spacing +6 added lines, -6 removed lines

@@ -36,7 +36,7 @@ 
 use Icewind\Streams\RetryWrapper;
 use OCP\Files\StorageNotAvailableException;
 
-require_once __DIR__ . '/../../../3rdparty/Dropbox/autoload.php';
+require_once __DIR__.'/../../../3rdparty/Dropbox/autoload.php';
 
 class Dropbox extends \OC\Files\Storage\Common {
 
@@ -54,7 +54,7 @@ 
 			&& isset($params['token_secret'])
 		) {
 			$this->root = isset($params['root']) ? $params['root'] : '';
-			$this->id = 'dropbox::'.$params['app_key'] . $params['token']. '/' . $this->root;
+			$this->id = 'dropbox::'.$params['app_key'].$params['token'].'/'.$this->root;
 			$this->oauth = new \Dropbox_OAuth_Curl($params['app_key'], $params['app_secret']);
 			$this->oauth->setToken($params['token'], $params['token_secret']);
 			// note: Dropbox_API connection is lazy
@@ -89,7 +89,7 @@ 
 	 */
 	private function getDropBoxMetaData($path, $list = false) {
 		$path = ltrim($this->root.$path, '/');
-		if ( ! $list && isset($this->metaData[$path])) {
+		if (!$list && isset($this->metaData[$path])) {
 			return $this->metaData[$path];
 		} else {
 			if ($list) {
@@ -144,7 +144,7 @@ 
 		}
 	}
 
-	public function getId(){
+	public function getId() {
 		return $this->id;
 	}
 
@@ -259,7 +259,7 @@ 
 				try {
 					// slashes need to stay
 					$encodedPath = str_replace('%2F', '/', rawurlencode(trim($path, '/')));
-					$downloadUrl = 'https://api-content.dropbox.com/1/files/auto/' . $encodedPath;
+					$downloadUrl = 'https://api-content.dropbox.com/1/files/auto/'.$encodedPath;
 					$headers = $this->oauth->getOAuthHeader($downloadUrl, [], 'GET');
 
 					$client = \OC::$server->getHTTPClientService()->newClient();
@@ -309,7 +309,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);
 			});
 		}

apps/files_external/lib/Lib/StorageModifierTrait.php

Spacing +1 added lines, -1 removed lines

@@ -51,7 +51,7 @@
 	 * @throws InsufficientDataForMeaningfulAnswerException
 	 * @throws StorageNotAvailableException
 	 */
-	public function manipulateStorageConfig(StorageConfig &$storage, IUser $user = null) {
+	public function manipulateStorageConfig(StorageConfig & $storage, IUser $user = null) {
 	}
 
 	/**

apps/files_external/lib/Lib/Notify/SMBNotifyHandler.php

Spacing +1 added lines, -1 removed lines

@@ -64,7 +64,7 @@
 
 	public function listen(callable $callback) {
 		$oldRenamePath = null;
-		$this->shareNotifyHandler->listen(function (\Icewind\SMB\Change $shareChange) use ($callback) {
+		$this->shareNotifyHandler->listen(function(\Icewind\SMB\Change $shareChange) use ($callback) {
 			$change = $this->mapChange($shareChange);
 			if (!is_null($change)) {
 				return $callback($change);

apps/files_external/lib/Lib/StorageConfig.php

Spacing +6 added lines, -6 removed lines

@@ -182,7 +182,7 @@ 
 	 * @param Backend $backend
 	 */
 	public function setBackend(Backend $backend) {
-		$this->backend= $backend;
+		$this->backend = $backend;
 	}
 
 	/**
@@ -214,13 +214,13 @@ 
 	 * @param array $backendOptions backend options
 	 */
 	public function setBackendOptions($backendOptions) {
-		if($this->getBackend() instanceof  Backend) {
+		if ($this->getBackend() instanceof  Backend) {
 			$parameters = $this->getBackend()->getParameters();
-			foreach($backendOptions as $key => $value) {
-				if(isset($parameters[$key])) {
+			foreach ($backendOptions as $key => $value) {
+				if (isset($parameters[$key])) {
 					switch ($parameters[$key]->getType()) {
 						case \OCA\Files_External\Lib\DefinitionParameter::VALUE_BOOLEAN:
-							$value = (bool)$value;
+							$value = (bool) $value;
 							break;
 					}
 					$backendOptions[$key] = $value;
@@ -426,7 +426,7 @@ 
 			$result['statusMessage'] = $this->statusMessage;
 		}
 		$result['userProvided'] = $this->authMechanism instanceof IUserProvided;
-		$result['type'] = ($this->getType() === self::MOUNT_TYPE_PERSONAl) ? 'personal': 'system';
+		$result['type'] = ($this->getType() === self::MOUNT_TYPE_PERSONAl) ? 'personal' : 'system';
 		return $result;
 	}
 }

apps/files_external/lib/Lib/Backend/SMB.php

Spacing +1 added lines, -1 removed lines

@@ -60,7 +60,7 @@
 	 * @param StorageConfig $storage
 	 * @param IUser $user
 	 */
-	public function manipulateStorageConfig(StorageConfig &$storage, IUser $user = null) {
+	public function manipulateStorageConfig(StorageConfig & $storage, IUser $user = null) {
 		$user = $storage->getBackendOption('user');
 		if ($domain = $storage->getBackendOption('domain')) {
 			$storage->setBackendOption('user', $domain.'\\'.$user);

apps/files_external/lib/Lib/Backend/SMB_OC.php

Spacing +2 added lines, -2 removed lines

@@ -61,11 +61,11 @@
 		;
 	}
 
-	public function manipulateStorageConfig(StorageConfig &$storage, IUser $user = null) {
+	public function manipulateStorageConfig(StorageConfig & $storage, IUser $user = null) {
 		$username_as_share = ($storage->getBackendOption('username_as_share') === true);
 
 		if ($username_as_share) {
-			$share = '/' . $storage->getBackendOption('user');
+			$share = '/'.$storage->getBackendOption('user');
 			$storage->setBackendOption('share', $share);
 		}
 	}