nextcloud / server

lib/private/Files/Node/Folder.php

Spacing +33 added lines, -33 removed lines

@@ -71,7 +71,7 @@ 
 		if (!$this->isValidPath($path)) {
 			throw new NotPermittedException('Invalid path');
 		}
-		return $this->path . $this->normalizePath($path);
+		return $this->path.$this->normalizePath($path);
 	}
 
 	/**
@@ -84,7 +84,7 @@ 
 		}
 		if ($path === $this->path) {
 			return '/';
-		} elseif (strpos($path, $this->path . '/') !== 0) {
+		} elseif (strpos($path, $this->path.'/') !== 0) {
 			return null;
 		} else {
 			$path = substr($path, strlen($this->path));
@@ -99,7 +99,7 @@ 
 	 * @return bool
 	 */
 	public function isSubNode($node) {
-		return strpos($node->getPath(), $this->path . '/') === 0;
+		return strpos($node->getPath(), $this->path.'/') === 0;
 	}
 
 	/**
@@ -111,7 +111,7 @@ 
 	public function getDirectoryListing() {
 		$folderContent = $this->view->getDirectoryContent($this->path);
 
-		return array_map(function (FileInfo $info) {
+		return array_map(function(FileInfo $info) {
 			if ($info->getMimetype() === 'httpd/unix-directory') {
 				return new Folder($this->root, $this->view, $info->getPath(), $info);
 			} else {
@@ -228,7 +228,7 @@ 
 	 */
 	public function search($query) {
 		if (is_string($query)) {
-			$query = $this->queryFromOperator(new SearchComparison(ISearchComparison::COMPARE_LIKE, 'name', '%' . $query . '%'));
+			$query = $this->queryFromOperator(new SearchComparison(ISearchComparison::COMPARE_LIKE, 'name', '%'.$query.'%'));
 		}
 
 		// Limit+offset for queries with ordering
@@ -255,13 +255,13 @@ 
 		$internalPath = $mount->getInternalPath($this->path);
 		$internalPath = rtrim($internalPath, '/');
 		if ($internalPath !== '') {
-			$internalPath = $internalPath . '/';
+			$internalPath = $internalPath.'/';
 		}
 
 		$subQueryLimit = $query->getLimit() > 0 ? $query->getLimit() + $query->getOffset() : 0;
 		$rootQuery = new SearchQuery(
 			new SearchBinaryOperator(ISearchBinaryOperator::OPERATOR_AND, [
-				new SearchComparison(ISearchComparison::COMPARE_LIKE, 'path', $internalPath . '%'),
+				new SearchComparison(ISearchComparison::COMPARE_LIKE, 'path', $internalPath.'%'),
 				$query->getSearchOperation(),
 			]
 			),
@@ -306,7 +306,7 @@ 
 
 		$order = $query->getOrder();
 		if ($order) {
-			usort($files, function (FileInfo $a,FileInfo  $b) use ($order) {
+			usort($files, function(FileInfo $a, FileInfo  $b) use ($order) {
 				foreach ($order as $orderField) {
 					$cmp = $orderField->sortFileInfo($a, $b);
 					if ($cmp !== 0) {
@@ -318,7 +318,7 @@ 
 		}
 		$files = array_values(array_slice($files, $query->getOffset(), $query->getLimit() > 0 ? $query->getLimit() : null));
 
-		return array_map(function (FileInfo $file) {
+		return array_map(function(FileInfo $file) {
 			return $this->createNode($file->getPath(), $file);
 		}, $files);
 	}
@@ -326,8 +326,8 @@ 
 	private function cacheEntryToFileInfo(IMountPoint $mount, string $appendRoot, string $trimRoot, ICacheEntry $cacheEntry): FileInfo {
 		$trimLength = strlen($trimRoot);
 		$cacheEntry['internalPath'] = $cacheEntry['path'];
-		$cacheEntry['path'] = $appendRoot . substr($cacheEntry['path'], $trimLength);
-		return new \OC\Files\FileInfo($this->path . '/' . $cacheEntry['path'], $mount->getStorage(), $cacheEntry['internalPath'], $cacheEntry, $mount);
+		$cacheEntry['path'] = $appendRoot.substr($cacheEntry['path'], $trimLength);
+		return new \OC\Files\FileInfo($this->path.'/'.$cacheEntry['path'], $mount->getStorage(), $cacheEntry['internalPath'], $cacheEntry, $mount);
 	}
 
 	/**
@@ -338,7 +338,7 @@ 
 	 */
 	public function searchByMime($mimetype) {
 		if (strpos($mimetype, '/') === false) {
-			$query = $this->queryFromOperator(new SearchComparison(ISearchComparison::COMPARE_LIKE, 'mimetype', $mimetype . '/%'));
+			$query = $this->queryFromOperator(new SearchComparison(ISearchComparison::COMPARE_LIKE, 'mimetype', $mimetype.'/%'));
 		} else {
 			$query = $this->queryFromOperator(new SearchComparison(ISearchComparison::COMPARE_EQUAL, 'mimetype', $mimetype));
 		}
@@ -368,38 +368,38 @@ 
 		} else {
 			$user = null;
 		}
-		$mountsContainingFile = $mountCache->getMountsForFileId((int)$id, $user);
+		$mountsContainingFile = $mountCache->getMountsForFileId((int) $id, $user);
 		$mounts = $this->root->getMountsIn($this->path);
 		$mounts[] = $this->root->getMount($this->path);
 		/** @var IMountPoint[] $folderMounts */
-		$folderMounts = array_combine(array_map(function (IMountPoint $mountPoint) {
+		$folderMounts = array_combine(array_map(function(IMountPoint $mountPoint) {
 			return $mountPoint->getMountPoint();
 		}, $mounts), $mounts);
 
 		/** @var ICachedMountInfo[] $mountsContainingFile */
-		$mountsContainingFile = array_values(array_filter($mountsContainingFile, function (ICachedMountInfo $cachedMountInfo) use ($folderMounts) {
+		$mountsContainingFile = array_values(array_filter($mountsContainingFile, function(ICachedMountInfo $cachedMountInfo) use ($folderMounts) {
 			return isset($folderMounts[$cachedMountInfo->getMountPoint()]);
 		}));
 
 		if (count($mountsContainingFile) === 0) {
 			if ($user === $this->getAppDataDirectoryName()) {
-				return $this->getByIdInRootMount((int)$id);
+				return $this->getByIdInRootMount((int) $id);
 			}
 			return [];
 		}
 
-		$nodes = array_map(function (ICachedMountInfo $cachedMountInfo) use ($folderMounts, $id) {
+		$nodes = array_map(function(ICachedMountInfo $cachedMountInfo) use ($folderMounts, $id) {
 			$mount = $folderMounts[$cachedMountInfo->getMountPoint()];
-			$cacheEntry = $mount->getStorage()->getCache()->get((int)$id);
+			$cacheEntry = $mount->getStorage()->getCache()->get((int) $id);
 			if (!$cacheEntry) {
 				return null;
 			}
 
 			// cache jails will hide the "true" internal path
-			$internalPath = ltrim($cachedMountInfo->getRootInternalPath() . '/' . $cacheEntry->getPath(), '/');
+			$internalPath = ltrim($cachedMountInfo->getRootInternalPath().'/'.$cacheEntry->getPath(), '/');
 			$pathRelativeToMount = substr($internalPath, strlen($cachedMountInfo->getRootInternalPath()));
 			$pathRelativeToMount = ltrim($pathRelativeToMount, '/');
-			$absolutePath = rtrim($cachedMountInfo->getMountPoint() . $pathRelativeToMount, '/');
+			$absolutePath = rtrim($cachedMountInfo->getMountPoint().$pathRelativeToMount, '/');
 			return $this->root->createNode($absolutePath, new \OC\Files\FileInfo(
 				$absolutePath, $mount->getStorage(), $cacheEntry->getPath(), $cacheEntry, $mount,
 				\OC::$server->getUserManager()->get($mount->getStorage()->getOwner($pathRelativeToMount))
@@ -408,14 +408,14 @@ 
 
 		$nodes = array_filter($nodes);
 
-		return array_filter($nodes, function (Node $node) {
+		return array_filter($nodes, function(Node $node) {
 			return $this->getRelativePath($node->getPath());
 		});
 	}
 
 	protected function getAppDataDirectoryName(): string {
 		$instanceId = \OC::$server->getConfig()->getSystemValueString('instanceid');
-		return 'appdata_' . $instanceId;
+		return 'appdata_'.$instanceId;
 	}
 
 	/**
@@ -437,8 +437,8 @@ 
 			return [];
 		}
 
-		$absolutePath = '/' . ltrim($cacheEntry->getPath(), '/');
-		$currentPath = rtrim($this->path, '/') . '/';
+		$absolutePath = '/'.ltrim($cacheEntry->getPath(), '/');
+		$currentPath = rtrim($this->path, '/').'/';
 
 		if (strpos($absolutePath, $currentPath) !== 0) {
 			return [];
@@ -493,10 +493,10 @@ 
 		$mounts = $this->root->getMountsIn($this->path);
 		$mounts[] = $this->getMountPoint();
 
-		$mounts = array_filter($mounts, function (IMountPoint $mount) {
+		$mounts = array_filter($mounts, function(IMountPoint $mount) {
 			return $mount->getStorage() !== null;
 		});
-		$storageIds = array_map(function (IMountPoint $mount) {
+		$storageIds = array_map(function(IMountPoint $mount) {
 			return $mount->getStorage()->getCache()->getNumericStorageId();
 		}, $mounts);
 		/** @var IMountPoint[] $mountMap */
@@ -507,7 +507,7 @@ 
 		 * Construct an array of the storage id with their prefix path
 		 * This helps us to filter in the final query
 		 */
-		$filters = array_map(function (IMountPoint $mount) {
+		$filters = array_map(function(IMountPoint $mount) {
 			$storage = $mount->getStorage();
 
 			$storageId = $storage->getCache()->getNumericStorageId();
@@ -571,7 +571,7 @@ 
 
 			if ($filter['pathPrefix'] !== '') {
 				$storageFilter->add(
-					$builder->expr()->like('f.path', $builder->createNamedParameter($dbconn->escapeLikeParameter($filter['pathPrefix']) . '/%'))
+					$builder->expr()->like('f.path', $builder->createNamedParameter($dbconn->escapeLikeParameter($filter['pathPrefix']).'/%'))
 				);
 			}
 
@@ -599,7 +599,7 @@ 
 	}
 
 	private function recentParse($result, $mountMap, $mimetypeLoader) {
-		$files = array_filter(array_map(function (array $entry) use ($mountMap, $mimetypeLoader) {
+		$files = array_filter(array_map(function(array $entry) use ($mountMap, $mimetypeLoader) {
 			$mount = $mountMap[$entry['storage']];
 			$entry['internalPath'] = $entry['path'];
 			$entry['mimetype'] = $mimetypeLoader->getMimetypeById($entry['mimetype']);
@@ -612,7 +612,7 @@ 
 			return $this->root->createNode($fileInfo->getPath(), $fileInfo);
 		}, $result));
 
-		return array_values(array_filter($files, function (Node $node) {
+		return array_values(array_filter($files, function(Node $node) {
 			$cacheEntry = $node->getMountPoint()->getStorage()->getCache()->get($node->getId());
 			if (!$cacheEntry) {
 				return false;
@@ -634,13 +634,13 @@ 
 			$rootLength = strlen($jailRoot) + 1;
 			if ($path === $jailRoot) {
 				return $mount->getMountPoint();
-			} elseif (substr($path, 0, $rootLength) === $jailRoot . '/') {
-				return $mount->getMountPoint() . substr($path, $rootLength);
+			} elseif (substr($path, 0, $rootLength) === $jailRoot.'/') {
+				return $mount->getMountPoint().substr($path, $rootLength);
 			} else {
 				return null;
 			}
 		} else {
-			return $mount->getMountPoint() . $path;
+			return $mount->getMountPoint().$path;
 		}
 	}
 }