nextcloud / server

lib/private/Files/Storage/Home.php

Spacing +1 added lines, -1 removed lines

@@ -49,7 +49,7 @@
 	public function __construct($arguments) {
 		$this->user = $arguments['user'];
 		$datadir = $this->user->getHome();
-		$this->id = 'home::' . $this->user->getUID();
+		$this->id = 'home::'.$this->user->getUID();
 
 		parent::__construct(array('datadir' => $datadir));
 	}

lib/private/Files/Storage/Temporary.php

Spacing +1 added lines, -1 removed lines

@@ -28,7 +28,7 @@
 /**
  * local storage backend in temporary folder for testing purpose
  */
-class Temporary extends Local{
+class Temporary extends Local {
 	public function __construct($arguments = null) {
 		parent::__construct(array('datadir' => \OC::$server->getTempManager()->getTemporaryFolder()));
 	}

lib/private/Files/Storage/Local.php

Spacing +13 added lines, -13 removed lines

@@ -58,7 +58,7 @@ 
 		if ($this->datadir === '/') {
 			$this->realDataDir = $this->datadir;
 		} else {
-			$this->realDataDir = rtrim(realpath($this->datadir), '/') . '/';
+			$this->realDataDir = rtrim(realpath($this->datadir), '/').'/';
 		}
 		if (substr($this->datadir, -1) !== '/') {
 			$this->datadir .= '/';
@@ -70,7 +70,7 @@ 
 	}
 
 	public function getId() {
-		return 'local::' . $this->datadir;
+		return 'local::'.$this->datadir;
 	}
 
 	public function mkdir($path) {
@@ -228,17 +228,17 @@ 
 		$dstParent = dirname($path2);
 
 		if (!$this->isUpdatable($srcParent)) {
-			\OCP\Util::writeLog('core', 'unable to rename, source directory is not writable : ' . $srcParent, \OCP\Util::ERROR);
+			\OCP\Util::writeLog('core', 'unable to rename, source directory is not writable : '.$srcParent, \OCP\Util::ERROR);
 			return false;
 		}
 
 		if (!$this->isUpdatable($dstParent)) {
-			\OCP\Util::writeLog('core', 'unable to rename, destination directory is not writable : ' . $dstParent, \OCP\Util::ERROR);
+			\OCP\Util::writeLog('core', 'unable to rename, destination directory is not writable : '.$dstParent, \OCP\Util::ERROR);
 			return false;
 		}
 
 		if (!$this->file_exists($path1)) {
-			\OCP\Util::writeLog('core', 'unable to rename, file does not exists : ' . $path1, \OCP\Util::ERROR);
+			\OCP\Util::writeLog('core', 'unable to rename, file does not exists : '.$path1, \OCP\Util::ERROR);
 			return false;
 		}
 
@@ -319,13 +319,13 @@ 
 		foreach (scandir($physicalDir) as $item) {
 			if (\OC\Files\Filesystem::isIgnoredDir($item))
 				continue;
-			$physicalItem = $physicalDir . '/' . $item;
+			$physicalItem = $physicalDir.'/'.$item;
 
 			if (strstr(strtolower($item), strtolower($query)) !== false) {
-				$files[] = $dir . '/' . $item;
+				$files[] = $dir.'/'.$item;
 			}
 			if (is_dir($physicalItem)) {
-				$files = array_merge($files, $this->searchInDir($query, $dir . '/' . $item));
+				$files = array_merge($files, $this->searchInDir($query, $dir.'/'.$item));
 			}
 		}
 		return $files;
@@ -354,7 +354,7 @@ 
 	 * @throws ForbiddenException
 	 */
 	public function getSourcePath($path) {
-		$fullPath = $this->datadir . $path;
+		$fullPath = $this->datadir.$path;
 		if ($this->allowSymlinks || $path === '') {
 			return $fullPath;
 		}
@@ -365,7 +365,7 @@ 
 			$realPath = realpath($pathToResolve);
 		}
 		if ($realPath) {
-			$realPath = $realPath . '/';
+			$realPath = $realPath.'/';
 		}
 		if (substr($realPath, 0, $this->dataDirLength) === $this->realDataDir) {
 			return $fullPath;
@@ -391,9 +391,9 @@ 
 		if ($this->is_file($path)) {
 			$stat = $this->stat($path);
 			return md5(
-				$stat['mtime'] .
-				$stat['ino'] .
-				$stat['dev'] .
+				$stat['mtime'].
+				$stat['ino'].
+				$stat['dev'].
 				$stat['size']
 			);
 		} else {

lib/private/Files/Storage/Common.php

Spacing +16 added lines, -16 removed lines

@@ -216,7 +216,7 @@ 
 			$this->mkdir($path2);
 			while ($file = readdir($dir)) {
 				if (!Filesystem::isIgnoredDir($file)) {
-					if (!$this->copy($path1 . '/' . $file, $path2 . '/' . $file)) {
+					if (!$this->copy($path1.'/'.$file, $path2.'/'.$file)) {
 						return false;
 					}
 				}
@@ -267,12 +267,12 @@ 
 		if (is_resource($dh)) {
 			while (($file = readdir($dh)) !== false) {
 				if (!\OC\Files\Filesystem::isIgnoredDir($file)) {
-					if ($this->is_dir($path . '/' . $file)) {
-						mkdir($target . '/' . $file);
-						$this->addLocalFolder($path . '/' . $file, $target . '/' . $file);
+					if ($this->is_dir($path.'/'.$file)) {
+						mkdir($target.'/'.$file);
+						$this->addLocalFolder($path.'/'.$file, $target.'/'.$file);
 					} else {
-						$tmp = $this->toTmpFile($path . '/' . $file);
-						rename($tmp, $target . '/' . $file);
+						$tmp = $this->toTmpFile($path.'/'.$file);
+						rename($tmp, $target.'/'.$file);
 					}
 				}
 			}
@@ -291,10 +291,10 @@ 
 			while (($item = readdir($dh)) !== false) {
 				if (\OC\Files\Filesystem::isIgnoredDir($item)) continue;
 				if (strstr(strtolower($item), strtolower($query)) !== false) {
-					$files[] = $dir . '/' . $item;
+					$files[] = $dir.'/'.$item;
 				}
-				if ($this->is_dir($dir . '/' . $item)) {
-					$files = array_merge($files, $this->searchInDir($query, $dir . '/' . $item));
+				if ($this->is_dir($dir.'/'.$item)) {
+					$files = array_merge($files, $this->searchInDir($query, $dir.'/'.$item));
 				}
 			}
 		}
@@ -345,7 +345,7 @@ 
 		if (!isset($this->watcher)) {
 			$this->watcher = new Watcher($storage);
 			$globalPolicy = \OC::$server->getConfig()->getSystemValue('filesystem_check_changes', Watcher::CHECK_NEVER);
-			$this->watcher->setPolicy((int)$this->getMountOption('filesystem_check_changes', $globalPolicy));
+			$this->watcher->setPolicy((int) $this->getMountOption('filesystem_check_changes', $globalPolicy));
 		}
 		return $this->watcher;
 	}
@@ -419,7 +419,7 @@ 
 	 */
 	public function cleanPath($path) {
 		if (strlen($path) == 0 or $path[0] != '/') {
-			$path = '/' . $path;
+			$path = '/'.$path;
 		}
 
 		$output = array();
@@ -595,7 +595,7 @@ 
 			if (is_resource($dh)) {
 				while ($result and ($file = readdir($dh)) !== false) {
 					if (!Filesystem::isIgnoredDir($file)) {
-						$result &= $this->copyFromStorage($sourceStorage, $sourceInternalPath . '/' . $file, $targetInternalPath . '/' . $file);
+						$result &= $this->copyFromStorage($sourceStorage, $sourceInternalPath.'/'.$file, $targetInternalPath.'/'.$file);
 					}
 				}
 			}
@@ -621,7 +621,7 @@ 
 				$this->getCache()->remove($targetInternalPath);
 			}
 		}
-		return (bool)$result;
+		return (bool) $result;
 	}
 
 	/**
@@ -701,7 +701,7 @@ 
 			);
 		}
 		try {
-			$provider->acquireLock('files/' . md5($this->getId() . '::' . trim($path, '/')), $type);
+			$provider->acquireLock('files/'.md5($this->getId().'::'.trim($path, '/')), $type);
 		} catch (LockedException $e) {
 			if ($logger) {
 				$logger->logException($e);
@@ -733,7 +733,7 @@ 
 			);
 		}
 		try {
-			$provider->releaseLock('files/' . md5($this->getId() . '::' . trim($path, '/')), $type);
+			$provider->releaseLock('files/'.md5($this->getId().'::'.trim($path, '/')), $type);
 		} catch (LockedException $e) {
 			if ($logger) {
 				$logger->logException($e);
@@ -765,7 +765,7 @@ 
 			);
 		}
 		try {
-			$provider->changeLock('files/' . md5($this->getId() . '::' . trim($path, '/')), $type);
+			$provider->changeLock('files/'.md5($this->getId().'::'.trim($path, '/')), $type);
 		} catch (LockedException $e) {
 			if ($logger) {
 				$logger->logException($e);

lib/private/Files/Storage/StorageFactory.php

Spacing +2 added lines, -2 removed lines

@@ -90,11 +90,11 @@
 	 */
 	public function wrap(IMountPoint $mountPoint, $storage) {
 		$wrappers = array_values($this->storageWrappers);
-		usort($wrappers, function ($a, $b) {
+		usort($wrappers, function($a, $b) {
 			return $b['priority'] - $a['priority'];
 		});
 		/** @var callable[] $wrappers */
-		$wrappers = array_map(function ($wrapper) {
+		$wrappers = array_map(function($wrapper) {
 			return $wrapper['wrapper'];
 		}, $wrappers);
 		foreach ($wrappers as $wrapper) {

lib/private/Files/Storage/PolyFill/CopyDirectory.php

Spacing +4 added lines, -4 removed lines

@@ -89,11 +89,11 @@
 		$result = true;
 		while ($file = readdir($dh)) {
 			if (!\OC\Files\Filesystem::isIgnoredDir($file)) {
-				if ($this->is_dir($source . '/' . $file)) {
-					$this->mkdir($target . '/' . $file);
-					$result = $this->copyRecursive($source . '/' . $file, $target . '/' . $file);
+				if ($this->is_dir($source.'/'.$file)) {
+					$this->mkdir($target.'/'.$file);
+					$result = $this->copyRecursive($source.'/'.$file, $target.'/'.$file);
 				} else {
-					$result = parent::copy($source . '/' . $file, $target . '/' . $file);
+					$result = parent::copy($source.'/'.$file, $target.'/'.$file);
 				}
 				if (!$result) {
 					break;

lib/private/Files/Storage/Flysystem.php

Spacing +3 added lines, -3 removed lines

@@ -56,7 +56,7 @@ 
 	}
 
 	protected function buildPath($path) {
-		$fullPath = \OC\Files\Filesystem::normalizePath($this->root . '/' . $path);
+		$fullPath = \OC\Files\Filesystem::normalizePath($this->root.'/'.$path);
 		return ltrim($fullPath, '/');
 	}
 
@@ -163,7 +163,7 @@ 
 		} catch (FileNotFoundException $e) {
 			return false;
 		}
-		$names = array_map(function ($object) {
+		$names = array_map(function($object) {
 			return $object['basename'];
 		}, $content);
 		return IteratorDirectory::wrap($names);
@@ -209,7 +209,7 @@ 
 					$tmpFile = \OCP\Files::tmpFile();
 				}
 				$source = fopen($tmpFile, $mode);
-				return CallbackWrapper::wrap($source, null, null, function () use ($tmpFile, $fullPath) {
+				return CallbackWrapper::wrap($source, null, null, function() use ($tmpFile, $fullPath) {
 					$this->flysystem->putStream($fullPath, fopen($tmpFile, 'r'));
 					unlink($tmpFile);
 				});

lib/private/Files/Storage/CommonTest.php

Spacing +4 added lines, -4 removed lines

@@ -32,7 +32,7 @@ 
 
 namespace OC\Files\Storage;
 
-class CommonTest extends \OC\Files\Storage\Common{
+class CommonTest extends \OC\Files\Storage\Common {
 	/**
 	 * underlying local storage used for missing functions
 	 * @var \OC\Files\Storage\Local
@@ -40,10 +40,10 @@ 
 	private $storage;
 
 	public function __construct($params) {
-		$this->storage=new \OC\Files\Storage\Local($params);
+		$this->storage = new \OC\Files\Storage\Local($params);
 	}
 
-	public function getId(){
+	public function getId() {
 		return 'test::'.$this->storage->getId();
 	}
 	public function mkdir($path) {
@@ -79,7 +79,7 @@ 
 	public function free_space($path) {
 		return $this->storage->free_space($path);
 	}
-	public function touch($path, $mtime=null) {
+	public function touch($path, $mtime = null) {
 		return $this->storage->touch($path, $mtime);
 	}
 }

lib/private/Files/Cache/Wrapper/CacheJail.php

Spacing +3 added lines, -3 removed lines

@@ -51,7 +51,7 @@ 
 		if ($path === '') {
 			return $this->root;
 		} else {
-			return $this->root . '/' . ltrim($path, '/');
+			return $this->root.'/'.ltrim($path, '/');
 		}
 	}
 
@@ -66,7 +66,7 @@ 
 		$rootLength = strlen($this->root) + 1;
 		if ($path === $this->root) {
 			return '';
-		} else if (substr($path, 0, $rootLength) === $this->root . '/') {
+		} else if (substr($path, 0, $rootLength) === $this->root.'/') {
 			return substr($path, $rootLength);
 		} else {
 			return null;
@@ -86,7 +86,7 @@ 
 
 	protected function filterCacheEntry($entry) {
 		$rootLength = strlen($this->root) + 1;
-		return ($entry['path'] === $this->root) or (substr($entry['path'], 0, $rootLength) === $this->root . '/');
+		return ($entry['path'] === $this->root) or (substr($entry['path'], 0, $rootLength) === $this->root.'/');
 	}
 
 	/**