aboutsummaryrefslogtreecommitdiffstats
path: root/lib/private/Server.php
diff options
context:
space:
mode:
authorCarl Schwan <carl@carlschwan.eu>2022-08-18 10:47:49 +0200
committerCarl Schwan <carl@carlschwan.eu>2022-08-23 19:44:04 +0200
commit9b8ca9ad1f3df5d32df241d8848c8dc92c9a1fc2 (patch)
tree72aa5edaaa4b3c3ded5931c6914988ac9dce9467 /lib/private/Server.php
parent604c1752845df068a7dd5d168abfbfc04065ac3f (diff)
downloadnextcloud-server-9b8ca9ad1f3df5d32df241d8848c8dc92c9a1fc2.tar.gz
nextcloud-server-9b8ca9ad1f3df5d32df241d8848c8dc92c9a1fc2.zip
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 <carl@carlschwan.eu>
Diffstat (limited to 'lib/private/Server.php')
-rw-r--r--lib/private/Server.php6
1 files changed, 5 insertions, 1 deletions
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();
}