From 9b8ca9ad1f3df5d32df241d8848c8dc92c9a1fc2 Mon Sep 17 00:00:00 2001 From: Carl Schwan Date: Thu, 18 Aug 2022 10:47:49 +0200 Subject: Move findBinaryFinder and isFunctionEnabled away from OC_Helper findBinaryFinder is now a service that is still private but with some minor optimization (remove the hasKey check). isFunctionEnabled is now in OCP\Util Both function are still keep but all internal usage in nextcloud/server were migrated to the new usage, so that we can remove it in 26 Signed-off-by: Carl Schwan --- lib/private/Server.php | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) (limited to 'lib/private/Server.php') diff --git a/lib/private/Server.php b/lib/private/Server.php index 7223c3b8ae3..1770aca26dd 100644 --- a/lib/private/Server.php +++ b/lib/private/Server.php @@ -202,6 +202,7 @@ use OCP\IAvatarManager; use OCP\ICache; use OCP\ICacheFactory; use OCP\ICertificateManager; +use OCP\IBinaryFinder; use OCP\IDateTimeFormatter; use OCP\IDateTimeZone; use OCP\IDBConnection; @@ -335,7 +336,8 @@ class Server extends ServerContainer implements IServerContainer { $c->get(GeneratorHelper::class), $c->get(ISession::class)->get('user_id'), $c->get(Coordinator::class), - $c->get(IServerContainer::class) + $c->get(IServerContainer::class), + $c->get(IBinaryFinder::class) ); }); /** @deprecated 19.0.0 */ @@ -1448,6 +1450,8 @@ class Server extends ServerContainer implements IServerContainer { $this->registerAlias(\OCP\Files\AppData\IAppDataFactory::class, \OC\Files\AppData\Factory::class); + $this->registerAlias(IBinaryFinder::class, BinaryFinder::class); + $this->connectDispatcher(); } -- cgit v1.2.3