nextcloud / files_fulltextsearch

lib/Service/GroupFoldersService.php

Spacing +3 added lines, -3 removed lines

@@ -79,7 +79,7 @@ 
 			$this->getMountPoint($file);
 		} catch (FileIsNotIndexableException $e) {
 			return;
-		} catch (\OCP\Files\StorageNotAvailableException|\OCP\Files\NotFoundException $e) {
+		} catch (\OCP\Files\StorageNotAvailableException | \OCP\Files\NotFoundException $e) {
 			$path = '';
 			try {
 				$path = $file->getPath();
@@ -107,7 +107,7 @@ 
 			$mount = $this->getMountPoint($file);
 		} catch (FileIsNotIndexableException $e) {
 			return;
-		} catch (\OCP\Files\StorageNotAvailableException|\OCP\Files\NotFoundException $e) {
+		} catch (\OCP\Files\StorageNotAvailableException | \OCP\Files\NotFoundException $e) {
 			$path = '';
 			try {
 				$path = $file->getPath();
@@ -175,7 +175,7 @@ 
 			$mountPoint = new MountPoint();
 			$mount = $mount->toArray();
 			$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/ExternalFilesService.php

Spacing +3 added lines, -3 removed lines

@@ -68,7 +68,7 @@ 
 			$this->getMountPoint($file);
 		} catch (FileIsNotIndexableException $e) {
 			return;
-		} catch (StorageNotAvailableException|NotFoundException $e) {
+		} catch (StorageNotAvailableException | NotFoundException $e) {
 			$path = '';
 			try {
 				$path = $file->getPath();
@@ -112,7 +112,7 @@ 
 			$mount = $this->getMountPoint($file);
 		} catch (FileIsNotIndexableException $e) {
 			return;
-		} catch (StorageNotAvailableException|NotFoundException $e) {
+		} catch (StorageNotAvailableException | NotFoundException $e) {
 			$path = '';
 			try {
 				$path = $file->getPath();
@@ -186,7 +186,7 @@ 
 			);
 		} catch (ExternalMountNotFoundException $e) {
 			throw new FileIsNotIndexableException('issue while getMountPoint');
-		} catch (NotFoundException|StorageNotAvailableException $e) {
+		} catch (NotFoundException | StorageNotAvailableException $e) {
 			throw new FileIsNotIndexableException('storage not available');
 		}
 	}

lib/Service/LocalFilesService.php

Spacing +2 added lines, -2 removed lines

@@ -51,7 +51,7 @@ 
 	public function getFileSource(Node $file, string &$source) {
 		try {
 			$mountType = $file->getMountPoint()->getMountType();
-		} catch (NotFoundException|StorageNotAvailableException $e) {
+		} catch (NotFoundException | StorageNotAvailableException $e) {
 			$this->logger->warning('Local mount not available when getting file source', ['exception' => $e]);
 			return;
 		}
@@ -111,7 +111,7 @@ 
 
 		foreach ($shares['users'] ?? [] as $user => $node) {
 			if (!is_string($user)) {
-				$this->logger->warning('malformed access list: ' . json_encode($shares));
+				$this->logger->warning('malformed access list: '.json_encode($shares));
 				continue;
 			}
 			if (in_array($user, $users) || $this->userManager->get($user) === null) {

lib/Service/FilesService.php

Spacing +20 added lines, -20 removed lines

@@ -116,7 +116,7 @@ 
 		} catch (NotFoundException $e) {
 			return [];
 		} catch (Throwable $e) {
-			$this->logger->warning('Issue while retrieving rootFolder for ' . $userId, ['exception' => $e]);
+			$this->logger->warning('Issue while retrieving rootFolder for '.$userId, ['exception' => $e]);
 			return [];
 		}
 
@@ -206,7 +206,7 @@ 
 				$result[] = $this->generateFilesDocumentFromFile($userId, $files);
 			} catch (FileIsNotIndexableException $e) {
 				// file is not indexable - skip
-			} catch (NotFoundException|StorageNotAvailableException $e) {
+			} catch (NotFoundException | StorageNotAvailableException $e) {
 				$this->logger->warning('File not available when getting files from user, skipping', ['path' => $files->getPath(), 'exception' => $e]);
 			} catch (Throwable $e) {
 				$this->logger->warning('Unexpected error while getting files from user, skipping', ['path' => $files->getPath(), 'exception' => $e]);
@@ -260,7 +260,7 @@ 
 			} catch (FileIsNotIndexableException $e) {
 				// file is not indexable - skip
 				continue;
-			} catch (NotFoundException|StorageNotAvailableException $e) {
+			} catch (NotFoundException | StorageNotAvailableException $e) {
 				// file not found or storage temporarily not available - skip and continue
 				$this->logger->warning('File not available while listing directory, skipping', ['path' => $file->getPath(), 'exception' => $e]);
 				continue;
@@ -377,7 +377,7 @@ 
 		$tagIds = $this->systemTagObjectMapper->getTagIdsForObjects([$file->getId()], 'files');
 		if (array_key_exists($file->getId(), $tagIds)) {
 			$tags = array_values(
-				array_map(function (ISystemTag $tag): string {
+				array_map(function(ISystemTag $tag): string {
 					return $tag->getName();
 				}, $this->systemTagManager->getTagsByIds($tagIds[$file->getId()]))
 			);
@@ -395,10 +395,10 @@ 
 				]
 			);
 		} else {
-			$this->logger->warning('stat() on File #' . $file->getId() . ' is not an array: ' . json_encode($stat));
+			$this->logger->warning('stat() on File #'.$file->getId().' is not an array: '.json_encode($stat));
 		}
 
-		} catch (NotFoundException|StorageNotAvailableException|NotPermittedException|LockedException $e) {
+		} catch (NotFoundException | StorageNotAvailableException | NotPermittedException | LockedException $e) {
 			// storage not available or file removed / access issue - mark as not indexable
 			throw new FileIsNotIndexableException($e->getMessage());
 		}
@@ -456,7 +456,7 @@ 
 		}
 
 		if ($this->userManager->get($userId) === null) {
-			throw new NoUserException('User does not exist: ' . $userId);
+			throw new NoUserException('User does not exist: '.$userId);
 		}
 
 		$files = $this->rootFolder->getUserFolder($userId)
@@ -542,7 +542,7 @@ 
 				&& ($file->getMountPoint()->getMountType() === 'external')) {
 				throw new Exception();
 			}
-		} catch (FilesNotFoundException|NotFoundException $e) {
+		} catch (FilesNotFoundException | NotFoundException $e) {
 			// file removed -> remove from index
 			$index->setStatus(IIndex::INDEX_REMOVE);
 			$document = new FilesDocument($index->getProviderId(), $index->getDocumentId());
@@ -744,7 +744,7 @@ 
 
 		$part = [];
 		foreach ($comments as $comment) {
-			$part[] = '<' . $comment->getActorId() . '> ' . $comment->getMessage();
+			$part[] = '<'.$comment->getActorId().'> '.$comment->getMessage();
 		}
 
 		$document->addPart('comments', implode(" \n ", $part));
@@ -778,7 +778,7 @@ 
 				$shareNames[$this->secureUsername($username)]
 					= (!is_string($path)) ? $path = '' : $path;
 			} catch (Throwable $e) {
-				$this->logger->debug('Issue while getting information on documentId:' . $document->getId(), ['exception' => $e]);
+				$this->logger->debug('Issue while getting information on documentId:'.$document->getId(), ['exception' => $e]);
 			}
 		}
 
@@ -953,7 +953,7 @@ 
 			$document->setContent(
 				base64_encode($file->getContent()), IIndexDocument::ENCODED_BASE64
 			);
-		} catch (NotPermittedException|LockedException $e) {
+		} catch (NotPermittedException | LockedException $e) {
 		}
 	}
 
@@ -1000,7 +1000,7 @@ 
 
 					// Construct XML
 					$diagram_xml = simplexml_load_string($diagram_str);
-					$content = $content . ' ' . $this->readDrawioXmlValue($diagram_xml);
+					$content = $content.' '.$this->readDrawioXmlValue($diagram_xml);
 				}
 			} catch (\Throwable $t) {
 			}
@@ -1010,14 +1010,14 @@ 
 					// 20220219 Pass content of inflated drawio graph xml
 					base64_encode($content), IIndexDocument::ENCODED_BASE64
 				);
-			} catch (NotPermittedException|LockedException $e) {
+			} catch (NotPermittedException | LockedException $e) {
 			}
 		} else {
 			try {
 				$document->setContent(
 					base64_encode($file->getContent()), IIndexDocument::ENCODED_BASE64
 				);
-			} catch (NotPermittedException|LockedException $e) {
+			} catch (NotPermittedException | LockedException $e) {
 			}
 		}
 	}
@@ -1032,15 +1032,15 @@ 
 	private function readDrawioXmlValue(\SimpleXMLElement $element) {
 		$str = '';
 		if ($element['value'] !== null && trim(strval($element['value'])) !== '') {
-			$str = $str . ' ' . trim(strval($element['value']));
+			$str = $str.' '.trim(strval($element['value']));
 		}
 		if ($element !== null && trim(strval($element)) !== '') {
-			$str = $str . ' ' . trim(strval($element));
+			$str = $str.' '.trim(strval($element));
 		}
 
 		try {
 			foreach ($element->children() as $child) {
-				$str = $str . ' ' . $this->readDrawioXmlValue($child);
+				$str = $str.' '.$this->readDrawioXmlValue($child);
 			}
 		} finally {
 		}
@@ -1076,7 +1076,7 @@ 
 			$document->setContent(
 				base64_encode($file->getContent()), IIndexDocument::ENCODED_BASE64
 			);
-		} catch (NotPermittedException|LockedException $e) {
+		} catch (NotPermittedException | LockedException $e) {
 		}
 	}
 
@@ -1112,7 +1112,7 @@ 
 			$document->setContent(
 				base64_encode($file->getContent()), IIndexDocument::ENCODED_BASE64
 			);
-		} catch (NotPermittedException|LockedException $e) {
+		} catch (NotPermittedException | LockedException $e) {
 		}
 	}
 
@@ -1293,7 +1293,7 @@ 
 			$path = '';
 		}
 
-		$result = (($entrySlash) ? '/' : '') . $path;
+		$result = (($entrySlash) ? '/' : '').$path;
 		$this->logger->debug(
 			'getPathFromRoot', [
 				'path' => $path,