nextcloud / server

lib/public/Collaboration/Resources/IProvider.php

Indentation +24 added lines, -24 removed lines

@@ -29,31 +29,31 @@
  */
 interface IProvider {
 
-	/**
-	 * Get the resource type of the provider
-	 *
-	 * @return string
-	 * @since 16.0.0
-	 */
-	public function getType(): string;
+    /**
+     * Get the resource type of the provider
+     *
+     * @return string
+     * @since 16.0.0
+     */
+    public function getType(): string;
 
-	/**
-	 * Get the rich object data of a resource
-	 *
-	 * @param IResource $resource
-	 * @return array
-	 * @since 16.0.0
-	 */
-	public function getResourceRichObject(IResource $resource): array;
+    /**
+     * Get the rich object data of a resource
+     *
+     * @param IResource $resource
+     * @return array
+     * @since 16.0.0
+     */
+    public function getResourceRichObject(IResource $resource): array;
 
-	/**
-	 * Can a user/guest access the collection
-	 *
-	 * @param IResource $resource
-	 * @param IUser|null $user
-	 * @return bool
-	 * @since 16.0.0
-	 */
-	public function canAccessResource(IResource $resource, ?IUser $user): bool;
+    /**
+     * Can a user/guest access the collection
+     *
+     * @param IResource $resource
+     * @param IUser|null $user
+     * @return bool
+     * @since 16.0.0
+     */
+    public function canAccessResource(IResource $resource, ?IUser $user): bool;
 
 }

core/Controller/CollaborationResourcesController.php

Indentation +252 added lines, -252 removed lines

@@ -37,256 +37,256 @@
 
 class CollaborationResourcesController extends OCSController {
 
-	/** @var IManager */
-	private $manager;
-	/** @var IUserSession */
-	private $userSession;
-	/** @var ILogger */
-	private $logger;
-
-	public function __construct(
-		string $appName,
-		IRequest $request,
-		IManager $manager,
-		IUserSession $userSession,
-		ILogger $logger
-	) {
-		parent::__construct($appName, $request);
-
-		$this->manager = $manager;
-		$this->userSession = $userSession;
-		$this->logger = $logger;
-	}
-
-	/**
-	 * @param int $collectionId
-	 * @return ICollection
-	 * @throws CollectionException when the collection was not found for the user
-	 */
-	protected function getCollection(int $collectionId): ICollection {
-		$collection = $this->manager->getCollectionForUser($collectionId, $this->userSession->getUser());
-
-		if (!$collection->canAccess($this->userSession->getUser())) {
-			throw new CollectionException('Not found');
-		}
-
-		return $collection;
-	}
-
-	/**
-	 * @NoAdminRequired
-	 *
-	 * @param int $collectionId
-	 * @return DataResponse
-	 */
-	public function listCollection(int $collectionId): DataResponse {
-		try {
-			$collection = $this->getCollection($collectionId);
-		} catch (CollectionException $e) {
-			return new DataResponse([], Http::STATUS_NOT_FOUND);
-		}
-
-		return $this->respondCollection($collection);
-	}
-
-	/**
-	 * @NoAdminRequired
-	 *
-	 * @param string $filter
-	 * @return DataResponse
-	 */
-	public function searchCollections(string $filter): DataResponse {
-		try {
-			$collections = $this->manager->searchCollections($this->userSession->getUser(), $filter);
-		} catch (CollectionException $e) {
-			return new DataResponse([], Http::STATUS_NOT_FOUND);
-		}
-
-		return new DataResponse($this->prepareCollections($collections));
-	}
-
-	/**
-	 * @NoAdminRequired
-	 *
-	 * @param int $collectionId
-	 * @param string $resourceType
-	 * @param string $resourceId
-	 * @return DataResponse
-	 */
-	public function addResource(int $collectionId, string $resourceType, string $resourceId): DataResponse {
-		try {
-			$collection = $this->getCollection($collectionId);
-		} catch (CollectionException $e) {
-			return new DataResponse([], Http::STATUS_NOT_FOUND);
-		}
-
-		$resource = $this->manager->createResource($resourceType, $resourceId);
-
-		if (!$resource->canAccess($this->userSession->getUser())) {
-			return new DataResponse([], Http::STATUS_NOT_FOUND);
-		}
-
-		try {
-			$collection->addResource($resource);
-		} catch (ResourceException $e) {
-		}
-
-		return $this->respondCollection($collection);
-	}
-
-	/**
-	 * @NoAdminRequired
-	 *
-	 * @param int $collectionId
-	 * @param string $resourceType
-	 * @param string $resourceId
-	 * @return DataResponse
-	 */
-	public function removeResource(int $collectionId, string $resourceType, string $resourceId): DataResponse {
-		try {
-			$collection = $this->getCollection($collectionId);
-		} catch (CollectionException $e) {
-			return new DataResponse([], Http::STATUS_NOT_FOUND);
-		}
-
-		try {
-			$resource = $this->manager->getResourceForUser($resourceType, $resourceId, $this->userSession->getUser());
-		} catch (CollectionException $e) {
-			return new DataResponse([], Http::STATUS_NOT_FOUND);
-		}
-
-		$collection->removeResource($resource);
-
-		return $this->respondCollection($collection);
-	}
-
-	/**
-	 * @NoAdminRequired
-	 *
-	 * @param string $resourceType
-	 * @param string $resourceId
-	 * @return DataResponse
-	 */
-	public function getCollectionsByResource(string $resourceType, string $resourceId): DataResponse {
-		try {
-			$resource = $this->manager->getResourceForUser($resourceType, $resourceId, $this->userSession->getUser());
-		} catch (ResourceException $e) {
-			$resource = $this->manager->createResource($resourceType, $resourceId);
-		}
-
-		if (!$resource->canAccess($this->userSession->getUser())) {
-			return new DataResponse([], Http::STATUS_NOT_FOUND);
-		}
-
-		return new DataResponse($this->prepareCollections($resource->getCollections()));
-	}
-
-	/**
-	 * @NoAdminRequired
-	 *
-	 * @param string $baseResourceType
-	 * @param string $baseResourceId
-	 * @param string $name
-	 * @return DataResponse
-	 */
-	public function createCollectionOnResource(string $baseResourceType, string $baseResourceId, string $name): DataResponse {
-		if (!isset($name[0]) || isset($name[64])) {
-			return new DataResponse([], Http::STATUS_BAD_REQUEST);
-		}
-
-		try {
-			$resource = $this->manager->createResource($baseResourceType, $baseResourceId);
-		} catch (CollectionException $e) {
-			return new DataResponse([], Http::STATUS_NOT_FOUND);
-		}
-
-		if (!$resource->canAccess($this->userSession->getUser())) {
-			return new DataResponse([], Http::STATUS_NOT_FOUND);
-		}
-
-		$collection = $this->manager->newCollection($name);
-		$collection->addResource($resource);
-
-		return $this->respondCollection($collection);
-	}
-
-	/**
-	 * @NoAdminRequired
-	 *
-	 * @param int $collectionId
-	 * @param string $collectionName
-	 * @return DataResponse
-	 */
-	public function renameCollection(int $collectionId, string $collectionName): DataResponse {
-		try {
-			$collection = $this->getCollection($collectionId);
-		} catch (CollectionException $exception) {
-			return new DataResponse([], Http::STATUS_NOT_FOUND);
-		}
-
-		$collection->setName($collectionName);
-
-		return $this->respondCollection($collection);
-	}
-
-	protected function respondCollection(ICollection $collection): DataResponse {
-		try {
-			return new DataResponse($this->prepareCollection($collection));
-		} catch (CollectionException $e) {
-			return new DataResponse([], Http::STATUS_NOT_FOUND);
-		} catch (Exception $e) {
-			$this->logger->logException($e);
-			return new DataResponse([], Http::STATUS_INTERNAL_SERVER_ERROR);
-		}
-	}
-
-	protected function prepareCollections(array $collections): array {
-		$result = [];
-
-		foreach ($collections as $collection) {
-			try {
-				$result[] = $this->prepareCollection($collection);
-			} catch (CollectionException $e) {
-			} catch (Exception $e) {
-				$this->logger->logException($e);
-			}
-		}
-
-		return $result;
-	}
-
-	protected function prepareCollection(ICollection $collection): array {
-		if (!$collection->canAccess($this->userSession->getUser())) {
-			throw new CollectionException('Can not access collection');
-		}
-
-		return [
-			'id' => $collection->getId(),
-			'name' => $collection->getName(),
-			'resources' => $this->prepareResources($collection->getResources()),
-		];
-	}
-
-	protected function prepareResources(array $resources): ?array {
-		$result = [];
-
-		foreach ($resources as $resource) {
-			try {
-				$result[] = $this->prepareResource($resource);
-			} catch (ResourceException $e) {
-			} catch (Exception $e) {
-				$this->logger->logException($e);
-			}
-		}
-
-		return $result;
-	}
-
-	protected function prepareResource(IResource $resource): array {
-		if (!$resource->canAccess($this->userSession->getUser())) {
-			throw new ResourceException('Can not access resource');
-		}
-
-		return $resource->getRichObject();
-	}
+    /** @var IManager */
+    private $manager;
+    /** @var IUserSession */
+    private $userSession;
+    /** @var ILogger */
+    private $logger;
+
+    public function __construct(
+        string $appName,
+        IRequest $request,
+        IManager $manager,
+        IUserSession $userSession,
+        ILogger $logger
+    ) {
+        parent::__construct($appName, $request);
+
+        $this->manager = $manager;
+        $this->userSession = $userSession;
+        $this->logger = $logger;
+    }
+
+    /**
+     * @param int $collectionId
+     * @return ICollection
+     * @throws CollectionException when the collection was not found for the user
+     */
+    protected function getCollection(int $collectionId): ICollection {
+        $collection = $this->manager->getCollectionForUser($collectionId, $this->userSession->getUser());
+
+        if (!$collection->canAccess($this->userSession->getUser())) {
+            throw new CollectionException('Not found');
+        }
+
+        return $collection;
+    }
+
+    /**
+     * @NoAdminRequired
+     *
+     * @param int $collectionId
+     * @return DataResponse
+     */
+    public function listCollection(int $collectionId): DataResponse {
+        try {
+            $collection = $this->getCollection($collectionId);
+        } catch (CollectionException $e) {
+            return new DataResponse([], Http::STATUS_NOT_FOUND);
+        }
+
+        return $this->respondCollection($collection);
+    }
+
+    /**
+     * @NoAdminRequired
+     *
+     * @param string $filter
+     * @return DataResponse
+     */
+    public function searchCollections(string $filter): DataResponse {
+        try {
+            $collections = $this->manager->searchCollections($this->userSession->getUser(), $filter);
+        } catch (CollectionException $e) {
+            return new DataResponse([], Http::STATUS_NOT_FOUND);
+        }
+
+        return new DataResponse($this->prepareCollections($collections));
+    }
+
+    /**
+     * @NoAdminRequired
+     *
+     * @param int $collectionId
+     * @param string $resourceType
+     * @param string $resourceId
+     * @return DataResponse
+     */
+    public function addResource(int $collectionId, string $resourceType, string $resourceId): DataResponse {
+        try {
+            $collection = $this->getCollection($collectionId);
+        } catch (CollectionException $e) {
+            return new DataResponse([], Http::STATUS_NOT_FOUND);
+        }
+
+        $resource = $this->manager->createResource($resourceType, $resourceId);
+
+        if (!$resource->canAccess($this->userSession->getUser())) {
+            return new DataResponse([], Http::STATUS_NOT_FOUND);
+        }
+
+        try {
+            $collection->addResource($resource);
+        } catch (ResourceException $e) {
+        }
+
+        return $this->respondCollection($collection);
+    }
+
+    /**
+     * @NoAdminRequired
+     *
+     * @param int $collectionId
+     * @param string $resourceType
+     * @param string $resourceId
+     * @return DataResponse
+     */
+    public function removeResource(int $collectionId, string $resourceType, string $resourceId): DataResponse {
+        try {
+            $collection = $this->getCollection($collectionId);
+        } catch (CollectionException $e) {
+            return new DataResponse([], Http::STATUS_NOT_FOUND);
+        }
+
+        try {
+            $resource = $this->manager->getResourceForUser($resourceType, $resourceId, $this->userSession->getUser());
+        } catch (CollectionException $e) {
+            return new DataResponse([], Http::STATUS_NOT_FOUND);
+        }
+
+        $collection->removeResource($resource);
+
+        return $this->respondCollection($collection);
+    }
+
+    /**
+     * @NoAdminRequired
+     *
+     * @param string $resourceType
+     * @param string $resourceId
+     * @return DataResponse
+     */
+    public function getCollectionsByResource(string $resourceType, string $resourceId): DataResponse {
+        try {
+            $resource = $this->manager->getResourceForUser($resourceType, $resourceId, $this->userSession->getUser());
+        } catch (ResourceException $e) {
+            $resource = $this->manager->createResource($resourceType, $resourceId);
+        }
+
+        if (!$resource->canAccess($this->userSession->getUser())) {
+            return new DataResponse([], Http::STATUS_NOT_FOUND);
+        }
+
+        return new DataResponse($this->prepareCollections($resource->getCollections()));
+    }
+
+    /**
+     * @NoAdminRequired
+     *
+     * @param string $baseResourceType
+     * @param string $baseResourceId
+     * @param string $name
+     * @return DataResponse
+     */
+    public function createCollectionOnResource(string $baseResourceType, string $baseResourceId, string $name): DataResponse {
+        if (!isset($name[0]) || isset($name[64])) {
+            return new DataResponse([], Http::STATUS_BAD_REQUEST);
+        }
+
+        try {
+            $resource = $this->manager->createResource($baseResourceType, $baseResourceId);
+        } catch (CollectionException $e) {
+            return new DataResponse([], Http::STATUS_NOT_FOUND);
+        }
+
+        if (!$resource->canAccess($this->userSession->getUser())) {
+            return new DataResponse([], Http::STATUS_NOT_FOUND);
+        }
+
+        $collection = $this->manager->newCollection($name);
+        $collection->addResource($resource);
+
+        return $this->respondCollection($collection);
+    }
+
+    /**
+     * @NoAdminRequired
+     *
+     * @param int $collectionId
+     * @param string $collectionName
+     * @return DataResponse
+     */
+    public function renameCollection(int $collectionId, string $collectionName): DataResponse {
+        try {
+            $collection = $this->getCollection($collectionId);
+        } catch (CollectionException $exception) {
+            return new DataResponse([], Http::STATUS_NOT_FOUND);
+        }
+
+        $collection->setName($collectionName);
+
+        return $this->respondCollection($collection);
+    }
+
+    protected function respondCollection(ICollection $collection): DataResponse {
+        try {
+            return new DataResponse($this->prepareCollection($collection));
+        } catch (CollectionException $e) {
+            return new DataResponse([], Http::STATUS_NOT_FOUND);
+        } catch (Exception $e) {
+            $this->logger->logException($e);
+            return new DataResponse([], Http::STATUS_INTERNAL_SERVER_ERROR);
+        }
+    }
+
+    protected function prepareCollections(array $collections): array {
+        $result = [];
+
+        foreach ($collections as $collection) {
+            try {
+                $result[] = $this->prepareCollection($collection);
+            } catch (CollectionException $e) {
+            } catch (Exception $e) {
+                $this->logger->logException($e);
+            }
+        }
+
+        return $result;
+    }
+
+    protected function prepareCollection(ICollection $collection): array {
+        if (!$collection->canAccess($this->userSession->getUser())) {
+            throw new CollectionException('Can not access collection');
+        }
+
+        return [
+            'id' => $collection->getId(),
+            'name' => $collection->getName(),
+            'resources' => $this->prepareResources($collection->getResources()),
+        ];
+    }
+
+    protected function prepareResources(array $resources): ?array {
+        $result = [];
+
+        foreach ($resources as $resource) {
+            try {
+                $result[] = $this->prepareResource($resource);
+            } catch (ResourceException $e) {
+            } catch (Exception $e) {
+                $this->logger->logException($e);
+            }
+        }
+
+        return $result;
+    }
+
+    protected function prepareResource(IResource $resource): array {
+        if (!$resource->canAccess($this->userSession->getUser())) {
+            throw new ResourceException('Can not access resource');
+        }
+
+        return $resource->getRichObject();
+    }
 }

lib/public/FullTextSearch/IFullTextSearchManager.php

Indentation +139 added lines, -139 removed lines

@@ -51,145 +51,145 @@
 interface IFullTextSearchManager {
 
 
-	/**
-	 * Register a IProviderService.
-	 *
-	 * @since 15.0.0
-	 *
-	 * @param IProviderService $providerService
-	 */
-	public function registerProviderService(IProviderService $providerService);
-
-	/**
-	 * Register a IIndexService.
-	 *
-	 * @since 15.0.0
-	 *
-	 * @param IIndexService $indexService
-	 */
-	public function registerIndexService(IIndexService $indexService);
-
-	/**
-	 * Register a ISearchService.
-	 *
-	 * @since 15.0.0
-	 *
-	 * @param ISearchService $searchService
-	 */
-	public function registerSearchService(ISearchService $searchService);
-
-	/**
-	 * returns true is Full Text Search is available (app is present and Service
-	 * are registered)
-	 *
-	 * @since 16.0.0
-	 *
-	 * @return bool
-	 */
-	public function isAvailable(): bool;
-
-
-	/**
-	 * Add the Javascript API in the navigation page of an app.
-	 * Needed to replace the default search.
-	 *
-	 * @since 15.0.0
-	 */
-	public function addJavascriptAPI();
-
-
-	/**
-	 * Check if the provider $providerId is already indexed.
-	 *
-	 * @since 15.0.0
-	 *
-	 * @param string $providerId
-	 *
-	 * @return bool
-	 */
-	public function isProviderIndexed(string $providerId): bool;
-
-
-	/**
-	 * Retrieve an Index from the database, based on the Id of the Provider
-	 * and the Id of the Document
-	 *
-	 * @since 15.0.0
-	 *
-	 * @param string $providerId
-	 * @param string $documentId
-	 *
-	 * @return IIndex
-	 */
-	public function getIndex(string $providerId, string $documentId): IIndex;
-
-
-	/**
-	 * Create a new Index.
-	 *
-	 * This method must be called when a new document is created.
-	 *
-	 * @since 15.0.0
-	 *
-	 * @param string $providerId
-	 * @param string $documentId
-	 * @param string $userId
-	 * @param int $status
-	 *
-	 * @return IIndex
-	 */
-	public function createIndex(string $providerId, string $documentId, string $userId, int $status = 0): IIndex;
-
-
-	/**
-	 * Update the status of an Index. status is a bitflag, setting $reset to
-	 * true will reset the status to the value defined in the parameter.
-	 *
-	 * @since 15.0.0
-	 *
-	 * @param string $providerId
-	 * @param string $documentId
-	 * @param int $status
-	 * @param bool $reset
-	 */
-	public function updateIndexStatus(string $providerId, string $documentId, int $status, bool $reset = false);
-
-
-	/**
-	 * Update the status of an array of Index. status is a bit flag, setting $reset to
-	 * true will reset the status to the value defined in the parameter.
-	 *
-	 * @since 15.0.0
-	 *
-	 * @param string $providerId
-	 * @param array $documentIds
-	 * @param int $status
-	 * @param bool $reset
-	 */
-	public function updateIndexesStatus(string $providerId, array $documentIds, int $status, bool $reset = false);
-
-	/**
-	 * Update an array of Index.
-	 *
-	 * @since 15.0.0
-	 *
-	 * @param IIndex[] $indexes
-	 */
-	public function updateIndexes(array $indexes);
-
-	/**
-	 * Search using an array as request. If $userId is empty, will use the
-	 * current session.
-	 *
-	 * @see ISearchService::generateSearchRequest
-	 *
-	 * @since 15.0.0
-	 *
-	 * @param array $request
-	 * @param string $userId
-	 * @return ISearchResult[]
-	 */
-	public function search(array $request, string $userId = ''): array;
+    /**
+     * Register a IProviderService.
+     *
+     * @since 15.0.0
+     *
+     * @param IProviderService $providerService
+     */
+    public function registerProviderService(IProviderService $providerService);
+
+    /**
+     * Register a IIndexService.
+     *
+     * @since 15.0.0
+     *
+     * @param IIndexService $indexService
+     */
+    public function registerIndexService(IIndexService $indexService);
+
+    /**
+     * Register a ISearchService.
+     *
+     * @since 15.0.0
+     *
+     * @param ISearchService $searchService
+     */
+    public function registerSearchService(ISearchService $searchService);
+
+    /**
+     * returns true is Full Text Search is available (app is present and Service
+     * are registered)
+     *
+     * @since 16.0.0
+     *
+     * @return bool
+     */
+    public function isAvailable(): bool;
+
+
+    /**
+     * Add the Javascript API in the navigation page of an app.
+     * Needed to replace the default search.
+     *
+     * @since 15.0.0
+     */
+    public function addJavascriptAPI();
+
+
+    /**
+     * Check if the provider $providerId is already indexed.
+     *
+     * @since 15.0.0
+     *
+     * @param string $providerId
+     *
+     * @return bool
+     */
+    public function isProviderIndexed(string $providerId): bool;
+
+
+    /**
+     * Retrieve an Index from the database, based on the Id of the Provider
+     * and the Id of the Document
+     *
+     * @since 15.0.0
+     *
+     * @param string $providerId
+     * @param string $documentId
+     *
+     * @return IIndex
+     */
+    public function getIndex(string $providerId, string $documentId): IIndex;
+
+
+    /**
+     * Create a new Index.
+     *
+     * This method must be called when a new document is created.
+     *
+     * @since 15.0.0
+     *
+     * @param string $providerId
+     * @param string $documentId
+     * @param string $userId
+     * @param int $status
+     *
+     * @return IIndex
+     */
+    public function createIndex(string $providerId, string $documentId, string $userId, int $status = 0): IIndex;
+
+
+    /**
+     * Update the status of an Index. status is a bitflag, setting $reset to
+     * true will reset the status to the value defined in the parameter.
+     *
+     * @since 15.0.0
+     *
+     * @param string $providerId
+     * @param string $documentId
+     * @param int $status
+     * @param bool $reset
+     */
+    public function updateIndexStatus(string $providerId, string $documentId, int $status, bool $reset = false);
+
+
+    /**
+     * Update the status of an array of Index. status is a bit flag, setting $reset to
+     * true will reset the status to the value defined in the parameter.
+     *
+     * @since 15.0.0
+     *
+     * @param string $providerId
+     * @param array $documentIds
+     * @param int $status
+     * @param bool $reset
+     */
+    public function updateIndexesStatus(string $providerId, array $documentIds, int $status, bool $reset = false);
+
+    /**
+     * Update an array of Index.
+     *
+     * @since 15.0.0
+     *
+     * @param IIndex[] $indexes
+     */
+    public function updateIndexes(array $indexes);
+
+    /**
+     * Search using an array as request. If $userId is empty, will use the
+     * current session.
+     *
+     * @see ISearchService::generateSearchRequest
+     *
+     * @since 15.0.0
+     *
+     * @param array $request
+     * @param string $userId
+     * @return ISearchResult[]
+     */
+    public function search(array $request, string $userId = ''): array;
 
 
 }

lib/private/FullTextSearch/FullTextSearchManager.php

Indentation +188 added lines, -188 removed lines

@@ -48,194 +48,194 @@
 class FullTextSearchManager implements IFullTextSearchManager {
 
 
-	/** @var IProviderService */
-	private $providerService;
-
-	/** @var IIndexService */
-	private $indexService;
-
-	/** @var ISearchService */
-	private $searchService;
-
-
-	/**
-	 * @since 15.0.0
-	 *
-	 * @param IProviderService $providerService
-	 */
-	public function registerProviderService(IProviderService $providerService) {
-		$this->providerService = $providerService;
-	}
-
-	/**
-	 * @since 15.0.0
-	 *
-	 * @param IIndexService $indexService
-	 */
-	public function registerIndexService(IIndexService $indexService) {
-		$this->indexService = $indexService;
-	}
-
-	/**
-	 * @since 15.0.0
-	 *
-	 * @param ISearchService $searchService
-	 */
-	public function registerSearchService(ISearchService $searchService) {
-		$this->searchService = $searchService;
-	}
-
-	/**
-	 * @since 16.0.0
-	 *
-	 * @return bool
-	 */
-	public function isAvailable(): bool {
-		if ($this->indexService === null ||
-			$this->providerService === null ||
-			$this->searchService === null) {
-			return false;
-		}
-
-		return true;
-	}
-
-
-	/**
-	 * @return IProviderService
-	 * @throws FullTextSearchAppNotAvailableException
-	 */
-	private function getProviderService(): IProviderService {
-		if ($this->providerService === null) {
-			throw new FullTextSearchAppNotAvailableException('No IProviderService registered');
-		}
-
-		return $this->providerService;
-	}
-
-
-	/**
-	 * @return IIndexService
-	 * @throws FullTextSearchAppNotAvailableException
-	 */
-	private function getIndexService(): IIndexService {
-		if ($this->indexService === null) {
-			throw new FullTextSearchAppNotAvailableException('No IIndexService registered');
-		}
-
-		return $this->indexService;
-	}
-
-
-	/**
-	 * @return ISearchService
-	 * @throws FullTextSearchAppNotAvailableException
-	 */
-	private function getSearchService(): ISearchService {
-		if ($this->searchService === null) {
-			throw new FullTextSearchAppNotAvailableException('No ISearchService registered');
-		}
-
-		return $this->searchService;
-	}
-
-
-	/**
-	 * @throws FullTextSearchAppNotAvailableException
-	 */
-	public function addJavascriptAPI() {
-		$this->getProviderService()->addJavascriptAPI();
-	}
-
-
-	/**
-	 * @param string $providerId
-	 *
-	 * @return bool
-	 * @throws FullTextSearchAppNotAvailableException
-	 */
-	public function isProviderIndexed(string $providerId): bool {
-		return $this->getProviderService()->isProviderIndexed($providerId);
-	}
-
-
-	/**
-	 * @param string $providerId
-	 * @param string $documentId
-	 * @return IIndex
-	 * @throws FullTextSearchAppNotAvailableException
-	 */
-	public function getIndex(string $providerId, string $documentId): IIndex {
-		return $this->getIndexService()->getIndex($providerId, $documentId);
-	}
-
-	/**
-	 * @param string $providerId
-	 * @param string $documentId
-	 * @param string $userId
-	 * @param int $status
-	 *
-	 * @see IIndex for available value for $status.
-	 *
-	 * @return IIndex
-	 * @throws FullTextSearchAppNotAvailableException
-	 */
-	public function createIndex(string $providerId, string $documentId, string $userId, int $status = 0): IIndex {
-		return $this->getIndexService()->createIndex($providerId, $documentId, $userId, $status);
-	}
-
-
-	/**
-	 * @param string $providerId
-	 * @param string $documentId
-	 * @param int $status
-	 * @param bool $reset
-	 *
-	 * @see IIndex for available value for $status.
-	 *
-	 * @throws FullTextSearchAppNotAvailableException
-	 */
-	public function updateIndexStatus(string $providerId, string $documentId, int $status, bool $reset = false) {
-		$this->getIndexService()->updateIndexStatus($providerId, $documentId, $status, $reset);
-	}
-
-	/**
-	 * @param string $providerId
-	 * @param array $documentIds
-	 * @param int $status
-	 * @param bool $reset
-	 *
-	 * @see IIndex for available value for $status.
-	 *
-	 * @throws FullTextSearchAppNotAvailableException
-	 */
-	public function updateIndexesStatus(string $providerId, array $documentIds, int $status, bool $reset = false) {
-		$this->getIndexService()->updateIndexesStatus($providerId, $documentIds, $status, $reset);
-	}
-
-
-	/**
-	 * @param IIndex[] $indexes
-	 *
-	 * @throws FullTextSearchAppNotAvailableException
-	 */
-	public function updateIndexes(array $indexes) {
-		$this->getIndexService()->updateIndexes($indexes);
-	}
-
-
-	/**
-	 * @param array $request
-	 * @param string $userId
-	 *
-	 * @return ISearchResult[]
-	 * @throws FullTextSearchAppNotAvailableException
-	 */
-	public function search(array $request, string $userId = ''): array {
-		$searchRequest = $this->getSearchService()->generateSearchRequest($request);
-
-		return $this->getSearchService()->search($userId, $searchRequest);
-	}
+    /** @var IProviderService */
+    private $providerService;
+
+    /** @var IIndexService */
+    private $indexService;
+
+    /** @var ISearchService */
+    private $searchService;
+
+
+    /**
+     * @since 15.0.0
+     *
+     * @param IProviderService $providerService
+     */
+    public function registerProviderService(IProviderService $providerService) {
+        $this->providerService = $providerService;
+    }
+
+    /**
+     * @since 15.0.0
+     *
+     * @param IIndexService $indexService
+     */
+    public function registerIndexService(IIndexService $indexService) {
+        $this->indexService = $indexService;
+    }
+
+    /**
+     * @since 15.0.0
+     *
+     * @param ISearchService $searchService
+     */
+    public function registerSearchService(ISearchService $searchService) {
+        $this->searchService = $searchService;
+    }
+
+    /**
+     * @since 16.0.0
+     *
+     * @return bool
+     */
+    public function isAvailable(): bool {
+        if ($this->indexService === null ||
+            $this->providerService === null ||
+            $this->searchService === null) {
+            return false;
+        }
+
+        return true;
+    }
+
+
+    /**
+     * @return IProviderService
+     * @throws FullTextSearchAppNotAvailableException
+     */
+    private function getProviderService(): IProviderService {
+        if ($this->providerService === null) {
+            throw new FullTextSearchAppNotAvailableException('No IProviderService registered');
+        }
+
+        return $this->providerService;
+    }
+
+
+    /**
+     * @return IIndexService
+     * @throws FullTextSearchAppNotAvailableException
+     */
+    private function getIndexService(): IIndexService {
+        if ($this->indexService === null) {
+            throw new FullTextSearchAppNotAvailableException('No IIndexService registered');
+        }
+
+        return $this->indexService;
+    }
+
+
+    /**
+     * @return ISearchService
+     * @throws FullTextSearchAppNotAvailableException
+     */
+    private function getSearchService(): ISearchService {
+        if ($this->searchService === null) {
+            throw new FullTextSearchAppNotAvailableException('No ISearchService registered');
+        }
+
+        return $this->searchService;
+    }
+
+
+    /**
+     * @throws FullTextSearchAppNotAvailableException
+     */
+    public function addJavascriptAPI() {
+        $this->getProviderService()->addJavascriptAPI();
+    }
+
+
+    /**
+     * @param string $providerId
+     *
+     * @return bool
+     * @throws FullTextSearchAppNotAvailableException
+     */
+    public function isProviderIndexed(string $providerId): bool {
+        return $this->getProviderService()->isProviderIndexed($providerId);
+    }
+
+
+    /**
+     * @param string $providerId
+     * @param string $documentId
+     * @return IIndex
+     * @throws FullTextSearchAppNotAvailableException
+     */
+    public function getIndex(string $providerId, string $documentId): IIndex {
+        return $this->getIndexService()->getIndex($providerId, $documentId);
+    }
+
+    /**
+     * @param string $providerId
+     * @param string $documentId
+     * @param string $userId
+     * @param int $status
+     *
+     * @see IIndex for available value for $status.
+     *
+     * @return IIndex
+     * @throws FullTextSearchAppNotAvailableException
+     */
+    public function createIndex(string $providerId, string $documentId, string $userId, int $status = 0): IIndex {
+        return $this->getIndexService()->createIndex($providerId, $documentId, $userId, $status);
+    }
+
+
+    /**
+     * @param string $providerId
+     * @param string $documentId
+     * @param int $status
+     * @param bool $reset
+     *
+     * @see IIndex for available value for $status.
+     *
+     * @throws FullTextSearchAppNotAvailableException
+     */
+    public function updateIndexStatus(string $providerId, string $documentId, int $status, bool $reset = false) {
+        $this->getIndexService()->updateIndexStatus($providerId, $documentId, $status, $reset);
+    }
+
+    /**
+     * @param string $providerId
+     * @param array $documentIds
+     * @param int $status
+     * @param bool $reset
+     *
+     * @see IIndex for available value for $status.
+     *
+     * @throws FullTextSearchAppNotAvailableException
+     */
+    public function updateIndexesStatus(string $providerId, array $documentIds, int $status, bool $reset = false) {
+        $this->getIndexService()->updateIndexesStatus($providerId, $documentIds, $status, $reset);
+    }
+
+
+    /**
+     * @param IIndex[] $indexes
+     *
+     * @throws FullTextSearchAppNotAvailableException
+     */
+    public function updateIndexes(array $indexes) {
+        $this->getIndexService()->updateIndexes($indexes);
+    }
+
+
+    /**
+     * @param array $request
+     * @param string $userId
+     *
+     * @return ISearchResult[]
+     * @throws FullTextSearchAppNotAvailableException
+     */
+    public function search(array $request, string $userId = ''): array {
+        $searchRequest = $this->getSearchService()->generateSearchRequest($request);
+
+        return $this->getSearchService()->search($userId, $searchRequest);
+    }
 
 
 }

apps/oauth2/lib/Db/AccessToken.php

Indentation +15 added lines, -15 removed lines

@@ -34,20 +34,20 @@
  * @method void setHashedCode(string $token)
  */
 class AccessToken extends Entity {
-	/** @var int */
-	protected $tokenId;
-	/** @var int */
-	protected $clientId;
-	/** @var string */
-	protected $hashedCode;
-	/** @var string */
-	protected $encryptedToken;
+    /** @var int */
+    protected $tokenId;
+    /** @var int */
+    protected $clientId;
+    /** @var string */
+    protected $hashedCode;
+    /** @var string */
+    protected $encryptedToken;
 
-	public function __construct() {
-		$this->addType('id', 'int');
-		$this->addType('tokenId', 'int');
-		$this->addType('clientId', 'int');
-		$this->addType('hashedCode', 'string');
-		$this->addType('encryptedToken', 'string');
-	}
+    public function __construct() {
+        $this->addType('id', 'int');
+        $this->addType('tokenId', 'int');
+        $this->addType('clientId', 'int');
+        $this->addType('hashedCode', 'string');
+        $this->addType('encryptedToken', 'string');
+    }
 }

lib/private/Authentication/Login/ClearLostPasswordTokensCommand.php

Indentation +19 added lines, -19 removed lines

@@ -29,24 +29,24 @@
 
 class ClearLostPasswordTokensCommand extends ALoginCommand {
 
-	/** @var IConfig */
-	private $config;
-
-	public function __construct(IConfig $config) {
-		$this->config = $config;
-	}
-
-	/**
-	 * User has successfully logged in, now remove the password reset link, when it is available
-	 */
-	public function process(LoginData $loginData): LoginResult {
-		$this->config->deleteUserValue(
-			$loginData->getUser()->getUID(),
-			'core',
-			'lostpassword'
-		);
-
-		return $this->processNextOrFinishSuccessfully($loginData);
-	}
+    /** @var IConfig */
+    private $config;
+
+    public function __construct(IConfig $config) {
+        $this->config = $config;
+    }
+
+    /**
+     * User has successfully logged in, now remove the password reset link, when it is available
+     */
+    public function process(LoginData $loginData): LoginResult {
+        $this->config->deleteUserValue(
+            $loginData->getUser()->getUID(),
+            'core',
+            'lostpassword'
+        );
+
+        return $this->processNextOrFinishSuccessfully($loginData);
+    }
 
 }

lib/private/Authentication/Login/UidLoginCommand.php

Indentation +23 added lines, -23 removed lines

@@ -30,28 +30,28 @@
 
 class UidLoginCommand extends ALoginCommand {
 
-	/** @var Manager */
-	private $userManager;
-
-	public function __construct(Manager $userManager) {
-		$this->userManager = $userManager;
-	}
-
-	/**
-	 * @param LoginData $loginData
-	 *
-	 * @return LoginResult
-	 */
-	public function process(LoginData $loginData): LoginResult {
-		/* @var $loginResult IUser */
-		$user = $this->userManager->checkPasswordNoLogging(
-			$loginData->getUsername(),
-			$loginData->getPassword()
-		);
-
-		$loginData->setUser($user);
-
-		return $this->processNextOrFinishSuccessfully($loginData);
-	}
+    /** @var Manager */
+    private $userManager;
+
+    public function __construct(Manager $userManager) {
+        $this->userManager = $userManager;
+    }
+
+    /**
+     * @param LoginData $loginData
+     *
+     * @return LoginResult
+     */
+    public function process(LoginData $loginData): LoginResult {
+        /* @var $loginResult IUser */
+        $user = $this->userManager->checkPasswordNoLogging(
+            $loginData->getUsername(),
+            $loginData->getPassword()
+        );
+
+        $loginData->setUser($user);
+
+        return $this->processNextOrFinishSuccessfully($loginData);
+    }
 
 }

lib/private/Authentication/Login/UpdateLastPasswordConfirmCommand.php

Indentation +12 added lines, -12 removed lines

@@ -29,20 +29,20 @@
 
 class UpdateLastPasswordConfirmCommand extends ALoginCommand {
 
-	/** @var ISession */
-	private $session;
+    /** @var ISession */
+    private $session;
 
-	public function __construct(ISession $session) {
-		$this->session = $session;
-	}
+    public function __construct(ISession $session) {
+        $this->session = $session;
+    }
 
-	public function process(LoginData $loginData): LoginResult {
-		$this->session->set(
-			'last-password-confirm',
-			$loginData->getUser()->getLastLogin()
-		);
+    public function process(LoginData $loginData): LoginResult {
+        $this->session->set(
+            'last-password-confirm',
+            $loginData->getUser()->getLastLogin()
+        );
 
-		return $this->processNextOrFinishSuccessfully($loginData);
-	}
+        return $this->processNextOrFinishSuccessfully($loginData);
+    }
 
 }

lib/private/Authentication/Login/CompleteLoginCommand.php

Indentation +18 added lines, -18 removed lines

@@ -28,23 +28,23 @@
 
 class CompleteLoginCommand extends ALoginCommand {
 
-	/** @var Session */
-	private $userSession;
-
-	public function __construct(Session $userSession) {
-		$this->userSession = $userSession;
-	}
-
-	public function process(LoginData $loginData): LoginResult {
-		$this->userSession->completeLogin(
-			$loginData->getUser(),
-			[
-				'loginName' => $loginData->getUsername(),
-				'password' => $loginData->getPassword(),
-			]
-		);
-
-		return $this->processNextOrFinishSuccessfully($loginData);
-	}
+    /** @var Session */
+    private $userSession;
+
+    public function __construct(Session $userSession) {
+        $this->userSession = $userSession;
+    }
+
+    public function process(LoginData $loginData): LoginResult {
+        $this->userSession->completeLogin(
+            $loginData->getUser(),
+            [
+                'loginName' => $loginData->getUsername(),
+                'password' => $loginData->getPassword(),
+            ]
+        );
+
+        return $this->processNextOrFinishSuccessfully($loginData);
+    }
 
 }