nextcloud / fulltextsearch_elasticsearch

appinfo/autoload.php

Spacing +3 added lines, -3 removed lines

@@ -26,9 +26,9 @@
 
 namespace OCA\FullTextSearch_ElasticSearch\AppInfo;
 
-$composerDir = __DIR__ . '/../vendor/';
+$composerDir = __DIR__.'/../vendor/';
 
-if (is_dir($composerDir) && file_exists($composerDir . 'autoload.php')) {
-	require_once $composerDir . 'autoload.php';
+if (is_dir($composerDir) && file_exists($composerDir.'autoload.php')) {
+	require_once $composerDir.'autoload.php';
 }
 

appinfo/app.php

Spacing +1 added lines, -1 removed lines

@@ -26,6 +26,6 @@
 
 namespace OCA\FullTextSearch_ElasticSearch\AppInfo;
 
-require_once __DIR__ . '/autoload.php';
+require_once __DIR__.'/autoload.php';
 
 new Application();

lib/Service/IndexMappingService.php

Spacing +3 added lines, -3 removed lines

@@ -75,7 +75,7 @@ 
 			'index' =>
 				[
 					'index' => $this->configService->getElasticIndex(),
-					'id'    => $document->getProviderId() . ':' . $document->getId(),
+					'id'    => $document->getProviderId().':'.$document->getId(),
 					'type'  => 'standard',
 					'body'  => $this->generateIndexBody($document)
 				]
@@ -105,7 +105,7 @@ 
 			'index' =>
 				[
 					'index' => $this->configService->getElasticIndex(),
-					'id'    => $document->getProviderId() . ':' . $document->getId(),
+					'id'    => $document->getProviderId().':'.$document->getId(),
 					'type'  => 'standard',
 					'body'  => ['doc' => $this->generateIndexBody($document)]
 				]
@@ -133,7 +133,7 @@ 
 			'index' =>
 				[
 					'index' => $this->configService->getElasticIndex(),
-					'id'    => $providerId . ':' . $documentId,
+					'id'    => $providerId.':'.$documentId,
 					'type'  => 'standard'
 				]
 		];

lib/Service/SearchService.php

Doc Comments +1 added lines, -1 removed lines

@@ -189,7 +189,7 @@
 
 	/**
 	 * @param ISearchResult $searchResult
-	 * @param array $result
+	 * @param callable $result
 	 */
 	private function updateSearchResult(ISearchResult $searchResult, array $result) {
 		$searchResult->setRawResult(json_encode($result));

Spacing +5 added lines, -5 removed lines

@@ -85,7 +85,7 @@ 
 		Client $client, ISearchResult $searchResult, IDocumentAccess $access
 	) {
 		try {
-			$this->miscService->log('New Search Request; SearchResult Model: ' . json_encode($searchResult), 0);
+			$this->miscService->log('New Search Request; SearchResult Model: '.json_encode($searchResult), 0);
 			$query = $this->searchMappingService->generateSearchQuery(
 				$searchResult->getRequest(), $access, $searchResult->getProvider()
 																   ->getId()
@@ -95,25 +95,25 @@ 
 		}
 
 		try {
-			$this->miscService->log('Searching ES: ' . json_encode($query['params']), 0);
+			$this->miscService->log('Searching ES: '.json_encode($query['params']), 0);
 
 			$result = $client->search($query['params']);
 		} catch (Exception $e) {
 			$this->miscService->log(
-				'debug - request: ' . json_encode($searchResult->getRequest()) . '   - query: '
+				'debug - request: '.json_encode($searchResult->getRequest()).'   - query: '
 				. json_encode($query)
 			);
 			throw $e;
 		}
 
-		$this->miscService->log('Result from ES: ' . json_encode($result), 0);
+		$this->miscService->log('Result from ES: '.json_encode($result), 0);
 		$this->updateSearchResult($searchResult, $result);
 
 		foreach ($result['hits']['hits'] as $entry) {
 			$searchResult->addDocument($this->parseSearchEntry($entry, $access->getViewerId()));
 		}
 
-		$this->miscService->log('Filled SearchResult Model: ' . json_encode($searchResult), 0);
+		$this->miscService->log('Filled SearchResult Model: '.json_encode($searchResult), 0);
 	}
 
 

lib/Platform/ElasticSearchPlatform.php

Spacing +3 added lines, -3 removed lines

@@ -126,12 +126,12 @@
 		$hosts = $this->configService->getElasticHost();
 		foreach ($hosts as $host) {
 			$parsedHost = parse_url($host);
-			$safeHost = $parsedHost['scheme'] . '://';
+			$safeHost = $parsedHost['scheme'].'://';
 			if (array_key_exists('user', $parsedHost)) {
-				$safeHost .= $parsedHost['user'] . ':' . '********' . '@';
+				$safeHost .= $parsedHost['user'].':'.'********'.'@';
 			}
 			$safeHost .= $parsedHost['host'];
-			$safeHost .= ':' . $parsedHost['port'];
+			$safeHost .= ':'.$parsedHost['port'];
 
 			$sanitizedHosts[] = $safeHost;
 		}

lib/Service/UserStoragesService.php

Indentation +11 added lines, -11 removed lines

@@ -36,19 +36,19 @@ 
  */
 class UserStoragesService implements IUserStoragesService {
     
-    /** @var UserGlobalStoragesService */
-    private $userGlobalStoragesService;
+	/** @var UserGlobalStoragesService */
+	private $userGlobalStoragesService;
 
-    function __construct(UserGlobalStoragesService $userGlobalStoragesService) {
-        $this->userGlobalStoragesService = $userGlobalStoragesService;
-    }
+	function __construct(UserGlobalStoragesService $userGlobalStoragesService) {
+		$this->userGlobalStoragesService = $userGlobalStoragesService;
+	}
 
    /**
-     * Returns an array of strings with all external mountpoints of the current user
-     * @return array
-     */
-    function getAllStoragesForUser() {
-        $userStorages = $this->userGlobalStoragesService->getAllStoragesForUser();
+    * Returns an array of strings with all external mountpoints of the current user
+    * @return array
+    */
+	function getAllStoragesForUser() {
+		$userStorages = $this->userGlobalStoragesService->getAllStoragesForUser();
 		$mountPoints = [];
 		foreach($userStorages as $userStorage){
 			/** @var $userStorage OCA\Files_External\Lib\StorageConfig */
@@ -62,5 +62,5 @@ 
 			$mountPoints[] = $mountPoint;
 		}
 		return $mountPoints;
-    }
+	}
 }
\ No newline at end of file

Spacing +3 added lines, -3 removed lines

@@ -50,13 +50,13 @@
     function getAllStoragesForUser() {
         $userStorages = $this->userGlobalStoragesService->getAllStoragesForUser();
 		$mountPoints = [];
-		foreach($userStorages as $userStorage){
+		foreach ($userStorages as $userStorage) {
 			/** @var $userStorage OCA\Files_External\Lib\StorageConfig */
 			$mountPoint = $userStorage->getMountPoint();
-			if (substr($mountPoint, 0, 1) === '/'){
+			if (substr($mountPoint, 0, 1) === '/') {
 				$mountPoint = substr($mountPoint, 1, strlen($mountPoint) - 1);
 			}
-			if (substr($mountPoint, strlen($mountPoint) - 1, 1) !== '/'){
+			if (substr($mountPoint, strlen($mountPoint) - 1, 1) !== '/') {
 				$mountPoint .= '/';
 			}
 			$mountPoints[] = $mountPoint;

lib/Service/SearchMappingService.php

Spacing +5 added lines, -5 removed lines

@@ -290,7 +290,7 @@ 
 
 		foreach ($request->getWildcardFields() as $field) {
 			if (!$this->fieldIsOutLimit($request, $field)) {
-				$queryFields[] = ['wildcard' => [$field => '*' . $content->getWord() . '*']];
+				$queryFields[] = ['wildcard' => [$field => '*'.$content->getWord().'*']];
 			}
 		}
 
@@ -338,9 +338,9 @@ 
 		// external files with "$request->getOption('files_external', '1') === '1'"
 		$externalFileShares = $this->getExternalFileShares();
 
-		if ($externalFileShares){
+		if ($externalFileShares) {
 			$allowedExternalShares = [];
-			foreach($externalFileShares as $fileShare){
+			foreach ($externalFileShares as $fileShare) {
 				$allowedExternalShares[] = ['prefix' => ['title' => $fileShare]];
 			}
 			$externalFilesConditions = [];
@@ -484,7 +484,7 @@ 
 		return [
 			'index' => $this->configService->getElasticIndex(),
 			'type'  => 'standard',
-			'id'    => $providerId . ':' . $documentId
+			'id'    => $providerId.':'.$documentId
 		];
 	}
 
@@ -497,7 +497,7 @@ 
 	private function getPartsFields(ISearchRequest $request) {
 		return array_map(
 			function($value) {
-				return 'parts.' . $value;
+				return 'parts.'.$value;
 			}, $request->getParts()
 		);
 	}

lib/Service/IUserStoragesService.php

Indentation +5 added lines, -5 removed lines

@@ -30,9 +30,9 @@
 namespace OCA\FullTextSearch_ElasticSearch\Service;
 
 interface IUserStoragesService {
-    /**
-     * Returns an array of strings with all external mountpoints of the current user
-     * @return array
-     */
-    function getAllStoragesForUser();
+	/**
+	 * Returns an array of strings with all external mountpoints of the current user
+	 * @return array
+	 */
+	function getAllStoragesForUser();
 }
\ No newline at end of file

lib/AppInfo/Application.php

Spacing +2 added lines, -2 removed lines

@@ -57,13 +57,13 @@
 		$this->registerServices();
 	}
 
-	private function registerServices(){
+	private function registerServices() {
 		$container = $this->getContainer();
 		
 		// Make SearchMappingService also work without external storage
 		// if app is inactive or not installed.
 		$container->registerService(SearchMappingService::class, function($c) {
-			try{
+			try {
 				$userStoragesService = $c->query(\OCA\Files_External\Service\UserGlobalStoragesService::class);
 				return new SearchMappingService(
 					$c->query(ConfigService::class),

Braces +1 added lines, -2 removed lines

@@ -70,8 +70,7 @@
 					$c->query(MiscService::class),
 					new UserStoragesService($userStoragesService)
 				);
-			}
-			catch (\OCP\AppFramework\QueryException $e) {
+			} catch (\OCP\AppFramework\QueryException $e) {
 				return new SearchMappingService(
 					$c->query(ConfigService::class),
 					$c->query(MiscService::class)