chore: Remove deprecated legacy search backend

Signed-off-by: Julius Härtl <[email protected]>
nextcloud · Jun 18, 2024 · d01fa2e · d01fa2e
1 parent 74396a2
commit d01fa2e
Show file tree

Hide file tree

Showing 7 changed files with 0 additions and 229 deletions.
diff --git a/apps/files/lib/AppInfo/Application.php b/apps/files/lib/AppInfo/Application.php
@@ -118,7 +118,6 @@ public function register(IRegistrationContext $context): void {
 	public function boot(IBootContext $context): void {
 		$context->injectFn(Closure::fromCallable([$this, 'registerCollaboration']));
 		$context->injectFn([Listener::class, 'register']);
-		$context->injectFn(Closure::fromCallable([$this, 'registerSearchProvider']));
 		$this->registerTemplates();
 		$this->registerHooks();
 	}
@@ -127,10 +126,6 @@ private function registerCollaboration(IProviderManager $providerManager): void
 		$providerManager->registerResourceProvider(ResourceProvider::class);
 	}
 
-	private function registerSearchProvider(ISearch $search): void {
-		$search->registerProvider(File::class, ['apps' => ['files']]);
-	}
-
 	private function registerTemplates(): void {
 		$templateManager = \OC_Helper::getFileTemplateManager();
 		$templateManager->registerTemplate('application/vnd.oasis.opendocument.presentation', 'core/templates/filetemplates/template.odp');

diff --git a/core/Controller/SearchController.php b/core/Controller/SearchController.php
diff --git a/lib/private/Search.php b/lib/private/Search.php
diff --git a/lib/private/Server.php b/lib/private/Server.php
@@ -184,7 +184,6 @@
 use OCP\IPreview;
 use OCP\IRequest;
 use OCP\IRequestId;
-use OCP\ISearch;
 use OCP\IServerContainer;
 use OCP\ISession;
 use OCP\ITagManager;
@@ -762,10 +761,6 @@ public function __construct($webRoot, \OC\Config $config) {
 		/** @deprecated 19.0.0 */
 		$this->registerDeprecatedAlias('Router', IRouter::class);
 
-		$this->registerAlias(ISearch::class, Search::class);
-		/** @deprecated 19.0.0 */
-		$this->registerDeprecatedAlias('Search', ISearch::class);
-
 		$this->registerService(\OC\Security\RateLimiting\Backend\IBackend::class, function ($c) {
 			$config = $c->get(\OCP\IConfig::class);
 			if (ltrim($config->getSystemValueString('memcache.distributed', ''), '\\') === \OC\Memcache\Redis::class) {
@@ -1797,16 +1792,6 @@ public function getRouter() {
 		return $this->get(IRouter::class);
 	}
 
-	/**
-	 * Returns a search instance
-	 *
-	 * @return ISearch
-	 * @deprecated 20.0.0
-	 */
-	public function getSearch() {
-		return $this->get(ISearch::class);
-	}
-
 	/**
 	 * Returns a SecureRandom instance
 	 *

diff --git a/lib/public/ISearch.php b/lib/public/ISearch.php
diff --git a/lib/public/IServerContainer.php b/lib/public/IServerContainer.php
@@ -343,15 +343,6 @@ public function getLogFactory();
 	 */
 	public function getRouter();
 
-	/**
-	 * Returns a search instance
-	 *
-	 * @return \OCP\ISearch
-	 * @since 7.0.0
-	 * @deprecated 20.0.0
-	 */
-	public function getSearch();
-
 	/**
 	 * Get the certificate manager
 	 *

diff --git a/tests/lib/ServerTest.php b/tests/lib/ServerTest.php
@@ -119,8 +119,6 @@ public function dataTestQuery() {
 			['RootFolder', '\OCP\Files\Folder'],
 			['Router', '\OCP\Route\IRouter'],
 
-			['Search', '\OC\Search'],
-			['Search', '\OCP\ISearch'],
 			['SecureRandom', '\OC\Security\SecureRandom'],
 			['SecureRandom', '\OCP\Security\ISecureRandom'],
 			['ShareManager', '\OC\Share20\Manager'],