nextcloud / fulltextsearch

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/Db/ExtendedQueryBuilder.php

Spacing +31 added lines, -31 removed lines

@@ -211,7 +211,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);
 
@@ -228,7 +228,7 @@ 
 		$expr = $this->expr();
 		$pf = ($this->getType() === DBALQueryBuilder::SELECT) ? $this->getDefaultSelectAlias()
 																. '.' : '';
-		$field = $pf . $field;
+		$field = $pf.$field;
 
 		$orX = $expr->orX();
 		$orX->add(
@@ -258,8 +258,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(
@@ -277,8 +277,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)));
 	}
@@ -400,7 +400,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();
@@ -413,7 +413,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();
@@ -431,7 +431,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();
@@ -449,7 +449,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();
@@ -470,7 +470,7 @@ 
 		string $alias = ''
 	): ICompositeExpression {
 		if ($this->getType() === DBALQueryBuilder::SELECT) {
-			$field = (($alias === '') ? $this->getDefaultSelectAlias() : $alias) . '.' . $field;
+			$field = (($alias === '') ? $this->getDefaultSelectAlias() : $alias).'.'.$field;
 		}
 
 		$expr = $this->expr();
@@ -496,7 +496,7 @@ 
 		string $alias = ''
 	): ICompositeExpression {
 		if ($this->getType() === DBALQueryBuilder::SELECT) {
-			$field = (($alias === '') ? $this->getDefaultSelectAlias() : $alias) . '.' . $field;
+			$field = (($alias === '') ? $this->getDefaultSelectAlias() : $alias).'.'.$field;
 		}
 
 		$expr = $this->expr();
@@ -525,7 +525,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();
@@ -550,7 +550,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();
@@ -570,7 +570,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();
@@ -592,7 +592,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();
@@ -614,7 +614,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();
@@ -723,7 +723,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();
@@ -747,7 +747,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();
@@ -773,7 +773,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();
@@ -791,7 +791,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();
@@ -812,7 +812,7 @@ 
 		string $alias = ''
 	): ICompositeExpression {
 		if ($this->getType() === DBALQueryBuilder::SELECT) {
-			$field = (($alias === '') ? $this->getDefaultSelectAlias() : $alias) . '.' . $field;
+			$field = (($alias === '') ? $this->getDefaultSelectAlias() : $alias).'.'.$field;
 		}
 
 		$expr = $this->expr();
@@ -838,7 +838,7 @@ 
 		string $alias = ''
 	): ICompositeExpression {
 		if ($this->getType() === DBALQueryBuilder::SELECT) {
-			$field = (($alias === '') ? $this->getDefaultSelectAlias() : $alias) . '.' . $field;
+			$field = (($alias === '') ? $this->getDefaultSelectAlias() : $alias).'.'.$field;
 		}
 
 		$expr = $this->expr();
@@ -867,7 +867,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();
@@ -892,7 +892,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();
@@ -910,7 +910,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();
@@ -1075,8 +1075,8 @@ 
 		}
 
 		$selectFields = array_map(
-			function (string $item) use ($alias) {
-				return $alias . '.' . $item;
+			function(string $item) use ($alias) {
+				return $alias.'.'.$item;
 			}, $fields
 		);
 
@@ -1102,13 +1102,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/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): void {
 		$arr = array_filter(
 			$arr,
-			function ($v) {
+			function($v) {
 				if (is_string($v)) {
 					return ($v !== '');
 				}

lib/Tools/Traits/TDeserialize.php

Spacing +2 added lines, -2 removed lines

@@ -68,11 +68,11 @@
 		try {
 			$test = new ReflectionClass($class);
 		} catch (\ReflectionException $e) {
-			throw new InvalidItemException('cannot ReflectionClass ' . $class);
+			throw new InvalidItemException('cannot ReflectionClass '.$class);
 		}
 
 		if (!in_array(IDeserializable::class, $test->getInterfaceNames())) {
-			throw new InvalidItemException($class . ' does not implement IDeserializable');
+			throw new InvalidItemException($class.' does not implement IDeserializable');
 		}
 
 		/** @var IDeserializable $item */

lib/AppInfo/Application.php

Spacing +2 added lines, -2 removed lines

@@ -51,7 +51,7 @@ 
 use Symfony\Component\Routing\Exception\RouteNotFoundException;
 use Throwable;
 
-require_once __DIR__ . '/../../vendor/autoload.php';
+require_once __DIR__.'/../../vendor/autoload.php';
 
 
 class Application extends App implements IBootstrap {
@@ -139,7 +139,7 @@ 
 		return [
 			'id' => self::APP_ID,
 			'order' => 5,
-			'href' => $urlGen->linkToRoute(self::APP_ID . '.Navigation.navigate'),
+			'href' => $urlGen->linkToRoute(self::APP_ID.'.Navigation.navigate'),
 			'icon' => $urlGen->imagePath(self::APP_ID, 'fulltextsearch.svg'),
 			'name' => 'Search'
 		];

lib/Service/CliService.php

Spacing +2 added lines, -2 removed lines

@@ -137,7 +137,7 @@ 
 	 */
 	public function switchPanel(string $panelSlot, string $panelId) {
 		$this->displayedPanel = array_map(
-			function ($item) use ($panelId, $panelSlot) {
+			function($item) use ($panelId, $panelSlot) {
 				if ($item['slot'] === $panelSlot) {
 					$item['id'] = $panelId;
 				}
@@ -195,7 +195,7 @@ 
 			}
 		}
 
-		$this->display->setFormat(implode("\n", $format) . "\n");
+		$this->display->setFormat(implode("\n", $format)."\n");
 		$this->refreshInfo();
 		$this->display->start();
 	}

lib/Command/CollectionInit.php

Spacing +1 added lines, -1 removed lines

@@ -117,7 +117,7 @@
 
 		$this->cliService->createPanel(
 			'collection', [
-				'┌─ Collection ' . $collection . ' ────',
+				'┌─ Collection '.$collection.' ────',
 				'│ ProviderId, UserId: <info>%providerId%</info> / <info>%userId%</info>',
 				'│ Chunk: <info>%chunkCurr:3s%</info>/<info>%chunkTotal%</info>',
 				'│ Document: <info>%documentCurr:6s%</info>/<info>%documentChunk%</info>',

lib/Command/Test.php

Spacing +12 added lines, -12 removed lines

@@ -218,7 +218,7 @@ 
 			$output->write(' ', true);
 		}
 
-		$output->write($line . ' ', false);
+		$output->write($line.' ', false);
 	}
 
 
@@ -279,7 +279,7 @@ 
 		$testProvider->setIndexOptions(new IndexOptions());
 		$indexableDocuments =
 			$testProvider->generateIndexableDocuments(TestService::DOCUMENT_USER1, '');
-		$this->output($output, '(' . sizeof($indexableDocuments) . ' items)', false);
+		$this->output($output, '('.sizeof($indexableDocuments).' items)', false);
 		$this->outputResult($output, true);
 	}
 
@@ -295,12 +295,12 @@ 
 		$wrapper = $this->platformService->getPlatform();
 		$testPlatform = $wrapper->getPlatform();
 
-		$this->output($output, '(' . $testPlatform->getName() . ')', false);
+		$this->output($output, '('.$testPlatform->getName().')', false);
 		$this->outputResult($output, true);
 
 		$this->output($output, 'Testing search platform.');
 		if (!$testPlatform->testPlatform()) {
-			throw new Exception('Search platform (' . $testPlatform->getName() . ') down ?');
+			throw new Exception('Search platform ('.$testPlatform->getName().') down ?');
 		}
 		$this->outputResult($output, true);
 
@@ -397,13 +397,13 @@ 
 			);
 
 			$this->output(
-				$output, '(size: ' . $indexDocument->getContentSize() . ')', false
+				$output, '(size: '.$indexDocument->getContentSize().')', false
 			);
 			$this->outputResult($output, true);
 		} catch (Exception $e) {
 			throw new Exception(
-				"Issue while getting test document '" . TestService::DOCUMENT_TYPE_LICENSE
-				. "' from search platform: " . $e->getMessage()
+				"Issue while getting test document '".TestService::DOCUMENT_TYPE_LICENSE
+				. "' from search platform: ".$e->getMessage()
 			);
 		}
 
@@ -593,7 +593,7 @@ 
 	) {
 		$this->output(
 			$output,
-			" - '" . $search . "'" . (($moreOutput === '') ? '' : ' - ' . $moreOutput . ' - ')
+			" - '".$search."'".(($moreOutput === '') ? '' : ' - '.$moreOutput.' - ')
 		);
 		$request = new SearchRequest();
 
@@ -607,7 +607,7 @@ 
 
 		$this->output(
 			$output,
-			'(result: ' . $searchResult->getCount() . ', expected: ' . json_encode($expected) . ')',
+			'(result: '.$searchResult->getCount().', expected: '.json_encode($expected).')',
 			false
 		);
 		$this->compareSearchResult($searchResult, $expected);
@@ -671,12 +671,12 @@ 
 	private function compareSearchResult(SearchResult $searchResult, array $entries) {
 		$documents = $searchResult->getDocuments();
 		if (sizeof($documents) !== sizeof($entries)) {
-			throw new Exception('Unexpected SearchResult: ' . json_encode($searchResult));
+			throw new Exception('Unexpected SearchResult: '.json_encode($searchResult));
 		}
 
 		foreach ($documents as $document) {
 			if (!in_array($document->getId(), $entries)) {
-				throw new Exception('Unexpected Document: ' . json_encode($document));
+				throw new Exception('Unexpected Document: '.json_encode($document));
 			}
 		}
 	}
@@ -689,7 +689,7 @@ 
 	 * @throws InterruptException
 	 */
 	private function pause(OutputInterface $output, int $s) {
-		$this->output($output, 'Pausing ' . $s . ' seconds');
+		$this->output($output, 'Pausing '.$s.' seconds');
 
 		for ($i = 1; $i <= $s; $i++) {
 			if (time_nanosleep(1, 0) !== true) {

lib/Command/Index.php

Spacing +4 added lines, -4 removed lines

@@ -222,11 +222,11 @@ 
 			/** do not get stuck while waiting interactive input */
 			try {
 				readline_callback_handler_install(
-					'', function () {
+					'', function() {
 					}
 				);
 			} catch (Throwable $t) {
-				$this->miscService->log($t->getMessage() . ' -- ' . $t->getTraceAsString());
+				$this->miscService->log($t->getMessage().' -- '.$t->getTraceAsString());
 				throw new Exception('Please install php-readline, or use --no-readline');
 			}
 		}
@@ -642,7 +642,7 @@ 
 		$index = $error['index'];
 		$errorIndex = '';
 		if ($index !== null) {
-			$errorIndex = $index->getProviderId() . ':' . $index->getDocumentId();
+			$errorIndex = $index->getProviderId().':'.$index->getDocumentId();
 		}
 
 		$width = $this->terminal->getWidth() - 13;
@@ -694,7 +694,7 @@ 
 		$index = $result['index'];
 		$resultIndex = '';
 		if ($index !== null) {
-			$resultIndex = $index->getProviderId() . ':' . $index->getDocumentId();
+			$resultIndex = $index->getProviderId().':'.$index->getDocumentId();
 		}