nextcloud / server

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

Spacing +17 added lines, -17 removed lines

@@ -119,7 +119,7 @@ 
 
 		$options = new Options();
 		if (isset($params['timeout'])) {
-			$timeout = (int)$params['timeout'];
+			$timeout = (int) $params['timeout'];
 			if ($timeout > 0) {
 				$options->setTimeout($timeout);
 			}
@@ -129,8 +129,8 @@ 
 		$this->share = $this->server->getShare(trim($params['share'], '/'));
 
 		$this->root = $params['root'] ?? '/';
-		$this->root = '/' . ltrim($this->root, '/');
-		$this->root = rtrim($this->root, '/') . '/';
+		$this->root = '/'.ltrim($this->root, '/');
+		$this->root = rtrim($this->root, '/').'/';
 
 		$this->showHidden = isset($params['show_hidden']) && $params['show_hidden'];
 		$this->checkAcl = isset($params['check_acl']) && $params['check_acl'];
@@ -156,7 +156,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->getAuth()->getUsername() . '@' . $this->server->getHost() . '//' . $this->share->getName() . '/' . $this->root;
+		return 'smb::'.$this->server->getAuth()->getUsername().'@'.$this->server->getHost().'//'.$this->share->getName().'/'.$this->root;
 	}
 
 	/**
@@ -164,7 +164,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) {
@@ -242,7 +242,7 @@ 
 				throw new NotPermittedException();
 			}
 			foreach ($files as $file) {
-				$this->statCache[$path . '/' . $file->getName()] = $file;
+				$this->statCache[$path.'/'.$file->getName()] = $file;
 			}
 
 			foreach ($files as $file) {
@@ -256,21 +256,21 @@ 
 						// this doesn't take inheritance fully into account but if read permissions is denied for a parent we wouldn't be in this folder
 						// additionally, it's better to have false negatives here then false positives
 						if ($acl->denies(ACL::MASK_READ) || $acl->denies(ACL::MASK_EXECUTE)) {
-							$this->logger->debug('Hiding non readable entry ' . $file->getName());
+							$this->logger->debug('Hiding non readable entry '.$file->getName());
 							return false;
 						}
 					}
 
 					if ($hide) {
-						$this->logger->debug('hiding hidden file ' . $file->getName());
+						$this->logger->debug('hiding hidden file '.$file->getName());
 					}
 					if (!$hide) {
 						yield $file;
 					}
 				} catch (ForbiddenException $e) {
-					$this->logger->logException($e, ['level' => ILogger::DEBUG, 'message' => 'Hiding forbidden entry ' . $file->getName()]);
+					$this->logger->logException($e, ['level' => ILogger::DEBUG, 'message' => 'Hiding forbidden entry '.$file->getName()]);
 				} catch (NotFoundException $e) {
-					$this->logger->logException($e, ['level' => ILogger::DEBUG, 'message' => 'Hiding not found entry ' . $file->getName()]);
+					$this->logger->logException($e, ['level' => ILogger::DEBUG, 'message' => 'Hiding not found entry '.$file->getName()]);
 				}
 			}
 		} catch (ConnectException $e) {
@@ -461,7 +461,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':
@@ -493,7 +493,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);
@@ -522,7 +522,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());
 				}
@@ -603,7 +603,7 @@ 
 		} catch (NotPermittedException $e) {
 			return false;
 		}
-		$names = array_map(function ($info) {
+		$names = array_map(function($info) {
 			/** @var \Icewind\SMB\IFileInfo $info */
 			return $info->getName();
 		}, iterator_to_array($files));
@@ -693,7 +693,7 @@ 
 	 */
 	public static function checkDependencies() {
 		return (
-			(bool)\OC_Helper::findBinaryPath('smbclient')
+			(bool) \OC_Helper::findBinaryPath('smbclient')
 			|| NativeServer::available(new System())
 		) ? true : ['smbclient'];
 	}
@@ -713,7 +713,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 {
@@ -723,7 +723,7 @@ 
 	}
 
 	public function notify($path) {
-		$path = '/' . ltrim($path, '/');
+		$path = '/'.ltrim($path, '/');
 		$shareNotifyHandler = $this->share->notify($this->buildPath($path));
 		return new SMBNotifyHandler($shareNotifyHandler, $this->root);
 	}