nextcloud / files_fulltextsearch

lib/Service/ConfigService.php

Spacing +1 added lines, -1 removed lines

@@ -236,7 +236,7 @@
 	 */
 	public function setDocumentIndexOption(FilesDocument $document, string $option) {
 		$document->getIndex()
-				 ->addOption('_' . $option, (string)$this->getAppValue($option));
+				 ->addOption('_'.$option, (string)$this->getAppValue($option));
 	}
 
 

lib/Service/ExtensionService.php

Spacing +4 added lines, -4 removed lines

@@ -87,7 +87,7 @@ 
 	 * @param FilesDocument $document
 	 * @param Node $file
 	 */
-	public function fileIndexing(FilesDocument &$document, Node $file) {
+	public function fileIndexing(FilesDocument & $document, Node $file) {
 		$this->dispatch('Files_FullTextSearch.onFileIndexing', ['file' => $file, 'document' => &$document]);
 	}
 
@@ -95,7 +95,7 @@ 
 	/**
 	 * @param ISearchRequest $request
 	 */
-	public function searchRequest(ISearchRequest &$request) {
+	public function searchRequest(ISearchRequest & $request) {
 		$this->dispatch('Files_FullTextSearch.onSearchRequest', ['request' => &$request]);
 	}
 
@@ -103,7 +103,7 @@ 
 	/**
 	 * @param ISearchResult $result
 	 */
-	public function searchResult(ISearchResult &$result) {
+	public function searchResult(ISearchResult & $result) {
 		$this->dispatch('Files_FullTextSearch.onSearchResult', ['result' => &$result]);
 	}
 
@@ -111,7 +111,7 @@ 
 	/**
 	 * @param IIndexDocument $document
 	 */
-	public function indexComparing(IIndexDocument &$document) {
+	public function indexComparing(IIndexDocument & $document) {
 		$this->dispatch('Files_FullTextSearch.onIndexComparing', ['document' => &$document]);
 	}
 

lib/Service/ExternalFilesService.php

Spacing +1 added lines, -1 removed lines

@@ -191,7 +191,7 @@
 	 *
 	 * @throws FileIsNotIndexableException
 	 */
-	public function updateDocumentAccess(FilesDocument &$document, Node $file) {
+	public function updateDocumentAccess(FilesDocument & $document, Node $file) {
 		if ($document->getSource() !== ConfigService::FILES_EXTERNAL) {
 			return;
 		}

lib/Tools/Traits/TStringTools.php

Spacing +16 added lines, -16 removed lines

@@ -96,7 +96,7 @@ 
 			return $line;
 		}
 
-		return substr($line, 0, $length - 5) . ' (..)';
+		return substr($line, 0, $length - 5).' (..)';
 	}
 
 	/**
@@ -134,7 +134,7 @@ 
 	protected function feedStringWithParams(string $line, array $params): string {
 		$ak = array_keys($params);
 		foreach ($ak as $k) {
-			$line = str_replace('{' . $k . '}', (string)$params[$k], $line);
+			$line = str_replace('{'.$k.'}', (string)$params[$k], $line);
 		}
 
 		return $line;
@@ -188,7 +188,7 @@ 
 		$s = ['B', 'KB', 'MB', 'GB', 'TB', 'PB'];
 		$e = floor(log($bytes, 1024));
 
-		return round($bytes / pow(1024, $e), 2) . ' ' . $s[$e];
+		return round($bytes / pow(1024, $e), 2).' '.$s[$e];
 	}
 
 
@@ -211,8 +211,8 @@ 
 			$second = time();
 		}
 
-		$f = new DateTime('@' . $first);
-		$s = new DateTime('@' . $second);
+		$f = new DateTime('@'.$first);
+		$s = new DateTime('@'.$second);
 		$duration = $second - $first;
 		if ($short) {
 			$minutes = $this->get('minutes', $words, 'M');
@@ -220,16 +220,16 @@ 
 			$days = $this->get('days', $words, 'D');
 
 			if ($duration < 60) {
-				return $f->diff($s)->format('<1' . $minutes);
+				return $f->diff($s)->format('<1'.$minutes);
 			}
 			if ($duration < 3600) {
-				return $f->diff($s)->format('%i' . $minutes);
+				return $f->diff($s)->format('%i'.$minutes);
 			}
 			if ($duration < 86400) {
-				return $f->diff($s)->format('%h' . $hours . ', %i' . $minutes);
+				return $f->diff($s)->format('%h'.$hours.', %i'.$minutes);
 			}
 
-			return $f->diff($s)->format('%a' . $days . ', %h' . $hours . ', %i' . $minutes);
+			return $f->diff($s)->format('%a'.$days.', %h'.$hours.', %i'.$minutes);
 		}
 
 		$seconds = $this->get('seconds', $words, 'seconds');
@@ -237,22 +237,22 @@ 
 		$hours = $this->get('hours', $words, 'hours');
 		$days = $this->get('days', $words, 'days');
 		if ($duration < 60) {
-			return $f->diff($s)->format('%s ' . $seconds);
+			return $f->diff($s)->format('%s '.$seconds);
 		}
 
 		if ($duration < 3600) {
-			return $f->diff($s)->format('%i ' . $minutes . ' and %s ' . $seconds);
+			return $f->diff($s)->format('%i '.$minutes.' and %s '.$seconds);
 		}
 
 		if ($duration < 86400) {
-			return $f->diff($s)->format('%h ' . $hours . ', %i ' . $minutes . ' and %s ' . $seconds);
+			return $f->diff($s)->format('%h '.$hours.', %i '.$minutes.' and %s '.$seconds);
 		}
 
 		return $f->diff($s)->format(
-			'%a ' . $days .
-			', %h ' . $hours .
-			', %i ' . $minutes .
-			' and %s ' . $seconds
+			'%a '.$days.
+			', %h '.$hours.
+			', %i '.$minutes.
+			' and %s '.$seconds
 		);
 	}
 }

lib/Tools/Traits/TNCLogger.php

Spacing +6 added lines, -6 removed lines

@@ -128,7 +128,7 @@ 
 	 * @param array $serializable
 	 */
 	public function emergency(string $message, bool $trace = false, array $serializable = []): void {
-		$this->log(self::$EMERGENCY, '[emergency] ' . $message, $trace, $serializable);
+		$this->log(self::$EMERGENCY, '[emergency] '.$message, $trace, $serializable);
 	}
 
 	/**
@@ -137,7 +137,7 @@ 
 	 * @param array $serializable
 	 */
 	public function alert(string $message, bool $trace = false, array $serializable = []): void {
-		$this->log(self::$ALERT, '[alert] ' . $message, $trace, $serializable);
+		$this->log(self::$ALERT, '[alert] '.$message, $trace, $serializable);
 	}
 
 	/**
@@ -146,7 +146,7 @@ 
 	 * @param array $serializable
 	 */
 	public function warning(string $message, bool $trace = false, array $serializable = []): void {
-		$this->log(self::$WARNING, '[warning] ' . $message, $trace, $serializable);
+		$this->log(self::$WARNING, '[warning] '.$message, $trace, $serializable);
 	}
 
 	/**
@@ -155,7 +155,7 @@ 
 	 * @param array $serializable
 	 */
 	public function notice(string $message, bool $trace = false, array $serializable = []): void {
-		$this->log(self::$NOTICE, '[notice] ' . $message, $trace, $serializable);
+		$this->log(self::$NOTICE, '[notice] '.$message, $trace, $serializable);
 	}
 
 	/**
@@ -163,7 +163,7 @@ 
 	 * @param array $serializable
 	 */
 	public function debug(string $message, array $serializable = []): void {
-		$message = '[debug] ' . $message;
+		$message = '[debug] '.$message;
 		$debugLevel = (int)$this->appConfig('debug_level');
 		$this->log($debugLevel, $message, ($this->appConfig('debug_trace') === '1'), $serializable);
 	}
@@ -180,7 +180,7 @@ 
 		if ($trace) {
 			$opts['exception'] = new HintException($message, json_encode($serializable));
 		} elseif (!empty($serializable)) {
-			$message .= ' -- ' . json_encode($serializable);
+			$message .= ' -- '.json_encode($serializable);
 		}
 
 		$this->logger()

lib/Tools/Traits/TArrayTools.php

Spacing +2 added lines, -2 removed lines

@@ -404,7 +404,7 @@ 
 		foreach ($keys as $key) {
 			if (!array_key_exists($key, $arr)) {
 				throw new MalformedArrayException(
-					'source: ' . json_encode($arr) . ' - missing key: ' . $key
+					'source: '.json_encode($arr).' - missing key: '.$key
 				);
 			}
 		}
@@ -417,7 +417,7 @@ 
 	protected function cleanArray(array &$arr) {
 		$arr = array_filter(
 			$arr,
-			function ($v) {
+			function($v) {
 				if (is_string($v)) {
 					return ($v !== '');
 				}

lib/Tools/Db/ExtendedQueryBuilder.php

Spacing +31 added lines, -31 removed lines

@@ -215,7 +215,7 @@ 
 	 */
 	public function limitToCreation(int $delay = 0): self {
 		$date = new DateTime('now');
-		$date->sub(new DateInterval('PT' . $delay . 'M'));
+		$date->sub(new DateInterval('PT'.$delay.'M'));
 
 		$this->limitToDBFieldDateTime('creation', $date, true);
 
@@ -232,7 +232,7 @@ 
 		$expr = $this->expr();
 		$pf = ($this->getType() === DBALQueryBuilder::SELECT) ? $this->getDefaultSelectAlias()
 																. '.' : '';
-		$field = $pf . $field;
+		$field = $pf.$field;
 
 		$orX = $expr->orX();
 		$orX->add(
@@ -262,8 +262,8 @@ 
 		}
 
 		$expr = $this->expr();
-		$pf = ($this->getType() === DBALQueryBuilder::SELECT) ? $this->getDefaultSelectAlias() . '.' : '';
-		$field = $pf . $field;
+		$pf = ($this->getType() === DBALQueryBuilder::SELECT) ? $this->getDefaultSelectAlias().'.' : '';
+		$field = $pf.$field;
 
 		$orX = $expr->orX();
 		$orX->add(
@@ -281,8 +281,8 @@ 
 	public function searchInDBField(string $field, string $value): void {
 		$expr = $this->expr();
 
-		$pf = ($this->getType() === DBALQueryBuilder::SELECT) ? $this->getDefaultSelectAlias() . '.' : '';
-		$field = $pf . $field;
+		$pf = ($this->getType() === DBALQueryBuilder::SELECT) ? $this->getDefaultSelectAlias().'.' : '';
+		$field = $pf.$field;
 
 		$this->andWhere($expr->iLike($field, $this->createNamedParameter($value)));
 	}
@@ -404,7 +404,7 @@ 
 	 */
 	public function exprLike(string $field, string $value, string $alias = '', bool $cs = true): string {
 		if ($this->getType() === DBALQueryBuilder::SELECT) {
-			$field = (($alias === '') ? $this->getDefaultSelectAlias() : $alias) . '.' . $field;
+			$field = (($alias === '') ? $this->getDefaultSelectAlias() : $alias).'.'.$field;
 		}
 
 		$expr = $this->expr();
@@ -426,7 +426,7 @@ 
 	 */
 	public function exprLimit(string $field, string $value, string $alias = '', bool $cs = true): string {
 		if ($this->getType() === DBALQueryBuilder::SELECT) {
-			$field = (($alias === '') ? $this->getDefaultSelectAlias() : $alias) . '.' . $field;
+			$field = (($alias === '') ? $this->getDefaultSelectAlias() : $alias).'.'.$field;
 		}
 
 		$expr = $this->expr();
@@ -452,7 +452,7 @@ 
 	 */
 	public function exprLimitInt(string $field, int $value, string $alias = ''): string {
 		if ($this->getType() === DBALQueryBuilder::SELECT) {
-			$field = (($alias === '') ? $this->getDefaultSelectAlias() : $alias) . '.' . $field;
+			$field = (($alias === '') ? $this->getDefaultSelectAlias() : $alias).'.'.$field;
 		}
 
 		$expr = $this->expr();
@@ -470,7 +470,7 @@ 
 	 */
 	public function exprLimitBool(string $field, bool $value, string $alias = ''): string {
 		if ($this->getType() === DBALQueryBuilder::SELECT) {
-			$field = (($alias === '') ? $this->getDefaultSelectAlias() : $alias) . '.' . $field;
+			$field = (($alias === '') ? $this->getDefaultSelectAlias() : $alias).'.'.$field;
 		}
 
 		$expr = $this->expr();
@@ -491,7 +491,7 @@ 
 		string $alias = ''
 	): ICompositeExpression {
 		if ($this->getType() === DBALQueryBuilder::SELECT) {
-			$field = (($alias === '') ? $this->getDefaultSelectAlias() : $alias) . '.' . $field;
+			$field = (($alias === '') ? $this->getDefaultSelectAlias() : $alias).'.'.$field;
 		}
 
 		$expr = $this->expr();
@@ -517,7 +517,7 @@ 
 		string $alias = ''
 	): ICompositeExpression {
 		if ($this->getType() === DBALQueryBuilder::SELECT) {
-			$field = (($alias === '') ? $this->getDefaultSelectAlias() : $alias) . '.' . $field;
+			$field = (($alias === '') ? $this->getDefaultSelectAlias() : $alias).'.'.$field;
 		}
 
 		$expr = $this->expr();
@@ -546,7 +546,7 @@ 
 		bool $cs = true
 	): ICompositeExpression {
 		if ($this->getType() === DBALQueryBuilder::SELECT) {
-			$field = (($alias === '') ? $this->getDefaultSelectAlias() : $alias) . '.' . $field;
+			$field = (($alias === '') ? $this->getDefaultSelectAlias() : $alias).'.'.$field;
 		}
 
 		$andX = $this->expr()->andX();
@@ -571,7 +571,7 @@ 
 	 */
 	public function exprLimitInArray(string $field, array $values, string $alias = ''): string {
 		if ($this->getType() === DBALQueryBuilder::SELECT) {
-			$field = (($alias === '') ? $this->getDefaultSelectAlias() : $alias) . '.' . $field;
+			$field = (($alias === '') ? $this->getDefaultSelectAlias() : $alias).'.'.$field;
 		}
 
 		$expr = $this->expr();
@@ -589,7 +589,7 @@ 
 	 */
 	public function exprLimitBitwise(string $field, int $flag, string $alias = ''): string {
 		if ($this->getType() === DBALQueryBuilder::SELECT) {
-			$field = (($alias === '') ? $this->getDefaultSelectAlias() : $alias) . '.' . $field;
+			$field = (($alias === '') ? $this->getDefaultSelectAlias() : $alias).'.'.$field;
 		}
 
 		$expr = $this->expr();
@@ -611,7 +611,7 @@ 
 	 */
 	public function exprLt(string $field, int $value, bool $lte = false, string $alias = ''): string {
 		if ($this->getType() === DBALQueryBuilder::SELECT) {
-			$field = (($alias === '') ? $this->getDefaultSelectAlias() : $alias) . '.' . $field;
+			$field = (($alias === '') ? $this->getDefaultSelectAlias() : $alias).'.'.$field;
 		}
 
 		$expr = $this->expr();
@@ -633,7 +633,7 @@ 
 	 */
 	public function exprGt(string $field, int $value, bool $gte = false, string $alias = ''): string {
 		if ($this->getType() === DBALQueryBuilder::SELECT) {
-			$field = (($alias === '') ? $this->getDefaultSelectAlias() : $alias) . '.' . $field;
+			$field = (($alias === '') ? $this->getDefaultSelectAlias() : $alias).'.'.$field;
 		}
 
 		$expr = $this->expr();
@@ -742,7 +742,7 @@ 
 	 */
 	public function exprUnlike(string $field, string $value, string $alias = '', bool $cs = true): string {
 		if ($this->getType() === DBALQueryBuilder::SELECT) {
-			$field = (($alias === '') ? $this->getDefaultSelectAlias() : $alias) . '.' . $field;
+			$field = (($alias === '') ? $this->getDefaultSelectAlias() : $alias).'.'.$field;
 		}
 
 		$expr = $this->expr();
@@ -766,7 +766,7 @@ 
 	 */
 	public function exprFilter(string $field, string $value, string $alias = '', bool $cs = true): string {
 		if ($this->getType() === DBALQueryBuilder::SELECT) {
-			$field = (($alias === '') ? $this->getDefaultSelectAlias() : $alias) . '.' . $field;
+			$field = (($alias === '') ? $this->getDefaultSelectAlias() : $alias).'.'.$field;
 		}
 
 		$expr = $this->expr();
@@ -792,7 +792,7 @@ 
 	 */
 	public function exprFilterInt(string $field, int $value, string $alias = ''): string {
 		if ($this->getType() === DBALQueryBuilder::SELECT) {
-			$field = (($alias === '') ? $this->getDefaultSelectAlias() : $alias) . '.' . $field;
+			$field = (($alias === '') ? $this->getDefaultSelectAlias() : $alias).'.'.$field;
 		}
 
 		$expr = $this->expr();
@@ -810,7 +810,7 @@ 
 	 */
 	public function exprFilterBool(string $field, bool $value, string $alias = ''): string {
 		if ($this->getType() === DBALQueryBuilder::SELECT) {
-			$field = (($alias === '') ? $this->getDefaultSelectAlias() : $alias) . '.' . $field;
+			$field = (($alias === '') ? $this->getDefaultSelectAlias() : $alias).'.'.$field;
 		}
 
 		$expr = $this->expr();
@@ -831,7 +831,7 @@ 
 		string $alias = ''
 	): ICompositeExpression {
 		if ($this->getType() === DBALQueryBuilder::SELECT) {
-			$field = (($alias === '') ? $this->getDefaultSelectAlias() : $alias) . '.' . $field;
+			$field = (($alias === '') ? $this->getDefaultSelectAlias() : $alias).'.'.$field;
 		}
 
 		$expr = $this->expr();
@@ -857,7 +857,7 @@ 
 		string $alias = ''
 	): ICompositeExpression {
 		if ($this->getType() === DBALQueryBuilder::SELECT) {
-			$field = (($alias === '') ? $this->getDefaultSelectAlias() : $alias) . '.' . $field;
+			$field = (($alias === '') ? $this->getDefaultSelectAlias() : $alias).'.'.$field;
 		}
 
 		$expr = $this->expr();
@@ -886,7 +886,7 @@ 
 		bool $cs = true
 	): ICompositeExpression {
 		if ($this->getType() === DBALQueryBuilder::SELECT) {
-			$field = (($alias === '') ? $this->getDefaultSelectAlias() : $alias) . '.' . $field;
+			$field = (($alias === '') ? $this->getDefaultSelectAlias() : $alias).'.'.$field;
 		}
 
 		$orX = $this->expr()->orX();
@@ -911,7 +911,7 @@ 
 	 */
 	public function exprFilterInArray(string $field, array $values, string $alias = ''): string {
 		if ($this->getType() === DBALQueryBuilder::SELECT) {
-			$field = (($alias === '') ? $this->getDefaultSelectAlias() : $alias) . '.' . $field;
+			$field = (($alias === '') ? $this->getDefaultSelectAlias() : $alias).'.'.$field;
 		}
 
 		$expr = $this->expr();
@@ -929,7 +929,7 @@ 
 	 */
 	public function exprFilterBitwise(string $field, int $flag, string $alias = ''): string {
 		if ($this->getType() === DBALQueryBuilder::SELECT) {
-			$field = (($alias === '') ? $this->getDefaultSelectAlias() : $alias) . '.' . $field;
+			$field = (($alias === '') ? $this->getDefaultSelectAlias() : $alias).'.'.$field;
 		}
 
 		$expr = $this->expr();
@@ -1090,12 +1090,12 @@ 
 		string $alias = ''
 	): self {
 		$selectFields = array_map(
-			function (string $item) use ($alias) {
+			function(string $item) use ($alias) {
 				if ($alias === '') {
 					return $item;
 				}
 
-				return $alias . '.' . $item;
+				return $alias.'.'.$item;
 			}, $fields
 		);
 
@@ -1121,13 +1121,13 @@ 
 		string $prefix,
 		array $default = []
 	): self {
-		$prefix = trim($prefix) . '_';
+		$prefix = trim($prefix).'_';
 		foreach ($default as $k => $v) {
-			$this->addDefaultValue($prefix . $k, (string)$v);
+			$this->addDefaultValue($prefix.$k, (string)$v);
 		}
 
 		foreach ($fields as $field) {
-			$this->selectAlias($alias . '.' . $field, $prefix . $field);
+			$this->selectAlias($alias.'.'.$field, $prefix.$field);
 		}
 
 		return $this;

lib/Service/GroupFoldersService.php

Spacing +2 added lines, -2 removed lines

@@ -159,7 +159,7 @@ 
 	 * @param FilesDocument $document
 	 * @param Node $file
 	 */
-	public function updateDocumentAccess(FilesDocument &$document, Node $file) {
+	public function updateDocumentAccess(FilesDocument & $document, Node $file) {
 		if ($document->getSource() !== ConfigService::FILES_GROUP_FOLDERS) {
 			return;
 		}
@@ -222,7 +222,7 @@ 
 		foreach ($mounts as $path => $mount) {
 			$mountPoint = new MountPoint();
 			$mountPoint->setId($this->getInt('id', $mount, -1))
-					   ->setPath('/' . $userId . '/files/' . $mount['mount_point'])
+					   ->setPath('/'.$userId.'/files/'.$mount['mount_point'])
 					   ->setGroups(array_keys($mount['groups']));
 			$mountPoints[] = $mountPoint;
 		}

lib/Service/SearchService.php

Spacing +9 added lines, -9 removed lines

@@ -122,10 +122,10 @@ 
 	 */
 	private function searchQueryShareNames(ISearchRequest $request) {
 		$username = $this->miscService->secureUsername($request->getAuthor());
-		$request->addField('share_names.' . $username);
+		$request->addField('share_names.'.$username);
 
 		$request->addWildcardField('title');
-		$request->addWildcardField('share_names.' . $username);
+		$request->addWildcardField('share_names.'.$username);
 	}
 
 
@@ -142,8 +142,8 @@ 
 		$currentDir = $this->withoutBeginSlash($this->withEndSlash($currentDir));
 		$request->addRegexFilters(
 			[
-				['share_names.' . $username => $currentDir . '.*'],
-				['title' => $currentDir . '.*']
+				['share_names.'.$username => $currentDir.'.*'],
+				['title' => $currentDir.'.*']
 			]
 		);
 	}
@@ -161,8 +161,8 @@ 
 		$username = $this->miscService->secureUsername($request->getAuthor());
 		$request->addRegexFilters(
 			[
-				['share_names.' . $username => '.*\.' . $extension],
-				['title' => '.*\.' . $extension]
+				['share_names.'.$username => '.*\.'.$extension],
+				['title' => '.*\.'.$extension]
 			]
 		);
 	}
@@ -195,7 +195,7 @@ 
 
 		if (in_array('filename', $in)) {
 			$username = $this->miscService->secureUsername($request->getAuthor());
-			$request->addLimitField('share_names.' . $username);
+			$request->addLimitField('share_names.'.$username);
 			$request->addLimitField('title');
 		}
 
@@ -247,7 +247,7 @@ 
 				$filesDocuments[] = $filesDocument;
 			} catch (Exception $e) {
 				$this->miscService->log(
-					'Exception while improving searchresult: ' . $e->getMessage() . ' - trace: '
+					'Exception while improving searchresult: '.$e->getMessage().' - trace: '
 					. json_encode($e->getTrace())
 				);
 			}
@@ -365,6 +365,6 @@ 
 	private function getWebdavId(int $fileId): string {
 		$instanceId = $this->configService->getSystemValue('instanceid');
 
-		return sprintf("%08s", $fileId) . $instanceId;
+		return sprintf("%08s", $fileId).$instanceId;
 	}
 }