From 55b9a5d88689f41fa6ae7f7858bc800a495f4b74 Mon Sep 17 00:00:00 2001
From: Tobia De Koninck <tobia@ledfan.be>
Date: Tue, 13 Feb 2018 08:03:06 +0100
Subject: [PATCH] Remove OC_App::disable method
Signed-off-by: Tobia De Koninck <tobia@ledfan.be>
---
apps/files_sharing/tests/UpdaterTest.php | 2 +-
apps/files_trashbin/tests/TrashbinTest.php | 2 +-
lib/base.php | 2 +-
lib/private/Updater.php | 2 +-
lib/private/legacy/app.php | 16 +---------------
5 files changed, 5 insertions(+), 19 deletions(-)
diff --git a/apps/files_sharing/tests/UpdaterTest.php b/apps/files_sharing/tests/UpdaterTest.php
index c8d089f54b4..2e044716d07 100644
--- a/apps/files_sharing/tests/UpdaterTest.php
+++ b/apps/files_sharing/tests/UpdaterTest.php
@@ -127,7 +127,7 @@ class UpdaterTest extends TestCase {
$rootView->deleteAll('files_trashin');
if ($status === false) {
- \OC_App::disable('files_trashbin');
+ \OC::$server->getAppManager()->disableApp('files_trashbin');
}
\OC\Files\Filesystem::getLoader()->removeStorageWrapper('oc_trashbin');
diff --git a/apps/files_trashbin/tests/TrashbinTest.php b/apps/files_trashbin/tests/TrashbinTest.php
index 7e4cdb112e8..1121940c84e 100644
--- a/apps/files_trashbin/tests/TrashbinTest.php
+++ b/apps/files_trashbin/tests/TrashbinTest.php
@@ -71,7 +71,7 @@ class TrashbinTest extends \Test\TestCase {
$application->registerMountProviders();
//disable encryption
- \OC_App::disable('encryption');
+ \OC::$server->getAppManager()->disableApp('encryption');
$config = \OC::$server->getConfig();
//configure trashbin
diff --git a/lib/base.php b/lib/base.php
index c5eabe1910a..f0e139d92c8 100644
--- a/lib/base.php
+++ b/lib/base.php
@@ -949,7 +949,7 @@ class OC {
$appIds = (array)$request->getParam('appid');
foreach($appIds as $appId) {
$appId = \OC_App::cleanAppId($appId);
- \OC_App::disable($appId);
+ \OC::$server->getAppManager()->disableApp($appId);
}
\OC_JSON::success();
exit();
diff --git a/lib/private/Updater.php b/lib/private/Updater.php
index c70113e1c7d..4dc8edc0272 100644
--- a/lib/private/Updater.php
+++ b/lib/private/Updater.php
@@ -395,7 +395,7 @@ class Updater extends BasicEmitter {
if ($appManager->isShipped($app)) {
throw new \UnexpectedValueException('The files of the app "' . $app . '" were not correctly replaced before running the update');
}
- OC_App::disable($app);
+ \OC::$server->getAppManager()->disableApp($app);
$this->emit('\OC\Updater', 'incompatibleAppDisabled', array($app));
}
// no need to disable any app in case this is a non-core upgrade
diff --git a/lib/private/legacy/app.php b/lib/private/legacy/app.php
index eba29d27cf8..303afa797dc 100644
--- a/lib/private/legacy/app.php
+++ b/lib/private/legacy/app.php
@@ -154,7 +154,7 @@ class OC_App {
\OC::$server->getLogger()->logException($ex);
if (!\OC::$server->getAppManager()->isShipped($app)) {
// Only disable apps which are not shipped
- self::disable($app);
+ \OC::$server->getAppManager()->disableApp($app);
}
}
if (self::isType($app, array('authentication'))) {
@@ -421,20 +421,6 @@ class OC_App {
}
}
- /**
- * This function set an app as disabled in appconfig.
- *
- * @param string $app app
- * @throws Exception
- */
- public static function disable(string $app) {
- // flush
- self::$enabledAppsCache = [];
-
- $appManager = \OC::$server->getAppManager();
- $appManager->disableApp($app);
- }
-
/**
* Get the path where to install apps
*
--
GitLab