nextcloud / server

lib/private/Files/Cache/QuerySearchHelper.php

Spacing +12 added lines, -12 removed lines

@@ -74,7 +74,7 @@ 
 	 */
 	public function shouldJoinTags(ISearchOperator $operator) {
 		if ($operator instanceof ISearchBinaryOperator) {
-			return array_reduce($operator->getArguments(), function ($shouldJoin, ISearchOperator $operator) {
+			return array_reduce($operator->getArguments(), function($shouldJoin, ISearchOperator $operator) {
 				return $shouldJoin || $this->shouldJoinTags($operator);
 			}, false);
 		} else if ($operator instanceof ISearchComparison) {
@@ -88,7 +88,7 @@ 
 	 * @param ISearchOperator $operator
 	 */
 	public function searchOperatorArrayToDBExprArray(IQueryBuilder $builder, array $operators) {
-		return array_filter(array_map(function ($operator) use ($builder) {
+		return array_filter(array_map(function($operator) use ($builder) {
 			return $this->searchOperatorToDBExpr($builder, $operator);
 		}, $operators));
 	}
@@ -113,12 +113,12 @@ 
 				case ISearchBinaryOperator::OPERATOR_OR:
 					return call_user_func_array([$expr, 'orX'], $this->searchOperatorArrayToDBExprArray($builder, $operator->getArguments()));
 				default:
-					throw new \InvalidArgumentException('Invalid operator type: ' . $operator->getType());
+					throw new \InvalidArgumentException('Invalid operator type: '.$operator->getType());
 			}
 		} else if ($operator instanceof ISearchComparison) {
 			return $this->searchComparisonToDBExpr($builder, $operator, self::$searchOperatorMap);
 		} else {
-			throw new \InvalidArgumentException('Invalid operator type: ' . get_class($operator));
+			throw new \InvalidArgumentException('Invalid operator type: '.get_class($operator));
 		}
 	}
 
@@ -130,7 +130,7 @@ 
 			$queryOperator = $operatorMap[$type];
 			return $builder->expr()->$queryOperator($field, $this->getParameterForValue($builder, $value));
 		} else {
-			throw new \InvalidArgumentException('Invalid operator type: ' . $comparison->getType());
+			throw new \InvalidArgumentException('Invalid operator type: '.$comparison->getType());
 		}
 	}
 
@@ -140,18 +140,18 @@ 
 		$type = $operator->getType();
 		if ($field === 'mimetype') {
 			if ($operator->getType() === ISearchComparison::COMPARE_EQUAL) {
-				$value = (int)$this->mimetypeLoader->getId($value);
+				$value = (int) $this->mimetypeLoader->getId($value);
 			} else if ($operator->getType() === ISearchComparison::COMPARE_LIKE) {
 				// transform "mimetype='foo/%'" to "mimepart='foo'"
 				if (preg_match('|(.+)/%|', $value, $matches)) {
 					$field = 'mimepart';
-					$value = (int)$this->mimetypeLoader->getId($matches[1]);
+					$value = (int) $this->mimetypeLoader->getId($matches[1]);
 					$type = ISearchComparison::COMPARE_EQUAL;
 				} else if (strpos($value, '%') !== false) {
-					throw new \InvalidArgumentException('Unsupported query value for mimetype: ' . $value . ', only values in the format "mime/type" or "mime/%" are supported');
+					throw new \InvalidArgumentException('Unsupported query value for mimetype: '.$value.', only values in the format "mime/type" or "mime/%" are supported');
 				} else {
 					$field = 'mimetype';
-					$value = (int)$this->mimetypeLoader->getId($value);
+					$value = (int) $this->mimetypeLoader->getId($value);
 					$type = ISearchComparison::COMPARE_EQUAL;
 				}
 			}
@@ -185,14 +185,14 @@ 
 		];
 
 		if (!isset($types[$operator->getField()])) {
-			throw new \InvalidArgumentException('Unsupported comparison field ' . $operator->getField());
+			throw new \InvalidArgumentException('Unsupported comparison field '.$operator->getField());
 		}
 		$type = $types[$operator->getField()];
 		if (gettype($operator->getValue()) !== $type) {
-			throw new \InvalidArgumentException('Invalid type for field ' . $operator->getField());
+			throw new \InvalidArgumentException('Invalid type for field '.$operator->getField());
 		}
 		if (!in_array($operator->getType(), $comparisons[$operator->getField()])) {
-			throw new \InvalidArgumentException('Unsupported comparison for field  ' . $operator->getField() . ': ' . $operator->getType());
+			throw new \InvalidArgumentException('Unsupported comparison for field  '.$operator->getField().': '.$operator->getType());
 		}
 	}
 

lib/private/Files/Node/Folder.php

Spacing +30 added lines, -30 removed lines

@@ -56,7 +56,7 @@ 
 		if (!$this->isValidPath($path)) {
 			throw new NotPermittedException('Invalid path');
 		}
-		return $this->path . $this->normalizePath($path);
+		return $this->path.$this->normalizePath($path);
 	}
 
 	/**
@@ -69,7 +69,7 @@ 
 		}
 		if ($path === $this->path) {
 			return '/';
-		} else if (strpos($path, $this->path . '/') !== 0) {
+		} else if (strpos($path, $this->path.'/') !== 0) {
 			return null;
 		} else {
 			$path = substr($path, strlen($this->path));
@@ -84,7 +84,7 @@ 
 	 * @return bool
 	 */
 	public function isSubNode($node) {
-		return strpos($node->getPath(), $this->path . '/') === 0;
+		return strpos($node->getPath(), $this->path.'/') === 0;
 	}
 
 	/**
@@ -96,7 +96,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 {
@@ -157,7 +157,7 @@ 
 			$fullPath = $this->getFullPath($path);
 			$nonExisting = new NonExistingFolder($this->root, $this->view, $fullPath);
 			$this->sendHooks(['preWrite', 'preCreate'], [$nonExisting]);
-			if(!$this->view->mkdir($fullPath)) {
+			if (!$this->view->mkdir($fullPath)) {
 				throw new NotPermittedException('Could not create folder');
 			}
 			$node = new Folder($this->root, $this->view, $fullPath);
@@ -196,7 +196,7 @@ 
 	 */
 	public function search($query) {
 		if (is_string($query)) {
-			return $this->searchCommon('search', array('%' . $query . '%'));
+			return $this->searchCommon('search', array('%'.$query.'%'));
 		} else {
 			return $this->searchCommon('searchQuery', array($query));
 		}
@@ -229,7 +229,7 @@ 
 	 * @return \OC\Files\Node\Node[]
 	 */
 	private function searchCommon($method, $args) {
-		$limitToHome = ($method === 'searchQuery')? $args[0]->limitToHome(): false;
+		$limitToHome = ($method === 'searchQuery') ? $args[0]->limitToHome() : false;
 		if ($limitToHome && count(explode('/', $this->path)) !== 3) {
 			throw new \InvalidArgumentException('searching by owner is only allows on the users home folder');
 		}
@@ -241,7 +241,7 @@ 
 		$internalPath = $mount->getInternalPath($this->path);
 		$internalPath = rtrim($internalPath, '/');
 		if ($internalPath !== '') {
-			$internalPath = $internalPath . '/';
+			$internalPath = $internalPath.'/';
 		}
 		$internalRootLength = strlen($internalPath);
 
@@ -253,7 +253,7 @@ 
 				$result['internalPath'] = $result['path'];
 				$result['path'] = substr($result['path'], $internalRootLength);
 				$result['storage'] = $storage;
-				$files[] = new \OC\Files\FileInfo($this->path . '/' . $result['path'], $storage, $result['internalPath'], $result, $mount);
+				$files[] = new \OC\Files\FileInfo($this->path.'/'.$result['path'], $storage, $result['internalPath'], $result, $mount);
 			}
 		}
 
@@ -268,16 +268,16 @@ 
 					$results = call_user_func_array([$cache, $method], $args);
 					foreach ($results as $result) {
 						$result['internalPath'] = $result['path'];
-						$result['path'] = $relativeMountPoint . $result['path'];
+						$result['path'] = $relativeMountPoint.$result['path'];
 						$result['storage'] = $storage;
-						$files[] = new \OC\Files\FileInfo($this->path . '/' . $result['path'], $storage,
+						$files[] = new \OC\Files\FileInfo($this->path.'/'.$result['path'], $storage,
 							$result['internalPath'], $result, $mount);
 					}
 				}
 			}
 		}
 
-		return array_map(function (FileInfo $file) {
+		return array_map(function(FileInfo $file) {
 			return $this->createNode($file->getPath(), $file);
 		}, $files);
 	}
@@ -293,16 +293,16 @@ 
 		} 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()]);
 		}));
 
@@ -313,18 +313,18 @@ 
 			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))
@@ -333,14 +333,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;
 	}
 
 	/**
@@ -362,8 +362,8 @@ 
 			return [];
 		}
 
-		$absolutePath = '/' . ltrim($cacheEntry->getPath(), '/');
-		$currentPath = rtrim($this->path, '/') . '/';
+		$absolutePath = '/'.ltrim($cacheEntry->getPath(), '/');
+		$currentPath = rtrim($this->path, '/').'/';
 
 		if (strpos($absolutePath, $currentPath) !== 0) {
 			return [];
@@ -418,10 +418,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();
 		});
-		$storageIds = array_map(function (IMountPoint $mount) {
+		$storageIds = array_map(function(IMountPoint $mount) {
 			return $mount->getStorage()->getCache()->getNumericStorageId();
 		}, $mounts);
 		/** @var IMountPoint[] $mountMap */
@@ -476,7 +476,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']);
@@ -489,7 +489,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;
@@ -511,13 +511,13 @@ 
 			$rootLength = strlen($jailRoot) + 1;
 			if ($path === $jailRoot) {
 				return $mount->getMountPoint();
-			} else if (substr($path, 0, $rootLength) === $jailRoot . '/') {
-				return $mount->getMountPoint() . substr($path, $rootLength);
+			} else if (substr($path, 0, $rootLength) === $jailRoot.'/') {
+				return $mount->getMountPoint().substr($path, $rootLength);
 			} else {
 				return null;
 			}
 		} else {
-			return $mount->getMountPoint() . $path;
+			return $mount->getMountPoint().$path;
 		}
 	}
 }

apps/dav/lib/Files/FileSearchBackend.php

Spacing +11 added lines, -11 removed lines

@@ -158,7 +158,7 @@ 
 		$results = $folder->search($query);
 
 		/** @var SearchResult[] $nodes */
-		$nodes = array_map(function (Node $node) {
+		$nodes = array_map(function(Node $node) {
 			if ($node instanceof Folder) {
 				$davNode = new \OCA\DAV\Connector\Sabre\Directory($this->view, $node, $this->tree, $this->shareManager);
 			} else {
@@ -171,7 +171,7 @@ 
 
 		if (!$query->limitToHome()) {
 			// Sort again, since the result from multiple storages is appended and not sorted
-			usort($nodes, function (SearchResult $a, SearchResult $b) use ($search) {
+			usort($nodes, function(SearchResult $a, SearchResult $b) use ($search) {
 				return $this->sort($a, $b, $search->orderBy);
 			});
 		}
@@ -261,8 +261,8 @@ 
 	 * @return string
 	 */
 	private function getHrefForNode(Node $node) {
-		$base = '/files/' . $this->user->getUID();
-		return $base . $this->view->getRelativePath($node->getPath());
+		$base = '/files/'.$this->user->getUID();
+		return $base.$this->view->getRelativePath($node->getPath());
 	}
 
 	/**
@@ -286,7 +286,7 @@ 
 
 		return new SearchQuery(
 			$this->transformSearchOperation($query->where),
-			(int)$limit->maxResults,
+			(int) $limit->maxResults,
 			0,
 			$orders,
 			$this->user,
@@ -321,19 +321,19 @@ 
 			case Operator::OPERATION_LESS_THAN:
 			case Operator::OPERATION_IS_LIKE:
 				if (count($operator->arguments) !== 2) {
-					throw new \InvalidArgumentException('Invalid number of arguments for ' . $trimmedType . ' operation');
+					throw new \InvalidArgumentException('Invalid number of arguments for '.$trimmedType.' operation');
 				}
 				if (!($operator->arguments[0] instanceof SearchPropertyDefinition)) {
-					throw new \InvalidArgumentException('Invalid argument 1 for ' . $trimmedType . ' operation, expected property');
+					throw new \InvalidArgumentException('Invalid argument 1 for '.$trimmedType.' operation, expected property');
 				}
 				if (!($operator->arguments[1] instanceof Literal)) {
-					throw new \InvalidArgumentException('Invalid argument 2 for ' . $trimmedType . ' operation, expected literal');
+					throw new \InvalidArgumentException('Invalid argument 2 for '.$trimmedType.' operation, expected literal');
 				}
 				return new SearchComparison($trimmedType, $this->mapPropertyNameToColumn($operator->arguments[0]), $this->castValue($operator->arguments[0], $operator->arguments[1]->value));
 			case Operator::OPERATION_IS_COLLECTION:
 				return new SearchComparison('eq', 'mimetype', ICacheEntry::DIRECTORY_MIMETYPE);
 			default:
-				throw new \InvalidArgumentException('Unsupported operation ' . $trimmedType . ' (' . $operator->type . ')');
+				throw new \InvalidArgumentException('Unsupported operation '.$trimmedType.' ('.$operator->type.')');
 		}
 	}
 
@@ -358,7 +358,7 @@ 
 			case FilesPlugin::INTERNAL_FILEID_PROPERTYNAME:
 				return 'fileid';
 			default:
-				throw new \InvalidArgumentException('Unsupported property for search or order: ' . $property->name);
+				throw new \InvalidArgumentException('Unsupported property for search or order: '.$property->name);
 		}
 	}
 
@@ -415,7 +415,7 @@ 
 							} else {
 								throw new \InvalidArgumentException("searching by '$propertyName' is only allowed with a literal value");
 							}
-						} else{
+						} else {
 							throw new \InvalidArgumentException("searching by '$propertyName' is not allowed inside a '{DAV:}or' or '{DAV:}not'");
 						}
 					} else {