SearchResult should be difined in Server as it is a core component

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>

2 files changed, 1 insertions, 5 deletions

diff --git a/lib/private/AppFramework/DependencyInjection/DIContainer.php b/lib/private/AppFramework/DependencyInjection/DIContainer.php
index b005978c2b6..ee9234c1993 100644
--- a/lib/private/AppFramework/DependencyInjection/DIContainer.php
+++ b/lib/private/AppFramework/DependencyInjection/DIContainer.php
@@ -46,7 +46,6 @@ use OC\AppFramework\Middleware\Security\RateLimitingMiddleware;
 use OC\AppFramework\Middleware\Security\SecurityMiddleware;
 use OC\AppFramework\Middleware\SessionMiddleware;
 use OC\AppFramework\Utility\SimpleContainer;
-use OC\Collaboration\Collaborators\SearchResult;
 use OC\Core\Middleware\TwoFactorMiddleware;
 use OC\RichObjectStrings\Validator;
 use OC\ServerContainer;
@@ -54,13 +53,11 @@ use OCP\AppFramework\Http\IOutput;
 use OCP\AppFramework\IAppContainer;
 use OCP\AppFramework\QueryException;
 use OCP\AppFramework\Utility\ITimeFactory;
-use OCP\Collaboration\Collaborators\ISearchResult;
 use OCP\Files\Folder;
 use OCP\Files\IAppData;
 use OCP\GlobalScale\IConfig;
 use OCP\IL10N;
 use OCP\ILogger;
-use OCP\IRequest;
 use OCP\IServerContainer;
 use OCP\ISession;
 use OCP\IUserSession;
@@ -138,8 +135,6 @@ class DIContainer extends SimpleContainer implements IAppContainer {
 			return $c;
 		});
 
-		$this->registerAlias(ISearchResult::class, SearchResult::class);
-
 		// commonly used attributes
 		$this->registerService('UserId', function ($c) {
 			return $c->query(IUserSession::class)->getSession()->get('user_id');
diff --git a/lib/private/Server.php b/lib/private/Server.php
index eb1a9025ff3..1c8ad012ef5 100644
--- a/lib/private/Server.php
+++ b/lib/private/Server.php
@@ -1084,6 +1084,7 @@ class Server extends ServerContainer implements IServerContainer {
 			return $instance;
 		});
 		$this->registerAlias('CollaboratorSearch', \OCP\Collaboration\Collaborators\ISearch::class);
+		$this->registerAlias(\OCP\Collaboration\Collaborators\ISearchResult::class, \OC\Collaboration\Collaborators\SearchResult::class);
 
 		$this->registerAlias(\OCP\Collaboration\AutoComplete\IManager::class, \OC\Collaboration\AutoComplete\Manager::class);